瀏覽代碼

```
feat(config): 更新开发环境API地址

- 将开发环境API地址从http://47.109.84.152:8081切换到https://smqjh.admin.zswlgz.com:433
- 注释掉旧的开发环境配置项

fix(order): 修复订单状态显示逻辑并添加快递单号显示

- 修复订单详情页中订单完成状态的判断条件,将OrderArrived改为OrderCompleted
- 新增快递单号显示功能,当订单信息中存在dvyFlowId时展示快递单号
```

zhangtao 2 天之前
父節點
當前提交
a092382e8c
共有 2 個文件被更改,包括 11 次插入3 次删除
  1. 2 2
      src/config/index.ts
  2. 9 1
      src/subPack-xsb/orderDetaile/index.vue

+ 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.api.zswlgz.com',
+  // develop: 'http://47.109.84.152:8081',
+  develop: 'https://smqjh.admin.zswlgz.com:433',
   /**
    * 体验版
    */

+ 9 - 1
src/subPack-xsb/orderDetaile/index.vue

@@ -113,7 +113,7 @@ function handleCopy() {
           <view v-if="orderInfo.hbOrderStatus === OrderStatus.OrderArrived" class="mr10rpx">
             订单已送达
           </view>
-          <view v-if="orderInfo.hbOrderStatus === OrderStatus.OrderArrived" class="mr10rpx">
+          <view v-if="orderInfo.hbOrderStatus === OrderStatus.OrderCompleted" class="mr10rpx">
             订单已完成
           </view>
           <view :class="[collapse ? 'rotate-90' : '']">
@@ -126,6 +126,14 @@ function handleCopy() {
       </view>
     </view>
     <view class="mt20rpx rounded-16rpx bg-white p24rpx">
+      <view v-if="orderInfo.dvyFlowId" class="mb24rpx text-24rpx">
+        <view class="mb20rpx">
+          快递单号
+        </view>
+        <view class="text-48rpx font-semibold">
+          {{ orderInfo.dvyFlowId }}
+        </view>
+      </view>
       <view class="grid grid-cols-5 text-28rpx text-#222">
         <view v-if="[OrderStatus.OrderCancel, OrderStatus.OrderCompleted].includes(Number(orderInfo.hbOrderStatus)) " class="flex flex-col items-center" @click="handelDel">
           <image