Merge branch '黑龙江艺术高中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

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

@@ -312,9 +312,15 @@ export default {
 		//   data 为请求附带的提交数据
 		async HTTP_POST(url, data, showTips) {
 			const [err, res] = await this.requestBase(url, data, null, 'POST')
-
+			
 			return this.handleResult(err, res, showTips)
 		},
+		async HTTP_POST_HasData(url, data, showTips) {
+			return new Promise(async (resolve)=>{
+				const [err, res] = await this.requestBase(url, data, null, 'POST')
+				resolve([this.handleResult(err, res, showTips),res.data])
+			})
+		},
 
 		// 封装的文件上传，集成了验证信息
 		// 返回接口返回值或 null

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -7,15 +7,15 @@ export default {
   "enableSignUp": true,
   //请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择
   //黑龙江正式地址
-  // "apiHost": [
-  // 	  "http://1.190.222.34:9001/"
-  // ],
-  // "webHost":"http://1.190.222.34:9000/",
-  //本地：
   "apiHost": [
-  	  "http://192.168.10.58:8003/"
+  	  "http://1.190.222.34:9001/"
   ],
-  "webHost":"http://192.168.10.58:8004/",
+  "webHost":"http://1.190.222.34:9000/",
+  //本地：
+  // "apiHost": [
+  // 	  "http://192.168.10.58:8003/"
+  // ],
+  // "webHost":"http://192.168.10.58:8004/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
     { username: "system", password: "www.qj.com" }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "智慧校园",
-    "appid" : "__UNI__E4958C9",
+    "appid" : "__UNI__7C24C09",
     "description" : "智慧校园移动端",
-    "versionName" : "2.1.0",
-    "versionCode" : 20100,
+    "versionName" : "2.2.0",
+    "versionCode" : 20200,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single_zc.vue

@@ -1,8 +1,11 @@
 <template>
 	<view class="page">
-		<view v-if="ready">
+		<view v-if="ready" style="position: relative;">
 			<uploadImage @input="setValue('AttendanceCard.Img', $event)" :accept="['camera']" :value="getValue('AttendanceCard.Img')"
 				:readonly="!edit" :number="1" title="照片上传" required/>
+			<view class="errortext">
+				{{info}}
+			</view>
 			<!-- <l-textarea @input="setValue('AttendanceCard.ARemark', $event)" :value="getValue('AttendanceCard.ARemark')"
 				:readonly="!edit" title="备注" /> -->
 		</view>
@@ -81,7 +84,9 @@
 				// 数据源 
 				dataSource: {
 					AttendanceCard: {},
-				}
+				},
+				
+				info:'',
 			}
 		},
 
@@ -146,23 +151,21 @@
 							return
 						}
 						// let strEntity_ = {...strEntity,...this.params}
-						this.HTTP_POST('learun/adms/attendance/clockin', JSON.stringify(strEntity), '打卡失败').then(success => {
+						this.HTTP_POST_HasData('learun/adms/attendance/clockin', JSON.stringify(strEntity), '打卡失败').then(([success,res]) => {
 							this.HIDE_LOADING()
 							if (!success) {
 								// this.TOAST('打卡失败')
-								setTimeout(()=>{
-									this.NAV_BACK()
-								},1200)
+								// setTimeout(()=>{
+								// 	this.NAV_BACK()
+								// },1200)
+								this.HIDE_TOAST()
+								this.info = res.info || ''
 								return
 							}
 							this.TOAST('打卡成功', 'success')
 							setTimeout(()=>{
 								this.NAV_BACK(2)
 							}, 500)
-						}).catch(()=>{
-							setTimeout(()=>{
-								this.NAV_BACK()
-							}, 500)
 						})
 						break
 
@@ -185,4 +188,12 @@
 			// clearInterval(this.timer)
 		}
 	}
-</script>
+</script>
+<style scoped>
+	.errortext{
+		color: #E6A23C;
+		position: absolute;
+		left: 110px;
+		top: 100px;
+	}
+</style>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/single_zc.vue

@@ -1,8 +1,11 @@
 <template>
 	<view class="page">
-		<view v-if="ready">
+		<view v-if="ready" style="position: relative;">
 			<uploadImage @input="setValue('AttendanceCard.Img', $event)" :accept="['camera']" :value="getValue('AttendanceCard.Img')"
 				:readonly="!edit" :number="1" title="照片上传" required/>
+			<view class="errortext">
+				{{info}}
+			</view>
 			<!-- <l-textarea @input="setValue('AttendanceCard.ARemark', $event)" :value="getValue('AttendanceCard.ARemark')"
 				:readonly="!edit" title="备注" /> -->
 		</view>
@@ -81,7 +84,9 @@
 				// 数据源 
 				dataSource: {
 					AttendanceCard: {},
-				}
+				},
+				
+				info:'',
 			}
 		},
 
@@ -146,23 +151,21 @@
 							return
 						}
 						// let strEntity_ = {...strEntity,...this.params}
-						this.HTTP_POST('learun/adms/attendance/clockinTeacher', JSON.stringify(strEntity), '打卡失败').then(success => {
+						this.HTTP_POST_HasData('learun/adms/attendance/clockinTeacher', JSON.stringify(strEntity), '打卡失败').then(([success,res]) => {
 							this.HIDE_LOADING()
 							if (!success) {
 								// this.TOAST('打卡失败')
-								setTimeout(()=>{
-									this.NAV_BACK()
-								},1200)
+								// setTimeout(()=>{
+								// 	this.NAV_BACK()
+								// },1200)
+								this.HIDE_TOAST()
+								this.info = res.info || ''
 								return
 							}
 							this.TOAST('打卡成功', 'success')
 							setTimeout(()=>{
 								this.NAV_BACK(2)
 							}, 500)
-						}).catch(()=>{
-							setTimeout(()=>{
-								this.NAV_BACK()
-							}, 500)
 						})
 						break
 
@@ -185,4 +188,12 @@
 			// clearInterval(this.timer)
 		}
 	}
-</script>
+</script>
+<style scoped>
+	.errortext{
+		color: #E6A23C;
+		position: absolute;
+		left: 110px;
+		top: 100px;
+	}
+</style>