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

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

@@ -314,8 +314,8 @@ export default {
 						var uploadUid = '';
 
 						for (const item of val) {
-							if (item.uid) {
-								uploadUid = item.uid
+							if (item.folderId) {
+								uploadUid = item.folderId
 								continue
 							}
 

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

@@ -229,6 +229,14 @@ export default {
 
 			return await this.HTTP_GET('learun/adms/annexes/wxfileinfo', fileId)
 		},
+		//删除指定id的文件信息
+		async DELETE_FILE(fileId) {
+			if (!fileId) {
+				return null
+			}
+		
+			return await this.HTTP_POST('learun/adms/annexes/wxdelete', fileId);
+		},
 		//获取文件夹下文件列表
 		async FETCH_FILEList(folderId) {
 			if (!folderId) {

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

@@ -23,7 +23,7 @@
           </view>
           <view v-else class="file-icon solids" @click="fileClick(index)"><l-icon type="text" /></view>
 
-          <view v-if="!readonly" @click.stop="delFile(index)" class="cu-tag bg-red" style="height: 24px; width: 24px;">
+          <view v-if="!readonly" @click.stop="delFile(index,file.uid)" class="cu-tag bg-red" style="height: 24px; width: 24px;">
             <l-icon type="close" color="white" style="width: 18px; height: 24px; font-size: 24px;" />
           </view>
 		  <view class="fileName">
@@ -66,7 +66,7 @@ export default {
       return ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf'].includes(typeString)
     },
 
-    async delFile(index) {
+    async delFile(index,fileId) {
 	  if (!(await this.CONFIRM('删除文件', '确定要删除该文件吗？', true))) {
 		return
 	  }
@@ -75,6 +75,8 @@ export default {
       this.$emit('input', newList)
       this.$emit('change')
       this.$emit('del')
+	  //物理删除
+	  this.DELETE_FILE(fileId);
     },
 
     chooseFile() {