kuaifan 5 anni fa
parent
commit
0cebdb88db

File diff suppressed because it is too large
+ 1 - 1
resources/assets/js/main/components/ImgUpload.vue


+ 30 - 1
resources/assets/js/main/main.js

@@ -112,6 +112,35 @@ import '../../sass/main.scss';
         },
 
         /**
+         * 获取token
+         * @returns {boolean}
+         */
+        getToken() {
+            let token = $A.token();
+            return $A.count(token) < 10 ? false : token;
+        },
+
+        /**
+         * 设置token
+         * @param token
+         */
+        setToken(token) {
+            $A.token(token);
+        },
+
+        /**
+         * 获取会员昵称
+         * @returns string
+         */
+        getUserName() {
+            if ($A.getToken() === false) {
+                return "";
+            }
+            let userInfo = $A.getUserInfo();
+            return $A.ishave(userInfo.username) ? userInfo.username : '';
+        },
+
+        /**
          * 获取用户信息(并保存)
          * @param callback          网络请求获取到用户信息回调(监听用户信息发生变化)
          * @param onlyListener      只监听不重新网络请求获取
@@ -130,8 +159,8 @@ import '../../sass/main.scss';
                         },
                         success: (res) => {
                             if (res.ret === 1) {
-                                $A.token(res.data.token);
                                 $A.storage("userInfo", res.data);
+                                $A.setToken(res.data.token);
                                 $A.triggerUserInfoListener(res.data);
                                 //
                                 typeof callback === "function" && callback(res.data);

+ 9 - 5
resources/assets/js/main/pages/index.vue

@@ -45,7 +45,7 @@
                     </div>
                     <div class="z-8"><h3>{{$L('酷团队协作工具就从这里开始')}}</h3>
                         <div class="bl inline-block">
-                            <span class="start" @click="loginShow=true">{{$L('立即登陆')}}</span>
+                            <span class="start" @click="loginChack">{{$L('立即登陆')}}</span>
                         </div>
                     </div>
                 </div>
@@ -342,13 +342,17 @@
                 ]
             };
         },
-        mounted() {
-
-        },
         deactivated() {
             this.loginShow = false;
         },
         methods: {
+            loginChack() {
+                if ($A.getToken() !== false) {
+                    this.goForward({path: '/todo'}, true);
+                } else {
+                    this.loginShow = true;
+                }
+            },
             onLogin() {
                 this.$refs.login.validate((valid) => {
                     if (valid) {
@@ -361,8 +365,8 @@
                             },
                             success: (res) => {
                                 if (res.ret === 1) {
-                                    $A.token(res.data.token);
                                     $A.storage("userInfo", res.data);
+                                    $A.setToken(res.data.token);
                                     $A.triggerUserInfoListener(res.data);
                                     //
                                     this.loadIng--;

+ 3 - 0
webpack.mix.js

@@ -26,5 +26,8 @@ mix.webpackConfig({
     output: {
         hashDigestLength: 32,
         chunkFilename: 'js/build/[name].js?[hash]',
+    },
+    devServer:{
+        disableHostCheck: true,
     }
 });