diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 7790e1f..bef9f48 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -12,7 +12,7 @@
{{item.goods_name}}
-
+
{{item.prom_integral}}积分
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index be027d6..b90eee8 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -62,7 +62,7 @@
{{item.goods_name}}
-
+
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 91cdcf4..9f915b0 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -35,7 +35,7 @@
{{item.goods_name}}
-
+
{{item.prom_integral}}积分
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index 48eff7b..22713ee 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -38,6 +38,9 @@ Page({
def_recommon: null, //分享人的手机号
def_serviceman: null, //分享人的营业员
fir_leader: 0, //分享人的ID
+ staffNo_arr: [], //多个营业员
+ focus:false,
+ is_select: false, //是否选择营业员过
},
swiperChange: function (e) {
var currentId = e.detail.current;
@@ -280,6 +283,21 @@ Page({
})
}
},
+
+ //选择营业员
+ select_serviceman(e) {
+ let StaffNo = e.currentTarget.dataset.staffno;
+ let {req_data,req} = this.data;
+ if (StaffNo || StaffNo !== "") {
+ req_data.staffNo = StaffNo;
+ req.serviceman = StaffNo;
+ };
+ this.setData({
+ is_select: 1,
+ staffNo_arr:[],
+ })
+ this.check_serviceman(req_data,req)
+ },
//--绑定邀请码的输入--
b_input: function (e) {
var value = e.detail.value.trim();
@@ -299,6 +317,7 @@ Page({
},
//--立即购买卡--
buy_card: async function () {
+ console.log(11111);
var th = this;
var is_card = 0;
//--商家是不是有等级卡功能，开通的人数是不是够用，开通是时间是不是到期--
@@ -341,6 +360,9 @@ Page({
if (th.data.is_salesman) {
if (!th.data.inp_serviceman) {
getApp().my_warnning("请输入营业员", 0, th);
+ th.setData({
+ focus:true
+ })
return false;
}
req.serviceman = th.data.inp_serviceman
@@ -350,37 +372,93 @@ Page({
req.userId = getApp().globalData.user_id;
//--如果有邀请码，和营业员的情况下--
if (req.recommon || req.serviceman) {
+
var req_data = {
storeId: os.stoid,
userId: req.userId
};
if (req.recommon) req_data.inviteCode = req.recommon;
if (req.serviceman) req_data.staffNo = req.serviceman;
- getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", {
- data: req_data,
- success: function (res) {
- if (res.data.code == 0) {
- t_pay.pay(req, th.success, function () {
- getApp().my_warnning("支付失败", 0, th);
- });
- } else {
- getApp().my_warnning(res.data.msg, 0, th);
- }
- }
+ th.setData({
+ req_data,
+ req,
})
+ th.check_serviceman(req_data,req)
+ // getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", {
+ // data: req_data,
+ // success: function (res) {
+ // if (res.data.code == 0) {
+ // if(res.data.data.length > 1 && !th.data.is_select){
+ // th.setData({
+ // staffNo_arr:res.data.data
+ // })
+ // }else{
+ // t_pay.pay(req, th.success, function () {
+ // getApp().my_warnning("支付失败", 0, th);
+ // th.setData({
+ // is_select:0,
+ // })
+ // });
+ // }
+ // } else {
+ // getApp().my_warnning(res.data.msg, 0, th);
+ // th.setData({
+ // is_select:0,
+ // })
+ // }
+ // }
+ // })
} else {
t_pay.pay(req, th.success, function () {
getApp().my_warnning("支付失败", 0, th);
+ th.setData({
+ is_select:0,
+ focus:true,
+ })
});
- }
+ }
},
//返回会员页面
OpeningClose: function () {
this.setData({
- open_yq: 0
+ open_yq: 0,
+ inp_serviceman:""
});
},
-
+ dialog_close() {
+ this.setData({
+ staffNo_arr: [],
+ });
+ },
+ check_serviceman(data,req) {
+ let th = this;
+ getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", {
+ data,
+ success: function (res) {
+ if (res.data.code == 0) {
+ if (res.data.data.length > 1 && !th.data.is_select) {
+ th.setData({
+ staffNo_arr: res.data.data
+ })
+ }else{
+ t_pay.pay(req, th.success, function () {
+ getApp().my_warnning("支付失败", 0, th);
+ th.setData({
+ is_select:0,
+ focus:true,
+ })
+ });
+ }
+ } else {
+ getApp().my_warnning(res.data.msg, 0, th);
+ th.setData({
+ is_select:0,
+ focus:true,
+ })
+ }
+ }
+ })
+ },
//返回会员中心
back_user: function () {
setTimeout(function () {
@@ -409,7 +487,6 @@ Page({
url: u_url
})
}
-
},
diff --git a/pages/user/plus/plus.wxml b/pages/user/plus/plus.wxml
index 8e71b06..b51ed39 100644
--- a/pages/user/plus/plus.wxml
+++ b/pages/user/plus/plus.wxml
@@ -1,23 +1,23 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
{{item.CardName}}
@@ -32,7 +32,7 @@
-
+
按去年用户消费计算，开卡后一年预计省￥{{item.free}}元
@@ -41,76 +41,80 @@
+
-
-
+
-
-
+
+
+
+
+
+
+ 开通PLUS会员尊享礼遇
+
-
-
-
- 开通PLUS会员尊享礼遇
-
-
-
-
+
+
-
- PLUS会员可享受以下特权
+
+ PLUS会员可享受以下特权
+
+
+
+
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+ 好物推荐
- 好物推荐
+
+
+
+
+
+
-
-
-
-
+
+
+
+ GOOD HOT THING
+
-
-
-
-
- GOOD HOT THING
-
+
+
+
-
-
-
-
-
@@ -127,32 +131,54 @@
请完善下面信息
-
+
-
+
-
+
-
+
确认购买
+
+
+
+
+
+
+
+ 请选择营业员
+ X
+
+
+ 编号
+ 姓名
+
+
+
+ {{item.StaffNo}}
+ {{item.StaffName}}
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/plus/plus.wxss b/pages/user/plus/plus.wxss
index f169837..e6912d3 100644
--- a/pages/user/plus/plus.wxss
+++ b/pages/user/plus/plus.wxss
@@ -16,7 +16,48 @@ page {
width: 100%;
height: 100%;
}
-
+.dialogful{
+ position: fixed;
+ left: 0;
+ top: 15%;
+ right: 0;
+ bottom: 0;
+ z-index: 11;
+ background: rgba(0, 0, 0, 0.6);
+ width: 100%;
+ height: 100%;
+}
+.dialog_body {
+ margin:30% auto;
+ width: 660rpx;
+}
+.dialog_close{
+ float: right;
+ width: 50rpx;
+ height: 50rpx;
+ text-align: right;
+}
+.dialog_choose{
+ position: relative;
+ padding: 20rpx;
+ border-bottom: 1rpx solid #eee;
+}
+.dialog_name,
+.dialog_content {
+ padding: 10rpx;
+ display: flex;
+ border-bottom: 1rpx solid #f7f7f7;
+ justify-content: space-around;
+
+}
+.weui-active{
+ opacity: 0.9;
+ background: #f7f7f7;
+}
+.w50 {
+ width: 50%;
+ text-align: center;
+}
.Opening_bk image {
position: absolute;
z-index: 2;