From 3874ec783bda0fb1833ca3faf7b3a8c684c34513 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sat, 27 Jan 2024 17:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tpx-date-input/tpx-date-input.vue | 12 +--
 components/tpx-upload/tpx-upload.vue         | 85 +++++++++-----------
 pages/goods/edit.vue                         |  5 +-
 3 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/components/tpx-date-input/tpx-date-input.vue b/components/tpx-date-input/tpx-date-input.vue
index f56bfc9..154aeb4 100644
--- a/components/tpx-date-input/tpx-date-input.vue
+++ b/components/tpx-date-input/tpx-date-input.vue
@@ -9,9 +9,11 @@
 			</template>
 		</u-input>
 		<view class="pos-abt-all">
-			<tpx-select :list="toolsRangesList" :value="value[1]" :customInput="true" mode="drop" @onChange="handleToolsRangChange">
-				<view :style="`height: 64rpx;`" ></view>
-			</tpx-select>
+			<view v-if="showTools" @click.stop="">
+				<tpx-select :list="toolsRangesList" :value="value[1]" :customInput="true" mode="drop" @onChange="handleToolsRangChange">
+					<view :style="`height: 64rpx;`" ></view>
+				</tpx-select>
+			</view>
 		</view>
 	</view>
 	<!-- 日历 -->
@@ -87,9 +89,7 @@
 		
 		methods: {
 			handleSelectDate() {
-				if(!this.showTools) {
-					this.handleSwitchCladar()
-				}
+				this.handleSwitchCladar()
 			},
 			handleChange(val){
 				this.$emit('change', val)
diff --git a/components/tpx-upload/tpx-upload.vue b/components/tpx-upload/tpx-upload.vue
index ccd1df4..7fce8dc 100644
--- a/components/tpx-upload/tpx-upload.vue
+++ b/components/tpx-upload/tpx-upload.vue
@@ -1,5 +1,18 @@
 <template>
 	<view :style="`${customstyle};flex-direction: ${direction};`" class="up-cont">
+		
+		<view v-for="(item, index) in list" :style="`${compItemstyle}`">
+			<view class="cdimg" @click="handleItem(index)">
+				<tpx-image v-if="fileType==fileTypeEnum.image" :src="item" :height="height" :width="width"></tpx-image>
+				<video v-if="fileType==fileTypeEnum.video" :src="item"></video>
+				<view v-if="fileType==fileTypeEnum.all">{{item}}</view>
+				
+				<view v-if="!disabled" @click.stop="handleDel(index)" class="delIcon">
+					<u-icon name="close-circle-fill" size="32" color=""></u-icon>
+				</view>
+			</view>
+		</view>
+		
 		<view v-if="list.length < maxLen" style="width: 100%;">
 			<view v-if="!isSlot"  @click="handleChooseFile" class="camer-btn" :style="`width:${width}rpx;height:${height}rpx;`">
 				<template v-if="btnText">
@@ -22,14 +35,6 @@
 				<slot></slot>
 			</view>
 		</view>
-		
-		<view v-for="(item) in list" :style="`${compItemstyle}`">
-			<view class="cdimg" @click="handleItem" data-index="{{index}}">
-				<tpx-image v-if="fileType==fileTypeEnum.image" :src="item" :height="height" :width="width"></tpx-image>
-				<video v-if="fileType==fileTypeEnum.video" :src="item"></video>
-				<view v-if="fileType==fileTypeEnum.all">{{item}}</view>
-			</view>
-		</view>
 
 	</view>
 </template>
@@ -59,7 +64,7 @@
 				return res
 			},
 			compItemstyle(){
-				let style =  `margin-bottom: 20rpx;`
+				let style =  `margin-bottom: 16rpx;margin-right: 16rpx;`
 				if(this.direction == "row") {
 					// style += `width:${this.width}rpx;height:${this.height}rpx;`
 				}
@@ -122,6 +127,11 @@
 					return 1
 				}
 			},
+			disabled: {
+				default () {
+					return false
+				}
+			},
 			isSlot: {
 				default () {
 					return false
@@ -150,48 +160,20 @@
 				}
 				return coreMultiUploadFile(actMap[this.fileType], opt)
 			},
-			handlePreview() {
+			handlePreview(index) {
 				uni.previewImage({
+					current: index,
 					urls: [
 						...this.list
 					]
 				})
 			},
-			handleItem(e) {
-				const that = this
-				const index = e.currentTarget.dataset.index
-				let { list, fileType } = this
-				let itemList = ['更换', '删除', '预览']
-				if (fileType == fileTypeEnum.video) {
-					itemList.length--
-				}
-				uni.showActionSheet({
-					itemList,
-					success: (res) => {
-						const {
-							tapIndex
-						} = res
-						if (tapIndex == 0) {
-							// 更换, 只能选择一个文件
-							that.doChooseFile({
-								count: 1
-							}).then((res) => {
-								list[index] = res[0]
-								that.triggerChanged(list)
-							})
-						}
-						if (tapIndex == 1) {
-							list.splice(index, 1)
-							that.triggerChanged(list)
-						}
-						if (tapIndex == 2) {
-							this.handlePreview()
-						}
-					},
-					fail: (res) => {
-						console.log(res.errMsg)
-					}
-				})
+			handleDel(index){
+				this.list.splice(index, 1)
+				this.triggerChanged(this.list)
+			},
+			handleItem(index) {
+				this.handlePreview(index)
 			},
 			handleChooseFile: function() {
 				let that = this
@@ -238,4 +220,17 @@
 		align-items: center;
 		margin-bottom: 20rpx;
 	}
+	.cdimg {
+		position: relative;
+		.delIcon{
+			position: absolute;
+			height: 46rpx;
+			width: 46rpx;
+			right: -10rpx;
+			top: -10rpx;
+			.u-icon{
+				justify-content: end;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/goods/edit.vue b/pages/goods/edit.vue
index 8491e7f..40dc041 100644
--- a/pages/goods/edit.vue
+++ b/pages/goods/edit.vue
@@ -201,8 +201,8 @@
 						</u-row>
 					</view>
 				</view>
-				
-				<tpx-upload v-model:value="baseFormData.pic1" isSlot="true" maxLen="10">
+				<!-- fileType="all" -->
+				<tpx-upload v-model:value="baseFormData.fujianFiles"  isSlot="true" maxLen="10">
 					<u-button custom-style="border-radius: 16rpx;" type="primary" plain="true">
 						<u-row justify="center">
 							<view>
@@ -252,6 +252,7 @@
 					ydList: [
 						{}
 					],
+					fujianFiles: []
 				},
 				goodinfoModal:{
 					show: false,