diff --git a/pages/login/login.vue b/pages/login/login.vue
index e1bd7e7..865c2ba 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -71,11 +71,9 @@
登录中..
-
-
+
@@ -605,6 +603,11 @@
async loginSmsDo() {
const phone = this.form.phonenumber;
const smsCode = this.form.smsCode;
+
+ // 是否阅读协议
+ if(!this.checkxy()){
+ return false;
+ }
if (!this.$u.test.mobile(phone)) {
this.$refs.uToast.show({
diff --git a/pages/user/set.vue b/pages/user/set.vue
index 6e69f70..e251a0a 100644
--- a/pages/user/set.vue
+++ b/pages/user/set.vue
@@ -8,6 +8,24 @@
+
+
+ 修改密码
+
+
+
+
+
+ 用户服务协议
+
+
+
+
+
+ 隐私政策条款
+
+
+
@@ -21,18 +39,13 @@
已开启
-->
-
-
- 修改密码
-
-
-
-
+
+
-
+
关于我们
版本号 {{versionIn}}
@@ -115,6 +128,16 @@
})
}
},
+ gotofw(){
+ uni.navigateTo({
+ url: `/pages/user/infofw`
+ });
+ },
+ gotoys(){
+ uni.navigateTo({
+ url: `/pages/user/infoys`
+ });
+ },
gotoaddr() {
// 收货地址
uni.navigateTo({
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 68d36c4..556d018 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -638,44 +638,6 @@
});
}
},
- // 学员签到扫码
- scando(){
- var _this=this;
- // 允许从相机和相册扫码
- //qrCode,barCode
- // #ifdef APP-PLUS
- uni.scanCode({
- scanType: ['qrCode', 'barCode'],
- success: function(res) {
- console.log(res);
- console.log('条码类型：' + res.scanType);
- console.log('条码内容：' + res.result);
- // 入库扫码内容确认
- var rmbm=res.result;
- console.log(rmbm);
- if(rmbm){
- // 预约详情
- uni.navigateTo({
- url: `/pages/book/bookinfo?id=${rmbm}&type=qd`
- });
- }
- else{
- uni.showModal({
- title: '提示',
- content: '扫码异常，请正确扫码绑定推广员！',
- cancelText: '取消',
- confirmText: '确定',
- success: ress => {
- if (ress.confirm) {
- }
- }
- });
- }
- }
- });
- // #endif
- },
-
async logoff(){
uni.showLoading({
title: '账号注销中...'
@@ -683,9 +645,9 @@
var params = {
phone: this.phone
};
- const {data: res} = await uni.$http.post('/appiso/deleteBuyer',params);
+ const {data: res} = await uni.$http.get('/api/cancel');
console.log("账号注销返回",res)
- if (res&&res.data) {
+ if (res&&res.success) {
// 清除登录缓存
this.openId = "";
this.phone = "";
@@ -742,7 +704,7 @@
//#ifdef APP-PLUS
plus.runtime.setBadgeNumber(-1);
//#endif
-
+
uni.showModal({
title: '提示',
content: '账号已注销！',
@@ -767,6 +729,44 @@
});
}
},
+
+ // 学员签到扫码
+ scando(){
+ var _this=this;
+ // 允许从相机和相册扫码
+ //qrCode,barCode
+ // #ifdef APP-PLUS
+ uni.scanCode({
+ scanType: ['qrCode', 'barCode'],
+ success: function(res) {
+ console.log(res);
+ console.log('条码类型：' + res.scanType);
+ console.log('条码内容：' + res.result);
+ // 入库扫码内容确认
+ var rmbm=res.result;
+ console.log(rmbm);
+ if(rmbm){
+ // 预约详情
+ uni.navigateTo({
+ url: `/pages/book/bookinfo?id=${rmbm}&type=qd`
+ });
+ }
+ else{
+ uni.showModal({
+ title: '提示',
+ content: '扫码异常，请正确扫码绑定推广员！',
+ cancelText: '取消',
+ confirmText: '确定',
+ success: ress => {
+ if (ress.confirm) {
+ }
+ }
+ });
+ }
+ }
+ });
+ // #endif
+ },
getPhoneNumber(e){
if(e.userid){
this.userid = e.userid
diff --git a/static/image/yhxy.png b/static/image/yhxy.png
new file mode 100644
index 0000000..11f8f9c
Binary files /dev/null and b/static/image/yhxy.png differ
diff --git a/static/image/ys.png b/static/image/ys.png
new file mode 100644
index 0000000..f7c6bde
Binary files /dev/null and b/static/image/ys.png differ