Skip to content

H
h5-base
Commit 7958defa authored by IvyXia123's avatar IvyXia123
Browse files
Options

支付修改

parent 620f8b0c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 8 deletions
dist/index.html
View file @ 7958defa
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
position: fixed; position: fixed;
background: #f4f4f4; background: #f4f4f4;
} }
/* html{font-size: 1px;} */</style><link href=static/css/app.419a340d5d99fa41c7715c7b65489c6f.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.1fc98c23087820a0264d.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.168ed908919be54b9432.js></script></body></html> /* html{font-size: 1px;} */</style><link href=static/css/app.419a340d5d99fa41c7715c7b65489c6f.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.fd57a810b7faa8707adf.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.ca9b10bc8b107f944ad3.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/3.f10ee02c8663c7c311fe.js → dist/static/js/3.363f637115017092d0e9.js
View file @ 7958defa
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.6cca177877f0bfa11310.js → dist/static/js/5.819945a168f2ac815d8b.js
View file @ 7958defa
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.1fc98c23087820a0264d.js → dist/static/js/manifest.fd57a810b7faa8707adf.js
View file @ 7958defa
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={69:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"9baf7c00d262ea271601",1:"cd702ed7c711ea5ecfdb",2:"16e13d1a6c737c94cb9f",3:"f10ee02c8663c7c311fe",4:"ae2f2ad72b7647778888",5:"6cca177877f0bfa11310",6:"f33528d2879474d9b497",7:"013c69180ef15396ca9b",8:"3a12c8d7575a76f18500",9:"5428e5efda8c69b091a8",10:"18feb799f9b98c2237ff",11:"918861cd78184d817c80",12:"cb924d2c61a81e172ad0",13:"49e2fab89863e5a59349",14:"97a1294dd4dfb6301ebe",15:"23378403a5bada9571df",16:"af157bb03acb4b7f37b8",17:"6cf9e1b9fa0428cf5d63",18:"2340341552200a69e80d",19:"aa6e3d65aa96e428d7a5",20:"91202ae1839a0b6719cc",21:"5521f5785f298d62adf8",22:"b0fd96ad8f27124b5d6f",23:"cd228950ea5aeb35bcbb",24:"1bb321e30f4971d8a7e2",25:"0e030f5a087b8f9139db",26:"56f2bf2831acd0c1247b",27:"0fd42b65ee3a1a71573a",28:"8f8fa0383d5ca3b82190",29:"52b720592707e63c2d4e",30:"dbf29282817872a8c5ce",31:"7873c4c22c96bbafe2af",32:"c27850f6211fa385b971",33:"4f4179fc1318f9e7142e",34:"303ef6f9471ee0fa4d71",35:"4232915c9ad14f09d163",36:"8d68a6fdbee6ee8a9409",37:"df2033bdd5e192b42717",38:"30809f53757bc74a040c",39:"319287d76b07a39bc3ad",40:"0fbe69301fe779f4b9e1",41:"ca9b5451ab8772225eaa",42:"7023464731d1a0cd37ff",43:"43779b0239aa146283d0",44:"ed578babd4ce2567ceed",45:"0b782c3dea606ac8a53d",46:"41afd83289888baa28f3",47:"6614379db2a7200615db",48:"640efca78dbd0a067939",49:"6a4cd5657a94075f1bc7",50:"c1cfda636c0eccc2e1f6",51:"868e6e7f5a7d64ee287e",52:"8510973a8e8e6c464086",53:"a59c89c16a2ac8f87891",54:"aa33075401a787f3074c",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"57a1a4f4a139eb66ef6d",59:"7414e328ba8ed1a9d252",60:"8ef62856e5832a7d611b",61:"ed331ea12784c73c30b3",62:"95f5e4748e04cee8ac1e",63:"93655abfb6665a9aaf5a",64:"41c23561f78d47604f7b",65:"bdf70254fb0baae6b437",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={69:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"9baf7c00d262ea271601",1:"cd702ed7c711ea5ecfdb",2:"16e13d1a6c737c94cb9f",3:"363f637115017092d0e9",4:"ae2f2ad72b7647778888",5:"819945a168f2ac815d8b",6:"f33528d2879474d9b497",7:"013c69180ef15396ca9b",8:"3a12c8d7575a76f18500",9:"5428e5efda8c69b091a8",10:"18feb799f9b98c2237ff",11:"918861cd78184d817c80",12:"cb924d2c61a81e172ad0",13:"49e2fab89863e5a59349",14:"97a1294dd4dfb6301ebe",15:"23378403a5bada9571df",16:"af157bb03acb4b7f37b8",17:"6cf9e1b9fa0428cf5d63",18:"2340341552200a69e80d",19:"aa6e3d65aa96e428d7a5",20:"91202ae1839a0b6719cc",21:"5521f5785f298d62adf8",22:"b0fd96ad8f27124b5d6f",23:"cd228950ea5aeb35bcbb",24:"1bb321e30f4971d8a7e2",25:"0e030f5a087b8f9139db",26:"56f2bf2831acd0c1247b",27:"0fd42b65ee3a1a71573a",28:"8f8fa0383d5ca3b82190",29:"52b720592707e63c2d4e",30:"dbf29282817872a8c5ce",31:"7873c4c22c96bbafe2af",32:"c27850f6211fa385b971",33:"4f4179fc1318f9e7142e",34:"303ef6f9471ee0fa4d71",35:"4232915c9ad14f09d163",36:"8d68a6fdbee6ee8a9409",37:"df2033bdd5e192b42717",38:"30809f53757bc74a040c",39:"7caf3955d55358b99f4f",40:"0fbe69301fe779f4b9e1",41:"ca9b5451ab8772225eaa",42:"7023464731d1a0cd37ff",43:"43779b0239aa146283d0",44:"ed578babd4ce2567ceed",45:"0b782c3dea606ac8a53d",46:"41afd83289888baa28f3",47:"6614379db2a7200615db",48:"640efca78dbd0a067939",49:"6a4cd5657a94075f1bc7",50:"c1cfda636c0eccc2e1f6",51:"868e6e7f5a7d64ee287e",52:"8510973a8e8e6c464086",53:"a59c89c16a2ac8f87891",54:"aa33075401a787f3074c",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"57a1a4f4a139eb66ef6d",59:"7414e328ba8ed1a9d252",60:"8ef62856e5832a7d611b",61:"ed331ea12784c73c30b3",62:"95f5e4748e04cee8ac1e",63:"93655abfb6665a9aaf5a",64:"41c23561f78d47604f7b",65:"bdf70254fb0baae6b437",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/buy/guidelines.vue
View file @ 7958defa
...@@ -7,10 +7,11 @@ ...@@ -7,10 +7,11 @@
</template> </template>
<script> <script>
import {getBillRefreshApi, getStatusWechatApi,getCourseInfoApi} from "../../service/api"
import common from '../../util/common' import common from '../../util/common'
import zhiying from "../../assets/punchTheClock/zhiying.png" import zhiying from "../../assets/punchTheClock/zhiying.png"
import zhufubao from "../../assets/punchTheClock/zhifubaotup.png" import zhufubao from "../../assets/punchTheClock/zhifubaotup.png"
let timer = null;
export default { export default {
name: "guidelines", name: "guidelines",
data() { data() {
...@@ -20,6 +21,53 @@ ...@@ -20,6 +21,53 @@
zhufubao: zhufubao zhufubao: zhufubao
} }
}, },
methods: {
outTrade() {
timer = setInterval(() => {
let outTradEno = JSON.parse(window.localStorage.out_trade_no);
getBillRefreshApi({outTradeNo: outTradEno.out_trade_no}).then(res => {
// 支付成功
if (res.status === "SUCCESS") {
getCourseInfoApi().then(response => {
this.userCourse = JSON.parse(JSON.stringify(response));
console.log(this.userCourse)
localStorage.setItem("userCourse", JSON.stringify(this.userCourse));
localStorage.setItem("buyindex", 1);
Dialog.confirm({title: '标题', message: '支付成功', confirmButtonText: '去查看'}).then(() => {
if (response.teacher_alias && response.teacher_alias.substr(0, 1) == 1 && outTradEno.goods_type != 4 && outTradEno.is_subscribe == 1) {
clearInterval(timer);
router.push({ name: "guide", query: {shopId: outTradEno.shopId} });
localStorage.removeItem('out_trade_no')
}else {
if (res.buy_type == 1) {
clearInterval(timer);
router.push({name: "buySuccess", query: outTradEno});
localStorage.removeItem('out_trade_no')
} else {
clearInterval(timer);
router.push({name: "success", query: outTradEno});
localStorage.removeItem('out_trade_no')
}
}
}).catch(() => {
clearInterval(timer);
localStorage.removeItem('out_trade_no')
});
});
} else if (res.status === "NO_SYNC") {
Dialog.confirm({title: '标题', message: '您有一笔未支付的订单', confirmButtonText: '去支付'}).then(() => {
clearInterval(timer);
location.href = `http://${window.location.host}/#/guidelines?pay_url=${encodeURI(window.localStorage.pay_url)}&out_trade_no=${ window.localStorage.out_trade_no }`
localStorage.removeItem('out_trade_no')
}).catch(() => {
clearInterval(timer);
localStorage.removeItem('out_trade_no')
});
}
})
}, 2000)
}
},
mounted() { mounted() {
// 0 -> 微信 1 -> 支付宝 // 0 -> 微信 1 -> 支付宝
this.micromessenger = common.isWeixinBrowser() this.micromessenger = common.isWeixinBrowser()
...@@ -31,6 +79,7 @@ ...@@ -31,6 +79,7 @@
if(this.$route.query.out_trade_no) { if(this.$route.query.out_trade_no) {
localStorage.setItem('out_trade_no', this.$route.query.out_trade_no); localStorage.setItem('out_trade_no', this.$route.query.out_trade_no);
} }
this.outTrade()
} }
} }
</script> </script>
......
src/main.js
View file @ 7958defa
...@@ -50,7 +50,7 @@ Vue.use(Popup).use(Lazyload).use(Button).use(Dialog).use(Toast); ...@@ -50,7 +50,7 @@ Vue.use(Popup).use(Lazyload).use(Button).use(Dialog).use(Toast);
Vue.component('scroll', scroll); Vue.component('scroll', scroll);
// 支付宝支付完成，订单状态查询 // 支付宝支付完成，订单状态查询
let timer = null; /*let timer = null;
if (window.localStorage.out_trade_no) { if (window.localStorage.out_trade_no) {
timer = setInterval(() => { timer = setInterval(() => {
let outTradEno = JSON.parse(window.localStorage.out_trade_no); let outTradEno = JSON.parse(window.localStorage.out_trade_no);
...@@ -95,7 +95,7 @@ if (window.localStorage.out_trade_no) { ...@@ -95,7 +95,7 @@ if (window.localStorage.out_trade_no) {
} }
}) })
}, 6000) }, 6000)
} }*/
// 全局错误日志 // 全局错误日志
......
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