Merge pull request 'bug-rework-2025-0603' (#14) from bug-rework-2025-0603 into master

Reviewed-on: kuaileadmin/acupuncture_register_system_uniapp#14

components/FormItem.vue

@@ -51,7 +51,7 @@
     },
     data(){
         return{
-			cssUrl: this.cssUrl,
+			    cssUrl: this.cssUrl,
         }
     },
     methods: {

components/SelectYear.vue

@@ -28,15 +28,16 @@
 export default {
     data() {
         const date = new Date()
-		const years = []
+				const years = []
-        const year = date.getFullYear()
+				const year = date.getFullYear()
-        for (let i = 1990; i <= date.getFullYear(); i++) {
+				for (let i = 1900; i <= date.getFullYear(); i++) {
-				years.push(i)
+					years.push(i)
-			}
+				}
         return {
             cssUrl:this.cssUrl,
-            years: years,   // 年份列表
+						value:[90],
-            currentYear: new Date().getFullYear(),
+            currentYear: 1990,
+            years: years,
         };
     },
     methods: {
@@ -51,7 +52,7 @@ export default {
             this.$refs.selectDate.open('bottom')
         },
         closePop() {
-			this.$refs.selectDate.close()
+				this.$refs.selectDate.close()
 		},
     },
 };

pages/index/index.vue

@@ -98,10 +98,6 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<doctorImport v-if="user_type == '1' || user_type == '2'"></doctorImport>
 		<!-- #endif -->
-		<!-- #ifdef MP-WEIXIN -->
-		<button id="getPhoneBtn" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber"
-			style="display: none;"></button>
-		<!-- #endif -->
 		<uni-popup ref="nameWrap" :safe-area="false">
 			<view class="popup-container">
 				<view class="header">
@@ -117,7 +113,7 @@
 				</view>
 			</view>
 		</uni-popup>
-
+		<button class="getphone-box" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="!doctorInfo.aid"></button>
 	</view>
 </template>
 
@@ -164,12 +160,6 @@ export default {
 			this.state = option.state
 		}
 	},
-	onReady() { // 使用 onReady 替代 onLoad
-		// #ifdef MP-WEIXIN
-		// this.triggerGetPhone();
-		// #endif
-
-	},
 	async onShow() {
 		this.doctor_id = getApp().globalData.doctorId
 		if (!this.doctor_id) return
@@ -200,55 +190,18 @@ export default {
 				this.$refs.nameWrap.close()
 			});
 		},
-		// 主动触发获取手机号
+		getPhoneNumber(e) {
-		triggerGetPhone() {
+			console.log(e)
-			// 确保组件作用域和延迟
+			if (e.detail.errMsg === 'getPhoneNumber:ok') {
-			setTimeout(() => {
+				this.$http.req('api/user/bind_phone', {phonecode:e.detail.code}, 'POST').then(data=>{
-				const query = uni.createSelectorQuery().in(this);
+					if(data == -1) return
-				query.select('#getPhoneBtn')
+					this.getDoctorInfo()
-					.node()
-					.exec((res) => {
-						const node = res[0]?.node;
-						if (node) {
-							node.dispatchEvent(new CustomEvent('tap'));
-						} else {
-							console.error('节点未找到，请检查:', res);
-							// 备用方案：引导用户手动点击
-							wx.showModal({
-								title: '提示',
-								content: '请手动点击授权按钮',
-							});
-						}
-					});
-			}, 800);
-		},
-		// 手机号授权回调
-		onGetPhoneNumber(e) {
-			if (e.detail.errMsg === "getPhoneNumber:ok") {
-				const { code } = e.detail;
-				// 发送 code 到后端解密手机号
-				wx.login({
-					success: (loginRes) => {
-						wx.request({
-							url: '/api/user/bind_phone',
-							data: { wxCode: loginRes.code, phoneCode: code },
-							success: (res) => {
-								const phone = res.data.phone;
-								this.setData({ phone });
-								// 手机号获取成功后，弹出姓名填写
-								this.setData({ showNameDialog: true });
-							},
-						});
-					},
 				});
 			} else {
-				// 用户拒绝，记录状态
+
-				this.setData({ hasRejectedPhone: true });
-				wx.showToast({ title: "需要手机号才能继续", icon: "none" });
 			}
 		},
 		toLocation(hospital) {
-
 			// #ifdef MP-WEIXIN
 			var lngLat = hospital.hospital_pos.toString().split(',')
 			var lng = Number(lngLat[1])
@@ -332,15 +285,17 @@ export default {
 
 				this.pageShow = true;
 
-				this.$nextTick(() => {
-					console.log(this.$refs, 'this.$refs.nameWrap');
-					this.$refs.nameWrap.open('bottom')
-				})
 
 				let visitFlag = true;
 				this.doctorInfo = data;
 				this.user_type = this.doctorInfo.user_type;
 
+				if(!data.realname && data.aid) {
+					this.$nextTick(() => {
+						this.$refs.nameWrap.open('bottom')
+					})
+				}
+
 				var title = this.doctorInfo.doctor_info.doctor_name + '主页'
 				uni.setNavigationBarTitle({
 					title: title
@@ -748,7 +703,15 @@ export default {
 		margin: 0 auto;
 	}
 
-
+	.getphone-box{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 8999999999;
+		opacity: 0;
+	}
 }
 
 .popup-container {
@@ -831,6 +794,5 @@ export default {
 		font-size: 26rpx;
 		font-family: PingFang SC;
 	}
-
 }
 </style>

pages/modify_visitor/modify_visitor.vue

@@ -178,7 +178,7 @@ export default {
 		// },
 		checkSubmit() {
 			this.canSubmit = false
-			if (!this.name || !this.sex || !this.year) return
+			if (!this.name || (this.sex !=0 && this.sex!=1) || !this.year) return
 			this.canSubmit = true
 		},
 		reback() {

pages/usercenter/usercenter.vue

@@ -1,9 +1,26 @@
 <template>
 	<view class="page-usercenter">
-		<view class="user-wrapper" @click="toUserModify">
+		<view class="user-wrapper" v-if="uinfo">
-			<img :src="uinfo.user_avatar" class="avator" v-if="uinfo.user_avatar">
+			<view class="change-account">
-			<img :src="cssUrl+'user_grey.svg'" class="avator" v-else>
+				<img :src="cssUrl+'switch.svg'">
-			<view class="ucode PfScMedium over2" v-if="uinfo.user_code">{{uinfo.user_code}}</view>
+				切换账号
+				<button class="getphone-box" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"></button>
+			</view>
+
+			<view class="user-info-box flex">
+				<view class="user-left">
+					<img :src="uinfo.user_avatar" class="avator" v-if="uinfo.user_avatar">
+					<img :src="cssUrl+'user_grey.svg'" class="avator" v-else>
+					<view class="ucode PfScMedium over2" v-if="uinfo.user_code">{{uinfo.user_code}}</view>
+				</view>
+
+				<view class="user-right">
+					<view class="realname PfScMedium">{{uinfo.realname ? uinfo.realname : '未设置真实姓名'}}</view>
+					<view class="phone">{{uinfo.phone ? '手机号：'+uinfo.phone : '未设置手机号'}}</view>
+				</view>
+			</view>
+
+
 		</view>
 
 		<view class="menu">
@@ -28,7 +45,7 @@
 		data() {
 			return {
 				cssUrl:this.cssUrl,
-				uinfo:{}
+				uinfo:false
 			}
 		},
 		components:{
@@ -52,7 +69,22 @@
 			},
 			toUserModify(){
 				this.$nav.navToPath('/pages/user_modify/user_modify')
-			}
+			},
+			getPhoneNumber(e) {
+				if (e.detail.errMsg === 'getPhoneNumber:ok') {
+					this.$http.req('api/user/bind_phone', {phonecode:e.detail.code}, 'POST').then(data=>{
+						if(data == -1) return
+						this.getUser()
+						uni.showToast({
+							title: '切换成功',
+							icon: 'none',
+							mask: true
+						})
+					});
+				} else {
+
+				}
+			},
 		}
 	}
 </script>
@@ -63,12 +95,52 @@
 		height: 100vh;
 		overflow-y: auto;
 		background: #F8F8F8;
+		.user-wrapper{
+			margin: 24rpx 36rpx;
+			.change-account{
+				display: flex;
+				align-items: center;
+				font-size: 28rpx;
+				color: #333333;
+				column-gap: 12rpx;
+				height: 39rpx;
+				width: 100%;
+				position: relative;
+				justify-content: flex-end;
+				.getphone-box{
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
+					z-index: 10;
+					opacity: 0;
+				}
+				img{
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+			.user-info-box{
+				align-items: center;
+				column-gap: 42rpx;
+				.realname{
+					font-size: 38rpx;
+					font-weight: 500;
+					color: #333333;
+				}
+				.phone{
+					font-size: 26rpx;
+					color: #666666;
+					margin-top: 24rpx;
+				}
+			}
+		}
 		.avator{
 			display: block;
 			width: 160rpx;
 			height: 160rpx;
 			border-radius: 100%;
-			margin: 20rpx auto 24rpx;
 		}
 		.ucode{
 			width: 80%;