Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml

@@ -19,13 +19,13 @@
                                     <div id="MajorNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">班级</div>
-                                    <div id="ClassNo"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">年级</div>
                                     <div id="Grade"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js

@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
                 param: { strWhere: "1=1 AND CheckMark=1" },
                 select: function (item) {
                     var Grades = $("#Grade").lrselectGet();
-                    if (Grades) {
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
@@ -78,12 +78,14 @@ var bootstrap = function ($, learun) {
                 text: "text",
                 select: function (item) {
                     var MajorNos = $("#MajorNo").lrselectGet();
-                    if (MajorNos) {
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
                                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "majorno='" + item.MajorNos + "' AND CheckMark=1 AND Grade='" + item + "' order by classno desc" }
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
@@ -97,7 +99,9 @@ var bootstrap = function ($, learun) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
                                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: " CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
@@ -106,7 +110,8 @@ var bootstrap = function ($, learun) {
                                 param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
                             });
                         }
-                    }
+                    }   
+
                 }
             });
             $('#ClassNo').lrselect({

Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue

@@ -111,7 +111,7 @@ export default {
       //   }
       // })
 	  
-	  uni.chooseImage({
+	  uni.chooseFile({
 	    count: Number(this.number),
 	    sizeType: ['original', 'compressed'],
 	    sourceType: ['album', 'camera'],

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

@@ -21,9 +21,9 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-    // "http://cyzjzx.gnway.cc:30626/"//测试地址
+    "http://cyzjzx.gnway.cc:30626/"//测试地址
 	// "http://cyzjzx.gnway.cc:29615/"//正式地址
-	 "http://192.168.10.58:8012/"
+	 // "http://192.168.10.31:8088/"
   ],
   "webHost":"http://cyzjzx.gnway.cc:29618/",//测试地址
   //"webHost":"http://wxd3f.cyzjzx.com/",//正式地址