From 0dcad1dd74d43141c96c947d722f1e88dcf20333 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 13 Jun 2024 11:15:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E6=A1=86=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.js                                |  4 +-
 components/form/DateTime.vue                  | 40 ++++++++++++++-----
 .../dist/cache/.vite/deps/_metadata.json      |  8 ++--
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/api/request.js b/api/request.js
index d0b6aa9..fbaeeed 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,7 +1,7 @@
 //基础请求地址，需要根据自己的需求切换
 // 开发环境
-export const BASE_URL = "http://42.180.188.17:9809" // 鞍钢正式环境
-// export const BASE_URL = "http://42.180.188.17:19098"  // 鞍钢线上测试环境
+// export const BASE_URL = "http://42.180.188.17:9809" // 鞍钢正式环境
+export const BASE_URL = "http://42.180.188.17:19098"  // 鞍钢线上测试环境
 // export const BASE_URL = "http://47.93.215.234:9809" // 鞍钢正式环境(弃用)
 // export const BASE_URL = "http://47.93.215.234:19098"  // 鞍钢线上测试环境(弃用)
 // export const BASE_URL = "http://47.93.215.234:19097"
diff --git a/components/form/DateTime.vue b/components/form/DateTime.vue
index 20313e5..ea63f47 100644
--- a/components/form/DateTime.vue
+++ b/components/form/DateTime.vue
@@ -1,10 +1,14 @@
 <template>
 	<view class="w-form-timePicker" hover-class="w-click-hover" v-if="!readonly">
 		<template v-if="format.length > 9">
-			<uni-datetime-picker v-if="format === 'yyyy-mm-dd hh:mm'" class="w-form-input"
-				:border="false" type="datetime" :clear-icon="false" v-model="_value" />
-			<uni-datetime-picker v-else class="w-form-input" :border="false" type="date" :clear-icon="false"
-				v-model="_value" />
+			<!-- <uni-datetime-picker v-if="format === 'yyyy-mm-dd hh:mm'" class="w-form-input" :border="false"
+				type="datetime" :clear-icon="false" v-model="_value" ref="uniDateTime" @change="changeTime"/>
+			<uni-datetime-picker v-else class="w-form-input" :border="false" type="date" ref="uniDateTime"
+				:clear-icon="false" v-model="_value" @change="changeTime"/> -->
+			<uni-datetime-picker v-if="format === 'yyyy-mm-dd hh:mm'" class="w-form-input" :border="false"
+				type="datetime" :clear-icon="false" v-model="_value" ref="uniDateTime" @change="changeTime"/>
+			<uni-datetime-picker v-else class="w-form-input" :border="false" type="date" ref="uniDateTime"
+				:clear-icon="false" v-model="_value" @change="changeTime"/>
 			<uni-icons type="right" :size="20" color="#999999"></uni-icons>
 		</template>
 		<template v-else-if="props.formProps.format === 'yyyy-mm'">
@@ -24,9 +28,13 @@
 </template>
 
 <script setup>
-	import { computed } from 'vue'
+	import {
+		computed,
+		watch,
+		ref
+	} from 'vue'
 	import ClickInput from '@/components/ClickInput.vue'
-
+	const uniDateTime = ref();
 	const props = defineProps({
 		formProps: {
 			type: Object,
@@ -37,7 +45,6 @@
 		modelValue: String,
 		readonly: Boolean
 	})
-
 	const _value = computed({
 		get() {
 			return props.modelValue
@@ -49,7 +56,6 @@
 			emits('update:modelValue', val)
 		}
 	})
-	
 	const format = computed(() => {
 		return (props.formProps.format || '').toLocaleLowerCase()
 	})
@@ -89,9 +95,18 @@
 			return [range.value[0].indexOf(props.modelValue)]
 		}
 	})
-
 	const emits = defineEmits(['update:modelValue'])
-
+	const timeVal = ref();
+	const changeTime = (e) => {
+		// 需要等到watch监听执行完才进行此操作
+		setTimeout(function(){
+			console.log(timeVal.value,222333)
+			if(!props.modelValue){
+				// uniDateTime.value.clear();
+				uniDateTime.value.displayValue = ""
+			}
+		},100)
+	}
 	function timeChange(e) {
 		const indexs = e.detail.value
 		if (Array.isArray(indexs)) {
@@ -100,6 +115,11 @@
 			_value.value = `${range.value[0][indexs]}`
 		}
 	}
+	watch(() => props.modelValue, (newVal) => {
+		timeVal.value = newVal;
+	}, {
+		deep: true
+	})
 </script>
 
 <style lang="less" scoped>
diff --git a/unpackage/dist/cache/.vite/deps/_metadata.json b/unpackage/dist/cache/.vite/deps/_metadata.json
index 4af032a..a276489 100644
--- a/unpackage/dist/cache/.vite/deps/_metadata.json
+++ b/unpackage/dist/cache/.vite/deps/_metadata.json
@@ -1,8 +1,8 @@
 {
-  "hash": "0f0fbf16",
-  "configHash": "5bd87843",
-  "lockfileHash": "33a33614",
-  "browserHash": "a13cd6b4",
+  "hash": "6ab18a53",
+  "configHash": "87e744e2",
+  "lockfileHash": "2ddd0eeb",
+  "browserHash": "9b038b87",
   "optimized": {},
   "chunks": {}
 }
\ No newline at end of file