From 03657673fba20e38d95f147c12c3b7d03edd7414 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 26 Jun 2024 14:06:40 +0800
Subject: [PATCH] add
---
pageQuota/vipUser/index.vue | 46 ++++++--
pages/cart/cart.vue | 21 +++-
pages/index/index.vue | 103 +++++++++++++++---
pages/my/my.vue | 14 ++-
pagesOrder/settle/settle.vue | 10 +-
.../zy-passwordboard/zy-passwordboard.vue | 6 +
6 files changed, 160 insertions(+), 40 deletions(-)
diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index cf540f4..856a68e 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -288,15 +288,29 @@
const currentTab = ref(1)
const formData = reactive({
+ // store_id: STORE_INFO.id,
+ // mobile: "",
+ // province: 510000,
+ // city: '',
+ // area: "",
+ // street: "",
+ // village: "",
+ // real_name: "",
+ // auth_code: "",
+ // address: "",
+ // label_name: "",
+ // label_id: "",
+ // user_ship: '',
+ // code: ''
store_id: STORE_INFO.id,
- mobile: "",
+ mobile: "19130550023",
province: 510000,
- city: '',
- area: "",
- street: "",
+ city: '510600',
+ area: "510626",
+ street: "510626101",
village: "",
real_name: "赵明军",
- auth_code: "",
+ auth_code: "131527008529094084",
address: "",
label_name: "",
label_id: "",
@@ -430,16 +444,24 @@
if (!formData.real_name) return uni.$u.toast('请填写真实姓名');
if (!formData.mobile) return uni.$u.toast('请填写电话号码');
if (!formData.code) return uni.$u.toast('请输入短信验证码');
- uni.showLoading({
- title: '支付中...'
- });
formData.store_id = STORE_INFO.id
if (Role.value == 1) {
+ formData.recharge_type = 'INDUSTRYMEMBERS'
+ formData.user_ship = 1
+ vipRechargeApi(formData).then(res => {
+
+ // timer = setTimeout(() => {
+ // uni.hideLoading();
+ // uni.$u.toast('支付超时');
+ // }, 30000)
+ })
+ return
uni.scanCode({
success: function(res) {
-
- if (res.result.length != 14) return uni.$u.toast('二维码未扫描完整');
-
+ if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
+ uni.showLoading({
+ title: '支付中...'
+ });
formData.auth_code = res.result
formData.recharge_type = 'INDUSTRYMEMBERS'
formData.user_ship = 1
@@ -482,7 +504,7 @@
const rePay = (item) => {
uni.scanCode({
success: function(res) {
- if (res.result.length != 14) return uni.$u.toast('二维码未扫描完整');
+ if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
uni.showLoading({
title: '支付中...'
});
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 01e0222..e1881db 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -34,7 +34,11 @@
{{item.goods_name}}
{{item.unit_name}}
+ 原价：￥{{item.unit_name}}
+
+
￥{{item.sell}}
@@ -50,6 +54,7 @@
icon="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/29955202404260944367594.png">
+ {{priceKey}}
@@ -129,7 +134,8 @@
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 4b41dca..69ef55d 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -51,13 +51,15 @@
{{userInfo.purchase_funds||'0.00'}}
采购款
-
- {{userInfo.return_money||'0.00'}}
- 返还金
-
-
+
+
{{userInfo.integral ||"0.00"}}
- 礼品券
+ 冻结礼品券
+
+
+
+ {{userInfo.integral ||"0.00"}}
+ 可用礼品券
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index 72cc49f..bb2bba0 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -371,11 +371,11 @@
const passwordBoardProps = {
title: '输入支付密码',
onComplete(value) {
- uni.vibrateShort({
- success: function() {
- console.log('success');
- }
- });
+ // uni.vibrateShort({
+ // success: function() {
+ // console.log('success');
+ // }
+ // });
password.value = value
passwordBoardVisible.value = false
payFn()
diff --git a/uni_modules/zy-passwordboard/components/zy-passwordboard/zy-passwordboard.vue b/uni_modules/zy-passwordboard/components/zy-passwordboard/zy-passwordboard.vue
index b9e3317..cc35bcf 100644
--- a/uni_modules/zy-passwordboard/components/zy-passwordboard/zy-passwordboard.vue
+++ b/uni_modules/zy-passwordboard/components/zy-passwordboard/zy-passwordboard.vue
@@ -43,6 +43,12 @@
}
break;
}
+ uni.vibrateShort({
+ success: function () {
+ console.log('success');
+ }
+ });
+ console.log("点击了")
if (refValue.value.length === props.num) {
emits('complete', refValue.value.join(''));
}