jiazhipeng 10 months ago
parent
commit
b1d908c01b
  1. 6
      pages.json
  2. 10
      pages/user/user.vue
  3. 2
      static/js/request.js
  4. 21
      subPackages/order/payResult.vue
  5. 28
      subPackages/order/trades.vue
  6. 2
      unpackage/dist/build/web/index.html
  7. 1
      unpackage/dist/build/web/static/js/index.69b6f878.js
  8. 1
      unpackage/dist/build/web/static/js/index.7cac12de.js
  9. 1
      unpackage/dist/build/web/static/js/pages-user-user.78a80872.js
  10. 1
      unpackage/dist/build/web/static/js/pages-user-user.a62a4806.js
  11. 2
      unpackage/dist/build/web/static/js/request.js
  12. 1
      unpackage/dist/build/web/static/js/subPackages-order-payResult.1cb13989.js
  13. 1
      unpackage/dist/build/web/static/js/subPackages-order-trades.1b3ad5de.js
  14. 1
      unpackage/dist/build/web/static/js/subPackages-order-trades.8d5d9a07.js

6
pages.json

@ -176,6 +176,12 @@
"navigationBarTitleText": "支付" "navigationBarTitleText": "支付"
} }
}, },
{
"path": "order/payResult",
"style": {
"navigationBarTitleText": "支付"
}
},
{ {
"path": "video/video", "path": "video/video",
"style": { "style": {

10
pages/user/user.vue

@ -93,12 +93,12 @@
onShow() { onShow() {
this.userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {} this.userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
if(!this.userInfo.teken) { if(!this.userInfo.token) {
// this.$store.commit('changeLoginPath') 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: { methods: {
// //

2
static/js/request.js

@ -10,7 +10,7 @@ Vue.prototype.NEWAPIURL = NEWAPIURL
Vue.prototype.Post = (params, apiurl) => { Vue.prototype.Post = (params, apiurl) => {
if (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo')).token) params.token = JSON.parse(uni.getStorageSync('userInfo')).token 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 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) => { return new Promise((resolve, reject) => {
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'

21
subPackages/order/payResult.vue

@ -0,0 +1,21 @@
<template>
<view>
<view v-html="text"></view>
</view>
</template>
<script>
export default {
data() {
return {
text: ''
}
},
onLoad(option) {
this.text = JSON.parse(decodeURIComponent(option.text));
},
}
</script>
<style>
</style>

28
subPackages/order/trades.vue

@ -161,7 +161,33 @@
}, },
// //
setOrderId(id) { 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() { onReload() {
this.list = []; this.list = [];

2
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)')) <!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.7cac12de.js></script></body></html>

1
unpackage/dist/build/web/static/js/index.69b6f878.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/index.7cac12de.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-user-user.78a80872.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-user-user.a62a4806.js

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/web/static/js/request.js

@ -10,7 +10,7 @@ Vue.prototype.NEWAPIURL = NEWAPIURL
Vue.prototype.Post = (params, apiurl) => { Vue.prototype.Post = (params, apiurl) => {
if (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo')).token) params.token = JSON.parse(uni.getStorageSync('userInfo')).token 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 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) => { return new Promise((resolve, reject) => {
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'

1
unpackage/dist/build/web/static/js/subPackages-order-payResult.1cb13989.js

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["subPackages-order-payResult"],{"0fe8":function(t,n,e){"use strict";e("6a54"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{text:""}},onLoad:function(t){this.text=JSON.parse(decodeURIComponent(t.text))}};n.default=u},"76f9":function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){}));var u=function(){var t=this.$createElement,n=this._self._c||t;return n("v-uni-view",[n("v-uni-view",{domProps:{innerHTML:this._s(this.text)}})],1)},i=[]},8011:function(t,n,e){"use strict";e.r(n);var u=e("76f9"),i=e("d2f3");for(var r in i)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(r);var f=e("828b"),o=Object(f["a"])(i["default"],u["b"],u["c"],!1,null,"c776dcae",null,!1,u["a"],void 0);n["default"]=o.exports},d2f3:function(t,n,e){"use strict";e.r(n);var u=e("0fe8"),i=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(r);n["default"]=i.a}}]);

1
unpackage/dist/build/web/static/js/subPackages-order-trades.1b3ad5de.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/subPackages-order-trades.8d5d9a07.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save