zc订单状态

src/views/order/order/order_processing.vue

@@ -47,18 +47,17 @@
             </div>
             <div class="newDetailCell" v-if="newAddressInfo">
               <span>运费：</span>
-              <!-- <span>￥{{newAddressInfo && newAddressInfo.province == '北京市'?'10.00':'20.00'}}</span> -->
               <span>￥{{order.carriage?Number(order.carriage).toFixed(2):Number(0).toFixed(2)}}</span>
             </div>
             <!-- <div class="newDetailCell">
               <span>用户支付卡号：</span>
               <el-input v-model="cardNumber" placeholder="银行转账订单请输入用户支付卡号" style="width:240px;"></el-input>
             </div> -->
-            <div class="newDetailCell" v-if="logisticsDetail">
+            <div class="newDetailCell" v-if="logisticsDetail && order.orderType=='5'">
               <span>配送方式：</span>
               <el-input v-model="logisticsDetail.logisticsName" placeholder="请输入配送方式" style="width:240px;"></el-input>
             </div>
-            <div class="newDetailCell" v-if="logisticsDetail">
+            <div class="newDetailCell" v-if="logisticsDetail && order.orderType=='5'">
               <span>快递单号：</span>
               <el-input v-model="logisticsDetail.expressNo" placeholder="请输入快递单号" style="width:240px;"></el-input>
             </div>
@@ -80,8 +79,8 @@
               <span @click="changeOrder('cancel')" class="statusBtn" v-if="'待收货' == statusObj[order.status]&&order.orderType=='5'">取消发货</span>
             </div>
           </div>
-          <div class="title">收货人信息：</div>
-          <div class="newOrderAddressDetail" v-if="newAddressInfo">
+          <div class="title" v-if="newAddressInfo && order.orderType=='5'">收货人信息：</div>
+          <div class="newOrderAddressDetail" v-if="newAddressInfo && order.orderType=='5'">
             <div class="formMessage">
               <el-form :model="newAddressInfo" ref="newAddressInfo" :rules="rules" label-position="right" label-width="100px" v-if="newAddressInfo" size="small">
                 <el-form-item label="所在地区:" required>
@@ -187,7 +186,7 @@
               </div>
             </div>
             <div class="orderDetailBack">
-              <span class="backOrderBtn" @click="salesReturn" v-if="order.status == 1 || order.status == 2">商品退货</span>
+              <span class="backOrderBtn" @click="salesReturn" v-if="order.status == 1 || order.status == 2 || order.status == 6">商品退货</span>
               <span v-if="(order.status == 1 || order.status == 2 || order.status == 6) && salesOrderList && salesOrderList.length > 0">
                 <span>已关联退货单：</span>
                 <span class="salesOrderCell" v-for="(item,index) in salesOrderList" :key="'sr'+index" @click="goRefundDetail(item)">{{item.refundId}}</span>

src/views/order/returnGoods/order_processing.vue

@@ -47,11 +47,11 @@
               <span>运费：</span>
               <span>￥{{order.carriage?order.carriage.toFixed(2):order.carriage}}</span>
             </div>
-            <div class="newDetailCell" v-if="logisticsDetail">
+            <div class="newDetailCell" v-if="logisticsDetail && order.orderType=='5'">
               <span>配送方式：</span>
               <span>{{logisticsDetail.logisticsName}}</span>
             </div>
-            <div class="newDetailCell" v-if="logisticsDetail">
+            <div class="newDetailCell" v-if="logisticsDetail && order.orderType=='5'">
               <span>快递单号：</span>
               <span>{{logisticsDetail.expressNo}}</span>
             </div>
@@ -64,8 +64,8 @@
               <span>{{returnOfGoods.refundDesc}}</span>
             </div>
           </div>
-          <div class="title">收货人信息：</div>
-          <div class="newOrderAddressDetail" v-if="newAddressInfo">
+          <div class="title" v-if="newAddressInfo && order.orderType=='5'">收货人信息：</div>
+          <div class="newOrderAddressDetail" v-if="newAddressInfo && order.orderType=='5'">
             <div class="formMessage">
               <el-form :model="newAddressInfo" ref="newAddressInfo" label-position="right" label-width="120px" v-if="newAddressInfo" size="small">
                 <el-form-item label="所在地区：" required>