移除不用文件和更换大图base64

src/component/bottomTabs/bottomTabs.js

@@ -28,7 +28,8 @@ Component({
 			baseImgUrl: app.globalData.imageUrl
 		})
 		const { tabBar } = this.data
-
+    console.log(this.data.currHomePageId)
+    console.log(tabBar)
 		let currentTab = tabBar.images
 		currentTab.forEach(item => {
 			// 存在 row 处理数据 8 商品 9 分类

src/pages/logistics/logistics.js

@@ -14,7 +14,8 @@ wxService.page({
     orderId:'',
     orderCode:'',
     orderLogisticsNo: '',
-    params: null
+    params: null,
+    hasLogisticInfo : false
   },
 
   /**
@@ -83,20 +84,25 @@ wxService.page({
       if (!res) return false
       const { result, data } = res.data
       if (result == 0) {
-        console.log(data.list)
-        for (var i in data.list){
-          if (data.list[i].datetime){
-            data.list[i].date = data.list[i].datetime.substring(0,10)
+        if (data){
+          data.list = data.list ? data.list : [];
+          for (var i in data.list) {
+            if (data.list[i].datetime) {
+              data.list[i].date = data.list[i].datetime.substring(0, 10)
               data.list[i].time = data.list[i].datetime.substring(0, 10)
             }
           }
           this.setData({
-          logisData: data
+            logisData: data,
+            hasLogisticInfo : true
           })
-        
-        
         }
-
+        else{
+          this.setData({
+            hasLogisticInfo : false
+          })
+        }
+      }
     }).finally(() => {
     })
   },

src/pages/logistics/logistics.wxml

 <!--pages/logistics/logistics.wxml-->
 
-<view class="page-logistics" wx:if="{{orderId}}">
+<view class="page-logistics" wx:if="{{orderId && hasLogisticInfo}}">
 	<view class="header-wrap">
 		<image class="header-bg" src="/assets/imgs/7_1_0/logistics-bg.jpg" />
 		<view class="logistics-status">
@@ -57,7 +57,7 @@
 
 	<view class="button-wrap">
 		<button class="btn btn-primary btn-lg" bindtap="handelConfirmReceipt">确认收货</button>
-		<button class="btn btn-lg btn-gray" bindtap="handelReturnGood">申请退货</button>
+		<button class="btn btn-lg btn-gray" bindtap="handelReturnGood">申请退款</button>
 	</view>
 </view>
 <view wx:else class="df no-logis">

src/pages/order/order.js

@@ -165,7 +165,6 @@ wxService.page({
       if (res) {
         const { result, data } = res.data
         if (result == 0) {
-          console.log('dddd', data.amount)
           let amount = data.amount || 0
           wx.hideLoading()
           wx.requestPayment(Object.assign({
@@ -186,8 +185,18 @@ wxService.page({
   },
   // 查看物流
   checkLogistics(e) {
-    const { detail } = e.currentTarget.dataset
-    let params = JSON.stringify(detail)
+    let { detail } = e.currentTarget.dataset
+    let copyOrderInfo = JSON.parse(JSON.stringify(detail));
+    //过滤掉已经退货完的商品
+    copyOrderInfo.skuVOList = copyOrderInfo.skuVOList.filter(item => item.canRefundNum > 0);
+    //更新可退货数量
+    copyOrderInfo.skuVOList.forEach(item => {
+      item.totalCount = item.count;
+      item.count = item.canRefundNum;
+    });
+
+    let params = JSON.stringify(copyOrderInfo);
+    
     // 退款申请
     wxService.router(`/pages/logistics/logistics`).search({ params })
   },

src/pages/orderDetail/orderDetail.js

@@ -282,8 +282,18 @@ wxService.page({
   },
   // 查看物流
   checkLogistics(e) {
-    const { detail } = e.currentTarget.dataset
-    let params = JSON.stringify(detail)
+    let { detail } = e.currentTarget.dataset
+    detail.id = this.data.id;
+    let copyOrderInfo = JSON.parse(JSON.stringify(detail));
+    //过滤掉已经退货完的商品
+    copyOrderInfo.skuVOList = copyOrderInfo.skuVOList.filter(item => item.canRefundNum > 0);
+    //更新可退货数量
+    copyOrderInfo.skuVOList.forEach(item => {
+      item.totalCount = item.count;
+      item.count = item.canRefundNum;
+    });
+
+    let params = JSON.stringify(copyOrderInfo);
     // 退款申请
     wxService.router(`/pages/logistics/logistics`).search({params})
   },

src/utils/currentLinkRouter.js

@@ -15,9 +15,8 @@ function currentLinkRouter(event, _this) {
       } else if (curItemType.link.type == 2) {
         // 触发父组件更新页面
         wxService.nextTick(() => {
-
           _this.triggerEvent('updatePage', { pageId: currentClickType.url })
-        })
+        });
       } else if (curItemType.link.type == 3) {
         // 预览
         wx.previewImage({