Skip to content

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

支付结论

parent 4474b146
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 25 deletions
dist/index.html
View file @ e77668af
......@@ -11,4 +11,4 @@
position: fixed;
background: #f4f4f4;
}
/* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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.a3606860abb7502c3909.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.0f1856e1260b1c27c6a6.js></script></body></html>
\ No newline at end of file
/* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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.da85a8a272d855b6e85a.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.1efbcf214ab0aa1d327f.js></script></body></html>
\ No newline at end of file
dist/static/js/3.2b59635fbca51370a3b9.js → dist/static/js/3.a8d4b3b0db26d31f09d9.js
View file @ e77668af
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.0f1856e1260b1c27c6a6.js deleted 100644 → 0
View file @ 4474b146
This diff is collapsed.
dist/static/js/app.1efbcf214ab0aa1d327f.js 0 → 100644
View file @ e77668af
This diff is collapsed.
dist/static/js/manifest.a3606860abb7502c3909.js → dist/static/js/manifest.da85a8a272d855b6e85a.js
View file @ e77668af
!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,d,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(f&&f(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},c={69:0};function b(f){if(a[f])return a[f].exports;var c=a[f]={i:f,l:!1,exports:{}};return e[f].call(c.exports,c,c.exports,b),c.l=!0,c.exports}b.e=function(e){var f=c[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,b){f=c[e]=[a,b]});f[2]=a;var d=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",b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"ae6d2eb4f06f9106a0ee",1:"8d5852f2ec9ad4d5ee85",2:"6fc3fd4f87b5f4fd1a3f",3:"2b59635fbca51370a3b9",4:"aa3f49b3c3e5f1772157",5:"def8f4d8646672b08ed7",6:"902c1ac874941b0dd409",7:"edbd5b600984987cf3ba",8:"27ebe98fd09ac8d0b165",9:"ee87105b48f64b787127",10:"578b6bc67d58dc820b09",11:"7fbe7d622dd09d926d62",12:"bcd5e8f1318bb3c79e8d",13:"b01b98d68e1fa7d2364f",14:"d411dd43f6f87ec93d9f",15:"b7be808bd16c3c2b27de",16:"31a81e9a84fff14ea15a",17:"8be5a5f18a06a704996e",18:"2af804e8cbf10128cd98",19:"3465ee66a06d6a2976a0",20:"b9ef4345e91aef98aeab",21:"e07095365ce1beacb006",22:"b561ae9eecfbbafededb",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"893d97c0c3bfc70d5efe",26:"0be4571ab390eb999425",27:"8ee0be7fbb0fb087db54",28:"12b69a89c6f225567a67",29:"4a16aa6c537eeef551a8",30:"2272497b4ac6f7f9d683",31:"496a4f1feee35020b28e",32:"2fe57e5391faf7679e88",33:"23d58fac9b8c404b3188",34:"4b8b51094caa00ff9b1c",35:"f02b529bcd0f44cb0d63",36:"06ed863f8aa3d15b0c68",37:"813b04277d4a12e809a4",38:"3ca2090614a86bd3d8df",39:"a4a12d5e85d54caccf7c",40:"ff3778361e9c6e46fe3d",41:"441276f0ad5e7f00212d",42:"71228043e13acf59dc5c",43:"258c5a2a0219e06992af",44:"bb2ae7a02495e20df4c8",45:"d55c8bbbb2bd98e7c07a",46:"27ea399e0901f7ab807f",47:"f979126ad198aa677456",48:"3a715ff2fe5ab9ac84f8",49:"5e454442d7bf0135d9ef",50:"fb4ef93cfadffac2e7b0",51:"005a161e611e7c8a6810",52:"76d2f64279f977b68354",53:"7c84d0c3360d9f1faf71",54:"3e441ce6f21d3020c5ba",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"de878d75a83684169295",59:"c5bb7e2ee330bcffa04d",60:"e197d19bcfe7fcc6ed05",61:"253b4ccb0686ebc6fa49",62:"64d908b6b439898533ec",63:"f6ff62d24eb5ce25ba96",64:"caf94f2c30470c5b5010",65:"bdf70254fb0baae6b437",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=c[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,f,a){b.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(f,"a",f),f},b.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},b.p="",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(f&&f(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},c={69:0};function d(f){if(a[f])return a[f].exports;var c=a[f]={i:f,l:!1,exports:{}};return e[f].call(c.exports,c,c.exports,d),c.l=!0,c.exports}d.e=function(e){var f=c[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,d){f=c[e]=[a,d]});f[2]=a;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:"ae6d2eb4f06f9106a0ee",1:"8d5852f2ec9ad4d5ee85",2:"6fc3fd4f87b5f4fd1a3f",3:"a8d4b3b0db26d31f09d9",4:"aa3f49b3c3e5f1772157",5:"def8f4d8646672b08ed7",6:"902c1ac874941b0dd409",7:"edbd5b600984987cf3ba",8:"27ebe98fd09ac8d0b165",9:"ee87105b48f64b787127",10:"578b6bc67d58dc820b09",11:"7fbe7d622dd09d926d62",12:"bcd5e8f1318bb3c79e8d",13:"b01b98d68e1fa7d2364f",14:"d411dd43f6f87ec93d9f",15:"b7be808bd16c3c2b27de",16:"31a81e9a84fff14ea15a",17:"8be5a5f18a06a704996e",18:"2af804e8cbf10128cd98",19:"3465ee66a06d6a2976a0",20:"b9ef4345e91aef98aeab",21:"e07095365ce1beacb006",22:"b561ae9eecfbbafededb",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"893d97c0c3bfc70d5efe",26:"0be4571ab390eb999425",27:"8ee0be7fbb0fb087db54",28:"12b69a89c6f225567a67",29:"4a16aa6c537eeef551a8",30:"2272497b4ac6f7f9d683",31:"496a4f1feee35020b28e",32:"2fe57e5391faf7679e88",33:"23d58fac9b8c404b3188",34:"4b8b51094caa00ff9b1c",35:"f02b529bcd0f44cb0d63",36:"06ed863f8aa3d15b0c68",37:"813b04277d4a12e809a4",38:"3ca2090614a86bd3d8df",39:"a4a12d5e85d54caccf7c",40:"ff3778361e9c6e46fe3d",41:"441276f0ad5e7f00212d",42:"71228043e13acf59dc5c",43:"258c5a2a0219e06992af",44:"bb2ae7a02495e20df4c8",45:"d55c8bbbb2bd98e7c07a",46:"27ea399e0901f7ab807f",47:"bd958d5d79836d957b70",48:"3a715ff2fe5ab9ac84f8",49:"5e454442d7bf0135d9ef",50:"fb4ef93cfadffac2e7b0",51:"005a161e611e7c8a6810",52:"76d2f64279f977b68354",53:"7c84d0c3360d9f1faf71",54:"3e441ce6f21d3020c5ba",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"de878d75a83684169295",59:"c5bb7e2ee330bcffa04d",60:"e197d19bcfe7fcc6ed05",61:"253b4ccb0686ebc6fa49",62:"64d908b6b439898533ec",63:"f6ff62d24eb5ce25ba96",64:"caf94f2c30470c5b5010",65:"bdf70254fb0baae6b437",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=c[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,f,a){d.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(f,"a",f),f},d.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/buy/buy.vue
View file @ e77668af
......@@ -418,9 +418,10 @@ export default {
let data = { pay_type: 'ALI', return_url: window.location.href, buy_type: this.groupDetail.goods_type }
let dataObj = Object.assign({}, data, json)
postPayBillApi(dataObj).then(res => {
let outTradEno = JSON.stringify({ out_trade_no: res.out_trade_no, invite_code: this.$route.query.invite_code, shopId: this.$route.query.shopId })
let outTradEno = JSON.stringify({ out_trade_no: res.out_trade_no, invite_code: this.$route.query.invite_code, shopId: this.$route.query.shopId, goods_type: this.groupDetail.goods_type })
console.log(outTradEno)
localStorage.setItem('out_trade_no', outTradEno)
localStorage.setItem('out_trade_no', outTradEno);
localStorage.setItem('pay_url', res.pay_url);
location.href = `http://${ window.location.host }/#/guidelines?pay_url=${ encodeURI(res.pay_url) }`
})
}
......
src/components/buy/buySuccess.vue
View file @ e77668af
......@@ -101,6 +101,7 @@ export default {
message: ""
});
// this.groupDetail = JSON.parse(sessionStorage.getItem('groupDetail'));
console.log(this.$route.query.shopId)
if(this.$route.query.shopId) {
getGoodsDetailApi(this.$route.query.shopId).then(data => {
data.desc = JSON.parse(data.desc);
......@@ -116,6 +117,7 @@ export default {
}
if (sessionStorage.getItem("buyindex") == 1) {
getUserDetailApi().then(res => {
console.log(res, 22222)
localStorage.setItem("userDesc", JSON.stringify(res));
this.userDesc = res;
this.subscribe = this.userDesc.open_info.is_subscribe;
......@@ -129,6 +131,7 @@ export default {
});
} else {
this.userDesc = JSON.parse(localStorage.getItem("userDesc"));
console.log(this.userDesc)
this.subscribe = this.userDesc.open_info.is_subscribe;
getOrderDetailApi(this.orderNo).then(res => {
this.goods_id = res.goods_id;
......
src/main.js
View file @ e77668af
......@@ -52,26 +52,33 @@ Vue.component('scroll', scroll);
let timer = null;
if(window.localStorage.out_trade_no) {
timer = setInterval(() => {
let outTradEno = JSON.parse(window.localStorage.out_trade_no)
let outTradEno = JSON.parse(window.localStorage.out_trade_no);
getBillRefreshApi({ outTradeNo: outTradEno.out_trade_no }).then(res => {
/* if(res.status === "SUCCESS") {
Dialog.confirm({
title: '标题',
message: '弹窗内容'
}).then(() => {
if(res.status === "SUCCESS") {
Dialog.confirm({ title: '标题', message: '支付成功'}).then(() => {
if(outTradEno.goods_type == 1) {
router.push({ name: "buySuccess", query: outTradEno });
}else {
router.push({ name: "success", query: outTradEno });
}
clearInterval(timer);
localStorage.removeItem('out_trade_no')
}).catch(() => {
clearInterval(timer);
localStorage.removeItem('out_trade_no')
});
}
}).catch(error => {
if(error.code === 500 && error.msg.status === "NO_SYNC") {
Dialog.confirm({ title: '标题', message: '您有一笔未支付的订单'}).then(() => {
clearInterval(timer);
location.href = `http://${ window.location.host }/#/guidelines?pay_url=${ encodeURI(window.localStorage.pay_url) }`
localStorage.removeItem('out_trade_no')
}).catch(() => {
clearInterval(timer);
localStorage.removeItem('out_trade_no')
});
}*/
/*if(res.status == 'SUCCESS') {
if(res.buy_type == 1) {
router.push({ name: "buySuccess", query: outTradEno});
}else {
router.push({ name: "Success", query: outTradEno });
}
// clearInterval(timer);
}*/
}
})
}, 6000)
}
......
src/service/index.js
View file @ e77668af
......@@ -193,7 +193,7 @@ export function fetch(url, params = {}) {
query.is_new_user_url = 1;
window.location.href = `${process.env.AUTHOR_UEL}&refresh=1`
} else {
// reject(response.data);
reject(response.data);
/*if(response.data.code > 500 && response.data.code < 502) {
Toast(response.data.msg)
}*/
......
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