Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/mallManagement/order/order_detail/index.vue

@@ -379,7 +379,7 @@
           v-for="(item, index) in orderDetail.orderCommentImgs"
           :key="index"
           :src="$showImgUrl(item)"
-          :preview-src-list="orderDetail.orderCommentImgs.map((u = $showImgUrl(u)))"
+          :preview-src-list="orderDetail.orderCommentImgs.map(u => $showImgUrl(u))"
           fit="cover"
         ></el-image>
       </div>

src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -797,7 +797,7 @@ export default {
           this.formData.deliverStorageName = dData.storageStockName
           dData.orderDetailSendList.forEach(item => {
             item.waitRefundNum = item.sendNum
-            item.waitRefundPrice = item.payAmount
+            item.waitRefundPrice = item.price
           })
           this.goodsList = dData.orderDetailSendList
           getOrderDetail({ orderId: dData.orderId }).then(res => {
@@ -928,7 +928,7 @@ export default {
 
                 data.orderOfflineRefundItems.forEach(item => {
                   item.waitRefundNum = item.refundNum
-                  item.waitRefundPrice = item.payAmount
+                  item.waitRefundPrice = item.price
                   item.refundNum = item.retiredNum
                   // item.refundAmount = item.retiredAmount;
                   item.refundAmount = item.payAmount
@@ -1124,7 +1124,7 @@ export default {
         this.formData.deliverStorageName = data.storageStockName
         data.orderDetailSendList.forEach(item => {
           item.waitRefundNum = item.sendNum
-          item.waitRefundPrice = item.payAmount
+          item.waitRefundPrice = item.price
         })
         this.goodsList = data.orderDetailSendList
       })