Skip to content

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

授权修改

parent 101a31d8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 20 deletions
dev/index.html
View file @ a8a3c1b0
<!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>.mint-toast{ <!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>.mint-toast{
z-index: 10001 !important; z-index: 10001 !important;
}</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.0b5b50759e6f93699e46.js></script><script type=text/javascript src=static/js/vendor.f7071ab144d47917b1ae.js></script><script type=text/javascript src=static/js/app.b6e4936bcb8f542ee585.js></script></body></html> }</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.337eff29a3a4c49c222d.js></script><script type=text/javascript src=static/js/vendor.f7071ab144d47917b1ae.js></script><script type=text/javascript src=static/js/app.9ddef99860affb704a4f.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/7.066019edd9888f64ced3.js deleted 100644 → 0
View file @ 101a31d8
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/7.e043269665108f9e9ccf.js 0 → 100644
View file @ a8a3c1b0
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/app.9ddef99860affb704a4f.js 0 → 100644
View file @ a8a3c1b0
This diff is collapsed.
dev/static/js/app.9ddef99860affb704a4f.js.map 0 → 100644
View file @ a8a3c1b0
This diff is collapsed.
dev/static/js/app.b6e4936bcb8f542ee585.js deleted 100644 → 0
View file @ 101a31d8
This diff is collapsed.
dev/static/js/app.b6e4936bcb8f542ee585.js.map deleted 100644 → 0
View file @ 101a31d8
This diff is collapsed.
dev/static/js/manifest.0b5b50759e6f93699e46.js → dev/static/js/manifest.337eff29a3a4c49c222d.js
View file @ a8a3c1b0
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,d){for(var o,f,b,i=0,u=[];i<r.length;i++)f=r[i],t[f]&&u.push(t[f][0]),t[f]=0;for(o in c)Object.prototype.hasOwnProperty.call(c,o)&&(e[o]=c[o]);for(n&&n(r,c,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=a(a.s=d[i]);return b};var r={},t={27:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var c=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,a.nc&&d.setAttribute("nonce",a.nc),d.src=a.p+"static/js/"+e+"."+{0:"dd7a4a4d6f66f918b161",1:"b2eb1ec9d8299221df56",2:"fa22829657cbd48b57a2",3:"472102569d5fbabfb1de",4:"a2682c6e31a37fe605de",5:"a37b9ee5517eca783c3e",6:"9647eb509df36a9600db",7:"066019edd9888f64ced3",8:"96249bf4f90b6f353038",9:"44c210d2092c3697c18d",10:"2f54d13d0d763591dee7",11:"d1805b183f4d4f3442ae",12:"b11997c15c7db06080fa",13:"6d70586cdd12c8eeaed6",14:"1148391e7d226d6066c6",15:"0ba19a6db1bf129f5208",16:"51999ddf6c7a6d54de89",17:"df3e2da1a421c147caa2",18:"01e443c19e4b3a3b7a9e",19:"dc2614b3ca5a489beffa",20:"dcf6fb4d43664f468070",21:"611f6b0e632e903d111b",22:"fd1d479796f391b122b0",23:"5339ec0eda272fc1180d",24:"63c6299b0fb80ca9398d"}[e]+".js";var o=setTimeout(f,12e4);function f(){d.onerror=d.onload=null,clearTimeout(o);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return d.onerror=d.onload=f,c.appendChild(d),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},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="",a.oe=function(e){throw console.error(e),e}}([]); !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var d,f,b,i=0,u=[];i<r.length;i++)f=r[i],t[f]&&u.push(t[f][0]),t[f]=0;for(d in a)Object.prototype.hasOwnProperty.call(a,d)&&(e[d]=a[d]);for(n&&n(r,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=c(c.s=o[i]);return b};var r={},t={27:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});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,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+e+"."+{0:"dd7a4a4d6f66f918b161",1:"b2eb1ec9d8299221df56",2:"fa22829657cbd48b57a2",3:"472102569d5fbabfb1de",4:"a2682c6e31a37fe605de",5:"a37b9ee5517eca783c3e",6:"9647eb509df36a9600db",7:"e043269665108f9e9ccf",8:"96249bf4f90b6f353038",9:"44c210d2092c3697c18d",10:"2f54d13d0d763591dee7",11:"d1805b183f4d4f3442ae",12:"b11997c15c7db06080fa",13:"6d70586cdd12c8eeaed6",14:"1148391e7d226d6066c6",15:"0ba19a6db1bf129f5208",16:"51999ddf6c7a6d54de89",17:"df3e2da1a421c147caa2",18:"01e443c19e4b3a3b7a9e",19:"dc2614b3ca5a489beffa",20:"dcf6fb4d43664f468070",21:"611f6b0e632e903d111b",22:"fd1d479796f391b122b0",23:"5339ec0eda272fc1180d",24:"63c6299b0fb80ca9398d"}[e]+".js";var d=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(d);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=f,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},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="",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.0b5b50759e6f93699e46.js.map //# sourceMappingURL=manifest.337eff29a3a4c49c222d.js.map
\ No newline at end of file \ No newline at end of file
src/components/buy/buy.vue
View file @ a8a3c1b0
...@@ -190,7 +190,6 @@ ...@@ -190,7 +190,6 @@
Toast('请填写地址'); Toast('请填写地址');
return false return false
} }
if(this.groupDetail.goods_type === 2 && !this.type){ if(this.groupDetail.goods_type === 2 && !this.type){
json.buy_type = 2 json.buy_type = 2
} }
...@@ -203,7 +202,6 @@ ...@@ -203,7 +202,6 @@
if(this.saleObj){ if(this.saleObj){
json.order_coupon_id =this.saleObj.id json.order_coupon_id =this.saleObj.id
} }
let invite = this.$route.query.invite_code; let invite = this.$route.query.invite_code;
this.$sa.track('placeOrder',{ this.$sa.track('placeOrder',{
buyType:this.groupDetail.goods_type === 2 && !this.type ? '团购' : '直购', buyType:this.groupDetail.goods_type === 2 && !this.type ? '团购' : '直购',
...@@ -249,7 +247,8 @@ ...@@ -249,7 +247,8 @@
} }
}) })
} }
}).catch(()=>{
this.orderFlag = true;
}) })
} }
}, },
......
src/router/index.js
View file @ a8a3c1b0
...@@ -284,13 +284,15 @@ router.beforeEach((to,from,next)=> { ...@@ -284,13 +284,15 @@ router.beforeEach((to,from,next)=> {
} }
}); });
} }
// 无需token登录页面
}else{ }else{
let query = {retUrl:to.fullPath}; let query = {retUrl:to.fullPath};
localStorage.setItem('retUrl',to.fullPath);
if(to.meta.noNew){ if(to.meta.noNew){
query.is_new_user_url = 1 query.is_new_user_url = 1;
window.location.href = `${process.env.AUTHOR_UEL}`
}else{
window.location.href = `${process.env.AUTHOR_UEL}&is_new_user_url=1`
} }
next({name:'author',query:query})
} }
// if(to.meta.skip_login){ // if(to.meta.skip_login){
......
src/service/index.js
View file @ a8a3c1b0
...@@ -161,13 +161,10 @@ export function fetch(url,params={}){ ...@@ -161,13 +161,10 @@ export function fetch(url,params={}){
resolve(response.data.data); resolve(response.data.data);
}else if(response.data.code === 501){ }else if(response.data.code === 501){
reject(response.data); reject(response.data);
router.push({ let query = {retUrl:window.location.href.split('#')[1]};
name:'author',//从哪个页面跳转 localStorage.setItem('retUrl',window.location.href.split('#')[1]);
query:{ query.is_new_user_url = 1;
retUrl:window.location.href.split('#')[1] || '', window.location.href = `${process.env.AUTHOR_UEL}`
is_new_user_url:1
}
})
}else if(response.data.code === 503){ }else if(response.data.code === 503){
reject(response.data); reject(response.data);
}else{ }else{
......
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