From be4932df1241c86ca1876d39fa766399d927ce00 Mon Sep 17 00:00:00 2001
From: kuaileWu <1432334894@qq.com>
Date: Tue, 24 Jun 2025 18:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=85=BC=E5=AE=B9pad?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                 |   1 +
 components/FormItem.vue                 | 245 ++++++++++++++------------
 components/SelectYear.vue               | 170 ------------------
 components/customeDatePicker.vue        | 293 ++++++++++++++++++++++++++++++++
 components/inputBox.vue                 |  28 +--
 components/preBookList.vue              |   7 +-
 pages/index/index.vue                   |   1 +
 pages/modify_visitor/modify_visitor.vue |  42 ++---
 pages/visit_detail/visit_detail.vue     |   6 +-
 pages/visitors/visitors.vue             |   4 +-
 10 files changed, 472 insertions(+), 325 deletions(-)
 delete mode 100644 components/SelectYear.vue
 create mode 100644 components/customeDatePicker.vue

diff --git a/App.vue b/App.vue
index 9d7a82b..d4f6022 100644
--- a/App.vue
+++ b/App.vue
@@ -242,6 +242,7 @@
 	}
 	.btn{
 		text-align: center;
+		font-size: 32rpx;
 	}
 	.primary.btn{
 		background-color: #39D067;
diff --git a/components/FormItem.vue b/components/FormItem.vue
index ff9fb45..3b2ab6f 100644
--- a/components/FormItem.vue
+++ b/components/FormItem.vue
@@ -1,119 +1,152 @@
 <template>
-    <view class="form-item">
-      <!-- 左侧标签 + 必填提示 -->
-      <view class="label">
-          <!-- <text v-if="required" class="required">*</text> -->
-          <text>{{ label }}</text>
-          <image  v-if="required" class="required" :src="cssUrl + 'required.svg'" />
-      </view>
-
-      <!-- 输入模式 -->
-      <input
-        v-if="type === 'input'"
-        class="input"
-        :placeholder="placeholder"
-        :value="value"
-        @input="handleInput"
-        :disabled="disabled"
-      />
+  <view class="form-item">
+    <!-- 左侧标签 + 必填提示 -->
+    <view class="label">
+        <text class="PfScMedium">{{ label }}</text>
+        <image  v-if="required" class="required" :src="cssUrl + 'required.svg'" />
+    </view>
 
-      <!-- 点击选择模式（如性别、年份） -->
-      <view
-        v-else
-        class="picker"
-        @click="handleClick"
-      >
-        <text :class="{ 'placeholder': !value }">
-          {{ displayValue || placeholder }}
-        </text>
-        <image class="right_img"  :src="cssUrl + 'input_ex.png'" />
+    <!-- 输入模式 -->
+    <input
+      v-if="type === 'input'"
+      class="input"
+      :placeholder="placeholder"
+      :placeholder-class="!value ? placeholderClass : '' "
+      :value="value"
+      @input="handleInput"
+      :disabled="disabled"
+    />
 
-        <!-- <uni-icons type="arrowright" size="14" color="#999" /> -->
-      </view>
+    <!-- 点击选择模式（如性别、年份） -->
+    <view
+      v-else
+      class="picker"
+      @click="handleClick"
+    >
+      <text :class="((placeholderClass && !displayValue) ? placeholderClass : ((!displayValue ? 'placeholder ':'')))">
+        {{ displayValue || placeholder }}
+      </text>
+      <image class="right_img"  :src="cssUrl + '/input_ex.png'" />
     </view>
-  </template>
+  </view>
+</template>
 
-  <script>
-  export default {
-    name: 'FormItem',
-    props: {
-      label: String,          // 左侧标签文本（如"姓名"）
-      type: {                 // 类型：input（输入）或 picker（点击选择）
-        type: String,
-        default: 'input',
-        validator: (val) => ['input', 'picker'].includes(val),
-      },
-      value: [String, Number], // 绑定的值
-      placeholder: String,     // 占位文本
-      required: Boolean,       // 是否必填
-      disabled: Boolean,       // 是否禁用
-      displayValue: String,    // 显示的值（用于picker模式，如性别显示"男/女"）
+<script>
+export default {
+  name: 'FormItem',
+  props: {
+    label: String,          // 左侧标签文本（如"姓名"）
+    type: {                 // 类型：input（输入）或 picker（点击选择）
+      type: String,
+      default: 'input',
+      validator: (val) => ['input', 'picker'].includes(val),
     },
-    data(){
-        return{
-			    cssUrl: this.cssUrl,
-        }
+    placeholderClass: {
+      type: String,
+      default: 'formItemPlaceholderStyle'
     },
-    methods: {
-      handleInput(e) {
-        this.$emit('input', e.detail.value);
-      },
-      handleClick() {
-        if (!this.disabled) {
-          this.$emit('click'); // 触发父组件的选择逻辑
-        }
-      },
+    value:{
+      type: [String, Number, Boolean],
+      default: false
+    },// 绑定的值
+    placeholder: String,     // 占位文本
+    required: Boolean,       // 是否必填
+    disabled: Boolean,       // 是否禁用
+    displayValue: {
+      type: String,
+      default: ''
+    },    // 显示的值（用于picker模式，如性别显示"男/女"）
+
+  },
+  data(){
+      return{
+        cssUrl: this.cssUrl,
+      }
+  },
+  methods: {
+    handleInput(e) {
+      this.$emit('input', e.detail.value);
     },
-  };
-  </script>
+    handleClick() {
+      if (!this.disabled) {
+        this.$emit('click'); // 触发父组件的选择逻辑
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.form-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 36rpx 0rpx;
+  border-bottom: 1rpx solid #eee;
+  min-height: 44rpx;
+}
+.right_img{
+  width: 26rpx;
+  height: 26rpx;
+}
 
-  <style scoped>
-  .form-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 36rpx 24rpx;
-    border-bottom: 1rpx solid #eee;
-  }
-  .right_img{
-    width: 26rpx;
-    height: 26rpx;
-  }
+.label {
+  display: flex;
+  align-items: center;
+  font-size: 32rpx;
+  font-weight: 500;
+  line-height: 44rpx;
+  letter-spacing: 2rpx;
+  color: #222222;
+}
 
-  .label {
-    display: flex;
-    align-items: center;
-    font-family: PingFang SC;
-    font-size: 32rpx;
-    font-weight: 500;
-    line-height: 44rpx;
-    letter-spacing: 2rpx;
-    color: #222222;
-  }
+.required {
+  margin-left: 8rpx;
+  color: #f56c6c;
+  font-size: 12px;
+  width: 16rpx;
+  height: 16rpx;
+}
+.input{
+  height: 44rpx;
+  flex-grow: 1;
+  font-size: 32rpx;
+  flex: 1;
+  padding-left: 20rpx;
+  color: #000000;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  flex-grow: 1;
+  text-align: right;
+}
 
-  .required {
-    margin-left: 8rpx;
-    color: #f56c6c;
-    font-size: 12px;
-    width: 16rpx;
-    height: 16rpx;
-  }
+.picker {
+  flex: 1;
+  padding-left: 20rpx;
+  color: #000000;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
 
-  .input,
-  .picker {
-    flex: 1;
-    text-align: right;
-    padding-left: 20rpx;
-    color: #333;
-  }
+.picker text{
+  font-size: 32rpx;
+  line-height: 32rpx;
+}
 
-  .placeholder {
-    font-family: PingFang SC;
-    font-size: 32rpx;
-    font-weight: normal;
-    line-height: 44rpx;
-    text-align: right;
-    letter-spacing: 0.24rpx;
-    color: #999999;
-  }
-  </style>
\ No newline at end of file
+.placeholder {
+  font-family: PingFang SC;
+  font-size: 32rpx;
+  font-weight: normal;
+  line-height: 44rpx;
+  text-align: right;
+  letter-spacing: 0.24rpx;
+  color: #000;
+}
+/deep/ .formItemPlaceholderStyle {
+  font-size: 32rpx;
+  color: #999999;
+  line-height: 44rpx;
+}
+</style>
\ No newline at end of file
diff --git a/components/SelectYear.vue b/components/SelectYear.vue
deleted file mode 100644
index 0b08fcb..0000000
--- a/components/SelectYear.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
-    <uni-popup ref="selectDate" :safe-area="false">
-            <view class="popup-container">
-                <view class="header">
-                    <view class="title PfScMedium">出生年份</view>
-                    <image class="close-icon" @tap="closePop" :src="cssUrl + 'close.svg'" />
-                </view>
-                <view class="date">请选择阳历出生年份</view>
-
-                <view class="yearPicker date-wraper">
-                    <picker-view :value="value" @change="handleYearChange" class="picker-view">
-                        <picker-view-column class="picker-column">
-                            <view class="item" v-for="(item, index) in years" :key="index">{{ item }}</view>
-                        </picker-view-column>
-                    </picker-view>
-                </view>
-
-				<view class="confirm-button-wrapper btPadding">
-                    <view class="confirm-button PfScMedium" @click="comfirmYear">
-                        确认
-                    </view>
-                </view>
-			</view>
-        </uni-popup>
-</template>
-
-<script>
-export default {
-    data() {
-        const date = new Date()
-				const years = []
-				const year = date.getFullYear()
-				for (let i = 1900; i <= year; i++) {
-					years.push(i)
-				}
-				var currentYear = year - 10
-				var value = [years.indexOf(currentYear)]
-        return {
-						value,
-            currentYear,
-            cssUrl:this.cssUrl,
-            years: years,
-        };
-    },
-    methods: {
-        handleYearChange(e) {
-					this.currentYear = this.years[e.detail.value];
-        },
-        comfirmYear(){
-					this.$emit('change', this.currentYear)
-					this.closePop()
-        },
-        show(){
-            this.$refs.selectDate.open('bottom')
-        },
-        closePop() {
-				this.$refs.selectDate.close()
-		},
-    },
-};
-</script>
-<style lang="scss" scoped>
-.yearPicker {
-    height: 470rpx;
-    background: #F7F7F7;
-    .picker-view {
-		height: 420rpx;
-		margin: 0 auto;
-		padding: 0 35rpx;
-        background: #F7F7F7;
-
-	}
-    .item {
-		line-height: 70rpx;
-		font-size: 28rpx;
-		font-weight: 600;
-		text-align: center;
-	}
-}
-.popup-container {
-	position: relative;
-	max-height: calc(100vh - 200rpx);
-	overflow-y: scroll;
-	background: #ffffff;
-	border-radius: 40rpx 40rpx 0px 0px;
-	padding: 42rpx 54rpx 16rpx;
-
-	.header {
-		position: relative;
-		text-align: center;
-
-		.title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #000000;
-			line-height: 36rpx;
-		}
-
-		.close-icon {
-			width: 40rpx;
-			height: 40rpx;
-			position: absolute;
-			right: 0;
-			bottom: 0;
-		}
-	}
-
-	.content-container {
-		padding: 24rpx 0rpx 68rpx;
-		font-family: PingFang SC;
-
-		.content-item {
-			background: #FAFAFA;
-
-			&:first-child {
-				border-top: none;
-				padding: 25rpx 24rpx;
-			}
-
-			padding: 19rpx 24rpx;
-			border-top: 2rpx solid #F0F0F0;
-
-			span {}
-
-			.bold {
-				font-weight: 500;
-				font-size: 30rpx;
-				color: #000000;
-			}
-
-			.top {
-				margin-top: 12rpx;
-				margin-bottom: 12rpx;
-
-			}
-
-			.special {
-				color: #949699;
-				letter-spacing: 2rpx;
-				font-size: 30rpx;
-
-				.time {
-					margin: 0 6rpx;
-				}
-			}
-		}
-	}
-
-	.confirm-button {
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #ffffff;
-		margin-top: 46rpx;
-		line-height: 92rpx;
-		text-align: center;
-		width: 100%;
-		height: 92rpx;
-		background: #39d067;
-		border-radius: 16rpx;
-	}
-
-	.date {
-		margin: 12rpx 36rpx 42rpx;
-		text-align: center;
-		color: #000000;
-		font-size: 26rpx;
-		font-family: PingFang SC;
-	}
-}
-</style>
\ No newline at end of file
diff --git a/components/customeDatePicker.vue b/components/customeDatePicker.vue
new file mode 100644
index 0000000..e3d53b6
--- /dev/null
+++ b/components/customeDatePicker.vue
@@ -0,0 +1,293 @@
+<template>
+	<view class="datePicker">
+		<uni-popup ref="updateTreatment" :safe-area="false">
+			<view class="popup-container">
+				<view class="header">
+					<view class="title PfScMedium">出生年份</view>
+				</view>
+				<view class="desc">请选择阳历出生年份</view>
+
+				<view class="content-container">
+
+					<view class="datepicker-wrapper">
+						<picker-view mask-class="datepicker-mask-class" :indicatorStyle="indicatorStyle" indicator-class="datepicker-custom-indicator" :value="dateValue" @change="onDateChange" @pickstart="pickstart" @pickend="pickend" class="datepicker-picker-view" v-if="visible">
+							<picker-view-column v-show="showPickerColumn(0)">
+								<view :class="getItemClass(0, index)+'item ft24'" v-for="(item, index) in years" :key="index">{{item}}</view>
+							</picker-view-column>
+
+							<picker-view-column v-show="showPickerColumn(1)">
+								<view :class="getItemClass(1, index)+'item ft24'" v-for="(item, index) in months" :key="index">{{item.toString().length==1?('0'+item):item}}</view>
+							</picker-view-column>
+
+							<picker-view-column v-show="showPickerColumn(2)">
+								<view :class="getItemClass(2, index)+'item ft24'" v-for="(item, index) in days" :key="index">{{item.toString().length==1?('0'+item):item}}</view>
+							</picker-view-column>
+						</picker-view>
+					</view>
+
+
+					<view class="close-up-btn" @click="closePop">
+						<img :src="((cssUrl+'pop_close_ic.svg').replace('/user/', '/'))" alt="" />
+					</view>
+
+				</view>
+
+				<view class="confirm-button-wrapper btPadding">
+					<view class="confirm-button PfScMedium" @click="onUpdateTreatmentConfirmButtonClick">
+						确认
+					</view>
+				</view>
+
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:'datePicker',
+		data() {
+			const date = new Date()
+			const years = []
+			var year = date.getFullYear()
+			const months = []
+			var month = date.getMonth() + 1
+			const days = []
+			var day = date.getDate()
+			for (let i = date.getFullYear()-100; i <= date.getFullYear(); i++) {
+				years.push(i)
+			}
+			for (let i = 1; i <= 12; i++) {
+				months.push(i)
+			}
+			for (let i = 1; i <= 31; i++) {
+				days.push(i)
+			}
+
+			month = 1;
+			day = 1;
+			year = year - 10
+			var datestr = year+'/'+(month.toString().length==1?('0'+month):month)+'/'+(day.toString().length==1?('0'+day):day)
+
+			var dateValue = [years.indexOf(year), months.indexOf(month), days.indexOf(day)];
+			return {
+				title: "datepicker-picker-view",
+				years,
+				year,
+				months,
+				month,
+				days,
+				day,
+				cssUrl:this.cssUrl,
+				dateValue,
+				date:datestr,
+				treatmentDateString:'',
+				indicatorStyle: 'height: '+uni.upx2px(68)+'px;',
+				visible: true,
+				timetimer:null,
+				dateChangeFlag:true
+			}
+		},
+		props: {
+			defaultDate:{
+				type:String,
+				default:''
+			},
+			format:{
+				type:String,
+				default:'yyyy'
+			}
+		},
+		computed: {
+		},
+		methods: {
+			showPickerColumn(columnIndex) {
+				if (columnIndex === 0 && this.format.indexOf('yyyy') !== -1) return true
+				if (columnIndex === 1 && this.format.indexOf('mm')!== -1) return true
+				if (columnIndex === 2 && this.format.indexOf('dd')!== -1) return true
+				return false
+			},
+			getItemClass(columnIndex, index) {
+				var curindex = this.dateValue[columnIndex]
+				if(index == curindex) return 'selected PfScMedium ';
+				var abs = Math.abs(index-curindex)
+				if(abs <= 3) return 'style'+abs+' ';
+				return '';
+			},
+			open(direction){
+				this.visible = false;
+				this.$nextTick(() => {
+					this.visible = true;
+					this.$refs.updateTreatment.open(direction);
+				});
+			},
+			pickstart(e) {
+				this.dateChangeFlag = false
+			},
+			pickend(e) {
+				this.dateChangeFlag = true
+			},
+			onDateChange(e) {
+				var datainfo = e.detail.value
+				var year = this.years[datainfo[0]]
+				var month = this.months[datainfo[1]]
+				var day = this.days[datainfo[2]]
+				this.dateValue = [datainfo[0], datainfo[1], datainfo[2]];
+				this.date = year+'/'+(month.toString().length==1?('0'+month):month)+'/'+(day.toString().length==1?('0'+day):day)
+			},
+			closePop() {
+				this.$refs.updateTreatment.close();
+				this.visible = false;
+			},
+			onUpdateTreatmentConfirmButtonClick() {
+				if(!this.dateChangeFlag) return
+
+				this.treatmentDateString = this.date;
+				this.$emit('getDateString', this.treatmentDateString);
+				this.$refs.updateTreatment.close();
+				this.visible = false;
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.datePicker{
+		.popup-container {
+			position: relative;
+		  max-height: calc(100vh - 50rpx);
+		  overflow-y: scroll;
+		  background: #ffffff;
+		  border-radius: 40rpx 40rpx 0px 0px;
+		  padding: 42rpx 32rpx 0;
+
+		  .header {
+		    display: flex;
+		    align-items: center;
+		    justify-content: center;
+		    position: relative;
+
+		    .title {
+		      font-size: 36rpx;
+		      color: #000000;
+					height: 50px;
+					line-height: 50px;
+		      display: flex;
+		      align-items: center;
+		      justify-content: center;
+		    }
+
+		    .close-icon {
+		      position: absolute;
+		      z-index: 1;
+		      top: 50%;
+		      transform: translateY(-50%);
+		      right: 0;
+		      width: 40rpx;
+		      height: 40rpx;
+		    }
+		  }
+			.desc{
+				font-size: 28rpx;
+				font-weight: normal;
+				line-height: 38rpx;
+				height: 38rpx;
+				color: #666666;
+				text-align: center;
+				margin-top: 12rpx;
+			}
+			.content-container{
+				width: 100%;
+				padding: 0 25rpx;
+				box-sizing: border-box;
+				margin-bottom: 42rpx;
+				background: #F7F7F7;
+
+				.datepicker-wrapper{
+					width: calc(100% - 80rpx);
+					margin: 0 auto;
+				}
+				.close-up-btn{
+					position: absolute;
+					right: 44rpx;
+					top: 44rpx;
+					z-index: 9;
+					width: 40rpx;
+					height: 40rpx;
+					img{
+						width: 40rpx;
+						height: 40rpx;
+					}
+				}
+				.item{
+					line-height: 68rpx;
+					height: 68rpx;
+					color: #E5E5E5;
+					&.selected {
+						font-size: 28rpx !important;
+						color: #000000 !important;
+					}
+					&.style1 {
+						font-size: 26rpx !important;
+
+						color: #999999 !important;
+					}
+					&.style2 {
+						color: #BEBEBE !important;
+						font-size: 24rpx !important;
+					}
+					&.style3 {
+						color: #E5E5E5 !important;
+						font-size: 24rpx !important;
+					}
+				}
+			}
+
+		  .datepicker-picker-view {
+		    margin-top: 46rpx;
+				width: 100%;
+				height: 470rpx;
+				background: #F7F7F7;
+		  }
+
+		  .item {
+		    line-height: 100rpx;
+		    text-align: center;
+		  }
+
+			.confirm-button-wrapper{
+				box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(181,181,181,0.13);
+				height: 124rpx;
+				width: 750rpx;
+				margin-left: -32rpx;
+				background: #FFFFFF;
+				overflow: hidden;
+				position: relative;
+				z-index: 888;
+				.confirm-button {
+				  margin: 16rpx 54rpx;
+				  height: 92rpx;
+				  background: #39d067;
+				  border-radius: 16rpx;
+				  font-size: 32rpx;
+				  color: #ffffff;
+				  display: flex;
+				  align-items: center;
+				  justify-content: center;
+				}
+			}
+		}
+	}
+
+</style>
+<style>
+>>> .datepicker-mask-class{
+	background-image: none;
+}
+.datepicker-custom-indicatorr::before{
+		border-top: 3rpx solid #D7D7D7 !important;
+}
+.datepicker-custom-indicatorr::after{
+		border-bottom: 3rpx solid #D7D7D7 !important;
+}
+</style>
\ No newline at end of file
diff --git a/components/inputBox.vue b/components/inputBox.vue
index 14e0b10..da1fdcb 100644
--- a/components/inputBox.vue
+++ b/components/inputBox.vue
@@ -1,10 +1,10 @@
 <template>
   <view class="input-com">
-	<view :class="'input-wrapper'+(errormsg?' error':'')">
-		
+	<view :class="'input-wrapper'+(errormsg?' error':'')" :style="inputstyle">
+
 		<view class="top-wrapper flex">
 			<view class="left PfScMedium">
-				<view>{{label}}</view>
+				<view class="PfScMedium">{{label}}</view>
 				<image  v-if="required" class="required" :src="cssUrl + 'required.svg'" />
 			</view>
 			<view class="right">
@@ -12,11 +12,11 @@
 				<input class="input" v-else :value="value" :placeholder="holder" @blur="handleBlur" @input="handleInput"></input>
 			</view>
 		</view>
-		
+
 		<view class="bottom-wrapper" v-if="errormsg">
 			<view class="errmsg" >*{{errormsg}}</view>
 		</view>
-		
+
 	</view>
   </view>
 </template>
@@ -37,6 +37,10 @@ export default {
 		type: String,
 		default: ""
 	},
+	inputstyle: {
+		type: String,
+		default: ""
+	},
     holder: {
       type: String,
       default: ''
@@ -82,12 +86,12 @@ export default {
 			this.errormsg = this.label+'不能为空'
 			return false
 		}
-		
+
 		if(this.rule == 'phone' && !/^1[3-9]\d{9}$/.test(noEmptyVal)){
 			this.errormsg = '手机号格式不正确'
 			return false
 		}
-		
+
 		if(this.rule == 'idcardext' && (!/[a-z0-9A-Z]{4}/.test(noEmptyVal) || noEmptyVal.length!=4)){
 			this.errormsg = this.label+'格式不正确'
 			return false
@@ -126,7 +130,7 @@ export default {
 
 <style lang="scss" scoped>
 	.input-com{
-		
+
 		.input-wrapper{
 			min-height: 100rpx;
 			background: #FFFFFF;
@@ -149,12 +153,11 @@ export default {
 				font-size: 32rpx;
 				line-height: 32rpx;
 				letter-spacing: 1rpx;
-				align-items: center;
 				margin: 0;
 			}
 			&.error{
 				padding-bottom: 16rpx !important;
-				
+
 			}
 			.left{
 				display: flex;
@@ -168,9 +171,7 @@ export default {
 				view{
 					color: #000000;
 					letter-spacing: 2rpx;
-					font-family: PingFang SC;
 					font-size: 32rpx;
-					font-weight: 500;
 					line-height: 44rpx;
 					color: #000000;
 				}
@@ -187,6 +188,9 @@ export default {
 				position: relative;
 				.input{
 					color: #222222;
+					height: 100%;
+					font-size: 32rpx;
+
 					&::placeholder{
 						font-size: 32rpx;
 						font-weight: normal;
diff --git a/components/preBookList.vue b/components/preBookList.vue
index 14ab919..4426c53 100644
--- a/components/preBookList.vue
+++ b/components/preBookList.vue
@@ -99,9 +99,9 @@ export default {
 					margin-bottom: 12rpx
 				}
 				.loction{
-					max-width: 500rpx;
 					min-height: 40rpx;
 					line-height: 40rpx;
+					font-size: 28rpx;
 					color: #949699;
 				}
 			}
@@ -130,9 +130,8 @@ export default {
 						align-items: center;
 						justify-content: center;
 						border-radius: 6rpx;
-						padding: 2rpx 18rpx;
-						height: 32rpx;
-						line-height: 32rpx;
+						padding: 0rpx 18rpx;
+						height: 40rpx;
 						text-align: center;
 						font-size: 22rpx;
 					}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7cdbc79..961e731 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -748,6 +748,7 @@ export default {
 		color: #000000;
 		font-size: 34rpx;
 		line-height: 40rpx;
+		height: 40rpx;
 		font-family: PingFang SC;
 		font-weight: normal;
 		letter-spacing: normal;
diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue
index a7ad4b4..a38d2b5 100644
--- a/pages/modify_visitor/modify_visitor.vue
+++ b/pages/modify_visitor/modify_visitor.vue
@@ -2,16 +2,12 @@
 	<view class="visitor-form-page">
 		<view class="block">
 			<input-box class="inputcom-wrapper" v-model="name" holder="必填项" label="姓名"
-				@blurEvent="nameBlurEvent" required></input-box>
-			<!-- <input-box class="inputcom-wrapper" v-model="idcard" holder="填写身份证号码" label="身份证号" @blurEvent="idCardBlurEvent" rule="idcard"></input-box> -->
-			<!-- <input-box class="inputcom-wrapper" v-model="phone" holder="方便预约后联系，非必填" label="手机号"
-			@blurEvent="phoneBlurEvent" rule="phone"></input-box> -->
-			<!-- <FormItem label="姓名" type="input" v-model="name" placeholder="必填项" required /> -->
+				@blurEvent="nameBlurEvent" required inputstyle="border-radius:0;width:100%;"></input-box>
 			<FormItem label="性别" type="picker" :display-value="genders[sex] || ''" placeholder="必选" required
 				@click="showGenderPicker" />
 			<FormItem label="出生年份" type="picker" :display-value="year ? `${year}年` : ''" placeholder="必选"
 				required @click="showYearPicker" />
-			<FormItem label="手机号" type="input" v-model="phone" rule="phone" placeholder="方便预约后联系，非必填" />
+			<FormItem label="手机号" type="input" v-model="phone" rule="phone" placeholder="方便预约后联系，非必填"/>
 		</view>
 
 		<view class="submit-wrapper btPadding" v-if="!vid">
@@ -30,7 +26,7 @@
 				<view class="btn primary btn1" hover-class="hover" @click="submit">确认</view>
 			</view>
 		</view>
-		<SelectYear ref="yearPicker" @change="handleYearChange" />
+		<CustomeDatePicker ref="customeDatePicker" @getDateString="handleYearChange" />
 
 		<SexPop ref="genderPopup" v-model="sex" @confirm="handleConfirm" />
 
@@ -40,7 +36,7 @@
 <script>
 import InputBox from '@/components/inputBox.vue';
 import FormItem from '@/components/FormItem.vue';
-import SelectYear from '@/components/SelectYear.vue';
+import CustomeDatePicker from '@/components/customeDatePicker.vue';
 import SexPop from '@/components/SexPop.vue';
 
 export default {
@@ -50,12 +46,6 @@ export default {
 			cssUrl: this.cssUrl,
 			year: '',
 			name: '',
-			// form: {
-			// 	year: '',
-			// 	name: '',
-			// 	sex: '',
-			// 	phone: ''
-			// },
 			sex:'',
 			nameRule: false,
 			idcard: '',
@@ -76,7 +66,7 @@ export default {
 		InputBox,
 		FormItem,
 		SexPop,
-		SelectYear
+		CustomeDatePicker
 	},
 	onLoad(option) {
 		if (option.type) this.type = option.type
@@ -100,11 +90,11 @@ export default {
 			this.checkSubmit()
 		},
 		handleYearChange(year) {
-			this.year = year;
+			this.year = year.split('/')[0];
 			this.checkSubmit()
 		},
 		showYearPicker() {
-			this.$refs.yearPicker.show()
+			this.$refs.customeDatePicker.open('bottom')
 		},
 		showGenderPicker() {
 			this.$refs.genderPopup.show();
@@ -166,16 +156,6 @@ export default {
 			this.nameRule = res
 			this.checkSubmit()
 		},
-		// idCardBlurEvent(value, res) {
-		// 	this.idcard = value
-		// 	this.idcardExtRule = res
-		// 	this.checkSubmit()
-		// },
-		// phoneBlurEvent(value, res) {
-		// 	this.phone = value
-		// 	this.phoneRule = res
-		// 	this.checkSubmit()
-		// },
 		checkSubmit() {
 			this.canSubmit = false
 			if (!this.name || (this.sex !=0 && this.sex!=1) || !this.year) return
@@ -198,19 +178,20 @@ export default {
 
 <style lang="scss" scoped>
 .visitor-form-page {
-	// background: #F8F8F8;
-	background: #FFFFFF;
+	background: #F8F8F8;
 
 	height: 100vh;
 	overflow-y: scroll;
 
 	.block {
-		// background: #FFFFFF;
+		background: #FFFFFF;
 		box-shadow: 0rpx 2rpx 24rpx 0rpx rgba(0, 0, 0, 0.03);
 		border-radius: 8rpx;
 		width: 714rpx;
 		margin: 20rpx auto 0rpx;
 		overflow: hidden;
+		padding: 0 24rpx;
+		box-sizing: border-box;
 
 		&:nth-child(3) {
 			border: none !important;
@@ -238,6 +219,7 @@ export default {
 
 	.submit {
 		margin: 0 auto;
+		font-size: 32rpx;
 	}
 
 	.fixedBot {
diff --git a/pages/visit_detail/visit_detail.vue b/pages/visit_detail/visit_detail.vue
index 84b2a60..f8b980e 100644
--- a/pages/visit_detail/visit_detail.vue
+++ b/pages/visit_detail/visit_detail.vue
@@ -356,7 +356,11 @@
 	background: #F6F6F6;
 	overflow-y: auto;
 	box-sizing: border-box;
-
+	::v-deep{
+		.visitor-account-com .uni-collapse-item__wrap{
+			background: #F8FFF7;
+		}
+	}
 	.ccpop{
 		&.bed-edit-pop{
 			::v-deep{
diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue
index 297300a..8987cf4 100644
--- a/pages/visitors/visitors.vue
+++ b/pages/visitors/visitors.vue
@@ -577,8 +577,8 @@
 		width: 100%;
 		top: 82.41%;
 		.submitbtn{
-			// width: 646rpx;
 			margin: 0 auto;
+			font-size: 32rpx;
 		}
 		.tip{
 			text-align: center;
@@ -677,7 +677,7 @@
 
 	.popup-container {
 		position: relative;
-		max-height: calc(100vh - 200rpx);
+		max-height: calc(100vh - 50rpx);
 		overflow-y: scroll;
 		background: #ffffff;
 		border-radius: 40rpx 40rpx 0px 0px;