fix: 修改理货/装柜关联单等取值

src/pages/loading/detail.vue

@@ -58,14 +58,14 @@
                     </view>
                      <!-- 包装类型 -->
                     <view style="color:red;fontWeight:bold;">
-                      <text v-for="(prod, index) in order.goodsList" :key="prod.orderItemId">
-                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="prod.unit" />{{ index!== order.goodsList.length-1 ? ',':'' }}
+                      <text v-for="(unit, index) in order.units.split(',')" :key="index">
+                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
                       </text>
                     </view>
                     <!-- 关联单 -->
-                    <view v-if="order.guanLianOrderStatusVOList&&order.guanLianOrderStatusVOList.length>0" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
+                    <view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
                     <!-- 混箱 -->
-                    <view v-if="order.goodsList&&order.goodsList.length>0&&order.goodsList.some(v => v.mixStatus === 1)" style="color:red;fontWeight:bold;" @tap="showWarehouseLogs(order)">{{$t('混箱')}}</view>
+                    <view v-if="order.mixStatus=== 1" style="color:red;fontWeight:bold;" @tap="showWarehouseLogs(order)">{{$t('混箱')}}</view>
                   </view>
                   <view style="width:12%;">{{ order.volume | toFixed }}</view>
                   <view style="width:12%;">{{ order.weight | toFixed }}</view>

src/pages/tally/detail.vue

@@ -45,18 +45,14 @@
                     </view>
                      <!-- 包装类型 -->
                     <view style="color:red;fontWeight:bold;">
-                      <text v-for="(prod, index) in order.goodsList" :key="prod.orderItemId">
-                        <text v-for="(unit, unitIdx) in prod.units.split(',')">
-                          <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />
-                          {{ unitIdx!== prod.units.split(',').length-1 ? ',':'' }}
-                        </text>
-                        {{ index!== order.goodsList.length-1 ? ',':'' }}
+                      <text v-for="(unit, index) in order.units.split(',')" :key="index">
+                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
                       </text>
                     </view>
                     <!-- 关联单 -->
-                    <view v-if="order.guanLianOrderStatusVOList&&order.guanLianOrderStatusVOList.length>0" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
+                    <view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
                     <!-- 混箱 -->
-                    <view v-if="order.goodsList&&order.goodsList.length>0&&order.goodsList.some(v => v.mixStatus === 1)" style="color:red;fontWeight:bold;" @tap="showWarehouseList(order)">{{$t('混箱')}}</view>
+                    <view v-if="order.mixStatus === 1" style="color:red;fontWeight:bold;" @tap="showWarehouseList(order)">{{$t('混箱')}}</view>
                   </view>
                   <view style="width:15%;">{{ order.volume | toFixed }} m³</view>
                   <view style="width:15%;">{{ order.weight | toFixed }} kg</view>

src/pages/tallyAir/detail.vue

@@ -57,18 +57,14 @@
                     </view>
                      <!-- 包装类型 -->
                     <view style="color:red;fontWeight:bold;">
-                      <text v-for="(prod, index) in order.goodsList" :key="prod.orderItemId">
-                        <text v-for="(unit, unitIdx) in prod.units.split(',')">
-                          <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />
-                          {{ unitIdx!== prod.units.split(',').length-1 ? ',':'' }}
-                        </text>
-                        {{ index!== order.goodsList.length-1 ? ',':'' }}
+                      <text v-for="(unit, index) in order.units.split(',')" :key="index">
+                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
                       </text>
                     </view>
                     <!-- 关联单 -->
-                    <view v-if="order.guanLianOrderStatusVOList&&order.guanLianOrderStatusVOList.length>0" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
+                    <view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
                     <!-- 混箱 -->
-                    <view v-if="order.goodsList&&order.goodsList.length>0&&order.goodsList.some(v => v.mixStatus === 1)" style="color:red;fontWeight:bold;" @tap="showWarehouseList(order)">{{$t('混箱')}}</view>
+                    <view v-if="order.mixStatus === 1" style="color:red;fontWeight:bold;" @tap="showWarehouseList(order)">{{$t('混箱')}}</view>
                   </view>
                   <view style="width:15%;">{{ order.volume | toFixed }} m³</view>
                   <view style="width:15%;">{{ order.weight | toFixed }} kg</view>

src/util/config.js

@@ -19,6 +19,7 @@ if (process.env.NODE_ENV === 'development') {
  * 配置api基础路径
  */
 let apiBaseUrl = 'https://api2.groupage.cn/'
+// let apiBaseUrl = 'https://apitest.groupage.cn/'
 // let apiBaseUrl = 'https://api.jd.qipx.top/'
 //let apiBaseUrl = 'http://192.168.1.13:48080/'
 let localApiBaseUrl = uni.getStorageSync("localApiBaseUrl")