1002884655 преди 4 години
родител
ревизия
fc6fa85758

+ 1
- 1
package.json Целия файл

37
     "@babel/runtime": "^7.7.7",
37
     "@babel/runtime": "^7.7.7",
38
     "@tarojs/cli": "^3.0.7",
38
     "@tarojs/cli": "^3.0.7",
39
     "@tarojs/components": "3.0.7",
39
     "@tarojs/components": "3.0.7",
40
-    "@tarojs/mini-runner": "^3.0.7",
40
+    "@tarojs/mini-runner": "3.0.0",
41
     "@tarojs/runtime": "3.0.7",
41
     "@tarojs/runtime": "3.0.7",
42
     "@tarojs/taro": "3.0.7",
42
     "@tarojs/taro": "3.0.7",
43
     "qs": "^6.9.4",
43
     "qs": "^6.9.4",

+ 1
- 1
project.config.json Целия файл

27
 			"outputPath": ""
27
 			"outputPath": ""
28
 		},
28
 		},
29
 		"useIsolateContext": true,
29
 		"useIsolateContext": true,
30
-		"useCompilerModule": false,
30
+		"useCompilerModule": true,
31
 		"userConfirmedUseCompilerModuleSwitch": false
31
 		"userConfirmedUseCompilerModuleSwitch": false
32
 	},
32
 	},
33
 	"compileType": "miniprogram",
33
 	"compileType": "miniprogram",

+ 2
- 2
src/components/BodyCheckItem/index.vue Целия файл

1
 <template>
1
 <template>
2
   <view class="BodyCheckItem flex-h">
2
   <view class="BodyCheckItem flex-h">
3
     <view class="flex-item">
3
     <view class="flex-item">
4
-      <text>用户名</text>
5
-      <text>2020-08-08 22:22:22</text>
4
+      <text>{{Data.name}}</text>
5
+      <text>{{ToolClass.DateFormat(Data.createDate)}}</text>
6
     </view>
6
     </view>
7
     <navigator url="" hover-class="none">查看报告</navigator>
7
     <navigator url="" hover-class="none">查看报告</navigator>
8
   </view>
8
   </view>

+ 10
- 0
src/components/MainPage/index.vue Целия файл

25
         </view>
25
         </view>
26
       </view>
26
       </view>
27
     </view>
27
     </view>
28
+    <view class="StudentIdPopup" v-show="ShowStudentIdPopup">
29
+      <view class="centerLabel">
30
+        <text>完善信息</text>
31
+        <text>去完善您的个人信息</text>
32
+        <view>
33
+          <navigator url="/pages/Mine/MyInfo/index">去完善</navigator>
34
+        </view>
35
+      </view>
36
+    </view>
28
   </view>
37
   </view>
29
 </template>
38
 </template>
30
 
39
 
44
     return {
53
     return {
45
       ShowPhoneAuthPopup: false,
54
       ShowPhoneAuthPopup: false,
46
       ShowUserIconAuthPopup: false,
55
       ShowUserIconAuthPopup: false,
56
+      ShowStudentIdPopup: false,
47
       WxInfoData: {
57
       WxInfoData: {
48
         encryptedData: null,
58
         encryptedData: null,
49
         iv: null,
59
         iv: null,

+ 18
- 2
src/components/MainPage/page.scss Целия файл

4
   position: relative;
4
   position: relative;
5
   overflow: hidden;
5
   overflow: hidden;
6
   > .PhoneAuthPopup,
6
   > .PhoneAuthPopup,
7
-  > .UserIconAuthPopup {
7
+  > .UserIconAuthPopup,
8
+  > .StudentIdPopup {
8
     width: 100%;
9
     width: 100%;
9
     position: fixed;
10
     position: fixed;
10
     left: 0;
11
     left: 0;
30
           line-height: 60px;
31
           line-height: 60px;
31
         }
32
         }
32
       }
33
       }
33
-      > .flex-h {
34
+      > view {
34
         padding: 0 60px;
35
         padding: 0 60px;
35
         position: relative;
36
         position: relative;
36
         overflow: hidden;
37
         overflow: hidden;
65
       }
66
       }
66
     }
67
     }
67
   }
68
   }
69
+  > .StudentIdPopup {
70
+    > view {
71
+      > view {
72
+        padding: 0 60px;
73
+        > navigator {
74
+          text-align: center;
75
+          display: block;
76
+          line-height: 80px;
77
+          border-radius: 40px;
78
+          background: #f4c819 !important;
79
+          width: 100%;
80
+        }
81
+      }
82
+    }
83
+  }
68
 }
84
 }

+ 9
- 4
src/pages/Index/BookDetail/index.vue Целия файл

1
 <template>
1
 <template>
2
   <view class="page">
2
   <view class="page">
3
-    <MainPage @UserInfoChange="Init">
3
+    <MainPage ref="MainPage" @UserInfoChange="Init">
4
       <view class="page flex-v">
4
       <view class="page flex-v">
5
         <!-- 内容 -->
5
         <!-- 内容 -->
6
         <view class="flex-item">
6
         <view class="flex-item">
120
     ...mapUserMutations([
120
     ...mapUserMutations([
121
     ]),
121
     ]),
122
     Init () {
122
     Init () {
123
-      this.GetArticleDetail({ urlData: { id: Taro.getCurrentInstance().router.params.id } }).then((res) => {
124
-        this.ArticleInfo = res.data.data || {}
125
-      })
123
+      if (this.UserInfo !== null) {
124
+        this.GetArticleDetail({ urlData: { id: Taro.getCurrentInstance().router.params.id } }).then((res) => {
125
+          this.ArticleInfo = res.data.data || {}
126
+        })
127
+        if (this.UserInfo.studentId === null || this.UserInfo.studentId === '') {
128
+          this.$refs.MainPage.ShowStudentIdPopup = true
129
+        }
130
+      }
126
     },
131
     },
127
     TriggerSave () {
132
     TriggerSave () {
128
       if (!this.DataLock && this.ArticleInfo.postId) {
133
       if (!this.DataLock && this.ArticleInfo.postId) {

+ 6
- 6
src/pages/Mine/MyBodyCheck/index.vue Целия файл

4
       <view class="flex-h">
4
       <view class="flex-h">
5
         <view class="flex-h flex-item">
5
         <view class="flex-h flex-item">
6
           <text>姓名:</text>
6
           <text>姓名:</text>
7
-          <text class="flex-item">xxx</text>
7
+          <text class="flex-item">{{UserInfo.name || '-'}}</text>
8
         </view>
8
         </view>
9
         <view class="flex-h flex-item">
9
         <view class="flex-h flex-item">
10
           <text>学号:</text>
10
           <text>学号:</text>
11
-          <text class="flex-item">xxx</text>
11
+          <text class="flex-item">{{UserInfo.studentId || '-'}}</text>
12
         </view>
12
         </view>
13
         <view class="flex-h flex-item">
13
         <view class="flex-h flex-item">
14
           <text>性别:</text>
14
           <text>性别:</text>
15
-          <text class="flex-item">xxx</text>
15
+          <text class="flex-item">{{UserInfo.sex - 0 === 1 ? '男' : '女'}}</text>
16
         </view>
16
         </view>
17
         <view class="flex-h flex-item">
17
         <view class="flex-h flex-item">
18
           <text>学校:</text>
18
           <text>学校:</text>
19
-          <text class="flex-item">xxx</text>
19
+          <text class="flex-item">{{UserInfo.schoolName || '-'}}</text>
20
         </view>
20
         </view>
21
         <view class="flex-h flex-item">
21
         <view class="flex-h flex-item">
22
           <text>专业:</text>
22
           <text>专业:</text>
23
-          <text class="flex-item">xxx</text>
23
+          <text class="flex-item">{{UserInfo.specialtyName || '-'}}</text>
24
         </view>
24
         </view>
25
         <view class="flex-h flex-item">
25
         <view class="flex-h flex-item">
26
           <text>创建时间:</text>
26
           <text>创建时间:</text>
27
-          <text class="flex-item">xxx</text>
27
+          <text class="flex-item">-</text>
28
         </view>
28
         </view>
29
       </view>
29
       </view>
30
     </view>
30
     </view>

+ 5
- 1
src/util/Api/index.js Целия файл

61
   GetMyMedicalRecords: { // 获取我的就诊记录
61
   GetMyMedicalRecords: { // 获取我的就诊记录
62
     method: 'get',
62
     method: 'get',
63
     url: `${prefix}/ma/medical-log`
63
     url: `${prefix}/ma/medical-log`
64
-  }
64
+  },
65
+  // GetMyBodyCheckList: { // 获取我的体检记录
66
+  //   method: 'get',
67
+  //   url: `${prefix}/ma/medical-log`
68
+  // }
65
 }
69
 }
66
 
70
 
67
 export default Api
71
 export default Api

+ 841
- 192
yarn.lock
Файловите разлики са ограничени, защото са твърде много
Целия файл