Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp

pages/order/afterSales/afterSales.vue

@@ -119,6 +119,7 @@
 import uniLoadMore from "@/components/uni-load-more/uni-load-more.vue";
 import { getAfterSaleList, cancelAfterSale } from "@/api/after-sale.js";
 import { getOrderList } from "@/api/order.js";
+import storage from "@/utils/storage";
 
 export default {
   components: {
@@ -295,11 +296,9 @@ export default {
         ...order,
         ...sku,
       };
-
+      storage.setAfterSaleData(data);
       uni.navigateTo({
-        url: `/pages/order/afterSales/afterSalesSelect?sn=${sn}&sku=${encodeURIComponent(
-          JSON.stringify(data)
-        )}`,
+        url: `/pages/order/afterSales/afterSalesSelect?sn=${sn}`,
       });
     },
 
@@ -309,10 +308,9 @@ export default {
     onExpress(order, sku) {
       sku.storeName = order.storeName;
 
+      storage.setAfterSaleData(data);
       uni.navigateTo({
-        url: `./afterSalesDetailExpress?serviceSn=${
-          order.sn
-        }&sku=${encodeURIComponent(JSON.stringify(sku))}`,
+        url: `./afterSalesDetailExpress?serviceSn=${order.sn}`,
       });
     },
 

pages/order/afterSales/afterSalesDetail.vue

@@ -195,9 +195,7 @@ export default {
       title: navTitle, //此处写页面的title
     });
     this.sn = options.sn;
-    let dsku = decodeURIComponent(options.sku);
-    let newSku = JSON.parse(dsku);
-    this.sku = newSku;
+    this.sku = storage.getAfterSaleData();;
 
     this.form.orderItemSn = options.sn;
     this.form.skuId = this.sku.skuId;

pages/order/afterSales/afterSalesDetailExpress.vue

@@ -57,6 +57,7 @@
 <script>
 import { getLogistics } from "@/api/address.js";
 import { fillShipInfo } from "@/api/after-sale.js";
+import storage from "@/utils/storage";
 
 export default {
   data() {
@@ -76,7 +77,8 @@ export default {
     };
   },
   onLoad(options) {
-    this.sku = JSON.parse(decodeURIComponent(options.sku));
+    
+    this.sku = storage.getAfterSaleData();
     let navTitle = "服务单详情";
     uni.setNavigationBarTitle({
       title: navTitle, //此处写页面的title

pages/order/afterSales/afterSalesSelect.vue

@@ -56,6 +56,7 @@
 
 <script>
 import { getAfterSaleInfo } from "@/api/after-sale";
+import storage from "@/utils/storage";
 export default {
   data() {
     return {
@@ -66,10 +67,7 @@ export default {
   },
   onLoad(options) {
     this.sn = options.sn;
-    let dData = decodeURIComponent(options.sku);
-    let newData = JSON.parse(dData);
-    this.sku = newData;
-
+    this.sku = storage.getAfterSaleData();
     // 查看当前商品是否支持退款退货
     this.init()
   },
@@ -88,9 +86,7 @@ export default {
      */
     onSelect(value) {
       uni.redirectTo({
-        url: `./afterSalesDetail?sn=${this.sn}&sku=${encodeURIComponent(
-          JSON.stringify(this.sku)
-        )}&value=${value}`,
+        url: `./afterSalesDetail?sn=${this.sn}&value=${value}`,
       });
     },
 

pages/order/afterSales/applyDetail.vue

@@ -90,9 +90,10 @@
           serviceDetail.afterSaleImage &&
           serviceDetail.afterSaleImage.split(',').length != 0
         ">
-        <image :src="img" @click="preview(serviceDetail.afterSaleImage.split(','), index)"
-          v-for="(img, index) in serviceDetail.afterSaleImage.split(',')" :key="index"
-          style="width: 50px; height: 50px; margin: 0px 5px"></image>
+        <view v-for="(img, index) in serviceDetail.afterSaleImage.split(',')" :key="index">
+          <u-image width="100" height="100" :src="img" @click="preview(serviceDetail.afterSaleImage.split(','), index)"
+            ></u-image>
+        </view>
       </view>
       <!-- 如果服务类型为退款则不显示 -->
       <view class="detail-item"