From 239191fbe3137e2f47ef67ded24c2d9e12a9510b Mon Sep 17 00:00:00 2001 From: chenhao Date: Thu, 28 May 2026 10:49:20 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20save?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 1 + public/img/no.png | Bin 0 -> 76544 bytes public/img/pay_point.png | Bin 0 -> 3082 bytes src/App.vue | 53 +++++++ src/components/BaseList.vue | 12 -- src/main.js | 21 ++- src/router.js | 13 -- src/styles/public.less | 31 +++- src/views/Account/Login.vue | 14 +- src/views/Account/WxCallback.vue | 4 +- src/views/Goods/Category.vue | 26 +++- src/views/Goods/GoodsDetail.vue | 94 +++++++++--- src/views/Merchant/MerchantTrade.vue | 2 +- src/views/Merchant/MerchantTradeDetail.vue | 6 +- src/views/Platform/ColumnDetail.vue | 20 ++- src/views/Tabbars/Mall.vue | 28 ++-- src/views/Tabbars/PointMall.vue | 64 ++------- src/views/Trade/Pay.vue | 37 +++-- src/views/Trade/TradeConfirm.vue | 158 +++++++++++++++++---- src/views/Trade/Tradelist.vue | 31 ++-- src/views/User/Invite.vue | 2 +- vite.config.js | 11 +- 22 files changed, 416 insertions(+), 212 deletions(-) create mode 100644 public/img/no.png create mode 100644 public/img/pay_point.png diff --git a/index.html b/index.html index 38ebfcc..156d8e6 100644 --- a/index.html +++ b/index.html @@ -13,6 +13,7 @@
+ diff --git a/src/views/Trade/Tradelist.vue b/src/views/Trade/Tradelist.vue index 7f39ded..170ec45 100644 --- a/src/views/Trade/Tradelist.vue +++ b/src/views/Trade/Tradelist.vue @@ -39,7 +39,7 @@
¥{{ item.proskusaleprice?.toFixed(2) }} -

{{ item.discountratio }}%让利

+

惠利{{ item.discountratio }}%

@@ -74,7 +74,8 @@
物流单号 {{ currentLogistics?.exportnum }} - +
@@ -176,19 +177,19 @@ export default { methods: { // 加载订单状态和类型列表 - // async loadFilterOptions() { - // try { - // const [stateRes, areaRes] = await Promise.all([ - // this.$get('/v1/client/FOrdersClient/orderstate'), - // this.$get('/v1/client/EProsClient/mallstate'), - // ]) - // this.tradeStates = stateRes.data || [] - // this.mallList = [{ value: 0, label: '全部订单' }, ...(areaRes.data || [])] - // this._initializing = false - // } catch (err) { - // this.$showFailToast(err.message || '加载失败') - // } - // }, + async loadFilterOptions() { + try { + const [stateRes, areaRes] = await Promise.all([ + this.$get('/v1/client/FOrdersClient/orderstate'), + this.$get('/v1/client/EProsClient/mallstate'), + ]) + this.tradeStates = stateRes.data || [] + this.mallList = [{ value: 0, label: '全部订单' }, ...(areaRes.data || [])] + this._initializing = false + } catch (err) { + this.$showFailToast(err.message || '加载失败') + } + }, // Tab 切换 - 订单状态 onTabChange(name) { diff --git a/src/views/User/Invite.vue b/src/views/User/Invite.vue index b027359..6937459 100644 --- a/src/views/User/Invite.vue +++ b/src/views/User/Invite.vue @@ -47,7 +47,7 @@ export default { this.data.NickName = userInfo.data.nickname || '' } const inviteCode = userInfo?.data?.cellphone || '' - this.link = `${location.origin}${location.pathname}#/Login?invite=${inviteCode}` + this.link = `${location.origin}${location.pathname}#/Login?RecommendCode=${inviteCode}` } catch (err) { console.error('获取用户信息失败:', err) } finally { diff --git a/vite.config.js b/vite.config.js index 44b9aa7..519f774 100644 --- a/vite.config.js +++ b/vite.config.js @@ -13,7 +13,16 @@ export default defineConfig({ https: false, }, plugins: [ - vue(), + vue( + { + template: { + compilerOptions: { + // 忽略wx-open-launch 开头的组件，这些是微信的默认组件 + isCustomElement: (tag) => tag.includes('wx-open-launch') + } + } + } + ), Components({ resolvers: [VantResolver()], }),