From 1aa502103bd2ede3e3973745bca53f077e2157ce Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 28 Sep 2024 15:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E8=87=AA?=
 =?UTF-8?q?=E5=86=99=E5=85=AC=E5=85=B1=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/my-components/my-button.vue    |   2 +-
 components/my-components/my-radio.vue     |  35 ++++---
 components/my-components/my-step.vue      |   7 +-
 components/my-components/my-up-upload.vue | 114 ++++++++++++++--------
 4 files changed, 100 insertions(+), 58 deletions(-)

diff --git a/components/my-components/my-button.vue b/components/my-components/my-button.vue
index 7bb481f..ac7601b 100644
--- a/components/my-components/my-button.vue
+++ b/components/my-components/my-button.vue
@@ -105,7 +105,7 @@ import { computed } from 'vue';
 		margin:  auto;
 	}
 	.shadow{
-		box-shadow: 0 0 10px #999;
+		box-shadow: 0 0 10px #aaa;
 	}
 	.btn {
 		font-size: 28rpx;
diff --git a/components/my-components/my-radio.vue b/components/my-components/my-radio.vue
index 4c49cc0..e6a6836 100644
--- a/components/my-components/my-radio.vue
+++ b/components/my-components/my-radio.vue
@@ -1,10 +1,11 @@
 <template>
-	<view class="my-radio u-font-28 u-flex color-333" @tap.stop="changeVal" >
-		<view class="circle u-flex u-row-center"  :style="computedStyle()" :class="{active:modelValue,square:shape==='square'}">
+	<view class="my-radio u-font-28 u-flex color-333" @tap.stop="changeVal">
+		<view class="circle u-flex u-row-center" :style="computedStyle()"
+			:class="{active:modelValue,square:shape==='square'}">
 			<uni-icons type="checkmarkempty" v-if="modelValue" :size="size-4" color="#fff"></uni-icons>
 		</view>
 		<view class="u-m-l-12">
-			{{text}}
+			<slot>{{text}}</slot>
 		</view>
 	</view>
 </template>
@@ -14,11 +15,11 @@
 	} from 'vue'
 	import color from '@/commons/color.js'
 	const props = defineProps({
-		disabled:{
+		disabled: {
 			type: [Boolean],
 			default: false
 		},
-		borderColor:{
+		borderColor: {
 			type: String,
 			default: '#bbb',
 		},
@@ -29,10 +30,10 @@
 		},
 		// v-modal
 		modelValue: {
-			type: [Number,Boolean],
+			type: [Number, Boolean],
 			default: false,
 		},
-		shape:{
+		shape: {
 			//circle square
 			type: String,
 			default: 'circle',
@@ -52,18 +53,19 @@
 		`
 	}
 	const emits = defineEmits(['update:modelValue', 'change'])
+
 	function changeVal() {
-		if(props.disabled){
+		if (props.disabled) {
 			return
 		}
 		emits('click')
-		let currentVal=props.modelValue
-		let type=typeof currentVal 
-		if(type==='number'){
-			currentVal=currentVal===0?1:0
+		let currentVal = props.modelValue
+		let type = typeof currentVal
+		if (type === 'number') {
+			currentVal = currentVal === 0 ? 1 : 0
 		}
-		if(type==='boolean'){
-			currentVal=!currentVal
+		if (type === 'boolean') {
+			currentVal = !currentVal
 		}
 		emits('update:modelValue', currentVal)
 		emits('change', currentVal)
@@ -75,7 +77,7 @@
 
 		.circle {
 			background: #FFFFFF;
-			
+
 			&.active {
 				background-color: $my-main-color;
 				border-color: $my-main-color;
@@ -84,7 +86,8 @@
 			border: 1px solid #707070;
 			border-radius: 50%;
 			overflow: hidden;
-			&.square{
+
+			&.square {
 				border-radius: 8rpx;
 			}
 		}
diff --git a/components/my-components/my-step.vue b/components/my-components/my-step.vue
index 3f381cf..9474c6b 100644
--- a/components/my-components/my-step.vue
+++ b/components/my-components/my-step.vue
@@ -6,7 +6,7 @@
 				<view class="left-line" :class="{hide:index==list.length-1}"></view>
 			</view>
 			<view class="u-p-l-12  ">
-				<view class="u-font-20">{{item[titleKey]||''}}</view>
+				<view class="u-font-20">{{formatTitle(item[titleKey]||'') }}</view>
 				<view class="u-font-24 u-m-t-2">{{item[contentKey]||''}}</view>
 			</view>
 		</view>
@@ -14,6 +14,7 @@
 </template>
 
 <script setup>
+	import dayjs from 'dayjs';
 	const props = defineProps({
 		active: {
 			type: [String, Number],
@@ -32,6 +33,10 @@
 			default: 'content'
 		}
 	})
+	
+	function formatTitle(time){
+		return  dayjs(time).format('YYYY-M-D HH:MM:ss')
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/components/my-components/my-up-upload.vue b/components/my-components/my-up-upload.vue
index 77f8f85..9306f97 100644
--- a/components/my-components/my-up-upload.vue
+++ b/components/my-components/my-up-upload.vue
@@ -1,69 +1,103 @@
 <template>
-	<up-upload :fileList="images" @afterRead="afterRead" @delete="deletePic"  :multiple="multiple"
-		:width="width" :height="height"
-		:maxCount="10"></up-upload>
+	<up-upload :fileList="images" @afterRead="afterRead" @delete="deletePic" :multiple="multiple" :width="width"
+		:height="height" :maxCount="maxCount"></up-upload>
 </template>
 
 <script setup>
-	import {$uploadFile} from '@/http/yskApi/file.js'
 	import {
-		ref, watch
+		$uploadFile
+	} from '@/http/yskApi/file.js'
+	import {
+		ref,
+		watch
 	} from 'vue';
-	
-	const props=defineProps({
-		modelValue:{
-			type:Array,
-			default:()=>[]
+
+	const props = defineProps({
+		modelValue: {
+			type: Array,
+			default: () => []
 		},
-		width:{
-			type:[String,Number],
-			default:60
+		width: {
+			type: [String, Number],
+			default: 60
 		},
-		height:{
-			type:[String,Number],
-			default:60
+		height: {
+			type: [String, Number],
+			default: 60
 		},
-		multiple:{
-			type:Boolean,
-			default:true
+		maxCount: {
+			type: [Number],
+			default: 10
+		},
+		multiple: {
+			type: Boolean,
+			default: true
 		}
 	})
-	
-	
-	const emits=defineEmits(['update:modelValue'])
+
+
+	const emits = defineEmits(['update:modelValue'])
 	const images = ref(props.modelValue)
-	function afterRead(e){
-		for(let i in e.file){
-			const file=e.file[i].file
+
+	function afterRead(e) {
+		console.log(e);
+		if (Array.isArray(e)) {
+			for (let i in e.file) {
+				const file = e.file[i].file
+				$uploadFile(file).then(res => {
+					console.log(res);
+					images.value.push({
+						url: e.file[i].url,
+						serveUrl: res.data[0]
+					})
+				}).catch(res => {
+					console.log(res);
+					if (res.errMsg) {
+						images.value.splice(i, 1)
+						uni.showToast({
+							title: '图片大小超出限制',
+							icon: 'error'
+						})
+					}
+
+				})
+			}
+		}else{
+			const i=0
+			const file = e.file.file
 			$uploadFile(file).then(res => {
 				console.log(res);
 				images.value.push({
-					url: e.file[i].url,
+					url: e.file.url,
 					serveUrl: res.data[0]
 				})
-			}).catch(res=>{
+			}).catch(res => {
 				console.log(res);
-				if(res.errMsg){
-					images.value.splice(i,1)
+				if (res.errMsg) {
+					images.value.splice(i, 1)
 					uni.showToast({
-						title:'图片大小超出限制',
-						icon:'error'
+						title: '图片大小超出限制',
+						icon: 'error'
 					})
 				}
-				
+			
 			})
 		}
+
 	}
-	function deletePic(e){
-		const {index}=e
-		images.value.splice(index,1)
+
+	function deletePic(e) {
+		const {
+			index
+		} = e
+		images.value.splice(index, 1)
 	}
-	
-	watch(()=>images.value,(newval)=>{
-		emits('update:modelValue',newval)
+
+	watch(() => images.value, (newval) => {
+		emits('update:modelValue', newval)
 	})
-	watch(()=>props.modelValue,(newval)=>{
-		images.value=newval
+	watch(() => props.modelValue, (newval) => {
+		images.value = newval
 	})
 </script>