Skip to content

H
h5-base
Commit 3f5d09e8 authored by IvyXia123's avatar IvyXia123
Browse files
Options

支付

parent 602e5508
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
dist/index.html
View file @ 3f5d09e8
......@@ -11,4 +11,4 @@
position: fixed;
background: #f4f4f4;
}
/* html{font-size: 1px;} */</style><link href=static/css/app.ed6d1273dc8c2d144766934b011e5890.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.6a8a8f81d41eede92744.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.2ba11ac5a56f67eb6be7.js></script></body></html>
\ No newline at end of file
/* html{font-size: 1px;} */</style><link href=static/css/app.ed6d1273dc8c2d144766934b011e5890.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.6a8a8f81d41eede92744.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.f6bad05038d78943a865.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2ba11ac5a56f67eb6be7.js deleted 100644 → 0
View file @ 602e5508
This diff is collapsed.
dist/static/js/app.f6bad05038d78943a865.js 0 → 100644
View file @ 3f5d09e8
This diff is collapsed.
src/main.js
View file @ 3f5d09e8
......@@ -58,7 +58,7 @@ if(window.localStorage.out_trade_no) {
// 支付成功
if(res.status === "SUCCESS") {
sessionStorage.setItem("buyindex", 1);
Dialog.confirm({ title: '标题', message: '支付成功'}).then(() => {
Dialog.confirm({ title: '标题', message: '支付成功', confirmButtonText: '去查看' }).then(() => {
if(res.buy_type == 1) {
router.push({ name: "buySuccess", query: outTradEno });
}else {
......@@ -74,7 +74,7 @@ if(window.localStorage.out_trade_no) {
}).catch(error => {
// 支付失败或未支付
if(error.code === 500 && error.msg.status === "NO_SYNC") {
Dialog.confirm({ title: '标题', message: '您有一笔未支付的订单'}).then(() => {
Dialog.confirm({ title: '标题', message: '您有一笔未支付的订单', confirmButtonText: '去查看'}).then(() => {
clearInterval(timer);
location.href = `http://${ window.location.host }/#/guidelines?pay_url=${ encodeURI(window.localStorage.pay_url) }`
}).catch(() => {
......
src/service/index.js
View file @ 3f5d09e8
......@@ -17,10 +17,11 @@ axios.interceptors.request.use(
// process.env.versionTime
let versiontime = '09021400'
console.log(common.isWeixinBrowser(), '678887');
let token = ''
if(common.isWeixinBrowser() === 1) {
const token = common.getUrlParam().token;
token = common.getUrlParam().token;
}else {
const token = localStorage.getItem('cc_token');
token = localStorage.getItem('cc_token');
}
// 设置参数格式
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment