feats

public/index.html

@@ -6,6 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
+
+    <!-- 调式用 -->
+    <!-- <script src="js/vconsole.min.js"></script>
+    <script>const vConsole = new VConsole();</script> -->
+
     <title>抽取幸运签，解锁隐藏福利</title>
     <style>
       .page-loading-wrapper {
@@ -18,6 +23,7 @@
         z-index: 999;
         background: url(./images/loadingBgc.jpg) no-repeat 100% 100%;
         display: flex;
+        /* display: none; */
         justify-content: center;
         align-items: center;
       }

src/main.js

@@ -4,13 +4,24 @@ import App from './App.vue'
 import router from './router/index'//路由
 
 import { redirect } from './utils/wx'
-redirect()
 
-Vue.config.productionTip = false
+function main() {
 
-Vue.component('modal', Modal)
+  // if (redirect()) {
+  //   // 如果页面跳转了, 后面代码强制不执行
+  //   return;
+  // }
 
-const app = new Vue({
-  router,
-  render: h => h(App),
-}).$mount('#app')
+  redirect()
+  
+  Vue.config.productionTip = false
+    
+  Vue.component('modal', Modal)
+  
+  const app = new Vue({
+    router,
+    render: h => h(App),
+  }).$mount('#app')
+}
+
+main()

src/pages/Honghe.vue

@@ -253,12 +253,13 @@ export default {
       this.binggo = false
     },
     handleMonthClick(month) {
-      this.list.map((item) => {
-        if (item.id == month.id) {
-          item.mode = 2
-        }
-      })
+      if (!this.person || !this.personId) {
+        alert('为了您能够正常参与抽奖，请刷新页面并同意授权微信昵称!')
+        return
+      }
+      
       this.currentMonth = month
+      this.currentMonth.mode = 2
 
       // 如果点击可以抽奖
       if (month.id === this.bingoId && !this.noPrize) {

src/router/index.js

@@ -34,24 +34,25 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   const [person, setPerson] = useModel('person')
 
+  // console.log('-----person.personId---->', person.personId)
+
   // 未登录
   if (!person.personId) {
     getUserInfo().then(userinfo => {
       login(userinfo).then(res => {
+        // console.log('-----login---->', res)
         const { user, token } = res;
         setPerson(user)
         setToken(token)
-
-        next()
       }).catch(() => {
-        return redirect(true)
+        alert('系统异常, 请刷新重试')
       })
     }).catch(() => {
-      return redirect(true)
+      // do nothing
     })
-  } else {
-    next()
   }
+
+  next()
 })
 
 export default router;

src/utils/wx.js

@@ -74,9 +74,10 @@ export function redirect (force) {
   localStorage.setItem('wxcode', queryCode)
 
   if (force || !queryCode || queryCode === originCode) {
+    
     const local = encodeURIComponent(location.origin + location.pathname)
     const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd3bab568bc42d1de&redirect_uri=${local}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`
-    window.location.href = url
+    window.location.href = url;
   }
 }