diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index a3c887b..299e447 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -257,16 +257,6 @@
enabledPlatformCoupon: res1.data.enabledPlatformCoupon,
platformCoupon: res1.data.platformCoupon
})
-
- // uni.setStorageSync('datas', {
- // platformConsumption: res1.data.platformConsumption ||
- // [],
- // productData: that.merchantInfo,
- // checkForm: that.checkForm,
- // merName: that.mer_name,
- // money: that.cartForm.total_amount,
- // key: res1.data.key
- // })
},
fail(err) {
console.log(err)
@@ -296,6 +286,11 @@
this.mer_name = res.data.merchant;
} else {
that.merchantInfo = res.data.list;
+ if (res.data.count == 0) {
+ that.$util.Tips({
+ title: "当前价格下,暂无商品信息~"
+ })
+ }
}
}).catch((err) => {
that.loading = false;
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 433d6b9..e6e0b9b 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -100,7 +100,6 @@
-
填写邀请码
diff --git a/pages/users/user_modify_pwd/index.vue b/pages/users/user_modify_pwd/index.vue
index 2e0ff8b..2e6ae1d 100644
--- a/pages/users/user_modify_pwd/index.vue
+++ b/pages/users/user_modify_pwd/index.vue
@@ -8,33 +8,33 @@
{{userInfo.phone}}
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -43,7 +43,8 @@
-
+
+
@@ -77,12 +78,12 @@
toLogin
} from '@/libs/login.js';
import Verify from '@/components/verify/verify.vue';
- import popups from "@/components/popups/index.vue";
+ import popups from "@/components/popups/index.vue";
export default {
mixins: [sendVerifyCode],
components: {
Verify,
- popups
+ popups
},
data() {
return {
@@ -95,7 +96,7 @@
codeVal: '',
disabled: false,
type: '',
- set_type: '',
+ set_type: '',
};
},
computed: mapGetters(['isLogin', 'viewColor']),
@@ -129,18 +130,18 @@
that.userInfo = res.data
});
},
- showPopup(type){
- this.set_type = type;
- this.$refs.popups.handleOpen();
- },
- // 输入密码回调
- handleConfirm(e) {
- if(this.set_type==1)this.password = e;
- else this.repassword = e;
- },
-
- handleClear() {},
- handleChange() {},
+ showPopup(type) {
+ this.set_type = type;
+ this.$refs.popups.handleOpen();
+ },
+ // 输入密码回调
+ handleConfirm(e) {
+ if (this.set_type == 1) this.password = e;
+ else this.repassword = e;
+ },
+
+ handleClear() {},
+ handleChange() {},
confirmSubmit: function() {
let that = this;
@@ -164,12 +165,16 @@
sms_code: that.captcha
}).then(res => {
that.$util.Tips({
- title: '修改成功！',
- icon: 'success'
- })
- this.$nextTick((res=>{
- uni.navigateBack();
- }))
+ title: '修改成功！',
+ icon: 'success'
+ }, () => {
+ uni.navigateBack();
+ })
+ }).catch((err) => {
+ that.$util.Tips({
+ title: err,
+ icon: 'success'
+ })
})
} else { // 登录密码
modifyPassword({
@@ -204,7 +209,7 @@
await registerVerify({
phone: that.userInfo.phone,
code: that.captcha,
- type: 'change_pwd',
+ type: this.type == 'payPwd' ? 'pay_pwd' : 'change_pwd',
captchaType: 'blockPuzzle',
captchaVerification: data.captchaVerification
}).then(res => {
diff --git a/pages/users/user_nickname/index.vue b/pages/users/user_nickname/index.vue
index a445192..2972328 100644
--- a/pages/users/user_nickname/index.vue
+++ b/pages/users/user_nickname/index.vue
@@ -8,8 +8,8 @@
-
+
@@ -28,9 +28,17 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team
// +----------------------------------------------------------------------
- import { getUserInfo, userEdit, editAvatar } from '@/api/user.js'
- import { mapGetters } from "vuex";
- import { toLogin } from '@/libs/login.js';
+ import {
+ getUserInfo,
+ userEdit,
+ editAvatar
+ } from '@/api/user.js'
+ import {
+ mapGetters
+ } from "vuex";
+ import {
+ toLogin
+ } from '@/libs/login.js';
export default {
components: {},
data() {
@@ -61,7 +69,7 @@
if (this.userInfo.nickname == this.inputcontent) {
uni.showToast({
title: '昵称重复，请重新修改！',
- icon:'none',
+ icon: 'none',
});
} else if (this.inputcontent == '') {
uni.showToast({
@@ -83,7 +91,7 @@
uni.showToast({
title: err,
icon: 'none'
- });
+ });
});
}
},
@@ -156,6 +164,10 @@
background-color: var(--view-theme);
}
+ .ChangePassword .confirmBnt:active {
+ opacity: .8;
+ }
+
.getPhoneBtn {
font-size: 32rpx;
width: 580rpx;
@@ -172,4 +184,4 @@
margin-right: 12rpx;
}
}
-
+
\ No newline at end of file