diff --git a/pages/login/index.js b/pages/login/index.js index 0c5e12d..8795409 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -18,8 +18,13 @@ Page({ formPath: "", loginType: "tel", // 登录类型 password: null, - showPSW: false - + showPSW: false, + switchChecked:false, + }, + switchChange(){ + this.setData({ + switchChecked:!this.data.switchChecked + }) }, wxLogin () { var that = this; @@ -209,11 +214,21 @@ Page({ // }, // }); }, + checkCheck(){ + var that = this; + if(!that.data.switchChecked){ + app.showTips(that, "请先同意用户服务协议及隐私协议"); + return; + } + }, getPhoneNumber (e) { var that = this; console.log(e); - console.log(e.detail.errMsg); - + console.log(that.data.switchChecked); + if(!that.data.switchChecked){ + app.showTips(that, "请先同意用户服务协议及隐私协议"); + return; + } if ("getPhoneNumber:ok" == e.detail.errMsg || "phonenumber:ok" == e.detail.errMsg) { //同意 wx.showLoading({ @@ -666,6 +681,13 @@ Page({ beforeFormSubmit (e) { console.log(e); let that = this; + + if(!that.data.switchChecked){ + app.showTips(that, "请先同意用户服务协议及隐私协议"); + return; + } + + if (that.data.loginType == "tel") { this.formSubmit(e.detail.value); } else { diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 99e817a..c895d1d 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -56,12 +56,13 @@ - + + + + + + + 我已阅读并同意 + 《用户服务协议》 + 及 + 《隐私政策》 + - + 伯才人力资源供应链平台 荣誉出品 diff --git a/pages/login/index.wxss b/pages/login/index.wxss index eb0583e..7f207b6 100644 --- a/pages/login/index.wxss +++ b/pages/login/index.wxss @@ -154,7 +154,10 @@ label.radio:last-child { } .loginForm { padding: 0 37px; - margin-top: -20%; + /* margin-top: -20%; */ +} +.aLink{ + color: #1890ff; } .phoneInput { diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index 5fdb784..ac7ab93 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -435,6 +435,19 @@ + + + + + + + 投诉/举报 + + + + + + diff --git a/pages/setting/index.js b/pages/setting/index.js index aedc70d..bc14a8b 100644 --- a/pages/setting/index.js +++ b/pages/setting/index.js @@ -11,7 +11,13 @@ Page({ drawerShow: false, teamList: [], }, - + previewImage(e) { + const url = e.currentTarget.dataset.url; + wx.previewImage({ + current: url, // 当前显示图片的链接 + urls: [url], // 需要预览的图片链接列表 + }); + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/setting/index.wxml b/pages/setting/index.wxml index 63aea97..e49fa8b 100644 --- a/pages/setting/index.wxml +++ b/pages/setting/index.wxml @@ -73,6 +73,13 @@ + + 《营业执照》 + 《人力资源服务许可证》 + + + + 注销账号