From b88707b2453e0cb287f3645cfe1ebf86d4e8a497 Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Sat, 9 Aug 2025 16:54:03 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=91=E5=B8=83=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=90=8C=E6=84=8F=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=8F=96=E6=B6=88=E5=90=8C=E6=84=8F=203?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=90=8C=E6=84=8F=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E5=8F=AF=E4=BB=A5=E5=8F=96=E6=B6=88=E5=90=8C=E6=84=8F?=
 =?UTF-8?q?=EF=BC=9B=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E7=9A=84=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=96=B0=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=E7=9A=84=E6=96=B9=E6=B3=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=204=E3=80=81s-uploader=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E7=9A=84=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E6=96=B0=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E5=92=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=96=B9=E6=B3=95=E8=B7=9F=E9=9A=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=E4=BF=A1=E6=81=AF=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=205=E3=80=81=E6=94=B6=E8=97=8F=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=8F=AF=E6=9F=A5=E7=9C=8B=E5=88=97=E8=A1=A8=E7=9A=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=206=E3=80=81=E9=9A=90=E8=97=8F=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E7=9A=84=E6=94=B6=E8=97=8F=E5=92=8C=E5=AE=A2=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/canteenRent/rentEdit.vue                |  152 +-
 .../goods/components/detail/detail-tabbar.vue |    6 +-
 pages/index/fabu.vue                          |   12 +-
 pages/user/goods-collect.vue                  |   20 +-
 sheep/components/s-uploader/s-uploader.vue    | 1333 ++++++++---------
 sheep/components/s-uploader/upload-image.vue  |   10 +-
 6 files changed, 806 insertions(+), 727 deletions(-)

diff --git a/pages/canteenRent/rentEdit.vue b/pages/canteenRent/rentEdit.vue
index 109d47c..fe65f78 100644
--- a/pages/canteenRent/rentEdit.vue
+++ b/pages/canteenRent/rentEdit.vue
@@ -1,7 +1,7 @@
 <template>
 	<s-layout title="修改发布信息" :bgStyle="{ color: '#f7f7f7' }">
 		<view class="container">
-			<view class="backImg flex flex-column align-items">
+			<scroll-view scroll-y="true" class="backImg flex flex-column align-items">
 				<view class="scroll-container box flex flex-column align-items">
 					<view class="first flex flex-column align-items justify-start" style="padding: 30rpx;">
 						<view class="row flex align-items" style="padding: 0 30rpx;">
@@ -78,8 +78,10 @@
 									placeholder="请输入你的招标详细信息"></textarea>
 							</view>
 
-							<!-- 图片 -->
-							<s-uploader v-model:url="state.formData.images" fileMediatype="image" limit="9" mode="grid"
+							<!-- 图片 :value="state.formData.images" @success="handleUploadSuccess" @del-file="handleDelFile"
+							  v-model:url="state.formData.images"-->
+							<s-uploader ref="uploaderRef" :url="state.formData.images" @success="handleUploadSuccess"
+								@delete="handleDelFile" fileMediatype="image" limit="9" mode="grid"
 								:imageStyles="{ width: '168rpx', height: '168rpx'}"></s-uploader>
 						</view>
 						<span class="line-row" style="margin: 30rpx 0;"></span>
@@ -112,7 +114,7 @@
 						</view>
 						<view class="checkedLabel" style="margin-top: 26rpx;" v-if="selectTagslist.length != 0">
 							<view class="tagLab" v-for="(item, index) in selectTagslist" :key="index" style="">
-								<view>
+								<view style="font-size: 24rpx;line-height: 22rpx;color: #F76100;">
 									{{ item.name }}
 								</view>
 								<view style="height: 30rpx;width: 1rpx;background-color: #f76100;margin: 0 20rpx;">
@@ -129,18 +131,20 @@
 						</view>
 					</view>
 
+					<view style="height: 370rpx;width: 100%;color: #f7f7f7;"></view>
+
 				</view>
 
-			</view>
+			</scroll-view>
+
 
-			<view style="height: 200rpx;width: 100%;color: #f7f7f7;"></view>
 
 			<view class="bottomBtn">
 				<view style="margin:30rpx 0 0 0;display: flex;align-items: center;justify-content: center;">
 					<view v-if="agreeAdd == false" style="width: 31rpx;height: 32rpx;
 					border: 2rpx solid #999999;border-radius: 50%;" @click="show = true"></view>
 					<image v-if="agreeAdd == true" style="width: 32rpx;height: 32rpx;"
-						src="https://jiangxiaoxian.0rui.cn/fbxySelected.png"></image>
+						src="https://jiangxiaoxian.0rui.cn/fbxySelected.png" @click="agreeAdd = false"></image>
 					<view style="font-size: 22rpx;line-height: 31rpx;color: #9C9C9C;display: flex;
 					justify-content: center;align-items: center;margin-left: 20rpx;" @click="show = true">我已阅读并同意
 						<view style="margin-left: 20rpx;color: #FCC74E;">《发布须知》</view>
@@ -321,19 +325,31 @@
 	const status = ref(0)
 	const rentEditId = ref(0)
 
+	const tagList = ref([])
+	const showPopbq = ref(false)
+	const tagShowList = ref([])
+	const selectTagslist = ref([]); //已选择标签
+	const tagSelectedNum = ref(0)
+	const typeList = ref([])
+	const typeShowList = ref([])
+	const showType = ref(false)
+	const typeIndex = ref(0); //已选择项目类型
+	// 定义上传组件的引用
+	const uploaderRef = ref(null); // 与标签上的 ref 名称对应
+
 	onLoad((options) => {
 		getFbKnow();
 		getTagList();
-		getTypeList();
+		// getTypeList();
 		if (options.id) {
 			rentEditId.value = options.id
 			console.log('编辑接参ID', rentEditId.value);
-			getDetail()
+			// getDetail()
 		}
-		
+
 	})
 	onShow(() => {
-		
+
 		// getFbKnow();
 		// getTagList();
 		// getTypeList();
@@ -386,6 +402,7 @@
 		const res = await sheep.$api.rent.tagsList({});
 		if (res.code == 1) {
 			tagList.value = res.data.list
+			console.log('getTagList', tagList.value);
 			tagShowList.value = tagList.value.map(({
 				name,
 				id
@@ -393,15 +410,16 @@
 				name,
 				id
 			}));
+			console.log('getTagList222', tagList.value);
 			tagShowList.value.forEach(item => {
 				item.isSelect = false;
 			})
 			console.log('tagList', tagList.value, tagShowList.value);
+			getTypeList();
 		}
 	}
 
-	const typeList = ref([])
-	const typeShowList = ref([])
+
 	async function getTypeList() {
 		const res = await sheep.$api.rent.listType({});
 		if (res.code == 1) {
@@ -410,13 +428,14 @@
 
 			typeShowList.value = Object.values(typeList.value)
 			console.log('typeList', typeList.value, typeShowList.value);
+			if (rentEditId.value) {
+				getDetail()
+			}
 		}
 	}
 
 
 	//项目类型
-	const showType = ref(false)
-	const typeIndex = ref(0); //已选择项目类型
 	function closeType() {
 		console.log('取消type', typeIndex.value);
 		showType.value = false
@@ -436,12 +455,6 @@
 
 
 	//标签
-	const showPopbq = ref(false)
-	const tagList = ref([])
-	const tagShowList = ref([])
-	const selectTagslist = ref([]); //已选择标签
-	const tagSelectedNum = ref(0)
-
 	function openPopbq() {
 		showPopbq.value = true;
 	}
@@ -497,7 +510,7 @@
 		selectTagslist.value.splice(i, 1);
 		tagSelectedNum.value -= 1;
 		console.log('删除标签', tagSelectedNum.value);
-		
+
 	}
 
 	function change() {
@@ -512,40 +525,61 @@
 
 	//详情
 	function getDetail() {
-		console.log('详情1',tagList.value);
-		if(tagList.value.length == 0){
-			tagList.value = uni.getStorageInfoSync('tagList');
+		console.log('详情1', tagList.value, uni.getStorageSync('tagList'));
+		if (tagList.value.length == 0) {
+			console.log('详情-tagList.value.length == 0', tagList.value, uni.getStorageSync('tagList'));
+			tagList.value = uni.getStorageSync('tagList');
 			tagShowList.value = tagList.value
 		}
-		console.log('详情',tagList.value,tagShowList.value);
-		if(typeList.value.length == 0) {
-			typeList.value = uni.getStorageInfoSync('typeList');
+		console.log('详情', tagList.value, tagShowList.value);
+		if (typeList.value.length == 0) {
+			typeList.value = uni.getStorageSync('typeList');
 		}
 		sheep.$api.rent.rentInfo(rentEditId.value).then((res) => {
 			if (res.code == 1) {
 				form.value = res.data.detail,
-				selectTagslist.value = tagList.value.reduce((acc, obj) => {
-					if (form.value.cate_ids.includes(obj.id)) {
-						acc.push(obj);
-					}
-					return acc;
-				}, []);
+					selectTagslist.value = tagList.value.reduce((acc, obj) => {
+						if (form.value.cate_ids.includes(obj.id)) {
+							acc.push(obj);
+						}
+						return acc;
+					}, []);
 				tagSelectedNum.value = selectTagslist.value.length
 				form.value.area = form.value.address_city_text
 				form.value.typeName = form.value.type_text
 				typeIndex.value = typeShowList.value.findIndex(item => item == form.value.type_text)
 				state.formData.images = form.value.images
+				console.log('form.value.images', form.value.images);
 				const arr2Names = selectTagslist.value.map(item => item.name);
 				tagShowList.value.forEach(item => {
-				  if (arr2Names.includes(item.name)) {
-				    item.isSelect = true; // 直接修改原数组
-				  }
+					if (arr2Names.includes(item.name)) {
+						item.isSelect = true; // 直接修改原数组
+					}
 				});
-				console.log('详情22',tagShowList.value);
+				console.log('详情22', tagShowList.value);
 			}
 		})
 	}
 
+	//上传图片成功
+	const handleUploadSuccess = (res) => {
+		console.log('handleUploadSuccess', res.tempFilePaths);
+		// res.tempFilePaths 是新上传的临时路径数组
+		// const newImages = res.tempFilePaths.map(url => ({ url }));  // 转为对象数组
+		// 合并原有图片和新图片（去重可选）
+		state.formData.images.push(...res.tempFilePaths);
+	};
+	// rentEdit.vue 中添加删除处理
+	const handleDelFile = (newList) => {
+		console.log('newList', newList);
+		var newListA = state.formData.images;
+		// //  // 从数组中移除对应索引的图片
+		 newListA.splice(newList.delIndex, 1);
+		state.formData.images =newListA;
+		//console.log('newList', state.formData.images);
+	};
+
+
 	async function apply() {
 		if (agreeAdd.value == false) {
 			uni.showToast({
@@ -558,6 +592,7 @@
 		console.log('cate_ids', form.value.cate_ids, state.formData.images);
 
 		form.value.images = state.formData.images.join(',');
+		// form.value.images = state.formData.images.map(item => item.url).join(',');
 		console.log('images', form.value.images);
 
 		if (form.value.title == '') {
@@ -638,6 +673,7 @@
 			console.log('修改成功');
 			agreeAdd.value = false;
 			selectTagslist.value = []
+			tagSelectedNum.value = 0;
 			form.value = {
 				title: '',
 				area: '',
@@ -654,15 +690,29 @@
 				cateName: '',
 				imageList: [],
 			}
-			state.formData.images = []
+			state.formData.images = [];
+			state.imageFiles = []
+			console.log('state.formData.images', state.formData.images, uploaderRef.value);
+			// 2. 清空上传组件内部缓存（关键步骤）
+			if (uploaderRef.value) { // 确保组件实例存在
+				uploaderRef.value.clearFiles(); // 调用组件内置的清空方法
+			}
+
+			state.currentCityIndex = [0, 0]
+			console.log('currentCityIndex', state.currentCityIndex);
 			uni.showToast({
 				title: res.msg,
 				icon: 'success',
 			})
 			setTimeout(() => {
 				uni.navigateBack()
-			},2000)
-			
+			}, 2000)
+
+		} else {
+			uni.showToast({
+				title: res.msg,
+				icon: 'error'
+			})
 		}
 
 	}
@@ -675,7 +725,7 @@
 		background-color: #fff;
 		display: grid;
 		border-radius: 18rpx;
-	
+
 		.contactedBox {
 			width: 660rpx;
 			height: 325rpx;
@@ -685,7 +735,7 @@
 			justify-content: center;
 			align-items: center;
 		}
-	
+
 		.contactBtn {
 			width: 660rpx;
 			height: 92rpx;
@@ -693,7 +743,7 @@
 			display: flex;
 			border-radius: 0 0 18rpx 18rpx;
 			// margin-top: 40rpx;
-	
+
 			.tactBtnBox {
 				width: 330rpx;
 				height: 92rpx;
@@ -702,7 +752,7 @@
 				align-items: center;
 				justify-content: center;
 			}
-			
+
 			.tactBtnBox2 {
 				width: 330rpx;
 				height: 92rpx;
@@ -712,9 +762,9 @@
 				justify-content: center;
 			}
 		}
-	
+
 	}
-	
+
 	.checkedLabel {
 		width: 690rpx;
 		display: flex;
@@ -726,10 +776,10 @@
 		align-items: center;
 
 		.tagLab {
-			width: 197rpx;
+			width: 182rpx;
 			height: 30rpx;
-			margin-right: 20rpx;
-			margin-bottom: 20rpx;
+			margin-right: 8rpx;
+			margin-top: 20rpx;
 			// display: grid;
 			// box-sizing: border-box;
 			// column-gap: 20rpx;
@@ -747,7 +797,7 @@
 
 	.container {
 		.backImg {
-			height: 90vh;
+			height: 78vh;
 			// background: linear-gradient(to bottom, #F1F2F8 0%, #F1F2F8 50%, #FFFFFF 100%);
 			width: 100%;
 			background-color: #f7f7f7;
diff --git a/pages/goods/components/detail/detail-tabbar.vue b/pages/goods/components/detail/detail-tabbar.vue
index 1fd4e1b..8bc3108 100644
--- a/pages/goods/components/detail/detail-tabbar.vue
+++ b/pages/goods/components/detail/detail-tabbar.vue
@@ -2,7 +2,7 @@
   <su-fixed bottom placeholder bg="bg-white">
     <view class="ui-tabbar-box">
       <view class="ui-tabbar ss-flex ss-col-center ss-row-between">
-        <view
+       <!-- <view
           v-if="collectIcon"
           class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
           @tap="onFavorite"
@@ -23,7 +23,7 @@
             ></image>
             <view class="item-title">收藏</view>
           </block>
-        </view>
+        </view> 
         <view
           v-if="serviceIcon"
           class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
@@ -35,7 +35,7 @@
             mode="aspectFit"
           ></image>
           <view class="item-title">客服</view>
-        </view>
+        </view>-->
         <view
           v-if="shareIcon"
           class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
diff --git a/pages/index/fabu.vue b/pages/index/fabu.vue
index fd17d9b..b99d000 100644
--- a/pages/index/fabu.vue
+++ b/pages/index/fabu.vue
@@ -134,7 +134,7 @@
 					</view>
 					
 					<!-- <view class="width:100%;height:200rpx"></view> -->
-					<view style="height: 370rpx;width: 100%;color: #f7f7f7;"></view>
+					<view style="height: 200rpx;width: 100%;color: #f7f7f7;"></view>
 				</view>
 				
 				
@@ -147,7 +147,7 @@
 					<view v-if="agreeAdd == false" style="width: 31rpx;height: 32rpx;
 					border: 2rpx solid #999999;border-radius: 50%;" @click="show = true"></view>
 					<image v-if="agreeAdd == true" style="width: 32rpx;height: 32rpx;"
-						src="https://jiangxiaoxian.0rui.cn/fbxySelected.png"></image>
+						src="https://jiangxiaoxian.0rui.cn/fbxySelected.png" @click="agreeAdd = false"></image>
 					<view style="font-size: 22rpx;line-height: 31rpx;color: #9C9C9C;display: flex;
 					justify-content: center;align-items: center;margin-left: 20rpx;" @click="show = true">我已阅读并同意
 						<view style="margin-left: 6rpx;color: #FCC74E;font-size: 22rpx;line-height: 31rpx;">《发布须知》
@@ -694,6 +694,7 @@
 			console.log('发布成功');
 			agreeAdd.value = false;
 			selectTagslist.value = []
+			tagSelectedNum.value = 0;
 			form.value = {
 				title: '',
 				area: '',
@@ -724,8 +725,13 @@
 			uni.switchTab({
 				url: '/pages/index/user'
 			})
+		}else {
+			uni.showToast({
+				title: res.msg,
+				icon: 'error'
+			})
 		}
-
+		
 	}
 </script>
 
diff --git a/pages/user/goods-collect.vue b/pages/user/goods-collect.vue
index b132fc6..077daa3 100644
--- a/pages/user/goods-collect.vue
+++ b/pages/user/goods-collect.vue
@@ -13,7 +13,7 @@
 
 				<!-- 食堂招租 -->
 				<view class="recommend-box" v-if="currentTab == 0">
-					<view class="rrecommList" v-for="(item,index) in collectRentList" :key="index">
+					<view class="rrecommList" v-for="(item,index) in collectRentList" :key="index" @click="toDetail(item)">
 						<view class="reListItem">
 							<!-- 左侧图片 -->
 							<view class="listItem-images">
@@ -65,7 +65,7 @@
 				<!-- 平台课程 -->
 				<view class="exChangeBox" v-if="currentTab == 1">
 					<view class="couponsList">
-						<view class="list-item" v-for="(item,index) in collectSchoolList" :key="index">
+						<view class="list-item" v-for="(item,index) in collectSchoolList" :key="index" @click="toDetail(item)">
 							<image style="width: 330rpx;height: 200rpx;border-radius: 18rpx 18rpx 0 0;"
 								:src="item.image">
 							</image>
@@ -341,6 +341,22 @@
 			})
 		}
 	}
+	
+	function toDetail(e) {
+		console.log('跳转详情', e,currentTab.value);
+		if(currentTab.value == 0) {
+			console.log('收藏-招租');
+			uni.navigateTo({
+				url: '/pages/canteenRent/rentDetail?id=' + e.id
+			})
+		}else {
+			console.log('收藏-课程');
+			uni.navigateTo({
+				url:'/pages/school/classesDetail?id=' + e.id
+			})
+		}
+		
+	}
 
 	onReachBottom(() => {});
 	onLoad(() => {
diff --git a/sheep/components/s-uploader/s-uploader.vue b/sheep/components/s-uploader/s-uploader.vue
index d2fe143..1a0c053 100644
--- a/sheep/components/s-uploader/s-uploader.vue
+++ b/sheep/components/s-uploader/s-uploader.vue
@@ -1,693 +1,692 @@
 <template>
-  <view class="uni-file-picker">
-    <view v-if="title" class="uni-file-picker__header">
-      <text class="file-title">{{ title }}</text>
-      <text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
-    </view>
-    <view v-if="subtitle" class="file-subtitle">
-      <view>{{ subtitle }}</view>
-    </view>
-    <upload-image
-      v-if="fileMediatype === 'image' && showType === 'grid'"
-      :readonly="readonly"
-      :image-styles="imageStyles"
-      :files-list="url"
-      :limit="limitLength"
-      :disablePreview="disablePreview"
-      :delIcon="delIcon"
-      @uploadFiles="uploadFiles"
-      @choose="choose"
-      @delFile="delFile"
-    >
-      <slot>
-        <view class="is-add">
-          <!-- <image :src="imgsrc" class="add-icon"></image> -->
-		  <image src="https://jiangxiaoxian.0rui.cn/fabuAddImg.png" mode="widthFix"
-		  	style="width: 44rpx;height: 44rpx;" />
-		  <span class="texts">添加图片</span>
-        </view>
-      </slot>
-    </upload-image>
-    <upload-file
-      v-if="fileMediatype !== 'image' || showType !== 'grid'"
-      :readonly="readonly"
-      :list-styles="listStyles"
-      :files-list="filesList"
-      :showType="showType"
-      :delIcon="delIcon"
-      @uploadFiles="uploadFiles"
-      @choose="choose"
-      @delFile="delFile"
-    >
-      <slot><button type="primary" size="mini">选择文件</button></slot>
-    </upload-file>
-  </view>
+	<view class="uni-file-picker">
+		<view v-if="title" class="uni-file-picker__header">
+			<text class="file-title">{{ title }}</text>
+			<text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
+		</view>
+		<view v-if="subtitle" class="file-subtitle">
+			<view>{{ subtitle }}</view>
+		</view>
+		<upload-image v-if="fileMediatype === 'image' && showType === 'grid'" :readonly="readonly"
+			:image-styles="imageStyles" :files-list="url" :limit="limitLength" :disablePreview="disablePreview"
+			:delIcon="delIcon" @uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
+			<slot>
+				<view class="is-add">
+					<!-- <image :src="imgsrc" class="add-icon"></image> -->
+					<image src="https://jiangxiaoxian.0rui.cn/fabuAddImg.png" mode="widthFix"
+						style="width: 44rpx;height: 44rpx;" />
+					<span class="texts">添加图片</span>
+				</view>
+			</slot>
+		</upload-image>
+		<upload-file v-if="fileMediatype !== 'image' || showType !== 'grid'" :readonly="readonly"
+			:list-styles="listStyles" :files-list="filesList" :showType="showType" :delIcon="delIcon"
+			@uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
+			<slot><button type="primary" size="mini">选择文件</button></slot>
+		</upload-file>
+	</view>
 </template>
 
 <script>
-  import { chooseAndUploadFile, uploadCloudFiles } from './choose-and-upload-file.js';
-  import {
-    get_file_ext,
-    get_extname,
-    get_files_and_is_max,
-    get_file_info,
-    get_file_data,
-  } from './utils.js';
-  import uploadImage from './upload-image.vue';
-  import uploadFile from './upload-file.vue';
-  import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
+	import {
+		chooseAndUploadFile,
+		uploadCloudFiles
+	} from './choose-and-upload-file.js';
+	import {
+		get_file_ext,
+		get_extname,
+		get_files_and_is_max,
+		get_file_info,
+		get_file_data,
+	} from './utils.js';
+	import uploadImage from './upload-image.vue';
+	import uploadFile from './upload-file.vue';
+	import sheep from '@/sheep';
+	import {
+		isEmpty
+	} from 'lodash';
 
-  let fileInput = null;
-  /**
-   * FilePicker 文件选择上传
-   * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
-   * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
-   * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
-   * @property {String|Array}	url	  url数据
-   * @property {Boolean}	disabled = [true|false]	组件禁用
-   * 	@value true 	禁用
-   * 	@value false 	取消禁用
-   * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
-   * 	@value true 	只读
-   * 	@value false 	取消只读
-   * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
-   * 	@value true 	禁用图片预览
-   * 	@value false 	取消禁用图片预览
-   * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
-   * 	@value true 	显示删除按钮
-   * 	@value false 	不显示删除按钮
-   * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
-   * 	@value true 	自动上传
-   * 	@value false 	取消自动上传
-   * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
-   * @property {String}	title	组件标题，右侧显示上传计数
-   * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
-   * 	@value list 	列表显示
-   * 	@value grid 	宫格显示
-   * @property {String}	file-mediatype = [image|video|all]	选择文件类型
-   * 	@value image	只选择图片
-   * 	@value video	只选择视频
-   * 	@value all		选择所有文件
-   * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
-   * @property {Object}	list-style	mode:list 时的样式
-   * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
-   * @event {Function} select 	选择文件后触发
-   * @event {Function} progress 文件上传时触发
-   * @event {Function} success 	上传成功触发
-   * @event {Function} fail 		上传失败触发
-   * @event {Function} delete 	文件从列表移除时触发
-   */
-  export default {
-    name: 'sUploader',
-    components: {
-      uploadImage,
-      uploadFile,
-    },
-    options: {
-      virtualHost: true,
-    },
-    emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'update:url'],
-    props: {
-      modelValue: {
-        type: [Array, Object],
-        default() {
-          return [];
-        },
-      },
-      url: {
-        type: [Array, String],
-        default() {
-          return [];
-        },
-      },
-      disabled: {
-        type: Boolean,
-        default: false,
-      },
-      disablePreview: {
-        type: Boolean,
-        default: false,
-      },
-      delIcon: {
-        type: Boolean,
-        default: true,
-      },
-      // 自动上传
-      autoUpload: {
-        type: Boolean,
-        default: true,
-      },
-      // 最大选择个数 ，h5只能限制单选或是多选
-      limit: {
-        type: [Number, String],
-        default: 9,
-      },
-      // 列表样式 grid | list | list-card
-      mode: {
-        type: String,
-        default: 'grid',
-      },
-      // 选择文件类型  image/video/all
-      fileMediatype: {
-        type: String,
-        default: 'image',
-      },
-      // 文件类型筛选
-      fileExtname: {
-        type: [Array, String],
-        default() {
-          return [];
-        },
-      },
-      title: {
-        type: String,
-        default: '',
-      },
-      listStyles: {
-        type: Object,
-        default() {
-          return {
-            // 是否显示边框
-            border: true,
-            // 是否显示分隔线
-            dividline: true,
-            // 线条样式
-            borderStyle: {},
-          };
-        },
-      },
-      imageStyles: {
-        type: Object,
-        default() {
-          return {
-            width: 'auto',
-            height: 'auto',
-          };
-        },
-      },
-      readonly: {
-        type: Boolean,
-        default: false,
-      },
-      sizeType: {
-        type: Array,
-        default() {
-          return ['original', 'compressed'];
-        },
-      },
-      driver: {
-        type: String,
-        default: 'local', // local=本地 | oss | unicloud
-      },
-      subtitle: {
-        type: String,
-        default: '',
-      },
-    },
-    data() {
-      return {
-        files: [],
-        localValue: [],
-        imgsrc: sheep.$url.static('/assets/addons/shopro/uniapp/upload-camera.png'),
-      };
-    },
-    watch: {
-      modelValue: {
-        handler(newVal, oldVal) {
-          this.setValue(newVal, oldVal);
-        },
-        immediate: true,
-      },
-    },
-    computed: {
-      returnType() {
-        if (this.limit > 1) {
-          return 'array';
-        }
-        return 'object';
-      },
-      filesList() {
-        let files = [];
-        this.files.forEach((v) => {
-          files.push(v);
-        });
-        return files;
-      },
-      showType() {
-        if (this.fileMediatype === 'image') {
-          return this.mode;
-        }
-        return 'list';
-      },
-      limitLength() {
-        if (this.returnType === 'object') {
-          return 1;
-        }
-        if (!this.limit) {
-          return 1;
-        }
-        if (this.limit >= 9) {
-          return 9;
-        }
-        return this.limit;
-      },
-    },
-    created() {
-      if (this.driver === 'local') {
-        uniCloud.chooseAndUploadFile = chooseAndUploadFile;
-      }
-      this.form = this.getForm('uniForms');
-      this.formItem = this.getForm('uniFormsItem');
-      if (this.form && this.formItem) {
-        if (this.formItem.name) {
-          this.rename = this.formItem.name;
-          this.form.inputChildrens.push(this);
-        }
-      }
-    },
-    methods: {
-      /**
-       * 公开用户使用，清空文件
-       * @param {Object} index
-       */
-      clearFiles(index) {
-        if (index !== 0 && !index) {
-          this.files = [];
-          this.$nextTick(() => {
-            this.setEmit();
-          });
-        } else {
-          this.files.splice(index, 1);
-        }
-        this.$nextTick(() => {
-          this.setEmit();
-        });
-      },
-      /**
-       * 公开用户使用，继续上传
-       */
-      upload() {
-        let files = [];
-        this.files.forEach((v, index) => {
-          if (v.status === 'ready' || v.status === 'error') {
-            files.push(Object.assign({}, v));
-          }
-        });
-        return this.uploadFiles(files);
-      },
-      async setValue(newVal, oldVal) {
-        const newData = async (v) => {
-          const reg = /cloud:\/\/([\w.]+\/?)\S*/;
-          let url = '';
-          if (v.fileID) {
-            url = v.fileID;
-          } else {
-            url = v.url;
-          }
-          if (reg.test(url)) {
-            v.fileID = url;
-            v.url = await this.getTempFileURL(url);
-          }
-          if (v.url) v.path = v.url;
-          return v;
-        };
-        if (this.returnType === 'object') {
-          if (newVal) {
-            await newData(newVal);
-          } else {
-            newVal = {};
-          }
-        } else {
-          if (!newVal) newVal = [];
-          for (let i = 0; i < newVal.length; i++) {
-            let v = newVal[i];
-            await newData(v);
-          }
-        }
-        this.localValue = newVal;
-        if (this.form && this.formItem && !this.is_reset) {
-          this.is_reset = false;
-          this.formItem.setValue(this.localValue);
-        }
-        let filesData = Object.keys(newVal).length > 0 ? newVal : [];
-        this.files = [].concat(filesData);
-      },
+	let fileInput = null;
+	/**
+	 * FilePicker 文件选择上传
+	 * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
+	 * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
+	 * @property {String|Array}	url	  url数据
+	 * @property {Boolean}	disabled = [true|false]	组件禁用
+	 * 	@value true 	禁用
+	 * 	@value false 	取消禁用
+	 * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
+	 * 	@value true 	只读
+	 * 	@value false 	取消只读
+	 * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
+	 * 	@value true 	禁用图片预览
+	 * 	@value false 	取消禁用图片预览
+	 * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
+	 * 	@value true 	显示删除按钮
+	 * 	@value false 	不显示删除按钮
+	 * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
+	 * 	@value true 	自动上传
+	 * 	@value false 	取消自动上传
+	 * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
+	 * @property {String}	title	组件标题，右侧显示上传计数
+	 * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
+	 * 	@value list 	列表显示
+	 * 	@value grid 	宫格显示
+	 * @property {String}	file-mediatype = [image|video|all]	选择文件类型
+	 * 	@value image	只选择图片
+	 * 	@value video	只选择视频
+	 * 	@value all		选择所有文件
+	 * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
+	 * @property {Object}	list-style	mode:list 时的样式
+	 * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
+	 * @event {Function} select 	选择文件后触发
+	 * @event {Function} progress 文件上传时触发
+	 * @event {Function} success 	上传成功触发
+	 * @event {Function} fail 		上传失败触发
+	 * @event {Function} delete 	文件从列表移除时触发
+	 */
+	export default {
+		name: 'sUploader',
+		components: {
+			uploadImage,
+			uploadFile,
+		},
+		options: {
+			virtualHost: true,
+		},
+		emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'update:url'],
+		props: {
+			modelValue: {
+				type: [Array, Object],
+				default () {
+					return [];
+				},
+			},
+			url: {
+				type: [Array, String],
+				default () {
+					return [];
+				},
+			},
+			disabled: {
+				type: Boolean,
+				default: false,
+			},
+			disablePreview: {
+				type: Boolean,
+				default: false,
+			},
+			delIcon: {
+				type: Boolean,
+				default: true,
+			},
+			// 自动上传
+			autoUpload: {
+				type: Boolean,
+				default: true,
+			},
+			// 最大选择个数 ，h5只能限制单选或是多选
+			limit: {
+				type: [Number, String],
+				default: 9,
+			},
+			// 列表样式 grid | list | list-card
+			mode: {
+				type: String,
+				default: 'grid',
+			},
+			// 选择文件类型  image/video/all
+			fileMediatype: {
+				type: String,
+				default: 'image',
+			},
+			// 文件类型筛选
+			fileExtname: {
+				type: [Array, String],
+				default () {
+					return [];
+				},
+			},
+			title: {
+				type: String,
+				default: '',
+			},
+			listStyles: {
+				type: Object,
+				default () {
+					return {
+						// 是否显示边框
+						border: true,
+						// 是否显示分隔线
+						dividline: true,
+						// 线条样式
+						borderStyle: {},
+					};
+				},
+			},
+			imageStyles: {
+				type: Object,
+				default () {
+					return {
+						width: 'auto',
+						height: 'auto',
+					};
+				},
+			},
+			readonly: {
+				type: Boolean,
+				default: false,
+			},
+			sizeType: {
+				type: Array,
+				default () {
+					return ['original', 'compressed'];
+				},
+			},
+			driver: {
+				type: String,
+				default: 'local', // local=本地 | oss | unicloud
+			},
+			subtitle: {
+				type: String,
+				default: '',
+			},
+		},
+		data() {
+			return {
+				files: [],
+				localValue: [],
+				imgsrc: sheep.$url.static('/assets/addons/shopro/uniapp/upload-camera.png'),
+			};
+		},
+		watch: {
+			modelValue: {
+				handler(newVal, oldVal) {
+					this.setValue(newVal, oldVal);
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			returnType() {
+				if (this.limit > 1) {
+					return 'array';
+				}
+				return 'object';
+			},
+			filesList() {
+				let files = [];
+				this.files.forEach((v) => {
+					files.push(v);
+				});
+				return files;
+			},
+			showType() {
+				if (this.fileMediatype === 'image') {
+					return this.mode;
+				}
+				return 'list';
+			},
+			limitLength() {
+				if (this.returnType === 'object') {
+					return 1;
+				}
+				if (!this.limit) {
+					return 1;
+				}
+				if (this.limit >= 9) {
+					return 9;
+				}
+				return this.limit;
+			},
+		},
+		created() {
+			if (this.driver === 'local') {
+				uniCloud.chooseAndUploadFile = chooseAndUploadFile;
+			}
+			this.form = this.getForm('uniForms');
+			this.formItem = this.getForm('uniFormsItem');
+			if (this.form && this.formItem) {
+				if (this.formItem.name) {
+					this.rename = this.formItem.name;
+					this.form.inputChildrens.push(this);
+				}
+			}
+		},
+		methods: {
+			/**
+			 * 公开用户使用，清空文件
+			 * @param {Object} index
+			 */
+			clearFiles(index) {
+				if (index !== 0 && !index) {
+					this.files = [];
+					this.$nextTick(() => {
+						this.setEmit();
+					});
+				} else {
+					this.files.splice(index, 1);
+				}
+				this.$nextTick(() => {
+					this.setEmit();
+				});
+			},
+			/**
+			 * 公开用户使用，继续上传
+			 */
+			upload() {
+				let files = [];
+				this.files.forEach((v, index) => {
+					if (v.status === 'ready' || v.status === 'error') {
+						files.push(Object.assign({}, v));
+					}
+				});
+				return this.uploadFiles(files);
+			},
+			async setValue(newVal, oldVal) {
+				console.log('初始化或更新组件的内部数据',newVal);
+				console.log('初始化或更新组件的内部数据',oldVal);
+				const newData = async (v) => {
+					const reg = /cloud:\/\/([\w.]+\/?)\S*/;
+					let url = '';
+					if (v.fileID) {
+						url = v.fileID;
+					} else {
+						url = v.url;
+					}
+					if (reg.test(url)) {
+						v.fileID = url;
+						v.url = await this.getTempFileURL(url);
+					}
+					if (v.url) v.path = v.url;
+					return v;
+				};
+				if (this.returnType === 'object') {
+					if (newVal) {
+						await newData(newVal);
+					} else {
+						newVal = {};
+					}
+				} else {
+					if (!newVal) newVal = [];
+					for (let i = 0; i < newVal.length; i++) {
+						let v = newVal[i];
+						await newData(v);
+					}
+				}
+				this.localValue = newVal;
+				if (this.form && this.formItem && !this.is_reset) {
+					this.is_reset = false;
+					this.formItem.setValue(this.localValue);
+				}
+				let filesData = Object.keys(newVal).length > 0 ? newVal : [];
+				this.files = [].concat(filesData);
+			},
 
-      /**
-       * 选择文件
-       */
-      choose() {
-        if (this.disabled) return;
-        if (
-          this.files.length >= Number(this.limitLength) &&
-          this.showType !== 'grid' &&
-          this.returnType === 'array'
-        ) {
-          uni.showToast({
-            title: `您最多选择 ${this.limitLength} 个文件`,
-            icon: 'none',
-          });
-          return;
-        }
-        this.chooseFiles();
-      },
+			/**
+			 * 选择文件
+			 */
+			choose() {
+				if (this.disabled) return;
+				if (
+					this.files.length >= Number(this.limitLength) &&
+					this.showType !== 'grid' &&
+					this.returnType === 'array'
+				) {
+					uni.showToast({
+						title: `您最多选择 ${this.limitLength} 个文件`,
+						icon: 'none',
+					});
+					return;
+				}
+				this.chooseFiles();
+			},
 
-      /**
-       * 选择文件并上传
-       */
-      chooseFiles() {
-        const _extname = get_extname(this.fileExtname);
-        // 获取后缀
-        uniCloud
-          .chooseAndUploadFile({
-            type: this.fileMediatype,
-            compressed: false,
-            sizeType: this.sizeType,
-            // TODO 如果为空，video 有问题
-            extension: _extname.length > 0 ? _extname : undefined,
-            count: this.limitLength - this.files.length, //默认9
-            onChooseFile: this.chooseFileCallback,
-            onUploadProgress: (progressEvent) => {
-              this.setProgress(progressEvent, progressEvent.index);
-            },
-          })
-          .then((result) => {
-            this.setSuccessAndError(result.tempFiles);
-          })
-          .catch((err) => {
-            console.log('选择失败', err);
-          });
-      },
+			/**
+			 * 选择文件并上传
+			 */
+			chooseFiles() {
+				const _extname = get_extname(this.fileExtname);
+				// 获取后缀
+				uniCloud
+					.chooseAndUploadFile({
+						type: this.fileMediatype,
+						compressed: false,
+						sizeType: this.sizeType,
+						// TODO 如果为空，video 有问题
+						extension: _extname.length > 0 ? _extname : undefined,
+						count: this.limitLength - this.files.length, //默认9
+						onChooseFile: this.chooseFileCallback,
+						onUploadProgress: (progressEvent) => {
+							this.setProgress(progressEvent, progressEvent.index);
+						},
+					})
+					.then((result) => {
+						this.setSuccessAndError(result.tempFiles);
+					})
+					.catch((err) => {
+						console.log('选择失败', err);
+					});
+			},
 
-      /**
-       * 选择文件回调
-       * @param {Object} res
-       */
-      async chooseFileCallback(res) {
-        const _extname = get_extname(this.fileExtname);
-        const is_one =
-          (Number(this.limitLength) === 1 && this.disablePreview && !this.disabled) ||
-          this.returnType === 'object';
-        // 如果这有一个文件 ，需要清空本地缓存数据
-        if (is_one) {
-          this.files = [];
-        }
+			/**
+			 * 选择文件回调
+			 * @param {Object} res
+			 */
+			async chooseFileCallback(res) {
+				const _extname = get_extname(this.fileExtname);
+				const is_one =
+					(Number(this.limitLength) === 1 && this.disablePreview && !this.disabled) ||
+					this.returnType === 'object';
+				// 如果这有一个文件 ，需要清空本地缓存数据
+				if (is_one) {
+					this.files = [];
+				}
 
-        let { filePaths, files } = get_files_and_is_max(res, _extname);
-        if (!(_extname && _extname.length > 0)) {
-          filePaths = res.tempFilePaths;
-          files = res.tempFiles;
-        }
+				let {
+					filePaths,
+					files
+				} = get_files_and_is_max(res, _extname);
+				if (!(_extname && _extname.length > 0)) {
+					filePaths = res.tempFilePaths;
+					files = res.tempFiles;
+				}
 
-        let currentData = [];
-        for (let i = 0; i < files.length; i++) {
-          if (this.limitLength - this.files.length <= 0) break;
-          files[i].uuid = Date.now();
-          let filedata = await get_file_data(files[i], this.fileMediatype);
-          filedata.progress = 0;
-          filedata.status = 'ready';
-          this.files.push(filedata);
-          currentData.push({
-            ...filedata,
-            file: files[i],
-          });
-        }
-        this.$emit('select', {
-          tempFiles: currentData,
-          tempFilePaths: filePaths,
-        });
-        res.tempFiles = files;
-        // 停止自动上传
-        if (!this.autoUpload) {
-          res.tempFiles = [];
-        }
-      },
+				let currentData = [];
+				for (let i = 0; i < files.length; i++) {
+					if (this.limitLength - this.files.length <= 0) break;
+					files[i].uuid = Date.now();
+					let filedata = await get_file_data(files[i], this.fileMediatype);
+					filedata.progress = 0;
+					filedata.status = 'ready';
+					this.files.push(filedata);
+					currentData.push({
+						...filedata,
+						file: files[i],
+					});
+				}
+				this.$emit('select', {
+					tempFiles: currentData,
+					tempFilePaths: filePaths,
+				});
+				res.tempFiles = files;
+				// 停止自动上传
+				if (!this.autoUpload) {
+					res.tempFiles = [];
+				}
+			},
 
-      /**
-       * 批传
-       * @param {Object} e
-       */
-      uploadFiles(files) {
-        files = [].concat(files);
-        return uploadCloudFiles
-          .call(this, files, 5, (res) => {
-            this.setProgress(res, res.index, true);
-          })
-          .then((result) => {
-            this.setSuccessAndError(result);
-            return result;
-          })
-          .catch((err) => {
-            console.log(err);
-          });
-      },
+			/**
+			 * 批传
+			 * @param {Object} e
+			 */
+			uploadFiles(files) {
+				files = [].concat(files);
+				return uploadCloudFiles
+					.call(this, files, 5, (res) => {
+						this.setProgress(res, res.index, true);
+					})
+					.then((result) => {
+						this.setSuccessAndError(result);
+						return result;
+					})
+					.catch((err) => {
+						console.log(err);
+					});
+			},
 
-      /**
-       * 成功或失败
-       */
-      async setSuccessAndError(res, fn) {
-        let successData = [];
-        let errorData = [];
-        let tempFilePath = [];
-        let errorTempFilePath = [];
-        for (let i = 0; i < res.length; i++) {
-          const item = res[i];
-          const index = item.uuid ? this.files.findIndex((p) => p.uuid === item.uuid) : item.index;
+			/**
+			 * 成功或失败
+			 */
+			async setSuccessAndError(res, fn) {
+				let successData = [];
+				let errorData = [];
+				let tempFilePath = [];
+				let errorTempFilePath = [];
+				for (let i = 0; i < res.length; i++) {
+					const item = res[i];
+					const index = item.uuid ? this.files.findIndex((p) => p.uuid === item.uuid) : item.index;
 
-          if (index === -1 || !this.files) break;
-          if (item.errMsg === 'request:fail') {
-            this.files[index].url = item.path;
-            this.files[index].status = 'error';
-            this.files[index].errMsg = item.errMsg;
-            // this.files[index].progress = -1
-            errorData.push(this.files[index]);
-            errorTempFilePath.push(this.files[index].url);
-          } else {
-            this.files[index].errMsg = '';
-            this.files[index].fileID = item.url;
-            const reg = /cloud:\/\/([\w.]+\/?)\S*/;
-            if (reg.test(item.url)) {
-              this.files[index].url = await this.getTempFileURL(item.url);
-            } else {
-              this.files[index].url = item.url;
-            }
+					if (index === -1 || !this.files) break;
+					if (item.errMsg === 'request:fail') {
+						this.files[index].url = item.path;
+						this.files[index].status = 'error';
+						this.files[index].errMsg = item.errMsg;
+						// this.files[index].progress = -1
+						errorData.push(this.files[index]);
+						errorTempFilePath.push(this.files[index].url);
+					} else {
+						this.files[index].errMsg = '';
+						this.files[index].fileID = item.url;
+						const reg = /cloud:\/\/([\w.]+\/?)\S*/;
+						if (reg.test(item.url)) {
+							this.files[index].url = await this.getTempFileURL(item.url);
+						} else {
+							this.files[index].url = item.url;
+						}
 
-            this.files[index].status = 'success';
-            this.files[index].progress += 1;
-            successData.push(this.files[index]);
-            tempFilePath.push(this.files[index].fileID);
-          }
-        }
+						this.files[index].status = 'success';
+						this.files[index].progress += 1;
+						successData.push(this.files[index]);
+						tempFilePath.push(this.files[index].fileID);
+					}
+				}
 
-        if (successData.length > 0) {
-          this.setEmit();
-          // 状态改变返回
-          this.$emit('success', {
-            tempFiles: this.backObject(successData),
-            tempFilePaths: tempFilePath,
-          });
-        }
+				if (successData.length > 0) {
+					this.setEmit();
+					// 状态改变返回
+					this.$emit('success', {
+						tempFiles: this.backObject(successData),
+						tempFilePaths: tempFilePath,
+					});
+				}
 
-        if (errorData.length > 0) {
-          this.$emit('fail', {
-            tempFiles: this.backObject(errorData),
-            tempFilePaths: errorTempFilePath,
-          });
-        }
-      },
+				if (errorData.length > 0) {
+					this.$emit('fail', {
+						tempFiles: this.backObject(errorData),
+						tempFilePaths: errorTempFilePath,
+					});
+				}
+			},
 
-      /**
-       * 获取进度
-       * @param {Object} progressEvent
-       * @param {Object} index
-       * @param {Object} type
-       */
-      setProgress(progressEvent, index, type) {
-        const fileLenth = this.files.length;
-        const percentNum = (index / fileLenth) * 100;
-        const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
-        let idx = index;
-        if (!type) {
-          idx = this.files.findIndex((p) => p.uuid === progressEvent.tempFile.uuid);
-        }
-        if (idx === -1 || !this.files[idx]) return;
-        // fix by mehaotian 100 就会消失，-1 是为了让进度条消失
-        this.files[idx].progress = percentCompleted - 1;
-        // 上传中
-        this.$emit('progress', {
-          index: idx,
-          progress: parseInt(percentCompleted),
-          tempFile: this.files[idx],
-        });
-      },
+			/**
+			 * 获取进度
+			 * @param {Object} progressEvent
+			 * @param {Object} index
+			 * @param {Object} type
+			 */
+			setProgress(progressEvent, index, type) {
+				const fileLenth = this.files.length;
+				const percentNum = (index / fileLenth) * 100;
+				const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+				let idx = index;
+				if (!type) {
+					idx = this.files.findIndex((p) => p.uuid === progressEvent.tempFile.uuid);
+				}
+				if (idx === -1 || !this.files[idx]) return;
+				// fix by mehaotian 100 就会消失，-1 是为了让进度条消失
+				this.files[idx].progress = percentCompleted - 1;
+				// 上传中
+				this.$emit('progress', {
+					index: idx,
+					progress: parseInt(percentCompleted),
+					tempFile: this.files[idx],
+				});
+			},
 
-      /**
-       * 删除文件
-       * @param {Object} index
-       */
-      delFile(index) {
-        if (!isEmpty(this.files)) {
-          this.$emit('delete', {
-            tempFile: this.files[index],
-            tempFilePath: this.files[index].url,
-          });
-          this.files.splice(index, 1);
-        } else {
-          this.$emit('delete', {
-            tempFilePath: this.url,
-          });
-        }
+			/**
+			 * 删除文件
+			 * @param {Object} index
+			 */
+			delFile(index) {
+				console.log('s-uploader——delFile',index,this.files);
+				if (!isEmpty(this.files)) {
+					console.log('s-uploader——!isEmpty',index,this.files);
+					this.$emit('delete', {
+						tempFile: this.files[index],
+						tempFilePath: this.files[index].url,
+					});
+					this.files.splice(index, 1);
+				} else {
+					console.log('s-uploader——!isEmpty',index,this.files);
+					this.$emit('delete', {
+						tempFilePath: this.url,
+						delIndex:index
+					});
+				}
 
-        this.$nextTick(() => {
-          this.setEmit();
-        });
-      },
+				this.$nextTick(() => {
+					this.setEmit();
+				});
+			},
 
-      /**
-       * 获取文件名和后缀
-       * @param {Object} name
-       */
-      getFileExt(name) {
-        const last_len = name.lastIndexOf('.');
-        const len = name.length;
-        return {
-          name: name.substring(0, last_len),
-          ext: name.substring(last_len + 1, len),
-        };
-      },
+			/**
+			 * 获取文件名和后缀
+			 * @param {Object} name
+			 */
+			getFileExt(name) {
+				const last_len = name.lastIndexOf('.');
+				const len = name.length;
+				return {
+					name: name.substring(0, last_len),
+					ext: name.substring(last_len + 1, len),
+				};
+			},
 
-      /**
-       * 处理返回事件
-       */
-      setEmit() {
-        let data = [];
-        let updateUrl = [];
-        if (this.returnType === 'object') {
-          data = this.backObject(this.files)[0];
-          this.localValue = data ? data : null;
-          updateUrl = data ? data.url : '';
-        } else {
-          data = this.backObject(this.files);
-          if (!this.localValue) {
-            this.localValue = [];
-          }
-          this.localValue = [...data];
-          if (this.localValue.length > 0) {
-            this.localValue.forEach((item) => {
-              updateUrl.push(item.url);
-            });
-          }
-        }
-        this.$emit('update:modelValue', this.localValue);
-        this.$emit('update:url', updateUrl);
-      },
+			/**
+			 * 处理返回事件
+			 */
+			setEmit() {
+				let data = [];
+				let updateUrl = [];
+				if (this.returnType === 'object') {
+					data = this.backObject(this.files)[0];
+					this.localValue = data ? data : null;
+					updateUrl = data ? data.url : '';
+				} else {
+					data = this.backObject(this.files);
+					if (!this.localValue) {
+						this.localValue = [];
+					}
+					this.localValue = [...data];
+					if (this.localValue.length > 0) {
+						this.localValue.forEach((item) => {
+							updateUrl.push(item.url);
+						});
+					}
+				}
+				this.$emit('update:modelValue', this.localValue);
+				this.$emit('update:url', updateUrl);
+			},
 
-      /**
-       * 处理返回参数
-       * @param {Object} files
-       */
-      backObject(files) {
-        let newFilesData = [];
-        files.forEach((v) => {
-          newFilesData.push({
-            extname: v.extname,
-            fileType: v.fileType,
-            image: v.image,
-            name: v.name,
-            path: v.path,
-            size: v.size,
-            fileID: v.fileID,
-            url: v.url,
-          });
-        });
-        return newFilesData;
-      },
-      async getTempFileURL(fileList) {
-        fileList = {
-          fileList: [].concat(fileList),
-        };
-        const urls = await uniCloud.getTempFileURL(fileList);
-        return urls.fileList[0].tempFileURL || '';
-      },
-      /**
-       * 获取父元素实例
-       */
-      getForm(name = 'uniForms') {
-        let parent = this.$parent;
-        let parentName = parent.$options.name;
-        while (parentName !== name) {
-          parent = parent.$parent;
-          if (!parent) return false;
-          parentName = parent.$options.name;
-        }
-        return parent;
-      },
-    },
-  };
+			/**
+			 * 处理返回参数
+			 * @param {Object} files
+			 */
+			backObject(files) {
+				let newFilesData = [];
+				files.forEach((v) => {
+					newFilesData.push({
+						extname: v.extname,
+						fileType: v.fileType,
+						image: v.image,
+						name: v.name,
+						path: v.path,
+						size: v.size,
+						fileID: v.fileID,
+						url: v.url,
+					});
+				});
+				return newFilesData;
+			},
+			async getTempFileURL(fileList) {
+				fileList = {
+					fileList: [].concat(fileList),
+				};
+				const urls = await uniCloud.getTempFileURL(fileList);
+				return urls.fileList[0].tempFileURL || '';
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-  .uni-file-picker {
-    /* #ifndef APP-NVUE */
-    box-sizing: border-box;
-    overflow: hidden;
-    /* width: 100%; */
-    /* #endif */
-    /* flex: 1; */
-    position: relative;
-  }
-
-  .uni-file-picker__header {
-    padding-top: 5px;
-    padding-bottom: 10px;
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    justify-content: space-between;
-  }
-
-  .file-title {
-    font-size: 14px;
-    color: #333;
-  }
-
-  .file-count {
-    font-size: 14px;
-    color: #999;
-  }
-
-  .is-add {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    align-items: center;
-	flex-flow: column;
-    justify-content: center;
-	
-	.texts {
-		margin-top: 20rpx;
-		font-size: 24rpx;
-		color: #3D3D3D;
+	.uni-file-picker {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		overflow: hidden;
+		/* width: 100%; */
+		/* #endif */
+		/* flex: 1; */
+		position: relative;
 	}
-  }
-  .add-icon {
-    width: 57rpx;
-    height: 49rpx;
-  }
-  .file-subtitle {
-    position: absolute;
-    left: 50%;
-    transform: translateX(-50%);
-    bottom: 0;
-    width: 140rpx;
-    height: 36rpx;
-    z-index: 1;
-    display: flex;
-    justify-content: center;
-    color: #fff;
-    font-weight: 500;
-    background: rgba(#000, 0.3);
-    font-size: 24rpx;
-  }
-</style>
+
+	.uni-file-picker__header {
+		padding-top: 5px;
+		padding-bottom: 10px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: space-between;
+	}
+
+	.file-title {
+		font-size: 14px;
+		color: #333;
+	}
+
+	.file-count {
+		font-size: 14px;
+		color: #999;
+	}
+
+	.is-add {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		flex-flow: column;
+		justify-content: center;
+
+		.texts {
+			margin-top: 20rpx;
+			font-size: 24rpx;
+			color: #3D3D3D;
+		}
+	}
+
+	.add-icon {
+		width: 57rpx;
+		height: 49rpx;
+	}
+
+	.file-subtitle {
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+		width: 140rpx;
+		height: 36rpx;
+		z-index: 1;
+		display: flex;
+		justify-content: center;
+		color: #fff;
+		font-weight: 500;
+		background: rgba(#000, 0.3);
+		font-size: 24rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-uploader/upload-image.vue b/sheep/components/s-uploader/upload-image.vue
index 9d9beb1..659977a 100644
--- a/sheep/components/s-uploader/upload-image.vue
+++ b/sheep/components/s-uploader/upload-image.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="uni-file-picker__container">
 		<!-- <view class="file-picker__box" v-for="(url, index) in list" :key="index" :style="boxStyle" width: 196rpx;height: 196rpx;> -->
-		<view class="file-picker__box" v-for="(url, index) in list" :key="index" :style="boxStyle" >
+		<view class="file-picker__box" v-for="(url, index) in list" :key="index" :style="boxStyle">
 			<!-- <view class="file-picker__box-content" :style="borderStyle"> -->
 			<view class="file-picker__box-content" :style="borderStyle">
 				<image class="file-image" :src="getImageUrl(url)" mode="aspectFill"
@@ -153,6 +153,13 @@
 		},
 		methods: {
 			getImageUrl(url) {
+				console.log('getImageUrl', url);
+				// 若URL已包含http/https，直接返回（不处理）
+				if (url.startsWith('http://') || url.startsWith('https://')) {
+					return url;
+				}else {
+					return sheep.$url.cdn(url);
+				}
 				if ('blob:http:' === url.substr(0, 10)) {
 					return url;
 				} else {
@@ -166,6 +173,7 @@
 				this.$emit('choose');
 			},
 			delFile(index) {
+				console.log('uploader-image——delFile');
 				this.$emit('delFile', index);
 			},
 			previewImage(img, index) {