From 96a7985227acd97852b9242ac6a896d04b717f52 Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Mon, 13 Nov 2023 17:50:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/PetPage/index.vue                  |  6 ++--
 pages/OrderPage/index.vue                     |  4 +--
 .../components/m-radio/m-radio-group.vue      | 29 +++++++++++++++++++
 .../m-view/components/m-radio/m-radio.vue     | 29 +++++++++++++++++++
 .../components/uv-calendar/month.vue          | 11 ++++---
 5 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 uni_modules/m-view/components/m-radio/m-radio-group.vue
 create mode 100644 uni_modules/m-view/components/m-radio/m-radio.vue

diff --git a/components/PetPage/index.vue b/components/PetPage/index.vue
index 773511e..a88cfdf 100644
--- a/components/PetPage/index.vue
+++ b/components/PetPage/index.vue
@@ -392,14 +392,14 @@
       :value="data.last_vaccine_time"
       ref="vaccinePicker"
       mode="year-month"
-      minDate="2000-01-01"
+      :minDate="new Date().getTime() - 31536000000"
       @confirm="vaccineConfirm"
   ></uv-datetime-picker>
   <uv-datetime-picker
       :value="data.last_insect_repellent_time"
       ref="insectRepellentPicker"
       mode="year-month"
-      minDate="2000-01-01"
+      :minDate="new Date().getTime() - 31536000000"
       @confirm="insectRepellentConfirm"
   ></uv-datetime-picker>
   <uv-picker :columns="[homeList]" ref="pickerHome" key-name="name" title="是否有户口" round="20rpx" @confirm="homeSelect"></uv-picker>
@@ -651,7 +651,7 @@
           {name:'未知',value:0},
           {name:'弟弟',value:1},
           {name:'妹妹',value:2},
-          {name:'其他',value:9},
+          // {name:'其他',value:9},
         ],
         petTypeList:[
           {
diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue
index 2de04c4..ca36659 100644
--- a/pages/OrderPage/index.vue
+++ b/pages/OrderPage/index.vue
@@ -113,10 +113,10 @@
               </view>
               <view class="item-content row col">
                 <view class="item-content-text" v-if="add_time>0">
-                  {{add_time}}小时
+                  {{add_time + '小时'}}
                 </view>
                 <view class="item-content-text" v-else>
-                  <u-text text="请选择服务时长" size="28" color="#636363"></u-text>
+                  不加时
                 </view>
               </view>
               <view class="item-icon">
diff --git a/uni_modules/m-view/components/m-radio/m-radio-group.vue b/uni_modules/m-view/components/m-radio/m-radio-group.vue
new file mode 100644
index 0000000..f3b6ecf
--- /dev/null
+++ b/uni_modules/m-view/components/m-radio/m-radio-group.vue
@@ -0,0 +1,29 @@
+<template>
+  <view>
+    <slot>
+
+    </slot>
+  </view>
+</template>
+
+<script>
+	/**
+	 * 单选
+	 * @description
+	 * 
+	 * @property {String}			title       显示的文字
+	 */
+	export default {
+		name: 'm-radio',
+		methods: {
+
+		},
+    mounted() {
+
+    },
+	}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/uni_modules/m-view/components/m-radio/m-radio.vue b/uni_modules/m-view/components/m-radio/m-radio.vue
new file mode 100644
index 0000000..f3b6ecf
--- /dev/null
+++ b/uni_modules/m-view/components/m-radio/m-radio.vue
@@ -0,0 +1,29 @@
+<template>
+  <view>
+    <slot>
+
+    </slot>
+  </view>
+</template>
+
+<script>
+	/**
+	 * 单选
+	 * @description
+	 * 
+	 * @property {String}			title       显示的文字
+	 */
+	export default {
+		name: 'm-radio',
+		methods: {
+
+		},
+    mounted() {
+
+    },
+	}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/uni_modules/uv-calendar/components/uv-calendar/month.vue b/uni_modules/uv-calendar/components/uv-calendar/month.vue
index 8193f9b..5521854 100644
--- a/uni_modules/uv-calendar/components/uv-calendar/month.vue
+++ b/uni_modules/uv-calendar/components/uv-calendar/month.vue
@@ -160,6 +160,9 @@
 				return [this.minDate, this.maxDate, this.defaultDate]
 			},
 			dayStyle(index1, index2, item) {
+        if(this.width === 0){
+          this.width = 750;
+        }
 				return (index1, index2, item) => {
 					const style = {}
 					let week = item.week
@@ -173,7 +176,7 @@
 					if (index2 === 0) {
 						// 获取当前为星期几，如果为0，则为星期天，减一为每月第一天时，需要向左偏移的item个数
 						week = (week === 0 ? 7 : week) - 1
-						style.marginLeft = this.$uv.addUnit(week * dayWidth)
+						style.marginLeft = this.$uv.addUnit(week * dayWidth,'rpx')
 					}
 					if (this.mode === 'range') {
 						// 之所以需要这么写，是因为DCloud公司的iOS客户端的开发者能力有限导致的bug
@@ -545,7 +548,7 @@
 						top: 12px;
 						right: 7px;
 					}
-					
+
 					&__top-info {
 						color: $uv-content-color;
 						text-align: center;
@@ -558,12 +561,12 @@
 						&--selected {
 							color: #ffffff;
 						}
-						
+
 						&--disabled {
 							color: #cacbcd;
 						}
 					}
-					
+
 					&__buttom-info {
 						color: $uv-content-color;
 						text-align: center;