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"
>
@@ -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 @@
- {{add_time}}小时
+ {{add_time + '小时'}}
-
+ 不加时
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 @@
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
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;