diff --git a/app.js b/app.js
index 22508e5..0b00a92 100644
--- a/app.js
+++ b/app.js
@@ -148,7 +148,7 @@ App({
     // ip: 'http://106.54.198.47/', //接口地址
     ip: 'https://sanpinhuicai.com/', //接口地址
     // ip: 'http://192.168.0.112:9000/', //接口地址/
-    //  ip: 'http://127.0.0.1:9000/', //接口地址/
+    // ip: 'http://127.0.0.1:9000/', //接口地址/
 
     //appId  wx65c9560afc9cbaa7
   }
diff --git a/pages/my/my_order/my_order.wxml b/pages/my/my_order/my_order.wxml
index 9afb044..49ef931 100644
--- a/pages/my/my_order/my_order.wxml
+++ b/pages/my/my_order/my_order.wxml
@@ -37,7 +37,7 @@
       :item.status==4?'已完成'
       :''}}
     </view>
-    <view class="state" wx:if="{{item.afterSalesStatus && (type == 6 || (item.afterSalesStatus != 66 && type == 0))}}">
+    <view class="state" wx:if="{{item.afterSalesStatus && (type == 6 || (item.afterSalesStatus != 66 && item.afterSalesStatus != 67 && type == 0))}}">
       {{
 				 item.afterSalesStatus==61?'换货审核中'
 				:item.afterSalesStatus==62?'退款审核中'
@@ -94,7 +94,7 @@
       <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||type==0) && (item.afterSalesStatus==66||item.afterSalesStatus==67 || !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 && item.orderPayWay!=3 && (type==3||type==0) && (item.afterSalesStatus==66||item.afterSalesStatus==67 || !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==67 || !item.afterSalesStatus) }}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-s='{{item.status}}' data-sq='2' catchtap="apply">申请换货</view>
       <!-- 申请中 -->
       <!--  -->
diff --git a/pages/order_details/order_details.wxml b/pages/order_details/order_details.wxml
index dff4492..456f8c0 100644
--- a/pages/order_details/order_details.wxml
+++ b/pages/order_details/order_details.wxml
@@ -69,7 +69,10 @@
         <view>
           包裹{{index+1}}
         </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 style="display:flex;">
+          <view wx:if="{{goods.status == 3 && goods.orderPayWay!=3 && (!goods.afterSalesStatus || goods.afterSalesStatus == 66||goods.afterSalesStatus==67)}}" class="btn btn-red" data-id='{{goods.id}}' data-num='{{goods.orderNumber}}' data-s='{{goods.status}}' data-sq='1' data-package-id="{{item.id}}" capture-bind:tap="apply">退货</view>
+          <view wx:if="{{goods.status == 3 && (!goods.afterSalesStatus || goods.afterSalesStatus == 66||goods.afterSalesStatus==67)}}" 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>
       <view class="cont display_J_B" wx:for='{{item.goods}}' wx:key="specId" wx:for-item="goodsItem" catchtap="">
         <view class="cont-l">
@@ -206,6 +209,7 @@
   <view class="b-btn display_J_E display_A_C" wx:if="{{goods.status>2&&goods.status<6}}">
     <view class="btn" wx:if="{{goods.status==5||goods.status==4}}" catchtap="del">删除订单</view>
     <view class="btn" wx:if="{{goods.status==3}}" data-item='{{goods}}' data-logistics="{{goods.logistics}}" data-order-number="{{goods.orderNumber}}" data-logistics-name="{{goods.logisticsName}}" catchtap="viewLogisticsDetails">物流查询</view>
+    <view class="btn btn-red" catchtap="apply" data-id='{{goods.id}}' data-num='{{goods.orderNumber}}' data-s='{{goods.status}}' data-sq='1' wx:if="{{goods.status==3 && goods.orderPayWay!=3}}">全部退货</view>
     <view class="btn btn-red" catchtap="apply" data-id='{{goods.id}}' data-num='{{goods.orderNumber}}' data-s='{{goods.status}}' data-sq='2' wx:if="{{goods.status==3}}">全部换货</view>
     <view class="btn btn-red" catchtap="confirm" wx:if="{{goods.status==3}}">确认收货</view>
     <view class="btn btn-red" catchtap="rate" wx:if="{{goods.status==4}}">评价</view>