update 提及的修复问题和会员信息相关的

xuxueyang

2024-09-09 c3319db3d83f2d4fa7fdf06e3792496ce77d90aa

 sub_pages/customer/shopping/confirm.vue

@@ -179,14 +179,16 @@
                        console.log('pay,', data)
                        // /api/pub/init/callback?orderId=
                        // if(env.pro)
                        if (data && data['_testOrderId'] && environments.httpBaseUri.startsWith(
                        if (false && data && (data['_testV2OrderId'] || data['_testOrderId']) &&
                           environments.httpBaseUri.startsWith(
                              'http://47.99.58.211/flower')) {
                           //回调
                           tmp.$message.showLoading()
                           const res2 = await tmp.$http.request('get',
                              '/api/pub/init/callback', {
                                 params: {
                                    orderId: data['_testOrderId']
                                    orderId: data['_testV2OrderId'] || data[
                                       '_testOrderId'] || ''
                                 }
                              })
                           tmp.$message.hideLoading()
@@ -199,16 +201,23 @@
                              ...data,
                              async success(res) {
                                 console.log('pay success', res)
                                 tmp.$message.showToast('支付成功')
                                 // tmp.$message.showToast('支付成功')
                                 //返回上一页
                                 await tmp.$store.dispatch('sign_add', 'shopping')
                                 uni.navigateBack()
                                 tmp.$message.showToast('支付成功')
                                 setTimeout(() => {
                                    uni.navigateBack()
                                 }, 500)
                                 // await 
                                 // uni.navigateBack()


                              },
                              async fail(err) {
                                 console.error('pay fail', err)
                                 tmp.$message.showToast('支付失败')
                                 await tmp.$store.dispatch('sign_add', 'shopping')
                                 uni.navigateBack()
                                 // await tmp.$store.dispatch('sign_add', 'shopping')
                                 // uni.navigateBack()
                              }
                           })

@@ -376,7 +385,7 @@
      <view class="bottom-price flex">
         <view class="m-t-12 m-l-0 m-r-a">
            合计 <span class="t-red">￥
               {{ (dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) || 0 }} </span>元
               {{ ((dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) || 0).toFixed(2) }} </span>元
         </view>
         <view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder">
            提交订单