From 479bacee6d73ed497bb642543071a258c3b0a0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Thu, 26 Feb 2026 18:05:57 +0800 Subject: [PATCH] =?UTF-8?q?v2.28.0=20=E6=8A=96=E9=9F=B3=E5=9B=A2=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.interceptor.js | 2 +- page_fenbao/huiyuan/myhuiyuan.vue | 2 +- page_fenbao/storedlist/trueorder.vue | 3 +- .../verify/components/AreaSelectPopup.vue | 411 +++++++++++++++ .../verify/components/CouponSelectPopup.vue | 151 ++++++ page_user/verify/index.vue | 480 ++++++++++++++++++ pages.json | 8 +- pages/my.vue | 19 + 8 files changed, 1072 insertions(+), 4 deletions(-) create mode 100644 page_user/verify/components/AreaSelectPopup.vue create mode 100644 page_user/verify/components/CouponSelectPopup.vue create mode 100644 page_user/verify/index.vue diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 464401c..67fe7df 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -1,7 +1,7 @@ const install = (Vue, vm) => { uni.setStorageSync('deptId', 100); Vue.prototype.$u.http.setConfig({ - baseUrl: 'http://192.168.1.3:4101', //键辉本地 + baseUrl: 'http://192.168.1.7:4101', //键辉本地 // baseUrl: 'http://192.168.2.221:4101', //景森本地 // baseUrl: 'https://ele.ccttiot.com/prod-api', //线上 小鹿appid: wx8a05cf95418a6859 小兔骑骑appid:wx38f96c87621a87ab 遇福兴https://fu.chuantewulian.cn wxcb1d6a5d9dca8bbe // baseUrl: 'https://cc.ccttiot.com/prod-api', //叉车线上 diff --git a/page_fenbao/huiyuan/myhuiyuan.vue b/page_fenbao/huiyuan/myhuiyuan.vue index 6d94fd6..7f207ba 100644 --- a/page_fenbao/huiyuan/myhuiyuan.vue +++ b/page_fenbao/huiyuan/myhuiyuan.vue @@ -93,7 +93,7 @@ export default { // 查询用户会员卡列表 getlist() { this.loading = true - this.$u.get(`/app/vipUser/list?pageNum=1&pageSize=999&isEffective=true&minSurplusCount=1`).then((res) => { + this.$u.get(`/app/vipUser/list?pageNum=1&pageSize=999&isEffective=true&minSurplusCount=1&orderByColumn=createTime&isAsc=desc`).then((res) => { this.loading = false if (res.code == 200) { this.cardList = res.rows || [] diff --git a/page_fenbao/storedlist/trueorder.vue b/page_fenbao/storedlist/trueorder.vue index a1827f3..5ebab4c 100644 --- a/page_fenbao/storedlist/trueorder.vue +++ b/page_fenbao/storedlist/trueorder.vue @@ -1971,7 +1971,8 @@ getjisuan() { let data = { suitId: this.suitId, - channelId:this.channelId + channelId:this.channelId, + appId: this.$store.state.appid, } this.$u.post(`/app/order/calculatePrice`, data).then(res => { if (res.code == 200) { diff --git a/page_user/verify/components/AreaSelectPopup.vue b/page_user/verify/components/AreaSelectPopup.vue new file mode 100644 index 0000000..dd54ccf --- /dev/null +++ b/page_user/verify/components/AreaSelectPopup.vue @@ -0,0 +1,411 @@ + + + + + diff --git a/page_user/verify/components/CouponSelectPopup.vue b/page_user/verify/components/CouponSelectPopup.vue new file mode 100644 index 0000000..021b038 --- /dev/null +++ b/page_user/verify/components/CouponSelectPopup.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/page_user/verify/index.vue b/page_user/verify/index.vue new file mode 100644 index 0000000..0b18a4d --- /dev/null +++ b/page_user/verify/index.vue @@ -0,0 +1,480 @@ + + + + + diff --git a/pages.json b/pages.json index 4f48fbc..0cd4962 100644 --- a/pages.json +++ b/pages.json @@ -224,13 +224,19 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } - },{ + }, { "path": "returnbike", "style": { "navigationBarTitleText": "上传", "enablePullDownRefresh": false, "navigationStyle": "custom" } + },{ + "path": "verify/index", + "style": { + "navigationBarTitleText": "团购核销", + "enablePullDownRefresh": false + } },{ "path": "huanbike", "style": { diff --git a/pages/my.vue b/pages/my.vue index 9253410..4875e3a 100644 --- a/pages/my.vue +++ b/pages/my.vue @@ -32,6 +32,12 @@ + + + 团购核销 + + + 故障上报 @@ -492,6 +498,10 @@ uni.navigateTo({ url: '/page_fenbao/huiyuan/myhuiyuan' }) + } else if (num == 16) { + uni.navigateTo({ + url: '/page_user/verify/index' + }) } } } @@ -811,6 +821,15 @@ height: 48rpx; margin-right: 38rpx; } + + .verify-icon { + width: 48rpx; + height: 48rpx; + margin-right: 38rpx; + display: flex; + align-items: center; + justify-content: center; + } } image {