Merge branch 'main' of https://gitee.com/people_3/hmy_farmer

xuxy

2024-08-11 1e97cc472f8b156c464ecfd1c91c1e62f53151f0

 pages/order/order.vue

@@ -182,7 +182,7 @@
                  }
               }
               break
               case 'delOrder':{
               case 'delOrder': {
                  await this.$message.confirm('是否删除此订单')
                  // 发送请求
                  this.$message.showLoading()
@@ -242,6 +242,13 @@
               </view>
               <view class="value" style="color: #000">{{ dto.statusBackendStr || '-' }}</view>
            </view>
            <view class="desc flex" v-if="dto.deliveryNo" @click="copyTxt(dto.deliveryNo)">
               <view class="label">
                  快递单号:
               </view>
               <view class="value">{{ dto.deliveryNo }}</view>
            </view>

            <view class="flex">
               <view class="desc flex flex1">
                  <view class="label">
@@ -256,12 +263,21 @@
                  <view class="value">{{ dto.customerTel || '-' }}</view>
               </view>
            </view>
            <view class="desc flex">
               <view class="label">
                  收货地址:
            <view class="flex">
               <view class="desc flex flex1">
                  <view class="label">
                     收货地址:
                  </view>
                  <view class="value">{{ dto.customerAddress }}</view>
               </view>
               <view class="value">{{ dto.customerAddress }}</view>
               <view class="desc flex flex1" v-if="dto.deliveryName">
                  <view class="label">
                     快递名称:
                  </view>
                  <view class="value">{{ dto.deliveryName }}</view>
               </view>
            </view>
				
            <view class="desc flex" v-if="dto.statusBackend!=='PENDING'&&dto.statusBackend!=='CANCEL'">
               <view class="label">
                  支付时间:
@@ -333,9 +349,9 @@
               <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'confirm')"
                  v-if="dto.statusBackend ==='RECEIVE'"> 确认收货
               </view>

               <!-- ||item.statusBackend=='COMPLETED' -->
               <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)"
                  v-if="dto.statusBackend === 'EVALUATE'||item.statusBackend=='COMPLETED'"> 申请售后
                  v-if="dto.statusBackend === 'RECEIVE'"> 申请售后
               </view>
               <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
                  v-if="dto.statusBackend === 'EVALUATE'"> 评价