Merge branch '西昌分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/weixinlogin.js

@@ -1,4 +1,4 @@
-function GetQueryString(name) {
+function GetQueryString(name) {
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
     var r = window.location.search.substr(1).match(reg);//search,查询？后面的参数，并匹配正则
     if (r != null) return unescape(r[2]); return null;

Learun.Framework.Ultimate V7/LearunApp-2.2.0/.hbuilderx/launch.json

@@ -10,6 +10,10 @@
      	{
      		"launchtype" : "remote"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
      	"type" : "uniCloud"
      }
     ]

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

@@ -21,10 +21,10 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-    // "http://localhost:31173/"
-	"http://demo.bjquanjiang.com:31173/"
+     // "http://localhost:31173/"
+	"http://192.168.10.68:8002/"
   ],
-  "webHost":"http://demo.bjquanjiang.com:8081/",
+  "webHost":"http://localhost:20472/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
 	  // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026      420528200507261428

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

@@ -119,7 +119,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxbc18c9bf92c86d28",
+        "appid" : "wx36f8c96ee26af75b",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

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

@@ -508,6 +508,7 @@ export default{
 	text-align: center;
 	font-size: 14px;
 	color: #1a1a1a;
+	background-color: #ffffff;
 }
 
 .timeTableAlertLi.active {
@@ -518,10 +519,6 @@ export default{
 	background-color: #fbfdff;
 }
 
-.timeTableAlertLi:nth-child(2n - 1) {
-	background-color: #ffffff;
-}
-
 #MeasureTime {
 	text-align: center;
 }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue

@@ -273,7 +273,7 @@ page {
   
   .otherLogin{
 	  display: flex;
-	  justify-content: right;
+	  justify-content: flex-end;
 	  .textBtn{
 		  width: 100px;
 		  color: #606266;

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/myAttendance/single.vue

@@ -38,7 +38,7 @@
 				<view class="tSec2Con2">
 					<view class="studCheckList">
 						<view class="studCheckLi" v-for="(k, i) in data.result" :key="k.StuName">
-							<view style="float:right; margin-top: 7px;" class="studCheckStatue" :class="type(k.Sort)">
+							<view style="float:right; margin-top: 7px;" class="studCheckStatue" :class="[type(k.Sort)]">
 								<text></text>
 								{{ k.Sort }}
 							</view>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue

@@ -36,7 +36,7 @@
 				<view v-if="weekData.rows.length == 0">暂时没有信息</view>
 				<view v-if="weekData.rows.length != 0">
 					<view 
-						:class="timeTableClass(k.Sort)" 
+						:class="[timeTableClass(k.Sort)]" 
 						class="timeTableLi" v-for="(k, i) in weekData.rows" 
 						:key="k.StuNo" 
 						@click="tapTimeTable(i, timeTableClass(k.Sort))"
@@ -46,7 +46,7 @@
 				</view>
 		    </view>
 		</view>
-		<view class="timeTableAlert" :class="flag? 'active' : ''">
+		<view class="timeTableAlert" :class="[flag? 'active' : '']">
 		    <view class="timeTableAlertTop">
 		        <view class="timeTableAlertT">{{ weekData.rows[ind].StuName }}</view>
 		        <view class="timeTableAlertTxt">学号: {{ weekData.rows[ind].StuNo }} </view>
@@ -55,7 +55,7 @@
 		        <view 
 					v-for="(n, i) in Statue" 
 					:key="i" 
-					:class="n.className == className? 'active ' + n.className : n.className" 
+					:class="[n.className == className? 'active ' + n.className : n.className]" 
 					class="timeTableAlertLi"
 					@click="tapStatus(i)"
 				><text></text>{{ n.txt }}</view>
@@ -491,6 +491,7 @@ export default{
 	text-align: center;
 	font-size: 14px;
 	color: #1a1a1a;
+	background-color: #ffffff;
 }
 
 .timeTableAlertLi.active {
@@ -500,8 +501,4 @@ export default{
 .timeTableAlertLi:nth-child(2n) {
 	background-color: #fbfdff;
 }
-
-.timeTableAlertLi:nth-child(2n - 1) {
-	background-color: #ffffff;
-}
 </style>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/weixinLogin.vue

@@ -31,7 +31,7 @@
       <l-input v-if="ready" v-model="password" placeholder="请输入身份证后八位" password left>
         <l-icon slot="title" type="lock" />
       </l-input>
-      <l-button @click="login(null)" size="lg" color="blue" class="margin-top-sm block" block>确 认</l-button>
+      <l-button @click="loginClick(null)" size="lg" color="blue" class="margin-top-sm block" block>确 认</l-button>
 	  <view class="otherLogin">
 	  	<navigator url="/pages/login" class="textBtn">常规登陆</text></navigator>
 	  </view>
@@ -68,11 +68,14 @@
 </template>
 
 <script>
+import moment from 'moment';
 export default {
   data() {
     return {
       username: '',
       password: '',
+	  
+	  code:'',
 
       ready: false,
       showApiRootSelector: false,
@@ -83,7 +86,8 @@ export default {
     }
   },
 
-  async onLoad() {
+  async onLoad({code}) {
+	this.code = code
     await this.init()
   },
 
@@ -101,7 +105,8 @@ export default {
         this.username = account.username
         this.password = account.password
       }
-      this.ready = true
+      // this.ready = true
+	  this.loginInit()
     },
 
     // 点击新用户注册
@@ -109,7 +114,82 @@ export default {
       this.NAV_TO('/pages/signup')
     },
 
-    // 切换后台地址
+    loginInit(){
+		if (this.code) {
+			this.LOADING("加载中...")
+			this.HTTP_POST("weixinapi/getweixinaccess_token?code="+this.code).then(success=>{
+				this.HIDE_LOADING()
+				if(!success){
+					location.href = "http://" + window.location.host;
+					return
+				}
+				if(success.logined){
+					var logininfo = {
+					    account: account,
+					    token: success.baseinfo.token,
+					    date: moment().format('yyyy-MM-dd hh:mm:ss')
+					};
+					this.SET_STORAGE("logininfo",logininfo)
+					this.SET_STORAGE("userinfo",success)
+					location.href = "http://" + window.location.host;
+				}else{
+					this.ready = true
+					this.openid = success.openid
+				}
+			})
+		} else {
+		    this.HIDE_LOADING();
+			this.HTTP_GET("weixinapi/weixinconfig").then(success=>{
+				if(!success){
+					return
+				}
+				window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + success.appid + "&redirect_uri=" + encodeURIComponent('http://' + window.location.host + '/pages/weixinLogin') + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
+			})
+		}
+	},
+	
+	loginClick(){
+		
+		
+		// 点击登录
+		// 账号密码登录时，验证输入，输入有误则返回
+		if (!this.check()) {
+		  return
+		}
+		let up = true
+		
+		var postData = {
+		    username: this.username,
+		    password: this.MD5(this.password) ,
+		    openid: this.openid,
+		    up: up
+		};
+		this.LOADING("正在登录，请稍后")
+		this.HTTP_POST("weixinapi/loginbyidcard", postData).then(success=>{
+			this.HIDE_LOADING()
+			if(!success){
+				return
+			}
+			var logininfo = {
+			    account: this.username,
+			    token: success.baseinfo.token,
+			    date: moment().format('yyyy-MM-dd hh:mm:ss')
+			};
+			this.SET_STORAGE('logininfo', logininfo);
+			this.SET_STORAGE('userinfo', success);
+			this.username = ""
+			this.password = ""
+			if (success.pwd === true) {
+			    this.SET_STORAGE('pwd', true);
+			    this.TOAST("绑定失败！您的密码不满足强度要求，请您先修改密码后再执行系统其他操作");
+			} else {
+			    this.SET_STORAGE('pwd', false);
+			}
+			location.href = "http://" + window.location.host;
+		})
+	},
+	
+	// 切换后台地址
     changeApiRoot(newIndex) {
       const newApiRoot = this.apiRootList[newIndex]
       this.currentApiRoot = newApiRoot
@@ -272,7 +352,7 @@ page {
   
   .otherLogin{
   	  display: flex;
-  	  justify-content: right;
+  	  justify-content: flex-end;
   	  .textBtn{
   		  width: 100px;
   		  color: #606266;