diff --git a/packageG/pages/plus_agreement/plus_agreement.js b/packageG/pages/plus_agreement/plus_agreement.js
new file mode 100644
index 0000000..6eef7e2
--- /dev/null
+++ b/packageG/pages/plus_agreement/plus_agreement.js
@@ -0,0 +1,21 @@
+const w = require("../../../utils/wxParse/wxParse.js");
+var os=getApp().globalData.setting;
+var ut = require("../../../utils/util.js");
+Page({
+ data:{
+ },
+
+ //调用视频接口
+ onLoad:function(e){
+ var that = this;
+ //-----------商家配置信息----- 等级卡规则,是否又开邀请码,营业员------------
+ getApp().request.get("/api/weshop/storeconfig/get/" + os.stoid, {
+ success: function (res) {
+ var is_cardrule = res.data.data.cardrules;
+ w.wxParse("content", "html", ut.format_content(is_cardrule), that, 6);
+ }
+ })
+ },
+
+
+})
\ No newline at end of file
diff --git a/packageG/pages/plus_agreement/plus_agreement.json b/packageG/pages/plus_agreement/plus_agreement.json
new file mode 100644
index 0000000..e052655
--- /dev/null
+++ b/packageG/pages/plus_agreement/plus_agreement.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "PLUS会员用户协议",
+ "enablePullDownRefresh": false
+}
\ No newline at end of file
diff --git a/packageG/pages/plus_agreement/plus_agreement.wxml b/packageG/pages/plus_agreement/plus_agreement.wxml
new file mode 100644
index 0000000..4ac9dbe
--- /dev/null
+++ b/packageG/pages/plus_agreement/plus_agreement.wxml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/packageG/pages/plus_agreement/plus_agreement.wxss b/packageG/pages/plus_agreement/plus_agreement.wxss
new file mode 100644
index 0000000..5d7f9d7
--- /dev/null
+++ b/packageG/pages/plus_agreement/plus_agreement.wxss
@@ -0,0 +1 @@
+@import "../../../utils/wxParse/wxParse.wxss";
\ No newline at end of file
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index fcf49d3..2069cec 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -45,7 +45,8 @@ Page({
is_select: false, //是否选择营业员过
is_buy_card_id:"",//是否是链接直接过来购买的卡号id
- is_fir_open:0 //防止多次打开
+ is_fir_open:0, //防止多次打开
+ check_py_val:0
},
swiperChange: function (e) {
@@ -441,6 +442,11 @@ Page({
return false;
}
+ if(!this.data.check_py_val){
+ ut.m_toast('请先同意PLUS会员用户协议')
+ return false;
+ }
+
var item = th.data.is_plusCard[th.data.by_index];
var req = {};
req.cardId = item.CardId;
@@ -462,7 +468,7 @@ Page({
getApp().my_warnning("邀请人不能填自已", 0, th);
return false;
}
- req.recommon = th.data.inp_recommon
+ if(th.data.inp_recommon) req.recommon = th.data.inp_recommon
}
//--后台要求要输入营业员--
if (th.data.is_salesman) {
@@ -473,11 +479,15 @@ Page({
})
return false;
}
- req.serviceman = th.data.inp_serviceman
+ if(th.data.inp_serviceman) req.serviceman = th.data.inp_serviceman
}
}
req.storeId = os.stoid;
req.userId = getApp().globalData.user_id;
+
+
+
+
//--如果有邀请码,和营业员的情况下--
if (req.recommon || req.serviceman) {
@@ -707,5 +717,21 @@ Page({
})
}
}
+ },
+
+ //用户协议的同意的优化
+ handleCheckboxChange:function (){
+ console.log('this.data.checkboxValue ==> ' , this.data.checkboxValue);
+ this.setData({
+ // 点击之后进行取反
+ check_py_val : !this.data.check_py_val
+ })
+ },
+
+ //显示协议的内容
+ show_more_xy:function (){
+ getApp().goto("/packageG/pages/plus_agreement/plus_agreement");
}
+
+
})
\ No newline at end of file
diff --git a/pages/user/plus/plus.wxml b/pages/user/plus/plus.wxml
index ffafa5a..59f782b 100644
--- a/pages/user/plus/plus.wxml
+++ b/pages/user/plus/plus.wxml
@@ -153,6 +153,12 @@
确认购买
+
+
+
+
+
+
diff --git a/pages/user/plus/plus.wxss b/pages/user/plus/plus.wxss
index dcca6ec..42cf674 100644
--- a/pages/user/plus/plus.wxss
+++ b/pages/user/plus/plus.wxss
@@ -384,7 +384,8 @@ swiper {
height: 50rpx;
border-radius: 25rpx;
color: rgb(255, 255, 255);
- margin: 55rpx 0rpx;
+ margin-top: 55rpx;
+ margin-bottom: 15rpx;
background-position: center;background-repeat: no-repeat;background-size: cover
}
@@ -423,4 +424,10 @@ swiper-item{
left: -20%;
top: -2rpx;
border-radius: 0 0 50% 50%; /* 只要顶部两个角是圆弧就好了 */
+}
+
+.m_checkbox .wx-checkbox-input {
+ border-radius: 50%;
+ width: 23rpx !important;
+ height: 23rpx !important;
}
\ No newline at end of file