diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 2b845db..702ec73 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -51,7 +51,6 @@
suffixIcon='arrow-down'>
-
+
+
+
+
+
@@ -71,20 +79,20 @@
'border-radius': '30rpx'
}" :placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }">
-
重新获取({{ cutDown }})
{{ flag ? '获取验证码' : '重新获取' }}
-
+
+
报备人:{{ STORE_INFO.name }}
-
- ¥500.00
-
+
{
cutDown.value--
- if (cutDown.value <= 0) clearInterval(timer)
+ if (cutDown.value <= 0) {
+ cutDown.value = 0;
+ clearInterval(timer);
+ }
}, 1000)
}
// 验证码结束
@@ -311,7 +322,8 @@
label_id: "",
user_ship: '',
code: '',
- brigade: ""
+ brigade: "",
+ price: "",
// store_id: STORE_INFO.id,
// mobile: "19130550023",
// province: 510000,
@@ -342,6 +354,8 @@
const conformRole = (e) => {
formData.label_name = e.value[0].label_name
formData.label_id = e.value[0].label_id
+ console.log(e)
+
showPop1.value = false
}
@@ -465,7 +479,6 @@
if (!formData.real_name) return uni.$u.toast('请填写真实姓名');
if (!formData.mobile) return uni.$u.toast('请填写电话号码');
if (!formData.code) return uni.$u.toast('请输入短信验证码');
- if (!formData.label_id) return uni.$u.toast('请选择用户身份');
if (!formData.address) return uni.$u.toast('请选择地址');
formData.store_id = STORE_INFO.id
if (Role.value == 1) {
@@ -473,6 +486,7 @@
// formData.user_ship = 1
// vipRechargeApi(formData).then(res => {})
// return
+ if (!formData.label_id) return uni.$u.toast('请选择用户身份');
uni.scanCode({
success: function(res) {
if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
@@ -574,7 +588,6 @@
getCount()
getLists()
-
const upadtaStatus = (item) => {
updataOrderApi({
order_no: item.order_id,
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 190edb4..c9f0a92 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,7 +1,7 @@
+
@@ -42,32 +57,37 @@
-
-
-
+
+
+ 余额:
+
+
+ {{userInfo.now_money||"0.00"}}(元)
+
+
-
+
{{userInfo.purchase_funds||'0.00'}}
采购款
{{userInfo.return_money||'0.00'}}
-
返还金
-
- {{userInfo.number ||"0.00"}}
- 冻结礼品券
-
+
{{userInfo.GetNumber ||"0.00"}}
- 可用礼品券
+ 礼品券
+
+
+ {{userInfo.number ||"0.00"}}
+ 冻结券
@@ -222,7 +242,7 @@
box-sizing: border-box;
padding: 50rpx 0 50rpx 50rpx;
position: absolute;
- top: 50rpx;
+ top: -10rpx;
left: 0;
z-index: 2;
display: flex;
diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue
index 78f78fe..b9adf37 100644
--- a/pagesOrder/order/order.vue
+++ b/pagesOrder/order/order.vue
@@ -295,15 +295,14 @@
const pay_type = ref('3')
const rePay = async (e) => {
+ payFn(e)
+ return
if (!pay_type.value) return uni.$u.toast('请选择支付方式');
if (pay_type.value == 3 || pay_type.value == 18) {
let res = await userInfoApi()
return res.data.pay_password ? passwordBoardVisible.value = true : showModal.value = true
}
-
}
-
-
// 支付密码
const password = ref(''); // 支付密码
const passwordBoardVisible = ref(false);
@@ -321,7 +320,7 @@
}
- const payFn = () => {
+ const payFn = (e) => {
rePaymentApi({
order_id: e.id,
address_id: e.address_id,