Skip to content

H
h5-base
Commit 4439913c authored by wangwei's avatar wangwei
Browse files
Options

0元购 订单返回修改

parent 39e26f58
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 13 deletions
dev/index.html
View file @ 4439913c
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.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 type=text/javascript src=static/js/manifest.0d869d9eebce4c3dab2e.js></script><script type=text/javascript src=static/js/vendor.0302137f3a6bb59dc95e.js></script><script type=text/javascript src=static/js/app.27f6d66832e880eee87b.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.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 type=text/javascript src=static/js/manifest.563ab2ca3d7621f39b4a.js></script><script type=text/javascript src=static/js/vendor.0302137f3a6bb59dc95e.js></script><script type=text/javascript src=static/js/app.27f6d66832e880eee87b.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/7.54fe0baa0e4a5534cfa8.js deleted 100644 → 0
View file @ 39e26f58
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/7.656557af56134992379f.js 0 → 100644
View file @ 4439913c
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/manifest.0d869d9eebce4c3dab2e.js → dev/static/js/manifest.563ab2ca3d7621f39b4a.js
View file @ 4439913c
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,a,o){for(var f,b,d,i=0,u=[];i<n.length;i++)b=n[i],r[b]&&u.push(r[b][0]),r[b]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(c&&c(n,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)d=t(t.s=o[i]);return d};var n={},r={26:0};function t(c){if(n[c])return n[c].exports;var r=n[c]={i:c,l:!1,exports:{}};return e[c].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var c=r[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,t){c=r[e]=[n,t]});c[2]=n;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"static/js/"+e+"."+{0:"dd7a4a4d6f66f918b161",1:"74db0273aa29f9b44da4",2:"fa22829657cbd48b57a2",3:"27772a4c2090178fd73f",4:"a7c218178e7c608c375f",5:"abfa207e290b68cb040d",6:"2b98e3e2316b1706e760",7:"54fe0baa0e4a5534cfa8",8:"be4ed60496a08edbe14e",9:"84d52b2bfd66d01562b8",10:"fb904dd92fba2806640c",11:"96117a04205622d8c49a",12:"6b7a9a473eb005cfd1b0",13:"d1a375ca87ee0099c55f",14:"50eb8c907d3c981316c0",15:"8016506c55a85edfab62",16:"d65597b9762dcc1cd0ed",17:"e8ffb1f4ac658fec0e7e",18:"f63413591b9bdc9cb4ce",19:"c778bfb2475fb9071e71",20:"cc3848989c6b0e891bdc",21:"3e29f0466acabc459f5b",22:"4930019ea0011ef68ac8",23:"8d337c794f25767b4793"}[e]+".js";var f=setTimeout(b,12e4);function b(){o.onerror=o.onload=null,clearTimeout(f);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return o.onerror=o.onload=b,a.appendChild(o),n},t.m=e,t.c=n,t.d=function(e,c,n){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(c,"a",c),c},t.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},t.p="",t.oe=function(e){throw console.error(e),e}}([]); !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],c[d]&&u.push(c[d][0]),c[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=t(t.s=o[i]);return b};var r={},c={26:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"static/js/"+e+"."+{0:"dd7a4a4d6f66f918b161",1:"74db0273aa29f9b44da4",2:"fa22829657cbd48b57a2",3:"27772a4c2090178fd73f",4:"a7c218178e7c608c375f",5:"abfa207e290b68cb040d",6:"2b98e3e2316b1706e760",7:"656557af56134992379f",8:"be4ed60496a08edbe14e",9:"84d52b2bfd66d01562b8",10:"fb904dd92fba2806640c",11:"96117a04205622d8c49a",12:"6b7a9a473eb005cfd1b0",13:"d1a375ca87ee0099c55f",14:"50eb8c907d3c981316c0",15:"8016506c55a85edfab62",16:"d65597b9762dcc1cd0ed",17:"e8ffb1f4ac658fec0e7e",18:"f63413591b9bdc9cb4ce",19:"c778bfb2475fb9071e71",20:"cc3848989c6b0e891bdc",21:"3e29f0466acabc459f5b",22:"4930019ea0011ef68ac8",23:"8d337c794f25767b4793"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.0d869d9eebce4c3dab2e.js.map //# sourceMappingURL=manifest.563ab2ca3d7621f39b4a.js.map
\ No newline at end of file \ No newline at end of file
dist/index.html
View file @ 4439913c
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{ <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
-webkit-overflow-scrolling:touch; -webkit-overflow-scrolling:touch;
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.eb933ed3476c94c673661fe6cd53e40f.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=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.aa2278a4608e0e737c06.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.3a0087e50012f11a0897.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.be84b6af48f55c263a9d.js></script></body></html> }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.5128640a853304ede916a1f1223be4b0.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=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.f68e2e9447a71f2bc0bf.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.3a0087e50012f11a0897.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.be84b6af48f55c263a9d.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/7.6686710738030749a45b.js deleted 100644 → 0
View file @ 39e26f58
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.76121a8c311b465f88ce.js 0 → 100644
View file @ 4439913c
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.aa2278a4608e0e737c06.js → dist/static/js/manifest.f68e2e9447a71f2bc0bf.js
View file @ 4439913c
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(t,c,o){for(var f,d,b,i=0,u=[];i<t.length;i++)d=t[i],r[d]&&u.push(r[d][0]),r[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(t,c,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=a(a.s=o[i]);return b};var t={},r={26:0};function a(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.e=function(e){var n=r[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var t=new Promise(function(t,a){n=r[e]=[t,a]});n[2]=t;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+e+"."+{0:"f8138779f472b8734556",1:"d9d65737691e89e80e67",2:"b00d3826b27a25730b77",3:"1cae61d6239a1b32d241",4:"bcb972721072b3044e17",5:"0fe20001f4dfd6979b47",6:"8d08e431328b3f338461",7:"6686710738030749a45b",8:"964d58ebe302a7e1787c",9:"f9c5a89d289fcc720fdf",10:"8df83c76a31ac2deb389",11:"fee312134b00b39430e4",12:"d836b04852b1a725e100",13:"7122bbaee0f4b3769657",14:"b18dae547249ec13ef3c",15:"79fd72490282b9f2a35e",16:"fe0f31dd6fdfc1084f70",17:"97ebc305119c1291dabd",18:"a2ffbd298e78fb0ba6d3",19:"01152fe5c3dce2d3f467",20:"d3ada18be84514a2ec97",21:"e397d641cb978eef9f8b",22:"e2f4a4138c38aba8699e",23:"8ac42f5044de2f8ead1b"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=r[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return o.onerror=o.onload=d,c.appendChild(o),t},a.m=e,a.c=t,a.d=function(e,n,t){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:t})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="https://static-cdn.changchangenglish.com/new-sing/",a.oe=function(e){throw console.error(e),e}}([]); !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(t,a,o){for(var f,d,b,i=0,u=[];i<t.length;i++)d=t[i],r[d]&&u.push(r[d][0]),r[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(t,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=c(c.s=o[i]);return b};var t={},r={26:0};function c(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,c),r.l=!0,r.exports}c.e=function(e){var n=r[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var t=new Promise(function(t,c){n=r[e]=[t,c]});n[2]=t;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+e+"."+{0:"f8138779f472b8734556",1:"d9d65737691e89e80e67",2:"b00d3826b27a25730b77",3:"1cae61d6239a1b32d241",4:"bcb972721072b3044e17",5:"0fe20001f4dfd6979b47",6:"8d08e431328b3f338461",7:"76121a8c311b465f88ce",8:"964d58ebe302a7e1787c",9:"f9c5a89d289fcc720fdf",10:"8df83c76a31ac2deb389",11:"fee312134b00b39430e4",12:"d836b04852b1a725e100",13:"7122bbaee0f4b3769657",14:"b18dae547249ec13ef3c",15:"79fd72490282b9f2a35e",16:"fe0f31dd6fdfc1084f70",17:"97ebc305119c1291dabd",18:"a2ffbd298e78fb0ba6d3",19:"01152fe5c3dce2d3f467",20:"d3ada18be84514a2ec97",21:"e397d641cb978eef9f8b",22:"e2f4a4138c38aba8699e",23:"8ac42f5044de2f8ead1b"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=r[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),t},c.m=e,c.c=t,c.d=function(e,n,t){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:t})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="https://static-cdn.changchangenglish.com/new-sing/",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.aa2278a4608e0e737c06.js.map //# sourceMappingURL=manifest.f68e2e9447a71f2bc0bf.js.map
\ No newline at end of file \ No newline at end of file
src/components/buy/buy.vue
View file @ 4439913c
...@@ -130,7 +130,6 @@ ...@@ -130,7 +130,6 @@
this.jsApiParameters, this.jsApiParameters,
function (res) { function (res) {
that.orderFlag = true; that.orderFlag = true;
console.log(123)
if (res.err_msg === 'get_brand_wcpay_request:ok') { if (res.err_msg === 'get_brand_wcpay_request:ok') {
// 支付成功后处理 // 支付成功后处理
Toast('支付成功'); Toast('支付成功');
...@@ -212,7 +211,13 @@ ...@@ -212,7 +211,13 @@
this.orderFlag = false; this.orderFlag = false;
payApi(json).then(res=>{ payApi(json).then(res=>{
if(res.out_trade_no && !res.appId){ if(res.out_trade_no && !res.appId){
this.$router.push({name:'buySuccess',query:{out_trade_no:res.out_trade_no,invite_code:this.invite_code}}); if(this.groupDetail.goods_type === 2 && !this.type){
this.$router.push({name:'success',query:{out_trade_no:res.out_trade_no,invite_code:this.invite_code}});
}else if(this.groupDetail.goods_type === 4){
this.$router.push({name:'saleSuccess',query:{out_trade_no:res.out_trade_no,invite_code:this.invite_code}});
}else{
this.$router.push({name:'buySuccess',query:{out_trade_no:res.out_trade_no,invite_code:this.invite_code}});
}
}else{ }else{
let that = this; let that = this;
this.orderNo = res.out_trade_no; this.orderNo = res.out_trade_no;
......
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