diff --git a/components/sanshui-modal/index.vue b/components/sanshui-modal/index.vue index 0837d1e..938319b 100644 --- a/components/sanshui-modal/index.vue +++ b/components/sanshui-modal/index.vue @@ -94,8 +94,8 @@ box-sizing: border-box; opacity: 0; position: fixed; - top: 44px; - bottom: 50px; + top: 0px; + bottom: 0px; left: 0; width: 100%; pointer-events: none; diff --git a/components/sanshui-payment-password/index.vue b/components/sanshui-payment-password/index.vue index aa08a71..4a7c33a 100644 --- a/components/sanshui-payment-password/index.vue +++ b/components/sanshui-payment-password/index.vue @@ -331,11 +331,11 @@ } }, checkSafePwd(type) { - uni.showLoading({ - title: '校验安全密码中' - }); + // uni.showLoading({ + // title: '校验安全密码中' + // }); setTimeout(() => {//模拟请求，把这个换成ajax请求哈，或者emit出去 外面去请求，但是建议都集成在这边 省的写一堆重置代码 - uni.hideLoading(); + // uni.hideLoading(); let response = {//模拟返回 code: 1, msg: '密码正确' diff --git a/pages.json b/pages.json index 9c9184f..a48e375 100644 --- a/pages.json +++ b/pages.json @@ -497,7 +497,7 @@ "path" : "pages/user/bindingCard/bindingCard", "style" : { - "navigationBarTitleText": "綁定卡号", + "navigationBarTitleText": "绑定定卡号", "navigationBarBackgroundColor": "#0083f5", "backgroundColorTop": "#0083f5", "navigationBarTextStyle": "white", diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index 6d9ff0a..ce44b63 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -118,7 +118,7 @@ - + 实付:￥{{paytheprice}} @@ -154,7 +154,7 @@ - + @@ -202,7 +202,6 @@ user: '', paytype: '', PaymentPassword: '', - isture: true, orderId: '', jumpType: '', tongCardPrice: 0, @@ -498,9 +497,14 @@ }) return; } - that.isture = false; that.$refs.paymentPassword.modalFun('show'); } else if (that.paytype == 'gonghuika') { + if (!that.user.isSetPayPwd) { + uni.navigateTo({ + url: '../login/updatePas/updatePas' + }) + return; + } if (!that.user.isSetHltCard) { uni.showToast({ icon: 'none', @@ -516,7 +520,6 @@ }); return; } - that.isture = false; that.$refs.paymentPassword.modalFun('show'); } else { uni.showToast({ @@ -528,7 +531,14 @@ }, submitHandle(e) { this.PaymentPassword = e.value; - this.isture = true; + if(this.PaymentPassword == ''){ + uni.showToast({ + title: '请勿手动关闭弹窗', + icon: 'none', + duration: 2000 + }) + return; + } uni.showLoading({ title: '支付中...' }) diff --git a/pages/pay/payment/payment.vue b/pages/pay/payment/payment.vue index b5f8aca..6639c40 100644 --- a/pages/pay/payment/payment.vue +++ b/pages/pay/payment/payment.vue @@ -103,7 +103,6 @@ this.pryType = e.paytype; this.orderNo = e.orderId; this.couponId = e.couponId; - this.user = app.globalData.userInfo; this.jumpType = e.typeaout; if (this.pryType == 1) { this.paytype = 'wxpay'; @@ -116,6 +115,7 @@ }, onShow() { let that = this; + that.user = app.globalData.userInfo; uni.getStorage({ key: 'balanceCardNo', success(e) { @@ -222,6 +222,12 @@ } that.$refs.paymentPassword.modalFun('show'); } else if (that.paytype == 'gonghuika') { + if (!that.user.isSetPayPwd) { + uni.navigateTo({ + url: '../../login/updatePas/updatePas' + }) + return; + } if (!that.user.isSetHltCard) { uni.showToast({ icon: 'none', diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue index 714e74f..fada955 100644 --- a/pages/tabBar/user/user.vue +++ b/pages/tabBar/user/user.vue @@ -99,8 +99,8 @@ - - + + 我的 @@ -209,24 +209,7 @@ // } ], //操作列表 - czList: [ - // { - // url: '../../user/bindingCardList/bindingCardList', - // text: '卡列表', - // img: '../../../static/img/pas.png' - // }, - { - url: '../../user/unionCard/unionCard', - text: '工会卡', - img: '../../../static/img/ghk.png' - }, - { - url: '../../login/updatePas/resetPas', - text: '修改密码', - img: '../../../static/img/pas.png' - }, - - ], + czList: '', } }, //下拉刷新，需要自己在page.json文件中配置开启页面下拉刷新 "enablePullDownRefresh": true @@ -261,6 +244,32 @@ if (app.globalData.userInfo) { this.findUser(); } + + if (!app.globalData.userInfo.isSetPayPwd) { + this.czList = [{ + url: '../../user/unionCard/unionCard', + text: '工会卡', + img: '../../../static/img/ghk.png' + }, + { + url: '../../login/updatePas/updatePas', + text: '设置密码', + img: '../../../static/img/pas.png' + }, + ] + return; + } + this.czList = [{ + url: '../../user/unionCard/unionCard', + text: '工会卡', + img: '../../../static/img/ghk.png' + }, + { + url: '../../login/updatePas/resetPas', + text: '修改密码', + img: '../../../static/img/pas.png' + }, + ] }, methods: { findUser() { diff --git a/pages/user/bindingCard/bindingCard.vue b/pages/user/bindingCard/bindingCard.vue index fa315bc..7a8c2a2 100644 --- a/pages/user/bindingCard/bindingCard.vue +++ b/pages/user/bindingCard/bindingCard.vue @@ -109,8 +109,8 @@ getHuiLianTongCardByCardNo(params).then(res => { uni.hideLoading() if (res.return_code == '000000') { - this.phoneNumber = res.return_data.userMobile; - // this.phoneNumber = 15583658692; + // this.phoneNumber = res.return_data.userMobile; + this.phoneNumber = 15583658692; this.disStute = true } else { uni.showToast({ @@ -153,6 +153,16 @@ key: "balanceCardNo", data: this.cardNoNumber }) + app.globalData.userInfo = res.return_data + .object + .highUser; + app.globalData.token = res.return_data.uniqueCode; + uni.setStorage({ + key: "user", + data: res.return_data + .object + .highUser + }) uni.showToast({ title: '绑定成功', icon: "success", diff --git a/pages/user/unionCard/unionCard.vue b/pages/user/unionCard/unionCard.vue index 3c994c3..d93f971 100644 --- a/pages/user/unionCard/unionCard.vue +++ b/pages/user/unionCard/unionCard.vue @@ -234,7 +234,7 @@ this.cardConsumeList = []; uni.hideLoading(); uni.showToast({ - title:'请求超时稍后重试!', + title:res.return_msg, icon:'none', duration: 2000 })