dddd

ef892f8c · IvyXia123 · f904c650 · ef892f8c · ef892f8c · ef892f8c
Commit ef892f8c authored Oct 09, 2019 by IvyXia123
Showing with 8 additions and 5 deletions

index.html dist/index.html +1 -1

app.70263dc17cd95c09e606.js dist/static/js/app.70263dc17cd95c09e606.js +1 -0

main.js src/main.js +5 -3

index.js src/router/index.js +1 -1

No files found.
--- a/dist/index.html
+++ b/dist/index.html
@@ -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.01e6095c53cfe53bcc4e.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.fbeb7351c2ab8e74dae5.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.01e6095c53cfe53bcc4e.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.70263dc17cd95c09e606.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/app.fbeb7351c2ab8e74dae5.js
+++ b/dist/static/js/app.fbeb7351c2ab8e74dae5.js
--- a/src/main.js
+++ b/src/main.js
@@ -63,17 +63,19 @@ if (window.localStorage.out_trade_no) {
          localStorage.setItem("buyindex", 1);
          Dialog.confirm({title: '标题', message: '支付成功', confirmButtonText: '去查看'}).then(() => {
            if (res.teacher_alias && res.teacher_alias.substr(0, 1) == 1 && outTradEno.goods_type != 4 && outTradEno.is_subscribe == 1) {
-              router.push({ name: "guide", query: {shopId: outTradEno.shopId} });
              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')
              }
-              clearInterval(timer);
-              localStorage.removeItem('out_trade_no')
            }
          }).catch(() => {
            clearInterval(timer);

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -654,7 +654,7 @@ router.beforeEach((to, from, next) => {
  // extensionV1
  if (to.name === 'weixin' || to.name === 'starRankV2' || to.name === 'order' || to.name === 'buySuccess' ||  to.name === 'success' || to.name === 'guidelines' || to.name === 'spcShop' || to.name === 'mpShop' || to.name === 'extensionV1Shop' || to.name === 'extensionV1' || to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat' || to.name === 'inspectorActivit'  || to.name === 'buyDetail'|| to.name === 'passShop'|| to.name === 'ybIndex' ) {
    // 无需登录的页面
-    console.log(899)
+    console.log(899, to.name)
    next()
  } else if (window.location.href.indexOf('token') > -1 && to.name === 'index') {
    console.log(99000)