Merge branch 'master' of http://git.ycjcjy.com/support-game/wechat

src/App.vue

@@ -32,6 +32,7 @@ export default {
     ...mapactivityState({
       activity: s => s.activity || {},
       theme: s => `${s.theme}`,
+      code: s => s.code,
     })
   },
   created() {
@@ -39,15 +40,12 @@ export default {
     console.log("process.env.NODE_ENV =>", env)
     if (env === 'production' || env === 'test') {
       if (location.search && this.toolClass.UrlSearch(location.search).code) {
-        this.code = this.toolClass.UrlSearch(location.search).code
-        let oldCode = localStorage.getItem('code')
-        if (this.code === oldCode) {
-          localStorage.setItem('code', this.code)
+        const code = this.toolClass.UrlSearch(location.search).code
+        if (this.code === code) {
           this.toolClass.getCode(this.appid[env])
         } else {
-          localStorage.setItem('code', this.code)
-          // this.showPage = true
-          this.getUser({code: this.code }).then(() => {
+          this.setCode(code)
+          this.getUser({ code }).then(() => {
             this.showPage = true
           })
         }
@@ -59,7 +57,7 @@ export default {
     }
   },
   methods: {
-    ...mapIndexActions(["getUser"])
+    ...mapIndexActions(["getUser","setCode"])
   }
 };
 </script>

src/store/vote.js

@@ -11,6 +11,7 @@ export default {
     toplist: [],
     list: [],
     theme: 1,
+    code: '',
   },
   mutations: {
     updateActivity(state, data) {
@@ -48,6 +49,9 @@ export default {
       state.list = state.list.map(x => {
         return x.MemberId === data.MemberId ? data : x
       })
+    },
+    setCode(state, code) {
+      state.code = code
     }
   },
   actions: {
@@ -189,5 +193,8 @@ export default {
         }).catch(reject)
       })
     },
+    setCode({ commit }, code) {
+      commit('setCode', code)
+    },
   }
 }