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

xuxueyang

2024-09-24 2c095c287031ef764ef983002174f57cb630e5d5

 pages/order/order-detail.vue

@@ -111,7 +111,7 @@

      },
      methods: {
			

         openbrand(item) {
            //也要判断一下是否重复进入
            //判断堆栈，如果是店铺，就直接返回
@@ -134,7 +134,7 @@
                  return
               }
            }
			 

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

         },

         toFlowerDetail(item) {
            console.log(item)
            uni.navigateTo({
@@ -253,28 +253,37 @@
                        extraData: {
                           // merchant_id: '',
                           // merchant_trade_no: '',
                           merchant_id: '1661512517',
                           merchant_trade_no: tmp.id || '',
                           // merchant_id: '1661512517',
                           // merchant_trade_no: tmp.id || '',
                           transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
                        },
                        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