提交

10 months ago · fdbf52cf7d
10 changed files with 35 additions and 12 deletions
--- 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: {
 			// 去订单
--- 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: '加载中'
--- a/subPackages/order/trades.vue
+++ b/subPackages/order/trades.vue
@ -161,7 +161,30 @@
 			},
 			// 立即支付
 			setOrderId(id) {
-				
+				this.Post({
+					order_id: order_id,
+					type: "wx",
+					platform: 'miniprogram'
+				}, '/api/pay/unify').then(res => {
+					console.log(res)
+					if (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 = [];
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>daoyous</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.69b6f878.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.4d1c1923.js></script></body></html>
--- a/unpackage/dist/build/web/static/js/index.4d1c1923.js
+++ b/unpackage/dist/build/web/static/js/index.4d1c1923.js
--- a/unpackage/dist/build/web/static/js/pages-user-user.78a80872.js
+++ b/unpackage/dist/build/web/static/js/pages-user-user.78a80872.js
--- a/unpackage/dist/build/web/static/js/pages-user-user.a62a4806.js
+++ b/unpackage/dist/build/web/static/js/pages-user-user.a62a4806.js
--- a/unpackage/dist/build/web/static/js/request.js
+++ b/unpackage/dist/build/web/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: '加载中'
--- a/unpackage/dist/build/web/static/js/subPackages-order-trades.1b3ad5de.js
+++ b/unpackage/dist/build/web/static/js/subPackages-order-trades.1b3ad5de.js
--- a/unpackage/dist/build/web/static/js/subPackages-order-trades.4d62d8f8.js
+++ b/unpackage/dist/build/web/static/js/subPackages-order-trades.4d62d8f8.js