bug fix

app.json

@@ -10,6 +10,7 @@
     "pages/my/my_address/my_address",
     "pages/my/my_address/my_address_details/my_address_details",
     "pages/welfare/welfare",
+    "pages/welfare/goodsDetails/goodsDetails",
     "pages/welfare/cartPay/cartPay",
     "pages/index/welfareImg/welfareImg",
     "pages/index/banner_details/welfareImg",

pages/my/after_sales/after_sales.wxml

@@ -81,7 +81,7 @@
 <!-- 申请中 -->
 <view class="btn-1" wx:if='{{goods.afterSalesStatus==61||goods.afterSalesStatus==62}}'>下一步</view>
 
-<view class="btn btn-cancel" wx:if='{{goods.afterSalesStatus==61||goods.afterSalesStatus==62}}' catchtap="cancel">撤销申请</view>
+<view class="btn btn-cancel" wx:if='{{goods.afterSalesStatus==61||goods.afterSalesStatus==62||goods.afterSalesStatus==63}}' catchtap="cancel">撤销申请</view>
 
 <view class="height100"></view>
 <view class="height100"></view>

pages/my/my_order/my_order.wxml

@@ -37,7 +37,7 @@
       :item.status==4?'已完成'
       :''}}
     </view>
-    <view class="state" wx:if="{{item.afterSalesStatus && type==6}}">
+    <view class="state" wx:if="{{item.afterSalesStatus && (type == 6 || (item.afterSalesStatus != 66 && type == 0))}}">
       {{
 				 item.afterSalesStatus==61?'换货审核中'
 				:item.afterSalesStatus==62?'退款审核中'
@@ -80,9 +80,10 @@
     <view wx:if="{{item.timeStr}}" style="font-size: 28rpx">
       您需要在<text style="color:#ee7b1e;">{{item.timeStr}}</text>内处理
     </view>
+    <!-- 底部按钮列表 -->
     <view class="btn display_J_E" style="flex-wrap: wrap;row-gap: 24rpx;">
       <view class="btn1" wx:if="{{item.status==3&&item.afterSalesStatus!=64}}" data-item='{{item}}' data-logistics="{{item.logistics}}" data-order-number="{{item.orderNumber}}" data-logistics-name="{{item.logisticsName}}" catchtap="viewLogisticsDetails">物流查询</view>
-      <view class="btn1 btn2" wx:if="{{item.status==3&&type==3&&item.afterSalesStatus!=64}}" data-id='{{item.id}}' catchtap="confirm">确认收货</view>
+      <view class="btn1 btn2" wx:if="{{item.status==3&&(type==3||type==0)&&item.afterSalesStatus!=64}}" data-id='{{item.id}}' catchtap="confirm">确认收货</view>
       <view class="btn1" wx:if="{{item.status==1}}">立即支付</view>
       <view class="btn1" wx:if="{{item.status==4||item.status==5}}" catchtap="del" data-id='{{item.id}}' data-index="{{index}}">删除订单</view>
 
@@ -92,8 +93,8 @@
       <view class="btn1 btn2" wx:if="{{item.status==2 && (item.afterSalesStatus<66 || !item.afterSalesStatus)}}" data-id='{{item.id}}' catchtap="apply1">
         申请退款</view>
       <!-- 待收货申请 -->
-      <view class="btn1 btn2" wx:if="{{item.status==3&& type==3 && (item.afterSalesStatus==66 || !item.afterSalesStatus)}}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-s='{{item.status}}' data-sq='1' catchtap="apply">申请退货</view>
-      <view class="btn1 btn2" wx:if="{{item.status==3&& type==3 && ( item.afterSalesStatus==66 || !item.afterSalesStatus) }}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-s='{{item.status}}' data-sq='2' catchtap="apply">申请换货</view>
+      <view class="btn1 btn2" wx:if="{{item.status==3&& (type==3||type==0) && (item.afterSalesStatus==66 || !item.afterSalesStatus)}}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-s='{{item.status}}' data-sq='1' catchtap="apply">申请退货</view>
+      <view class="btn1 btn2" wx:if="{{item.status==3&&( type==3||type==0) && ( item.afterSalesStatus==66 || !item.afterSalesStatus) }}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-s='{{item.status}}' data-sq='2' catchtap="apply">申请换货</view>
       <!-- 申请中 -->
       <!--  -->
       <view class="btn1 btn2" wx:if="{{(item.afterSalesStatus==61||item.afterSalesStatus==62||item.afterSalesStatus==63||item.afterSalesStatus==66) && item.afterSalesStatus!=64&&type==6}}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' catchtap="after">查看进度</view>

pages/order_details/order_details.wxml

@@ -44,12 +44,12 @@
 
 
 <!--待收货-->
-<view class="logistics-all" data-item='{{goods}}' data-logistics-num="{{goods.logisticsNum}}" catchtap="viewLogisticsDetails" wx:if='{{goods.status==3}}'>
+<view class="logistics-all" data-item='{{goods}}' data-logistics-num="{{goods.logisticsNum}}" catchtap="viewLogisticsDetails" wx:if='{{goods.status==3 && (!goods.afterSalesStatus||goods.afterSalesStatus==66||goods.afterSalesStatus==64)}}'>
   <view class="logistics display_J_B">
     <view class="logistics-l display_J_S display_A_C">
       <image src="/icon/express_icon.png"></image>
-      <view class="logistics-l__1">待收货</view>
-      <view class="logistics-l__2">商家正在为您处理订单</view>
+      <view class="logistics-l__1">{{goods.afterSalesStatus==64?"退货中":"待收货"}}</view>
+      <view class="logistics-l__2">{{goods.afterSalesStatus==64?"商品正在退回物流中心":"商家正在为您处理订单"}}</view>
     </view>
     <view class="logistics-r display_A_C">
       <image src="/icon/right.png"></image>
@@ -69,7 +69,7 @@
         <view>
           包裹{{index+1}}
         </view>
-        <view wx:if="{{goods.status == 3 && !goods.afterSalesStatus}}" class="btn btn-red" data-id='{{goods.id}}' data-num='{{goods.orderNumber}}' data-s='{{goods.status}}' data-sq='2' data-package-id="{{item.id}}" capture-bind:tap="apply">换货申请</view>
+        <view wx:if="{{goods.status == 3 && (!goods.afterSalesStatus || goods.afterSalesStatus == 66)}}" class="btn btn-red" data-id='{{goods.id}}' data-num='{{goods.orderNumber}}' data-s='{{goods.status}}' data-sq='2' data-package-id="{{item.id}}" capture-bind:tap="apply">换货申请</view>
       </view>
       <view class="cont display_J_B" wx:for='{{item.goods}}' wx:key="specId" wx:for-item="goodsItem" catchtap="">
         <view class="cont-l">

pages/welfare/goodsDetails.js

@@ -0,0 +1,66 @@
+// pages/welfare/goodsDetails.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/welfare/goodsDetails.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/welfare/goodsDetails.wxml

@@ -0,0 +1,2 @@
+<!--pages/welfare/goodsDetails.wxml-->
+<text>pages/welfare/goodsDetails.wxml</text>

pages/welfare/goodsDetails.wxss

@@ -0,0 +1 @@
+/* pages/welfare/goodsDetails.wxss */

pages/welfare/welfare.js

@@ -103,6 +103,7 @@ Page({
 
   details(e) {
     let id = e.currentTarget.dataset.id;
+    console.log(id);
     if (this.data.packageId == 0) {
       //首页进入
       wx.navigateTo({

pages/welfare/welfare/goodsDetails.js

@@ -0,0 +1,66 @@
+// pages/welfare/welfare/goodsDetails.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/welfare/welfare/goodsDetails.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/welfare/welfare/goodsDetails.wxml

@@ -0,0 +1,2 @@
+<!--pages/welfare/welfare/goodsDetails.wxml-->
+<text>pages/welfare/welfare/goodsDetails.wxml</text>

pages/welfare/welfare/goodsDetails.wxss

@@ -0,0 +1 @@
+/* pages/welfare/welfare/goodsDetails.wxss */