类型规范化

2023-08-28 23:12:06 +08:00 · 2023-08-28 23:12:06 +08:00 · 5ad075c7c9
commit 5ad075c7c9
parent a4ed59eb92
4 changed files with 152 additions and 132 deletions
--- a/src/pages_mine/pages/info/edit.vue
+++ b/src/pages_mine/pages/info/edit.vue
@ -21,112 +21,112 @@
 </template>

 <script>
-  import { getUserProfile } from "@/api/system/user"
-  import { updateUserProfile } from "@/api/system/user"
+import { getUserProfile } from "@/api/system/user"
+import { updateUserProfile } from "@/api/system/user"

-  export default {
-    data() {
-      return {
-        user: {
-          nickName: "",
-          phonenumber: "",
-          email: "",
-          sex: ""
+export default {
+  data() {
+    return {
+      user: {
+        nickName: "",
+        phonenumber: "",
+        email: "",
+        sex: ""
+      },
+      sexs: [{
+        text: '男',
+        value: "0"
+      }, {
+        text: '女',
+        value: "1"
+      }],
+      rules: {
+        nickName: {
+          rules: [{
+            required: true,
+            errorMessage: '用户昵称不能为空'
+          }]
        },
-        sexs: [{
-          text: '男',
-          value: "0"
-        }, {
-          text: '女',
-          value: "1"
-        }],
-        rules: {
-          nickName: {
-            rules: [{
-              required: true,
-              errorMessage: '用户昵称不能为空'
-            }]
-          },
-          phonenumber: {
-            rules: [{
-              required: true,
-              errorMessage: '手机号码不能为空'
-            }, {
-              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-              errorMessage: '请输入正确的手机号码'
-            }]
-          },
-          email: {
-            rules: [{
-              required: true,
-              errorMessage: '邮箱地址不能为空'
-            }, {
-              format: 'email',
-              errorMessage: '请输入正确的邮箱地址'
-            }]
-          }
+        phonenumber: {
+          rules: [{
+            required: true,
+            errorMessage: '手机号码不能为空'
+          }, {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            errorMessage: '请输入正确的手机号码'
+          }]
+        },
+        email: {
+          rules: [{
+            required: true,
+            errorMessage: '邮箱地址不能为空'
+          }, {
+            format: 'email',
+            errorMessage: '请输入正确的邮箱地址'
+          }]
        }
      }
+    }
+  },
+  onLoad() {
+    this.getUser()
+  },
+  onReady() {
+    this.$refs.form.setRules(this.rules)
+  },
+  methods: {
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data
+      })
    },
-    onLoad() {
-      this.getUser()
-    },
-    onReady() {
-      this.$refs.form.setRules(this.rules)
-    },
-    methods: {
-      getUser() {
-        getUserProfile().then(response => {
-          this.user = response.data
+    submit(ref) {
+      this.$refs.form.validate().then(res => {
+        updateUserProfile(this.user).then(response => {
+          uni.showToast({
+            title: '修改成功',
+            mask: false,
+            duration: 1000
+          });
+          uni.navigateBack();
        })
-      },
-      submit(ref) {
-        this.$refs.form.validate().then(res => {
-          updateUserProfile(this.user).then(response => {
-			uni.showToast({
-			  title: '修改成功',
-			  mask: false,
-			  duration: 1000
-			});
-			uni.navigateBack();
-          })
-        })
-      }
+      })
    }
  }
+}
 </script>

 <style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
+page {
+  background-color: #ffffff;
+}

-  .example {
-    padding: 15px;
-    background-color: #fff;
-  }
+.example {
+  padding: 15px;
+  background-color: #fff;
+}

-  .segmented-control {
-    margin-bottom: 15px;
-  }
+.segmented-control {
+  margin-bottom: 15px;
+}

-  .button-group {
-    margin-top: 15px;
-    display: flex;
-    justify-content: space-around;
-  }
+.button-group {
+  margin-top: 15px;
+  display: flex;
+  justify-content: space-around;
+}

-  .form-item {
-    display: flex;
-    align-items: center;
-    flex: 1;
-  }
+.form-item {
+  display: flex;
+  align-items: center;
+  flex: 1;
+}

-  .button {
-    display: flex;
-    align-items: center;
-    height: 35px;
-    line-height: 35px;
-    margin-left: 10px;
-  }
+.button {
+  display: flex;
+  align-items: center;
+  height: 35px;
+  line-height: 35px;
+  margin-left: 10px;
+}
 </style>
--- a/src/pages_mine/pages/info/index.vue
+++ b/src/pages_mine/pages/info/index.vue
@ -1,44 +1,46 @@
 <template>
  <view class="container">
    <uni-list>
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'person-filled'}" title="昵称" :rightText="user.nickName" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'phone-filled'}" title="手机号码" :rightText="user.phonenumber" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'email-filled'}" title="邮箱" :rightText="user.email" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'auth-filled'}" title="岗位" :rightText="postGroup" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'staff-filled'}" title="角色" :rightText="roleGroup" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'calendar-filled'}" title="创建日期" :rightText="user.createTime" />
+      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'person-filled' }" title="昵称" :rightText="user.nickName" />
+      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'phone-filled' }" title="手机号码"
+        :rightText="user.phonenumber" />
+      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'email-filled' }" title="邮箱" :rightText="user.email" />
+      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'auth-filled' }" title="岗位" :rightText="postGroup" />
+      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'staff-filled' }" title="角色" :rightText="roleGroup" />
+      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'calendar-filled' }" title="创建日期"
+        :rightText="user.createTime" />
    </uni-list>
  </view>
 </template>

 <script>
-  import { getUserProfile } from "@/api/system/user"
+import { getUserProfile } from "@/api/system/user"

-  export default {
-    data() {
-      return {
-        user: {},
-        roleGroup: "",
-        postGroup: ""
-      }
-    },
-    onLoad() {
-      this.getUser()
-    },
-    methods: {
-      getUser() {
-        getUserProfile().then(response => {
-          this.user = response.data
-          this.roleGroup = response.roleGroup
-          this.postGroup = response.postGroup
-        })
-      }
+export default {
+  data() {
+    return {
+      user: {},
+      roleGroup: "",
+      postGroup: ""
+    }
+  },
+  onLoad() {
+    this.getUser()
+  },
+  methods: {
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data
+        this.roleGroup = response.roleGroup
+        this.postGroup = response.postGroup
+      })
    }
  }
+}
 </script>

 <style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
+page {
+  background-color: #ffffff;
+}
 </style>
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@ -47,7 +47,7 @@ const user = {
      return new Promise((resolve, reject) => {
        login(username, password, code, uuid).then(res => {
          setToken(res.token)
-          commit('SET_TOKEN',res.token )
+          commit('SET_TOKEN', res.token)
          resolve()
        }).catch(error => {
          reject(error)
@ -60,10 +60,8 @@ const user = {
      return new Promise((resolve, reject) => {
        getInfo().then(res => {
          const user = res.user
-		  //const avatar = (user == null || user.avatar == "" || user.avatar == null) ? "@/static/images/profile.jpg" : baseUrl + user.avatar
-		  /* cloud */
-		  const avatar = (user == null || user.avatar == "" || user.avatar == null) ? "/static/images/profile.jpg" : user.avatar
-		  const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName
+          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? "@/static/images/profile.jpg" : baseUrl + user.avatar
+          const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName
          if (res.roles && res.roles.length > 0) {
            commit('SET_ROLES', res.roles)
            commit('SET_PERMISSIONS', res.permissions)
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@ -4,10 +4,28 @@ import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'

-let timeout = 10000
 const baseUrl = config.baseUrl

-const request = config => {
+interface RequestConfig{
+  headers?:{
+    isToken:boolean
+  },
+  header?:any,
+  params?:any,
+  url:string,
+  method?:"OPTIONS" | "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "TRACE" | "CONNECT" | undefined
+  baseUrl?:string,
+  timeout?:number | undefined,
+  data?:any
+}
+
+interface ResponseData{
+  code:number,
+  data:any,
+  msg:string
+}
+
+const request = (config:RequestConfig) => {
  // 是否需要设置 token
  const isToken = (config.headers || {}).isToken === false
  config.header = config.header || {}
@ -22,8 +40,8 @@ const request = config => {
  }
  return new Promise((resolve, reject) => {
    uni.request({
-      method: config.method || 'get',
-      timeout: config.timeout || timeout,
+      method: config.method || 'GET',
+      timeout: config.timeout || 10000,
      url: config.baseUrl || baseUrl + config.url,
      data: config.data,
      header: config.header,
@ -36,8 +54,10 @@ const request = config => {
         return
       } */
      const res = response
-      const code = res.data.code || 200
-      const msg = errorCode[code] || res.data.msg || errorCode['default']
+      const data:ResponseData = res.data as ResponseData
+      const code = data.code || 200
+      // @ts-ignore
+      const msg:string = errorCode[code] || data.msg || errorCode['default']
      if (code === 401) {
        showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
          if (res.confirm) {