售后问题修改

pages/order/OrderReturnDetail/index.vue

@@ -33,20 +33,27 @@
         <text>退款总金额</text>
         <text class="colorRed">￥{{ orderDetail.refundAmount || 0 }}</text>
       </view>
-      <view class="express" v-if="orderDetail.serviceType === 1">
+      <view class="express" v-if="orderDetail.state === 1 && orderDetail.serviceType === 1 && orderDetail.deliverySn===null">
         <view class="title">商家已同意退货申请，请尽快发货。</view>
         <view class="info people"> 收货人： {{ orderDetail.consignee || '' }} </view>
         <view class="info address"> 收货地址： {{ orderDetail.address || '' }} </view>
         <view class="info phone"> 收货电话： {{ orderDetail.phoneNumber || '' }} </view>
       </view>
       <!-- 退款信息 -->
-      <view class="tips" v-if="orderDetail.state === 0">
+      <view class="tips" v-if="orderDetail.state === 0 && orderDetail.salesState !== 1 && orderDetail.salesState !== 2 ">
         <text class="title">您已成功发起退款申请，请耐心等待商家处理</text>
         <view class="content">
           <view>· 卖家同意或超时未处理，系统将退款给您</view>
           <view>· 如果卖家拒绝，您可以修改退款申请后再次发起，卖家会重新处理</view>
         </view>
       </view>
+        <!-- 物流信息 -->
+        <view class="express" v-if="orderDetail.deliverySn && orderDetail.state !== 3">
+            <text class="title">您已发送快递，请耐心等待商家处理</text>
+            <view class="info people"> 快递公司： {{ orderDetail.deliveryName || '' }}</view>
+            <view class="info address"> 快递单号： {{ orderDetail.deliverySn || '' }}</view>
+            <view class="info phone"> 发货时间： {{ orderDetail.deliveryTime || '' }}</view>
+        </view>
       <!-- 撤销 -->
       <!-- <view class="tips" v-if="orderDetail.serviceType === 1 && orderDetail.state  >= 2">
 				<text class="title">您已撤销售后申请</text>
@@ -65,7 +72,8 @@
 			</view> -->
       <view class="bottom">
         <view class="btns redBtn" v-if="orderDetail.salesState === 0 && orderDetail.serviceType === 1 && orderDetail.state === 1" @click="toExpress">填写物流</view>
-        <view class="btns def" v-if="orderDetail.salesState === 0" @click="cancelReq">撤销申请</view>
+          <view class="btns def" v-if="orderDetail.deliverySn" @click="goLogistics(orderDetail)">查看物流</view>
+          <view class="btns def" v-if="orderDetail.salesState === 0 && orderDetail.state !== 2 && orderDetail.state !== 3" @click="cancelReq">撤销申请</view>
         <!-- <view class="btns redBtn" @click="editReq">修改申请</view>-->
       </view>
     </view>
@@ -138,6 +146,12 @@ export default {
     this.getReturnDetail()
   },
   methods: {
+      goLogistics(order) {
+          this.$yrouter.push({
+              path: '/pages/order/Logistics/index',
+              query: {id: order.orderCode},
+          })
+      },
     /** state售后状态 0已提交等待平台审核 1平台已审核 等待用户发货/退款 2 用户已发货 3已完成 */
     async getReturnDetail() {
       getAfterSealsDetail(this.orderId, this.id)
@@ -175,7 +189,7 @@ export default {
         })
         .catch(err => {
           uni.showToast({
-            title: '撤销失败',
+            title: err.msg || '撤销失败',
             icon: 'none',
             duration: 2000,
           })

pages/order/submitExpress/index.vue

@@ -42,7 +42,7 @@ export default {
       expressQuery: {
         code: '', // 快递公司编码
         name: '', // 快递公司名称
-        postalCode: 'SF1213132132', // 快递编号
+        postalCode: '', // 快递编号
         orderCode: '', // 订单编号
       },
       expressList: [],
@@ -77,17 +77,21 @@ export default {
     async addExpress() {
       let errMsg = '请选择'
       if (!this.expressQuery.code || !this.expressQuery.code) {
-        errMsg += ' 快递公司 '
+        errMsg += '快递公司 '
+          uni.showToast({
+              title: errMsg,
+              icon: 'none',
+              duration: 2000,
+          })
+          return
       }
       if (!this.expressQuery.postalCode) {
-        errMsg += ' 快递单号 '
-      }
-      if (errMsg.length > 3) {
           uni.showToast({
-          title: errMsg,
+              title: '请填写快递单号',
               icon: 'none',
               duration: 2000,
           })
+          return
       }
       addExpressData(this.expressQuery)
         .then(res => {