tijao

42e96490 · IvyXia123 · eb1123fc · 42e96490 · 42e96490 · 42e96490
Commit 42e96490 authored Sep 29, 2019 by IvyXia123
Showing with 10 additions and 3 deletions

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

app.7523e0d78b1cecf348c5.js dist/static/js/app.7523e0d78b1cecf348c5.js +1 -0

main.js src/main.js +6 -0

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

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.c6fa84792a7ca7eb4395.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.f98788193b87d7d1f41a.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.c6fa84792a7ca7eb4395.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.7523e0d78b1cecf348c5.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/app.f98788193b87d7d1f41a.js
+++ b/dist/static/js/app.f98788193b87d7d1f41a.js
--- a/src/main.js
+++ b/src/main.js
@@ -51,6 +51,12 @@ Vue.component('scroll', scroll);
 // 支付宝支付完成，订单状态查询
 // 在支付宝里跳转
 let micromessenger = common.isWeixinBrowser();
+if(micromessenger == 2){
+  alert(micromessenger);
+  alert(999999)
+  // location.href = `http://${ window.location.host }/#/guidelines`
+  router.push({ path: 'guidelines' })
+}
 let timer = null;
 if(window.localStorage.out_trade_no) {
  timer = setInterval(() => {

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -605,14 +605,14 @@ router.beforeEach((to, from, next) => {
    }
  }

-  let micromessenger = common.isWeixinBrowser();
+  /*let micromessenger = common.isWeixinBrowser();
  if(micromessenger == 2){
    alert(micromessenger);
    alert(999999)
    // location.href = `http://${ window.location.host }/#/guidelines`
    next({ path: 'guidelines' })
    return false;
-  }
+  }*/

  // 移动端判断
  store.dispatch('isMobile', browser.versions.mobile);