From 94c18bcc09ac880dcef2e840f794b5bbd174dbbe Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Sat, 14 Jan 2023 17:41:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/request.js     |  6 +++---
 components/form.vue   | 21 ++++++++++++++++-----
 pages/massif/info.vue |  3 ++-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/common/request.js b/common/request.js
index f25c4b0..b56a794 100644
--- a/common/request.js
+++ b/common/request.js
@@ -1,11 +1,11 @@
 import store from "@/store"
 
-function host(host='default'){
+export function host(host='default',suffix='/plant_manage'){
 	return(
 		process.env.NODE_ENV === 'development'?{
-			default:"http://qv6mj8.natappfree.cc/plant_manage"
+			default:`http://qv6mj8.natappfree.cc${suffix}`
 		}:{
-			default:"http://vtm3hk.natappfree.cc/plant_manage"
+			default:`http://qv6mj8.natappfree.cc${suffix}`
 		}
 	)[host]
 }
diff --git a/components/form.vue b/components/form.vue
index f556940..250deb0 100644
--- a/components/form.vue
+++ b/components/form.vue
@@ -147,7 +147,7 @@
 				<button v-if="btnText" @click="btnFun" class="cu-btn bg-green shadow">{{btnText}}</button>
 			</view>
 			<view v-if="type=='select'" class="plant-youbian" :class="{noData:!/^\d+$/.test(value)}" @click="show=true">{{/^\d+$/.test(value)&&columns[0][value][keyName]||placeholder||`请选择${label}`}}</view>
-			<u-upload v-if="type=='upImg'" :fileList="imgList" previewFullImage multiple :maxCount="num" @delete="delImg" @afterRead="afterRead">
+			<u-upload v-if="type=='upImg'" :fileList="imgs" previewFullImage multiple :maxCount="num" @delete="delImg" @afterRead="afterRead">
 				<view class="album">
 					<text class="plant-paizhao">添加照片</text>
 				</view>
@@ -198,7 +198,7 @@
 </template>
 
 <script>
-import request from '@/common/request'
+import request,{host} from '@/common/request'
 	export default{
 		props:{
 			label:{
@@ -274,6 +274,10 @@ import request from '@/common/request'
 			},
 			minDate(){
 				if(this.type=='dateRange' && this.dateType=='end' && this.value[0])return new Date(this.value[0]).getTime();
+			},
+			imgs(){
+				if(this.type=='upImg')return this.value.map((v,index)=>({url:`${host(null,"/sys/common/static")}/${v}`,status:"success",index,type:'saved'})).concat(this.imgList.map((v,index)=>Object.assign(v,{index,type:'unsaved'})))
+				return []
 			}
 		},
 		methods:{
@@ -286,11 +290,12 @@ import request from '@/common/request'
 					var res=await request('/sys/common/upload',{
 						file:e.file[i]
 					})
-					if(res.statu){
+					if(res.statu ||true){
 						this.imgList.some((v,k)=>{
 							if(v==e.file[i]){
 								v.status='success'
 								v.message=''
+								v.tempUrl=res.data.data
 								this.$set(this.imgList,k,this.imgList[k])
 								return true
 							}
@@ -300,9 +305,15 @@ import request from '@/common/request'
 						this.imgList=this.imgList.filter(v=>!v==e.file[i])
 					}
 				}
+				this.$emit('imgs',this.imgs.map(v=>({saved:v.url,unsaved:v.tempUrl})[v.type]))
 			},
-			delImg(e){
-				console.log(e,'------------delImg----------')
+			delImg({file}){
+				if(file.type=='unsaved'){
+					this.imgList.splice(file.index,1)
+				}else{
+					this.$emit("input",this.value.filter(v=>v.index!=file.index).map(v=>v.url))
+				}
+				this.$emit('imgs',this.imgs.map(v=>({saved:v.url,unsaved:v.tempUrl})[v.type]))
 			},
 		},
 	}
diff --git a/pages/massif/info.vue b/pages/massif/info.vue
index 717c996..e100832 100644
--- a/pages/massif/info.vue
+++ b/pages/massif/info.vue
@@ -16,7 +16,8 @@
 				:field="k"
 				:value="({dateRange:fields.date.value})[v.type||'text']||formData[k]"
 				@input="formData[k]=$event"
-				@selectRDate="selectDate"/>
+				@selectRDate="selectDate"
+				@imgs="fields[k].value=$event"/>
 		</u-form>
 		<button class="cu-btn round bg-green shadow submit" @click="sumbit">保存</button>
 	</view>