diff --git a/node_modules/weixin-js-sdk/package.json b/node_modules/weixin-js-sdk/package.json index 91b7fb0..507343e 100644 --- a/node_modules/weixin-js-sdk/package.json +++ b/node_modules/weixin-js-sdk/package.json @@ -22,7 +22,7 @@ "_resolved": "https://registry.npmmirror.com/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz", "_shasum": "01fe5220b91dbfe089fc0730d061be0e68271e6a", "_spec": "weixin-js-sdk", - "_where": "D:\\work\\tourGuide", + "_where": "D:\\work\\tourist", "bugs": { "url": "https://github.com/yanxi123-com/weixin-js-sdk/issues" }, diff --git a/pages/index/index.vue b/pages/index/index.vue index baa431f..9a1da6e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -66,6 +66,7 @@ export default { data() { return { + imageValue: [], topBanner: [], typeList: [ { diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue index 89229e8..a03fc6a 100644 --- a/subPackages/order/trades.vue +++ b/subPackages/order/trades.vue @@ -163,29 +163,32 @@ setOrderId(id) { this.Post({ order_id: id, - type: "wx", + type: "miniprogram", platform: 'miniprogram' }, '/api/pay/unify').then(res => { console.log(res) if (res.data) { + let data = res.data + WeixinJSBridge.invoke('getBrandWCPayRequest', { + "appId": data.appId, //公众号ID,由商户传入 + "timeStamp": data.timeStamp, //时间戳,自1970年以来的秒数 + "nonceStr": data.timeStamp, //随机串 + "package": data.package, + "signType": data.signType, //微信签名方式: + "paySign": data.paySign //微信签名 + }, + function(res) { + // if (res.err_msg == "get_brand_wcpay_request:ok") { + // // 使用以上方式判断前端返回,微信团队郑重提示: + // //res.err_msg将在用户支付成功后返回ok,但并不保证它绝对可靠。 + // } + uni.navigateTo({ + url: '/subPackages/order/trades' + }) + }); // 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' - // }) - // } - // }) } }) }, diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html index 32bec3c..dca0efb 100644 --- a/unpackage/dist/build/web/index.html +++ b/unpackage/dist/build/web/index.html @@ -1,2 +1,2 @@