app2.0：功能修改；

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js

@@ -673,6 +673,22 @@ export default {
 
 				return null
 			}
+			
+			//dyy 2020-03-09 14:50
+			//请求成功后，返回数据状态码不等于200，请求数据失败
+			if(result.data && result.data.code !== 200){
+				uni.hideLoading()
+				if (tips) {
+					const errInfo = (result.data && result.data.info) || '(未知原因)'
+					const errTips = typeof tips === 'string' ? tips : '请求数据时发生错误'
+					uni.showToast({
+						title: `${errTips}： ${errInfo}`,
+						icon: 'none'
+					})
+				}
+				
+				return null
+			}
 
 			return result.data.data
 		},

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue

@@ -130,7 +130,7 @@ export default {
       dataSource: {
         EmpInfo: {
           PartyFaceNo: [],
-          NationalityNo: [],
+          NationalityNo: Object.values(this.GET_GLOBAL('dataDictionary').National).map(t => ({ value: t.value, text: t.text })), 
         },
       },
     };
@@ -150,7 +150,13 @@ export default {
       this.id = id;
       this.mode = type;
       this.edit = ["create", "edit"].includes(this.mode); // 拉取表单数据，同时拉取所有来自数据源的选单数据
-      await Promise.all([() => {}]);
+      await Promise.all([
+			this.FETCH_DATASOURCE('BCdPartyFace').then(result => {
+			  this.dataSource.EmpInfo.PartyFaceNo = result.data.map(t => ({ text: t.partyface, value: t.partyfaceno })) 
+			}),  
+		  () => {},
+		  
+	  ]);
       await this.fetchForm();
       this.ready = true;
       this.HIDE_LOADING();
@@ -164,7 +170,7 @@ export default {
           this.id
         );
         this.id=result.EmpInfo.EmpId;
-        console.log(result);
+        // console.log(result);
         this.origin = await this.formatFormData(result);
       }
       this.current = this.COPY(this.origin);

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue

@@ -70,7 +70,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   
   </view> 
 </template> 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue

@@ -97,7 +97,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   
   </view> 
 </template> 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue

@@ -85,7 +85,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   
   </view> 
 </template> 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/list.vue

@@ -79,7 +79,7 @@
 			</view>
 		</scroll-view>
 
-		<l-customlist-add v-if="!sideOpen" @click="action('add')" />
+		<!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
 	</view>
 </template>
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue

@@ -50,7 +50,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   
   </view> 
 </template> 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/info.vue

@@ -24,8 +24,8 @@ export default {
     
     // 计算出用户公司、岗位等信息
     info() {
-      const company = this.currentUser.companyId ? this.GET_GLOBAL('company')[this.currentUser.companyId].name : ''
-      const dep = this.currentUser.departmentId ? this.GET_GLOBAL('department')[this.currentUser.departmentId].name : ''
+      const company = this.currentUser.companyId ? this.GET_GLOBAL('company')[this.currentUser.companyId]?.name : ''
+      const dep = this.currentUser.departmentId ? this.GET_GLOBAL('department')[this.currentUser.departmentId]?.name : ''
       const role = (this.currentUser.role || []).map(t => t.F_FullName).join(' · ')
       const job = (this.currentUser.post || []).map(t => t.F_Name).join(' · ')
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue

@@ -41,8 +41,8 @@ export default {
       const success = await this.HTTP_POST(
         'learun/adms/user/modifypw',
         {
-          newpassword: this.md5(newPwd),
-          oldpassword: this.md5(oldPwd)
+          newpassword: this.MD5(newPwd),
+          oldpassword: this.MD5(oldPwd)
         },
         '未能成功修改密码'
       )