From 5c1086a4a9d2d5280368a0c7c7e146f5f25dcfa9 Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Sat, 15 Jun 2024 14:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9=20?=
=?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/login/login.vue | 7 ++++++-
pages/my/my.vue | 10 +++++-----
pagesOrder/settle/settle.vue | 26 ++++++++++++++++++++++----
static/icon/cgkzf.png | Bin 0 -> 960 bytes
4 files changed, 33 insertions(+), 10 deletions(-)
create mode 100644 static/icon/cgkzf.png
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5c0b8a9..9d2a479 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -134,7 +134,12 @@
const isAgree = ref(false); //是否同意协议
const weixinLogin = () => {
- if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议');
+ if (!isAgree.value) {
+ uni.$u.sleep(1000).then(res => {
+ isAgree.value = true;
+ })
+ return uni.$u.toast('请先阅读并同意协议');
+ }
uni.showLoading({
title: '登录中'
})
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 5dcaec2..ffc206e 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -41,27 +41,27 @@
- 123123
+ {{userInfo.now_money}}
余额
- 123123
+ {{userInfo.purchase_funds}}
采购款
- 123123
+ {{userInfo.return_money}}
待返还金额
-
+
我的订单
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index ad517c7..fa0c646 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -80,18 +80,33 @@
-
+
-
+
余额支付
-
+
+
+
+
+
+
+
+ 采购款支付
+
+
+
+
@@ -149,6 +164,7 @@
nextTick,
ref
} from "vue"
+ import useUserStore from "@/store/user";
import addressPopup from "@/components/addressPopup.vue";
import shopListPopupVue from "@/components/shopListPopup.vue";
import useCartStore from "@/store/cart.js";
@@ -164,6 +180,8 @@
createOrderApi
} from "@/api/order.js";
+ const userInfo = useUserStore().userInfo;
+
// 用户选择的门店信息
let STORE_INFO = uni.getStorageSync('STORE_INFO');
if (STORE_INFO)
@@ -347,7 +365,7 @@
shipping_type: orderInfo.value.shipping_type,
mark: formData.value.remark
}).then(res => {
- if (pay_type.value == 3) {
+ if (pay_type.value == 3 || pay_type.value == 18) {
if (res.code == 1) {
uni.showToast({
title: res.msg,
diff --git a/static/icon/cgkzf.png b/static/icon/cgkzf.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9c47c038f326deeac48e791978f7de88af2d57f
GIT binary patch
literal 960
zcmV;x13&zUP)Px&dPzh@f(lkVd@#ua?^>5X`bSPMFC0B;1c&A$J1Qdc#%1
z9@bE*vo%$#R91Mn?}9u5m=jjk(xEtP?8SKtIW%`S8CViZOF+iOENXy@EeX%1
zhqV~o4hw)g^>>1qF$Mh9E*Z&DQd*`Frj{0sqbV=O-6-50hhsCC9Hp8F%$iuAuG{E2
z5-tOfLxK(!mDvD!va2<@q>@%&+bbX!R9)$%pQhJ_n!K(K=UX+DoQ{DML{D}|O$SlM
zR~b-x0@#<_0rXV>zZ~5V;#yw|vq^<~YLlFj8Z*14IF3-UTSlMpsty#;M2|oCt
zz>?dg3$Q1|a(y+0-rj&p%__VYR$~J4C97A1cEgS>ZvNj~s7}KdviE+iQiF{P!
zp!PUbVxadx1VfiK3m0%IF*G2?qUpo2FlwDvL)&2RA)*P2Fsoag+X_i;U9D{PQp}ph
zk)0sEq_CGztxok~Pc4)KMX2RC-)Q
z%9w6u8ginB)mKy--`8fS3of^t7-F(5zX4*pO!ro&rIUBJwx!j&G^N>oM<5Z`SXD2z
z46@&GoR=ok+zYyRmh{M+nkbqRx^^~UNw~*~c9jisRSoCUN3M2cFnpuhH$^k*!#p1O
zUMPakZ~yes(nDOV83-OQ_0z_GNgRP8i2}5()Q5Zm?nWl$`JzdZ@HQPylIUiphX;O!
iK-51)NFU5yd;SHI4~%^oKwz5y0000