Skip to content

7
7-Eleven
Commit 2688d89e by 谢中龙
Options

我的邀请修改

parent 575716cd
Showing with 249 additions and 89 deletions
src/app.json
......@@ -56,7 +56,8 @@
"pages/recordList/recordList",
"pages/IntegralMallGoods/IntegralMallGoods",
"pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo",
"pages/exchangeAddress/exchangeAddress"
"pages/exchangeAddress/exchangeAddress",
"pages/myInviteRecords/myInviteRecords"
]
},
{
......
src/pages/activateCard/activateCardCallback.js
......@@ -73,11 +73,16 @@ wxService.page({
success: (res) => {
wx.setStorageSync('_loginCode', res.code)
if(res.code){
wxService.post(`/member/minaLogin`, {
let param = {
code: res.code,
wechatInfo: null,
brandId: app.globalData.brandId,
}).then(response=>{
};
if (!envInfo.isMall){
param.appid = app.globalData.appId
}
wxService.post(`/member/minaLogin`, param).then(response=>{
let dataResp = response.data.data
wx.setStorageSync('token', dataResp.token)
wx.setStorageSync('_baseUserInfo', dataResp)
......
src/project.config.json
......@@ -39,7 +39,7 @@
"list": []
},
"miniprogram": {
"current": 24,
"current": 69,
"list": [
{
"id": -1,
......@@ -499,6 +499,13 @@
"pathName": "shoppingGuid/page/pages/openCard/openCard",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的邀请人员记录",
"pathName": "subPackage/page/pages/myInviteRecords/myInviteRecords",
"query": "",
"scene": null
}
]
}
......
src/shoppingGuid/page/pages/home/home.wxml
......@@ -92,7 +92,7 @@
<image class='goods-lf-icon' src='{{item.productImgUrl}}' mode='aspectFit'></image>
<view class='goods-rg-info'>
<view class='goods-title'>{{item.productName}}</view>
<view class='goods-second-title'>这个是商品的描述</view>
<!-- <view class='goods-second-title'>这个是商品的描述</view> -->
<view class='goods-price'>
<view class='price'>
<view class='plus'>
......
src/subPackage/page/pages/myInvite/myInvite.js
......@@ -26,11 +26,16 @@ wxService.page({
onShow: function () {
this.getInviteNumber()
this.getYesterdayInviteNumber()
this.getInviteMemberList()
this.getInviteBanner()
this.getIsInvite()
wx.hideShareMenu()
},
//跳转到我的邀请界面
onTapToMyInviteRecords(){
wx.navigateTo({
url: '/subPackage/page/pages/myInviteRecords/myInviteRecords',
})
},
// 获取当前邀请人数
getInviteNumber(){
......@@ -90,30 +95,7 @@ wxService.page({
})
},
// 邀请会员列表
getInviteMemberList(){
let params = {
userId: memberId,
tentacleType: 3
}
wx.showLoading({
title: '加载中',
mask: true
})
wxService.post(`/member/share/inviteFriends/buyer/findPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, params).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
this.setData({
inviteMemberList: data
}, () => {
})
}
}
})
},
// 获取邀请页面banner
getInviteBanner(){
......
src/subPackage/page/pages/myInvite/myInvite.wxml
<!--subPackage/page/pages/myInvite/myInvite.wxml-->
<view class="page-my-invite">
<view class="release-num weui-flex df-j--bt">
<view class="num-invite df-1 border_box">
<view class="num-invite df-1 border_box" bindtap='onTapToMyInviteRecords'>
<view class="share-number">{{currentInviteNum || 0}}</view>
<view class="share-title">当前邀请人数</view>
</view>
......@@ -15,50 +15,6 @@
<view class="invite-banner" bindtap="gotoInviteShare">
<image src="{{isGoToInvite ? inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}" mode="widthFix"></image>
</view>
<!-- </navigator> -->
<view class="order-benefit-wrap">
<view class="order-benefit-list" wx:for="{{inviteMemberList}}" wx:key="{{index}}">
<navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type=10&id={{item.memberId}}" hover-class="none">
<view class="top-info">
<!-- 暂时先把头像去掉 -->
<!-- <image class="invite-avatar" src="{{item.headimgurl}}"></image> -->
<view class="invite-phone">
<view class="order-num">{{item.mobile}}</view>
<view class="order-date">{{item.activateWxCardTime}}</view>
</view>
<view class="look-benefit">
<button class="btn btn-primary btn-outline">查看收益</button>
</view>
</view>
</navigator>
<!-- <view class="bottom-info">
<view>
<image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix"></image>
<text class="benefit-num">100</text>
</view>
<view>
<image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix"></image>
<text class="benefit-num">100</text>
</view>
<view>
<image src="/assets/imgs/7_1_0/experience.png" class="experience-icon" mode="widthFix"></image>
<text class="benefit-num">100</text>
</view>
<view>
<image src="/assets/imgs/7_1_0/share-value.png" class="share-value" mode="widthFix"></image>
<text class="benefit-num">100</text>
</view>
</view> -->
</view>
<view class="empty" wx:if="{{!inviteMemberList || inviteMemberList.length < 1}}">
暂无邀请记录~
</view>
</view>
<view class="benefit-tips">
<text>邀请好友只显示前50名</text>
</view>
<!--goHome-->
<go-home/>
<go-home/>
</view>
src/subPackage/page/pages/myInvite/myInvite.wxss
/* subPackage/page/pages/myInvite/myInvite.wxss */
@import './../../../../base/base.wxss';
page{
padding-bottom: 80rpx;
/* padding-bottom: 80rpx; */
}
.release-num {
......@@ -30,12 +30,13 @@ page{
color: #666666;
}
.invite-banner{
padding: 0 20rpx;
margin-top: 20rpx;
/* padding: 0 20rpx; */
/* margin-top: 20rpx; */
}
.invite-banner image{
width: 712rpx;
border-radius: 17rpx;
width: 100%;
/* width: 712rpx; */
/* border-radius: 17rpx; */
/* background-color: rgba(216, 216, 216, 1); */
box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
}
......
src/subPackage/page/pages/myInviteRecords/myInviteRecords.js 0 → 100644
// subPackage/page/pages/myInviteRecords/myInviteRecords.js
const app = getApp()
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
wxService.page({
/**
* 页面的初始数据
*/
data: {
inviteMemberList : [],
pageNo : 1,
pageSize : 50,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
wx.hideShareMenu();
this.getInviteMemberList();
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
// 邀请会员列表
getInviteMemberList(isRefreesh) {
const { memberId } = wx.getStorageSync('_baseUserInfo')
let params = {
userId: memberId,
tentacleType: 3
}
wx.showLoading({
title: '加载中',
mask: true
});
let pageSize = this.data.pageSize;
let pageNo = this.data.pageNo;
wxService.post(`/member/share/inviteFriends/buyer/findPage?pageNo=${pageNo}&pageSize=${pageSize}`, params).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading();
this.setData({
inviteMemberList: data
})
}
}
if(isRefreesh){
wx.stopPullDownRefresh();
wx.showToast({
title: '刷新成功',
});
}
})
},
//跳转到我的收益界面
ontapToMyBenifit(e){
let item = e.currentTarget.dataset.item;
wx.navigateTo({
url: '/subPackage/page/pages/orderBenefit/orderBenefit?type=10&id=' + item.memberId,
});
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
this.data.pageNo = 1;
this.data.inviteMemberList = [];
this.getInviteMemberList(true);
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
})
\ No newline at end of file
src/subPackage/page/pages/myInviteRecords/myInviteRecords.json 0 → 100644
{
"enablePullDownRefresh": true,
"navigationBarTitleText": "我的邀请记录",
"usingComponents": {
"go-home": "/component/goHome/goHome",
"empty": "../../../../component/empty/empty"
}
}
\ No newline at end of file
src/subPackage/page/pages/myInviteRecords/myInviteRecords.wxml 0 → 100644
<!--subPackage/page/pages/myInviteRecords/myInviteRecords.wxml-->
<view class="order-benefit-wrap">
<view class="order-benefit-list" wx:for="{{inviteMemberList}}" wx:key="{{index}}" data-item="{{item}}" bindtap='ontapToMyBenifit'>
<view class="top-info">
<!-- 暂时先把头像去掉 -->
<!-- <image class="invite-avatar" src="{{item.headimgurl}}"></image> -->
<view class="invite-phone">
<view class="order-num">{{item.mobile}}</view>
<view class="order-date">{{item.activateWxCardTime}}</view>
</view>
<view class="look-benefit">
<button class="btn btn-primary btn-outline" >查看收益</button>
</view>
</view>
<!-- <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type=10&id={{item.memberId}}" hover-class="none">
</navigator> -->
</view>
</view>
<!-- 空 -->
<empty text="您还没用邀请记录哦~" wx:if="{{inviteMemberList.length == 0}}"/>
<view class="benefit-tips">
<text>邀请好友只显示前50名</text>
</view>
<!--goHome-->
<go-home/>
src/subPackage/page/pages/myInviteRecords/myInviteRecords.wxss 0 → 100644
/* subPackage/page/pages/myInviteRecords/myInviteRecords.wxss */
page{
padding-bottom: 60px;
}
.order-benefit-wrap{
margin-top: 8rpx;
padding: 0 20rpx;
}
.order-benefit-list{
border-radius: 10rpx;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
padding: 34rpx 20rpx;
margin-top: 20rpx;
/* border-bottom: solid 2rpx #eeeeee; */
}
.top-info{
display: flex;
align-items: center;
justify-content: space-between;
}
.order-num{
color: #333333;
}
.order-date{
color: #aaaaaa;
font-size: 20rpx;
margin-top: 5rpx;
}
.benefit-tips{
width: 750rpx;
height: 53rpx;
/* background-color: rgba(0, 0, 0, 0.25); */
background-color: #ccc;
position: fixed;
bottom: 0;
line-height: 53rpx;
color: #ffffff;
font-size: 20rpx;
text-align: center;
}
.invite-avatar{
width: 68rpx;
height: 68rpx;
background-color: rgba(216, 216, 216, 1);
border: 1px solid rgba(151, 151, 151, 1);
border-radius: 50%;
vertical-align: middle;
}
.invite-phone{
vertical-align: middle;
margin-left: 32rpx;
width: 429rpx;
}
.look-benefit{
width: 107rpx;
}
.look-benefit button{
height: 35rpx;
border-radius: 17rpx;
line-height: 35rpx;
font-size: 18rpx;
}
\ No newline at end of file
src/subPackage/page/pages/orderBenefit/orderBenefit.wxss
......@@ -14,6 +14,7 @@ page{
.top-info,.bottom-info{
display: flex;
justify-content: space-between;
align-items: center;
}
.bottom-info{
margin-top:10rpx;
......
src/subPackage/page/pages/paymentStatus/paymentStatus.js
......@@ -4,6 +4,7 @@
const app = getApp()
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
const envInfo = require('../../../../config/index').envInfo;
wxService.page({
......@@ -53,11 +54,16 @@ wxService.page({
const code = wx.getStorageSync('_loginCode')
const wechatInfo = wx.getStorageSync('_wechatInfo')
wxService.login().then((res) => {
wxService.post(`/member/minaLogin`, {
code:res.code,
let param = {
code: res.code,
wechatInfo,
brandId: app.globalData.brandId,
}).then(response => {
};
if (!envInfo.isMall) {
param.appid = app.globalData.appId
}
wxService.post(`/member/minaLogin`, param).then(response => {
let dataResp = response.data.data
wx.setStorageSync('token', dataResp.token)
wx.setStorageSync('_baseUserInfo', dataResp)
......
src/utils/util.js
......@@ -293,12 +293,16 @@ function getUserInfoByBtn(userInfo) {
const currentEnv = wx.getStorageSync('_qyWeChat')
// let currentLoginUrl = currentEnv ? `/member/qiyeweixin/minaLogin` : `/member/minaLogin`
let currentLoginUrl = `/member/minaLogin`
return wxService.post(`${currentLoginUrl}`, {
let param = {
code: res[1].code,
wechatInfo: res[0],
brandId: app.globalData.brandId,
})
};
if (!envInfo.isMall) {
param.appid = app.globalData.appId
}
return wxService.post(`${currentLoginUrl}`,param)
}, (err) => {
return Promise.reject(err)
}).then(response => {
......
src/utils/wxService.js
......@@ -134,11 +134,15 @@ class WXService extends Http {
var _this = this
return _this.login().then(result => {
if (result.code) {
_this.post(`/member/minaLogin`, {
let param = {
code: result.code,
wechatInfo: null,
brandId: app.globalData.brandId,
}).then(response => {
};
if (!envInfo.isMall) {
param.appid = app.globalData.appId
}
_this.post(`/member/minaLogin`, param).then(response => {
if (response) {
let dataResp = response.data.data
wx.setStorageSync('token', dataResp.token)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment