From 9df2ed46c5d00bcf4b91dc763380f042dce533db Mon Sep 17 00:00:00 2001 From: zpc Date: Wed, 8 Apr 2026 19:29:37 +0800 Subject: [PATCH 1/2] 21 --- uniapp/config/index.js | 7 ++++++- uniapp/manifest.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/uniapp/config/index.js b/uniapp/config/index.js index ce197ec..2807542 100644 --- a/uniapp/config/index.js +++ b/uniapp/config/index.js @@ -9,11 +9,16 @@ const ENV = { STATIC_BASE_URL: 'http://localhost:5238', SIGNALR_URL: 'ws://api.nxt.shhmkjgs.cn/hubs/chat' }, - production: { + test: { API_BASE_URL: 'https://api.nxt.shhmkjgs.cn/api', STATIC_BASE_URL: 'https://api.nxt.shhmkjgs.cn', SIGNALR_URL: 'ws://api.nxt.shhmkjgs.cn/hubs/chat' }, + production: { + API_BASE_URL: 'https://api.xueyeyiguihua.top/api', + STATIC_BASE_URL: 'https://api.xueyeyiguihua.top', + SIGNALR_URL: 'ws://api.xueyeyiguihua.top/hubs/chat' + }, } // 当前环境 diff --git a/uniapp/manifest.json b/uniapp/manifest.json index 58eb3ae..b56f978 100644 --- a/uniapp/manifest.json +++ b/uniapp/manifest.json @@ -1,6 +1,6 @@ { "name" : "学业邑规划", - "appid" : "__UNI__A612028", + "appid" : "__UNI__1BAACAB", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", From ef186007c450d3cb3d907e384cf9c7368f9e40df Mon Sep 17 00:00:00 2001 From: zpc Date: Wed, 8 Apr 2026 19:33:23 +0800 Subject: [PATCH 2/2] 21 --- uniapp/pages/order/list/index.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/uniapp/pages/order/list/index.vue b/uniapp/pages/order/list/index.vue index df25026..b3eadb6 100644 --- a/uniapp/pages/order/list/index.vue +++ b/uniapp/pages/order/list/index.vue @@ -20,8 +20,7 @@ const { checkLogin } = useAuth() const tabs = [ { label: '全部', value: 'all' }, { label: '已测评', value: 'completed' }, - { label: '待测评', value: 'pending' }, - { label: '已退款', value: 'refunded' } + { label: '待测评', value: 'pending' } ] // 状态 @@ -70,12 +69,16 @@ function getDisplayStatus(order) { * 根据当前tab过滤订单列表 */ const filteredList = computed(() => { - if (activeTab.value === 'all') return orderList.value - return orderList.value.filter(order => { + // 过滤掉已退款和退款中的订单 + const visibleList = orderList.value.filter(order => { + const dst = getDisplayStatus(order) + return dst !== '已退款' && dst !== '退款中' + }) + if (activeTab.value === 'all') return visibleList + return visibleList.filter(order => { const dst = getDisplayStatus(order) if (activeTab.value === 'completed') return dst === '已测评' if (activeTab.value === 'pending') return dst === '待测评' || dst === '测评中' - if (activeTab.value === 'refunded') return dst === '已退款' || dst === '退款中' return true }) })