From 0c1a561545b4b7d71897005bd69ed0f3e0418357 Mon Sep 17 00:00:00 2001 From: chenhao Date: Sun, 31 May 2026 08:36:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 ++ src/components/ManagerPopup.vue | 2 +- src/main.js | 8 ++++---- src/views/Goods/Category.vue | 18 +++++++++++------- src/views/Merchant/PayCode.vue | 2 +- src/views/Operations/QrReader.vue | 4 ++-- src/views/Trade/TradeDetail.vue | 8 ++++---- src/views/Trade/Tradelist.vue | 2 +- src/views/User/Wallet/Certificate.vue | 25 ++++++++++++++++++++++++- 9 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/App.vue b/src/App.vue index 6a2a2d4..367f9a5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -82,12 +82,14 @@ export default { return res.json(); }).then(res => { const data = res.data || {}; + // alert(JSON.stringify(data)) let shareinfo = { title: title || data.title || '泰古润', desc: data.contents || '汇聚平凡梦想，共创美好未来', imgUrl: imgUrl || data.img, link: this.$getShareLink(), }; + // alert(JSON.stringify(shareinfo)) const jsApiList = data.jsApiList || ['onMenuShareTimeline', 'onMenuShareAppMessage', 'updateAppMessageShareData', 'updateTimelineShareData']; const openTagList = data.openTagList || ['wx-open-launch-weapp']; jsApiList.push('wx-open-launch-weapp'); diff --git a/src/components/ManagerPopup.vue b/src/components/ManagerPopup.vue index 60f6d90..5ad62bf 100644 --- a/src/components/ManagerPopup.vue +++ b/src/components/ManagerPopup.vue @@ -24,7 +24,7 @@
- 首页 + 主页
diff --git a/src/main.js b/src/main.js index da12997..367a208 100644 --- a/src/main.js +++ b/src/main.js @@ -334,11 +334,11 @@ app.config.globalProperties.$validIdCard = (idCard) => { app.config.globalProperties.$getShareLink = () => { const query = app.config.globalProperties.$route.query; const recommend = localStorage.getItem('cellphone'); - let link = Object.keys(query).filter(x => x != 'RecommendCode').map(x => { + const params = Object.keys(query).filter(x => x != 'RecommendCode').map(x => { return `${x}=${query[x]}`; - }).join('&'); - link += `&RecommendCode=${recommend}`; - return `${location.href.split('?')[0]}?${link}`; + }); + params.push(`RecommendCode=${recommend}`); + return `${location.href.split('?')[0]}?${params.join('&')}`; } // CH diff --git a/src/views/Goods/Category.vue b/src/views/Goods/Category.vue index 26a0cd5..3e6da2d 100644 --- a/src/views/Goods/Category.vue +++ b/src/views/Goods/Category.vue @@ -38,12 +38,15 @@
- - - - +
+ + + + + +
@@ -75,8 +78,9 @@
￥{{ item.saleprice?.toFixed(2) }} - 销量{{ item.salenums - }} + 销量{{ + item.salenums + }}
diff --git a/src/views/Merchant/PayCode.vue b/src/views/Merchant/PayCode.vue index 4d4902b..fd0770b 100644 --- a/src/views/Merchant/PayCode.vue +++ b/src/views/Merchant/PayCode.vue @@ -56,7 +56,7 @@ export default { this.$get(`/v1/client/DShopsClient/${id}`).then(res => { this.shopname = res.data.shopname this.shopimg = res.data.shopimg - this.link = `${location.origin}${location.pathname}#/Checkout?id=${res.data.userid}` + this.link = `${location.origin}${location.pathname}#/Checkout?id=${res.data.userid}&RecommendCode=${localStorage.getItem('cellphone')}` this.$nextTick(() => { this.generateImage() }) diff --git a/src/views/Operations/QrReader.vue b/src/views/Operations/QrReader.vue index fc8b9cd..2a6fea8 100644 --- a/src/views/Operations/QrReader.vue +++ b/src/views/Operations/QrReader.vue @@ -28,10 +28,10 @@
将二维码放入框内即可自动扫描
{{ error }}
-
+
diff --git a/src/views/Trade/TradeDetail.vue b/src/views/Trade/TradeDetail.vue index a2f263f..2cef111 100644 --- a/src/views/Trade/TradeDetail.vue +++ b/src/views/Trade/TradeDetail.vue @@ -40,10 +40,10 @@
-
+

买家留言:

- {{ data.remark || '无' }} + {{ data.usermsg || '无' }}
@@ -57,7 +57,7 @@ -￥{{ data.payjifen?.toFixed(2) }}

- 会员卡额度抵扣 + 会员卡抵扣 -￥{{ data.payquan?.toFixed(2) }}

@@ -96,7 +96,7 @@ {{ $formatGMT(data.exporttime, 'yyyy-MM-dd HH:mm:ss') }}

- 收货时间 + 完成时间 {{ $formatGMT(data.receipttime, 'yyyy-MM-dd HH:mm:ss') }}

diff --git a/src/views/Trade/Tradelist.vue b/src/views/Trade/Tradelist.vue index da2d3a3..c8242c8 100644 --- a/src/views/Trade/Tradelist.vue +++ b/src/views/Trade/Tradelist.vue @@ -187,7 +187,7 @@ export default { mounted() { const isReturningFromDetail = sessionStorage.getItem('TradeList_fromDetail') === '1' sessionStorage.removeItem('TradeList_fromDetail') - + this.loadFilterOptions() if (!isReturningFromDetail) { sessionStorage.setItem('TradeList_scroll', '0') } diff --git a/src/views/User/Wallet/Certificate.vue b/src/views/User/Wallet/Certificate.vue index 48d6cfa..74a9e36 100644 --- a/src/views/User/Wallet/Certificate.vue +++ b/src/views/User/Wallet/Certificate.vue @@ -43,8 +43,17 @@