Merge remote-tracking branch 'origin/main'

xuxueyang

2024-08-11 7f693ebe71d34fd84b3618ff0d5a66f004e46db5

 pages/order/order-detail.vue

@@ -27,7 +27,7 @@
               orderId: this.id,
               imageList: [],
               videoList: [],
               reason: [],
               reason: '',
               orderItems: []
            }
            this.showSales = options.showsales && true || false
@@ -180,7 +180,7 @@
                     orderId: this.id,
                     imageList: [],
                     videoList: [],
                     reason: [],
                     reason: '',
                     orderItems: [],
                  }
                  this.showSales = true
@@ -285,6 +285,8 @@
            if (code == 0) {
               this.$message.showToast('提交成功')
               this.showSales = false
               this.$forceUpdate()
               uni.navigateBack()
            }
         },
      },
@@ -377,6 +379,12 @@
            <view class="label">订单编号:</view>
            <view class="value">{{ dto.orderNo || '-' }}</view>
            <view class="button m-l-a m-r-0" @click="copyTxt(dto.orderNo)">复制
            </view>
         </view>
         <view class="form-item" v-if="dto.deliveryNo">
            <view class="label">快递单号:</view>
            <view class="value">{{ dto.deliveryNo || '-' }}</view>
            <view class="button m-l-a m-r-0" @click="copyTxt(dto.deliveryNo)">复制
            </view>
         </view>
         <view class="form-item">
@@ -523,8 +531,9 @@
         </view>
         <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
         </view>
         <view class="button button-1" @click="buttonClick('sales')"
            v-if=" dto.status === 'EVALUATE'||dto.status=='COMPLETED'"> 申请售后
         <!-- ||dto.status=='COMPLETED' -->
         <view class="button button-1" @click="buttonClick('sales')"			
            v-if=" dto.status === 'RECEIVE'"> 申请售后
         </view>
      </view>
      <view v-if="showSales">