冲突

pageC/orderForm/component/orderInofrmation.vue

@@ -26,7 +26,11 @@
       :key="item.id"
     >
       <view class="commodity-1">
-        <image class="commodity-img" :src="item.sku_item.image" mode=""></image>
+        <image
+          class="commodity-img"
+          :src="item.sku_item.image || item.goods_image"
+          mode=""
+        ></image>
         <view style="width: 70%">
           <view class="commodity-2">
             <view class="commodity-title" v-if="language == 'zh-CN'">

pageC/orderForm/orderForm.vue

@@ -164,9 +164,9 @@ export default {
     },
     //切换搜索订单状态
     tabSwitch(num) {
-      this.getOrderList(1);
-      this.page = 1;
       this.follow = num;
+      this.page = 1;
+      this.getOrderList(1);
     },
     //跳转订单详情
     toDetail(value) {
@@ -300,6 +300,7 @@ export default {
         });
     },
 
+    //获取订单列表
     getOrderList(value) {
       uni.$u.http
         .get(

pageC/orderFormDetail/component/commodityDetail.vue

@@ -16,7 +16,7 @@
         <view class="commodity-1">
           <image
             class="commodity-img"
-            :src="item.sku_item.image"
+            :src="item.sku_item.image || item.goods_image"
             mode=""
           ></image>
           <view

pageC/refundDetail/component/moneyDestination.vue

@@ -90,7 +90,6 @@ export default {
     },
   },
   methods: {
-    open() {},
     handleChange(name) {
       console.log(this.value);
       this.$emit("close", name);

pageC/refundDetail/component/refundSuccessful.vue

@@ -44,6 +44,12 @@ export default {
         return {};
       },
     },
+    i18n: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
   },
 };
 </script>

pageC/refundDetail/refundDetail.vue

@@ -4,6 +4,7 @@
       v-if="refundDetail.goods[0].refund.status == 1"
       @checkMoney="checkMoney"
       :refundDetail="refundDetail"
+      :i18n="i18n"
     />
 
     <RefundInProgress
@@ -61,7 +62,6 @@ export default {
     };
   },
   onLoad(options) {
-    console.log(options);
     this.orderRefundId = options.orderId;
     this.getDetail();
   },