update 细节和订单确认收货（写死了商户号）

xuxueyang

2024-09-24 056997b07e61fc99d5c311d0c5489b9de48fd9bc

 pages/order/order-detail.vue

@@ -42,8 +42,9 @@
            }
            this.showSales = options.showsales && true || false

            if (this.dto.statusBackend === 'PENDING' || this.dto.status === 'PENDING') {

            if (this.dto.statusBackend === 'PENDING') {

               this.timer = setInterval(() => {
                  //倒计时
                  var nowdate = new Date().getTime() - 1000 * 60 * 5
@@ -93,7 +94,7 @@
            }
         }).then(res => {
            var data = res.data;
	

            let tmpData = data.map(item => ({
               value: item.value,
               label: item.label
@@ -136,6 +137,22 @@
                  //    description: 'descriptiondescriptiondescriptiondescriptiondescription'
                  // }]
               }
               if (this.dto.statusBackend === 'PENDING') {
                  //先判断要不要字节变成已取消
                  var nowdate = new Date().getTime() - 1000 * 60 * 5
                  var diff = new Date(this.dto.createTime).getTime() - nowdate

                  if (diff <= 2000 && true) {
                     //超过了5分钟
                     this.dto.statusBackend = 'CANCEL'
                     this.dto.statusBackendStr = '已取消'
                     this.dto.status = 'CANCEL'
                     this.dto.statusStr = '已取消'
                     this.dto.bctime = ''
                     this.$forceUpdate()
                  }
               }

            }
         },
         async callTel() {
@@ -193,9 +210,12 @@
                        extraData: {
                           // merchant_id: '',
                           // merchant_trade_no: '',
                           merchant_id: '1661512517',
                           merchant_trade_no: tmp.id || '',
                           transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
                        },
                        async success() {
                        async success(info) {
                           console.log('info', info)
                           //dosomething
                           // 发送请求
                           tmp.$message.showLoading()
@@ -549,7 +569,7 @@
         </view>
         <view class="form-item">
            <view class="label">下单日期:</view>
            <view class="value">{{ dto.paymentTime || '-' }}</view>
            <view class="value">{{ dto.createTime || '-' }}</view>
         </view>
         <view class="form-item" v-if="dto.cancelTime&&(dto.status==='CANCEL'||dto.status==='REFUND')">
            <view class="label">取消时间:</view>
@@ -596,8 +616,8 @@
      </view>
      <view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
         <view class="form-item flex">
            <view class="label">订单金额:</view>
            <view class="value m-l-a m-r-0 text-right">+{{ dto.totalAmount || '0' }}</view>
            <view class="label">商品金额:</view>
            <view class="value m-l-a m-r-0 text-right">+{{ dto.flowerAmount || '0' }}</view>
         </view>
         <view class="form-item flex">
            <view class="label">运费:</view>