diff --git a/pages.json b/pages.json
index 5edcffe..32a420c 100644
--- a/pages.json
+++ b/pages.json
@@ -176,6 +176,12 @@
"navigationBarTitleText": "支付"
}
},
+ {
+ "path": "order/payResult",
+ "style": {
+ "navigationBarTitleText": "支付"
+ }
+ },
{
"path": "video/video",
"style": {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index ae8d536..a85f0aa 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -93,12 +93,12 @@
onShow() {
this.userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
- if(!this.userInfo.teken) {
- // this.$store.commit('changeLoginPath')
+ if(!this.userInfo.token) {
+ this.Post({}, '/api/user/getUserDetails').then(res => {
+ this.userInfo = res.data
+ this.$store.commit('changeUserInfo', res.data)
+ })
}
- // this.Post({}, '/api/Merchants/get_login_details').then(res => {
- // this.userInfo = res.data
- // })
},
methods: {
// 去订单
diff --git a/static/js/request.js b/static/js/request.js
index f8916c8..051d46e 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -10,7 +10,7 @@ Vue.prototype.NEWAPIURL = NEWAPIURL
Vue.prototype.Post = (params, apiurl) => {
if (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo')).token) params.token = JSON.parse(uni.getStorageSync('userInfo')).token
else if (store.state.user.userInfo.token) params.token = store.state.user.userInfo.token
- // params.token = 'f15f0d69-53a5-4330-b327-664fba53258b'
+ params.token = '84bf42c7-e4b9-48b7-976e-2dddcc596d39'
return new Promise((resolve, reject) => {
uni.showLoading({
title: '加载中'
diff --git a/subPackages/order/payResult.vue b/subPackages/order/payResult.vue
new file mode 100644
index 0000000..7f4173e
--- /dev/null
+++ b/subPackages/order/payResult.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue
index 85858dd..89229e8 100644
--- a/subPackages/order/trades.vue
+++ b/subPackages/order/trades.vue
@@ -161,7 +161,33 @@
},
// 立即支付
setOrderId(id) {
-
+ this.Post({
+ order_id: id,
+ type: "wx",
+ platform: 'miniprogram'
+ }, '/api/pay/unify').then(res => {
+ console.log(res)
+ if (res.data) {
+ // uni.navigateTo({
+ // url: '/subPackages/order/payResult?text=' + encodeURIComponent(JSON.stringify(res.data))
+ // })
+ // uni.requestPayment({
+ // nonceStr: res.data.nonceStr,
+ // package: res.data.package,
+ // paySign: res.data.paySign,
+ // signType: res.data.signType,
+ // timeStamp: res.data.timeStamp,
+ // success: () => {
+ // this.getSubscribeMessage()
+ // },
+ // fail() {
+ // uni.navigateTo({
+ // url: '/subPackages/order/trades'
+ // })
+ // }
+ // })
+ }
+ })
},
onReload() {
this.list = [];
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index a849d46..32bec3c 100644
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
daoyous
\ No newline at end of file
+ document.write('')