zhangdan 4 лет назад
Родитель
Сommit
d4bd86e847

+ 11 - 8
src/views/recoveryManage/riderOrderModal.vue

@@ -58,10 +58,11 @@
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">门头照:</p>
-          <viewer :images="pageInfo.imageHeader ? pageInfo.imageHeader :[]" class="viewer" ref="viewer" @inited="inited" rebuild>
-            <img v-for="src in pageInfo.imageHeader" :src="src" :key="src" class="image1">
-          </viewer>
-          <!-- <P style="margin-bottom: 0;">{{ pageInfo.imageHeader ? pageInfo.imageHeader : '' }}</P> -->
+          <p class="item-main">
+            <viewer :images="pageInfo.imageHeader ? pageInfo.imageHeader :[]" class="viewer" ref="viewer" @inited="inited" rebuild>
+              <img v-for="src in pageInfo.imageHeader" :src="src" :key="src" class="image1">
+            </viewer>
+          </p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">类型:</p>
@@ -73,10 +74,12 @@
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">图片:</p>
-          <viewer :images="pageInfo.imageList? pageInfo.imageList:[]" class="viewer" ref="viewer" @inited="inited" rebuild>
-            <img v-for="src in pageInfo.imageList" :src="src" :key="src" class="image">
-          </viewer>
-          <P style="margin-bottom: 0;">{{ pageInfo.imageList ? pageInfo.imageList.length+' 张' :'' }}</P>
+          <p class="item-main">
+            <viewer :images="pageInfo.imageList? pageInfo.imageList:[]" class="viewer" ref="viewer" @inited="inited" rebuild>
+              <img v-for="src in pageInfo.imageList" :src="src" :key="src" class="image">
+            </viewer>
+          </p><P style="margin-bottom: 0;">{{ pageInfo.imageList ? pageInfo.imageList.length+' 张' :'' }}</P>
+          </p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">下单账号:</p>

+ 6 - 0
src/views/recoveryManage/riderRecoveryTotal.vue

@@ -94,6 +94,12 @@ export default {
           searchData.beginDate = null
           searchData.endDate = null
         }
+        if (searchData.sortField == 'totalAlWeight') {
+          searchData.sortField = 'total_al_weight'
+        }
+        if (searchData.sortField == 'originalAlAmount') {
+          searchData.sortField = 'original_al_amount'
+        }
         return getOrderTotalList(searchData).then(res => {
           if (res.status == 200) {
             const no = (res.data.pageNo - 1) * res.data.pageSize