feats

src/components/MainPage/index.vue

@@ -64,7 +64,8 @@ export default {
   },
   computed: {
     ...mapUserState({
-      UserInfo: x => x.UserInfo // 用户信息
+      UserInfo: x => x.UserInfo, // 用户信息
+      Student: x => x.UserInfo.student, // 学生信息
     })
   },
   components: {

src/pages/Mine/MyInfo/index.vue

@@ -122,7 +122,8 @@ export default {
   },
   computed: {
     ...mapUserState({
-      UserInfo: x => x.UserInfo // 用户信息
+      UserInfo: x => x.UserInfo, // 用户信息
+      Student: x => x.UserInfo.student || {}, // 学生信息
     })
   },
   components: {
@@ -141,7 +142,8 @@ export default {
       'PutUserInfo'
     ]),
     ...mapUserMutations([
-      'UpdateUserInfo'
+      'UpdateUserInfo',
+      'UpdateStudentInfo',
     ]),
     Init () {
       if (this.UserInfo !== null) {
@@ -149,6 +151,11 @@ export default {
           this.Form[key] = this.UserInfo[key]
         }
       }
+      if (this.Student !== null) {
+        for (let key in this.Form) {
+          this.Form[key] = this.Student[key]
+        }
+      }
     },
     SexChange (e) {
       this.SexIndex = e.detail.value - 0
@@ -165,7 +172,7 @@ export default {
         }
         this.PutUserInfo({ data: { data: { ...Data } } }).then((res) => {
           console.log(res.data.data)
-          this.UpdateUserInfo({ ...res.data.data })
+          // this.UpdateUserInfo({ ...res.data.data })
           wx.showToast({
             title: '保存成功',
             icon: 'none',

src/pages/Mine/index.vue

@@ -10,7 +10,7 @@
               <image mode="aspectFill" :src="UserInfo.avatar" class="centerLabel"></image>
             </view>
             <view class="UserName">{{UserInfo.nickName || '-'}}</view>
-            <view class="UserNo">学号：{{UserInfo.studentId || '-'}}</view>
+            <view class="UserNo">学号：{{Student.studentNo || '-'}}</view>
           </view>
 
           <!-- 信息卡 -->
@@ -18,7 +18,7 @@
             <view>
               <view class="School flex-h">
                 <text>学校：</text>
-                <text class="flex-item">{{UserInfo.schoolName || '-'}}</text>
+                <text class="flex-item">{{Student.schoolName || '-'}}</text>
                 <navigator url="/pages/Mine/MyInfo/index" hover-class="none">
                   <text>完善信息</text>
                   <text class="iconfont iconjiantouright"></text>
@@ -28,7 +28,7 @@
                 <view>
                   <view class="flex-h">
                     <text>专业：</text>
-                    <text class="flex-item">{{UserInfo.specialtyName || '-'}}</text>
+                    <text class="flex-item">{{Student.specialtyName || '-'}}</text>
                   </view>
                   <view class="flex-h">
                     <text>手机号：</text>
@@ -36,7 +36,7 @@
                   </view>
                   <view class="flex-h">
                     <text>学届：</text>
-                    <text class="flex-item">{{UserInfo.schoolBatch}}</text>
+                    <text class="flex-item">{{Student.schoolBatch}}</text>
                   </view>
                 </view>
                 <view class="flex-item">
@@ -84,7 +84,8 @@ export default {
   },
   computed: {
     ...mapUserState({
-      UserInfo: x => x.UserInfo // 用户信息
+      UserInfo: x => x.UserInfo, // 用户信息
+      Student: x => x.UserInfo.student || {} // 学生信息
     })
   },
   components: {

src/store/user/index.js

@@ -16,6 +16,9 @@ export default {
     },
     UpdateUserInfo (state, data) {
       state.UserInfo = { ...state.UserInfo, ...data }
+    },
+    UpdateStudentInfo (state, data) {
+      state.UserInfo = { ...state.UserInfo, student: data }
     }
   },
   actions: {
@@ -36,7 +39,7 @@ export default {
     },
     PutUserInfo (context, payload) { // 更新用户信息
       return new Promise((resolve, reject) => {
-        ToolClass.ToolRequest({ url: Api.UpdateUserInfo.url, method: Api.UpdateUserInfo.method, ...payload, success (res) { context.commit('UpdateUserInfo', res.data.data.person); resolve(res) }, error (res) { reject(res) } })
+        ToolClass.ToolRequest({ url: Api.UpdateUserInfo.url, method: Api.UpdateUserInfo.method, ...payload, success (res) { context.commit('UpdateStudentInfo', res.data.data.person); resolve(res) }, error (res) { reject(res) } })
       })
     },
     GetCurrentPersonInfo (context, payload) { // 获取当前人员信息

src/util/Api/index.js

@@ -16,7 +16,7 @@ const Api = {
   },
   UpdateUserInfo: { // 更新用户信息
     method: 'put',
-    url: `${prefix}/ma/person`
+    url: `${prefix}/ma/student`
   },
   GetIndexBanner: { // 获取首页banner
     method: 'get',