From c3319db3d83f2d4fa7fdf06e3792496ce77d90aa Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 09 九月 2024 02:24:16 +0800
Subject: [PATCH] update 提及的修复问题和会员信息相关的
---
sub_pages/customer/shopping/confirm.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index bfd1426..f691c38 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -2,6 +2,7 @@
import {
mapState
} from 'vuex'
+ import environments from '@/environments'
export default {
name: "订单详情",
@@ -62,7 +63,7 @@
this.partnerInfo = res.data || {}
if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
//刷新用户信息
- await dispatch('getCurrentInfo')
+ await this.$store.dispatch('getCurrentInfo')
}
}
})
@@ -176,31 +177,47 @@
if (code === 0) {
//提交信息
console.log('pay,', data)
- if (data && data['_testOrderId']) {
+ // /api/pub/init/callback?orderId=
+ // if(env.pro)
+ 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/customer/flower/order/callback/tmp', {
+ '/api/pub/init/callback', {
params: {
- id: res2.data['_testOrderId']
+ orderId: data['_testV2OrderId'] || data[
+ '_testOrderId'] || ''
}
})
tmp.$message.hideLoading()
+ tmp.$message.showToast('支付成功')
+ //返回上一页
+ await tmp.$store.dispatch('sign_add', 'shopping')
+ uni.navigateBack()
} else if (data) {
wx.requestPayment({
...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()
}
})
@@ -368,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">
提交订单
--
Gitblit v1.9.3