fix: 用户订单列表

pages/classify.vue

@@ -1,7 +1,5 @@
 <template>
   <view>
-    <!-- 志愿者 -->
-    <!-- v-if="userType == '2'" -->
     <view class="classify-main" >
       <up-tabs
         :list="column"
@@ -17,20 +15,12 @@
       >
       </up-tabs>
       <view class="list">
-        <List :data="data" v-if="data.length > 0" @refresh="getList" ref="listRef"/>
+        <List :data="data" v-if="data && data.length > 0" @refresh="getList" ref="listRef"/>
         <view v-else>
           <NoneView value="您还没有相关订单" />
         </view>
       </view>
     </view>
-    <!-- 用户 -->
-    <!-- <OrderList
-      :dataList="dataList"
-      :dictSort="dictData"
-      @fetchData="getListData"
-      v-else
-    /> -->
-
     <custom-tab-bar :page="2" />
   </view>
 </template>
@@ -42,9 +32,9 @@ import { provide } from 'vue'
 import { getVolunteerOrderList } from '@/api/volunteer.js'
 import { onMounted } from 'vue'
 import { useDict } from '@/utils/dict.js'
-import { onLoad, onShow } from '@dcloudio/uni-app'
+import { onShow } from '@dcloudio/uni-app'
 import NoneView from '@/components/NoneView/index.vue'
-import { userMainOrderList, systemDictdaTalist } from '@/api/userList.js'
+import { userMainOrderList } from '@/api/userList.js'
 import CustomTabBar from '@/components/CustomTabBar/index.vue'
 import { wxMakePhoneCall } from '@/utils/wxRequest.js'
 const {
@@ -54,13 +44,9 @@ const {
 provide('order_status', order_status) //订单/服务状态
 
 const userType = uni.getStorageSync('userType') //读取本地存储
-
 const tab = ref('')
 const tabKey = ref(0)
-const dataList = ref([]) //用户
 const data = ref([]) //志愿者
-// 定义存储字典数据的响应式变量
-const dictData = ref([])
 const listRef =ref(null)
 /**
  * 	0待支付 1已支付 2支付超时或取消 3进行中 4已完成 5申请退款中 6已退款 7部分退款 8 待确认
@@ -110,7 +96,7 @@ const user = [
 		},
 		{
 			name: "售后",
-			value: ['2','5','6','7'],
+			value: '2,5,6,7',
 		}
 ]
 
@@ -118,21 +104,6 @@ const column = computed(() => {
   return userType === 1 ? user : admin
 })
 
-//获取用户订单列表状态
-async function getData() {
-  console.log('进入')
-  try {
-    const res = await systemDictdaTalist().catch((err) => {
-      throw err // 重新抛出以进入 catch 块
-    })
-    console.log(res, '用户状态获取成功')
-    dictData.value = res.rows
-    console.log(dictData.value, 'dictData.value')
-  } catch (e) {
-    console.error('获取数据异常:', e) // 确保这里打印错误
-  }
-}
-
 async function getList() {
   try {
     uni.showLoading({
@@ -140,11 +111,10 @@ async function getList() {
     })
 
     const listApi = userType === 1 ? userMainOrderList : getVolunteerOrderList
-
     const res = await listApi({
       orderStatus: tab.value,
     })
-    data.value = res.data
+    data.value =res.rows ||  res.data
 
     // 判断 userType 来决定调用哪个接口
     // let res
@@ -175,23 +145,6 @@ async function getList() {
   }
 }
 
-const getListData = async (orderStatus = tab.value) => {
-  // 如果dataList已经有数据，则从dataList中获取orderStatus
-  if (dataList.value && dataList.value.length > 0) {
-    const statusList = dataList.value.map(item => item.orderStatus);
-    const statusString = statusList.join(',');
-    const res = await userMainOrderList({
-      orderStatus: statusString
-    });
-    dataList.value = res.rows;
-  } else {
-    // 首次加载时使用传入的orderStatus
-    const res = await userMainOrderList({
-      orderStatus: orderStatus
-    });
-    dataList.value = res.rows;
-  }
-}
 /**
  * 1: 查看
  * 2：沟通
@@ -226,14 +179,12 @@ function onChange(tabItem) {
 
 onMounted(() => {
   getList()
-  getListData()
-  getData()
 })
 
 onShow(() => {
   const params = getApp().globalData.switchTabParams || {}
   tabKey.value = params.tabKey || 0
-  onChange(column[tabKey.value])
+  onChange(column.value[tabKey.value])
   // 使用后建议清除参数，避免重复读取
   getApp().globalData.switchTabParams = null
 })

pages/common/orderList/userItem.vue

@@ -58,7 +58,7 @@ const btns = [
     {
         name: '退款',
         onClick: (e)=>handleRefund(e),
-        show: (item) => ['3'].includes(item.orderStatus),
+        show: (item) => ['3','1'].includes(item.orderStatus),
         type: 'error'
     },
     {