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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs

@@ -135,7 +135,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<MeetingManagementEntity>(keyValue);
+                var data = this.BaseRepository("CollegeMIS").FindEntity<MeetingManagementEntity>(keyValue);
+                if (data!=null)
+                {
+                    data.ConferenceRoomName = this.BaseRepository("CollegeMIS").FindEntity<ConferenceRoomEntity>(data.MeetingPlace).Name;
+                }
+                return data;
             }
             catch (Exception ex)
             {

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

@@ -89,19 +89,33 @@ export default {
       // #endif
 
       // #ifndef MP-DINGTALK
-      uni.chooseFile({
-        count: Number(this.number),
-        sizeType: ['original', 'compressed'],
-        sourceType: ['album', 'camera'],
-        success: ({ tempFilePaths }) => {
-          const newList = JSON.parse(JSON.stringify(this.value || [])).concat(
-            tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) }))
-          )
-          this.$emit('input', newList)
-          this.$emit('change', newList)
-          this.$emit('add')
-        }
-      })
+      // uni.chooseFile({
+      //   count: Number(this.number),
+      //   sizeType: ['original', 'compressed'],
+      //   sourceType: ['album', 'camera'],
+      //   success: ({ tempFilePaths }) => {
+      //     const newList = JSON.parse(JSON.stringify(this.value || [])).concat(
+      //       tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) }))
+      //     )
+      //     this.$emit('input', newList)
+      //     this.$emit('change', newList)
+      //     this.$emit('add')
+      //   }
+      // })
+	  
+	  uni.chooseImage({
+	    count: Number(this.number),
+	    sizeType: ['original', 'compressed'],
+	    sourceType: ['album', 'camera'],
+	    success: ({ tempFilePaths }) => {
+	      const newList = JSON.parse(JSON.stringify(this.value || [])).concat(
+	        tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) }))
+	      )
+	      this.$emit('input', newList)
+	      this.$emit('change', newList)
+	      this.$emit('add')
+	    }
+	  })
       // #endif
     },
 

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

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