Merge branch 'master' of http://192.168.195.14:3000/outsource/mi-assessment

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'
+  },
 }
 
 // 当前环境

uniapp/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "学业邑规划",
-    "appid" : "__UNI__A612028",
+    "appid" : "__UNI__1BAACAB",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

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
   })
 })