Merge branch 'master' of http://82.156.35.112:3000/chensiyi/zonghe_web

.env.production

@@ -10,9 +10,9 @@ ENV = 'production'
 # VITE_APP_BASE_URL ='http://192.168.100.63:8087/'
 # VITE_APP_BASE_URL = 'https://trial.etcjz.cn/' #测试环境地址
 # VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #生成环境地址/试运行环境
-VITE_APP_BASE_URL = 'http://100.65.11.2:8086/prod/' #线上地址 nDev
 # VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境
-VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/prod/' # 新地址 prod生产 ndev测试
+VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 nDev
+VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址 prod生产 ndev测试
 # VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址
 
 # VITE_APP_BASE_URL = "http://43.136.169.197:50001/"

src/views/onlineBusinessHall/orderManagement/index.vue

@@ -977,7 +977,7 @@
     }
     BaseService.post(api, { orderId: beanData.orderId }).then((res: any) => {
       if (res && res.statusCode === 0) {
-        const data = JSON.parse(res.bizContent)?.data ?? []
+        const data = res.data ?? []
         biddingProcessInfoData.value = data
       } else {
         ElMessage.error(res.message)
@@ -1082,7 +1082,7 @@
     }).then((res: any) => {
       if (res && res.statusCode === 0) {
         biddingProcessLoading.value = false
-        biddingProcessList.value = res.data?.data ?? []
+        biddingProcessList.value = res?.data ?? []
         console.log(biddingProcessList.value, 'biddingProcessList.value')
       } else {
         biddingProcessLoading.value = false