Przeglądaj źródła

```
feat(api): 修改确认收货接口参数格式

- 将确认收货接口的 pathParams 参数改为 data 参数
- 适配接口参数传递方式的变更

feat(config): 更新开发环境配置

- 切换开发环境API地址配置
- 启用 http://47.109.84.152:8081 作为开发环境地址
- 注释掉旧的开发环境地址配置

feat(order): 添加全局加载中间件

- 在smqjh和xsb两个子包的订单页面中引入全局加载中间件
- 为订单列表请求添加 loading 状态管理

fix(order): 修复订单状态判断错误

- 修复smqjh子包中订单状态判断的可选链访问错误
- 使用可选链操作符避免属性访问错误
```

zhangtao 2 dni temu
rodzic
commit
83d92331e2

+ 1 - 1
src/api/globals.d.ts

@@ -359,7 +359,7 @@ declare global {
       ): Alova2Method<apiResData<{deliveryType:number}>, 'xsb.delivery', Config>;
       confirmReceipt<
         Config extends Alova2MethodConfig<any> & {
-          pathParams: {
+          data: {
             orderNumber: string;
           }
         }

+ 2 - 2
src/config/index.ts

@@ -16,8 +16,8 @@ const mapEnvVersion = {
   // develop: 'http://192.168.0.157:8080',
   // develop: 'http://192.168.1.253:8080',
   // develop: 'http://192.168.1.89:8080', // 田
-  // develop: 'http://47.109.84.152:8081',
-  develop: 'https://smqjh.admin.zswlgz.com:433',
+  develop: 'http://47.109.84.152:8081',
+  // develop: 'https://smqjh.admin.zswlgz.com:433',
   /**
    * 体验版
    */

+ 3 - 1
src/subPack-smqjh/order/index.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { navTabTypeList, orderStatusList } from './order-data'
+import { createGlobalLoadingMiddleware } from '@/api/core/middleware'
 import { StaticUrl } from '@/config'
 import router from '@/router'
 
@@ -30,6 +31,7 @@ const { data: orderList, refresh, isLastPage, page, reload } = usePagination((pa
   initialData: [],
   data: res => res.data?.list,
   append: true,
+  middleware: createGlobalLoadingMiddleware(),
 })
 onMounted(async () => {
   subPackOrder.value = await AsyncImport('@/subPack-xsb/utils/order-data')
@@ -119,7 +121,7 @@ async function handleSubmitOrder(order: Api.xsbOrderList) {
             </view>
           </view>
           <view class="text-24rpx text-#FF4D3A">
-            <template v-if="item.hbOrderStatus !== subPackOrder.OrderStatus.PaddingPay">
+            <template v-if="item.hbOrderStatus !== subPackOrder?.OrderStatus.PaddingPay">
               {{ subPackOrder?.handleCommonOrderStatusText(item) }}
             </template>
             <template v-else>

+ 2 - 0
src/subPack-xsb/order/index.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { getWxCommonPayment, handleCommonPayMent } from '../utils/confirm-order'
 import { OrderStatus, handleCommonCancelOrder, handleCommonDeleteOrder, handleCommonOrderReceive, handleCommonOrderStatusText, navTabTypeList, orderStatusList } from '../utils/order-data'
+import { createGlobalLoadingMiddleware } from '@/api/core/middleware'
 import { StaticUrl } from '@/config'
 import router from '@/router'
 
@@ -28,6 +29,7 @@ const { data: orderList, refresh, isLastPage, page, reload } = usePagination((pa
   initialData: [],
   data: res => res.data?.list,
   append: true,
+  middleware: createGlobalLoadingMiddleware(),
 })
 function handleChangeTypeNav(value: number) {
   navActiveTab.value = value

+ 1 - 1
src/subPack-xsb/utils/order-data.ts

@@ -144,7 +144,7 @@ export function handleCommonOrderReceive(order: Api.xsbOrderList) {
       success: async () => {
         uni.showLoading({ mask: true })
         await Apis.xsb.confirmReceipt({
-          pathParams: {
+          data: {
             orderNumber: String(order.orderNumber),
           },
         })