feat: #调整

src/store/modules/user.js

@@ -36,83 +36,87 @@ const actions = {
   login({ commit }, userInfo) {
     console.log(userInfo);
     const { phone, code } = userInfo;
-    return new Promise((resolve, reject) => {
-      const data = {
-        token: 'admin-token'
-      };
-      commit('SET_TOKEN', data.token);
-      setToken(data.token);
-      resolve();
-    });
     // return new Promise((resolve, reject) => {
-    //   login({
-    //     data: {
-    //       account: phone,
-    //       signInType: 'MOBILE_NUMBER_SMS',
-    //       smsCode: code
-    //     }
-    //   })
-    //     .then(response => {
-    //       const { data } = response;
-
-    //       if (data.token) {
-    //         commit('SET_TOKEN', data.token);
-    //         setToken(data.token);
-    //         resolve();
-    //       } else {
-    //         reject(data.message);
-    //       }
-    //     })
-    //     .catch(error => {
-    //       reject(error);
-    //     });
+    //   const data = {
+    //     token: 'admin-token'
+    //   };
+    //   commit('SET_TOKEN', data.token);
+    //   setToken(data.token);
+    //   resolve();
     // });
+    return new Promise((resolve, reject) => {
+      login({
+        data: {
+          account: phone,
+          signInType: 'MOBILE_NUMBER_SMS',
+          smsCode: code
+        }
+      })
+        .then(response => {
+          const { data } = response;
+
+          if (data.token) {
+            commit('SET_TOKEN', data.token);
+            setToken(data.token);
+            resolve();
+          } else {
+            reject(data.message);
+          }
+        })
+        .catch(error => {
+          reject(error);
+        });
+    });
   },
 
   // get user info
   getInfo({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      const data = {
-        roles: ['admin'],
-        introduction: 'I am a super administrator',
-        avatar: 'https://picsum.photos/id/237/200/300',
-        name: 'Super Admin'
-      };
-      const { name, avatar, roles } = data;
-
-      // const roles = [];
-
-      commit('SET_ROLES', roles);
-      commit('SET_NAME', name);
-      commit('SET_AVATAR', avatar);
-
-      // dispatch('permission/generateRoutes');
-      resolve(data);
-    });
     // return new Promise((resolve, reject) => {
-    //   getInfo(state.token)
-    //     .then(async response => {
-    //       const { data } = response;
+    //   const data = {
+    //     roles: ['admin'],
+    //     introduction: 'I am a super administrator',
+    //     avatar: 'https://picsum.photos/id/237/200/300',
+    //     name: 'Super Admin'
+    //   };
+    //   const { name, avatar, roles } = data;
+
+    //   // const roles = [];
+
+    //   commit('SET_ROLES', roles);
+    //   commit('SET_NAME', name);
+    //   commit('SET_AVATAR', avatar);
+
+    //   // dispatch('permission/generateRoutes');
+    //   resolve(data);
+    // });
+    return new Promise((resolve, reject) => {
+      getInfo(state.token)
+        .then(async response => {
+          console.log(response);
+          const { data } = response;
 
-    //       if (!data) {
-    //         return reject('Verification failed, please Login again.');
-    //       }
+          if (!success && !data) {
+            dispatch('user/logout');
+            return reject('Verification failed, please Login again.');
+          }
 
-    //       const { name, avatar, roles } = data;
+          const { name, avatar, roles } = data;
 
-    //       // const roles = [];
+          // const roles = [];
 
-    //       commit('SET_ROLES', roles);
-    //       commit('SET_NAME', name);
-    //       commit('SET_AVATAR', avatar);
+          commit('SET_ROLES', roles);
+          commit('SET_NAME', name);
+          commit('SET_AVATAR', avatar);
 
-    //       // dispatch('permission/generateRoutes');
-    //       resolve(data);
-    //     })
-    //     .catch(error => {
-    //       reject(error);
-    //     });
-    // });
+          // dispatch('permission/generateRoutes');
+          resolve(data);
+        })
+        .catch(error => {
+          console.error('-dada');
+          dispatch('user/logout');
+          reject(error);
+        });
+    });
   },
 
   // user logout

src/utils/request.js

@@ -316,7 +316,9 @@ const post = (url, data = {}, config) => {
     },
     config
   );
-  return formatResponse(axios.post(url, data, config));
+  return formatResponse(
+    axios.post(url, { data, seq: config.seq, token: config.token }, config)
+  );
 };
 
 const put = (url, data = {}, config) => {
@@ -329,7 +331,9 @@ const put = (url, data = {}, config) => {
     },
     config
   );
-  return formatResponse(axios.put(url, data, config));
+  return formatResponse(
+    axios.put(url, { data, seq: config.seq, token: config.token }, config)
+  );
 };
 
 /* 上方注释函数 */

src/views/helpInfo/issueType/index.vue

@@ -110,16 +110,27 @@ export default {
             );
             action.push(
               h(
-                'el-button',
+                'el-popcomfirm',
                 {
                   props: {
-                    type: 'text'
+                    icon: 'el-icon-warning-outline',
+                    iconColor: '#c01',
+                    title: '确定要删除吗？'
                   },
                   on: {
-                    click: () => this.handleDelItem(row)
+                    confirm: () => this.handleDelItem(row)
                   }
                 },
-                '删除'
+                h(
+                  'el-button',
+                  {
+                    props: {
+                      type: 'text',
+                      solt: 'reference'
+                    }
+                  },
+                  '删除'
+                )
               )
             );
             return h('div', action);

src/views/login/index.vue

@@ -63,10 +63,15 @@
       广东帕斯融媒体科技有限公司
     </div>
 
-    <el-dialog title="真人验证" :visible.sync="dialogVisible" width="20%">
+    <el-dialog
+      title="真人验证"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      width="20%"
+    >
       <div class="f-c-c f-col">
         <img :src="info.base64Img" class="info-img" @click="loadCheckImg" />
-        <el-input placeholder="请输入验证码" v-model="point" clearable />
+        <el-input v-model="point" placeholder="请输入验证码" clearable />
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>