update 细节和订单确认收货（提示支付和确认收货的人，需要同一个openid）

xuxueyang

2024-09-24 2c095c287031ef764ef983002174f57cb630e5d5

 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
@@ -110,6 +111,49 @@

      },
      methods: {

         openbrand(item) {
            //也要判断一下是否重复进入
            //判断堆栈，如果是店铺，就直接返回
            //或者是：从商铺到列表再到详情，再到商铺，这种也不行
            const pages = getCurrentPages();
            console.log('toShopping', pages)
            if (pages && pages.length >= 2) {
               if (pages[pages.length - 2].route === "sub_pages/customer/shop/shop") {
                  uni.navigateBack()
                  return
               }
            }
            if (pages && pages.length >= 3) {
               if (pages[pages.length - 3].route === "sub_pages/customer/shop/shop" &&
                  pages[pages.length - 2].route === "sub_pages/customer/trade/list"
               ) {
                  uni.navigateBack({
                     delta: 2
                  })
                  return
               }
            }

            if (pages.length >= 10) {
               //直接强制购物车
               uni.reLaunch({
                  url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
               })
            } else {
               uni.navigateTo({
                  url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
               })
            }

         },

         toFlowerDetail(item) {
            console.log(item)
            uni.navigateTo({
               url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
            })
         },
         salesTypeChange(e) {
            this.submitForm.salesType = e.value
         },
@@ -136,6 +180,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,25 +253,37 @@
                        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()
                           const {
                              code
                           } = await tmp.$http.request('get',
                              '/api/customer/order/receive/confirm', {
                                 params: {
                                    id: tmp.id,
                                 }
                              })
                           tmp.$message.hideLoading()
                           if (code === 0) {
                              tmp.getDetail()
                              tmp.$store.dispatch('getCurrentInfo')
                           if (info.extraData && info.extraData.status === 'fail') {
                              tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
										
                           } else if (info.extraData && info.extraData.status === 'cancel') {

                           } else {
                              tmp.$message.showLoading()
                              const {
                                 code
                              } = await tmp.$http.request('get',
                                 '/api/customer/order/receive/confirm', {
                                    params: {
                                       id: tmp.id,
                                    }
                                 })
                              tmp.$message.hideLoading()
                              if (code === 0) {
                                 tmp.getDetail()
                                 tmp.$store.dispatch('getCurrentInfo')
                              }

                           }

                        },
                        fail(e) {
                           //dosomething
@@ -476,7 +548,7 @@
      <view v-for="(item,index) of list" :key="index">
         <view class="flower-info m-b-20 m-t-12 br-4"
            v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
            <view class="supplier-name ">
            <view class="supplier-name " @click.stop="openbrand(item)">
               <image class="icon-dp" src="/static/common/icon-dp.png"></image>
               {{ item.supplierName || ''}}
            </view>
@@ -490,7 +562,7 @@
               <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
                  @click="previewImg(item.flowerCover)">
               </image>
               <view class="flex1">
               <view class="flex1" @click.stop="toFlowerDetail(item)">
                  <view class=" flex">
                     <view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
                           class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
@@ -549,7 +621,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 +668,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>