Merge pull request 'version_v1_2024_11_04' (#4) from version_v1_2024_11_04 into master

Reviewed-on: kuaileadmin/acupuncture_register_system_uniapp#4

components/inputBox.vue

@@ -2,7 +2,7 @@
   <view class="input-com">
 	<view :class="'input-wrapper'+(errormsg?' error':'')">
 		<view class="left">
-			<text :class="!required?'hide-start':''"><img :src="cssUrl+'hua.svg'" class="hua"></text>
+			<!-- <text :class="!required?'hide-start':''"><img :src="cssUrl+'hua.svg'" class="hua"></text> -->
 			<view>{{label}}：</view>
 		</view>
 		<view class="right">
@@ -130,9 +130,11 @@ export default {
 			box-sizing: border-box;
 			margin: 0 auto;
 			font-size: 32rpx;
+			line-height: 32rpx;
 			letter-spacing: 1rpx;
+			align-items: center;
 			&.error{
-				border: 1rpx solid #FAB0B0;
+				border: 2rpx solid #FAB0B0;
 			}
 			.left{
 				display: flex;

manifest.json

@@ -70,6 +70,8 @@
         "enable" : false
     },
     "vueVersion" : "2",
+		/*  "target" : "http://jasonyizherenxin.checkcopy.com",*/
+		/*  "target" : "http://api.yizherenxin.cn",*/
     "h5" : {
         "router" : {
             "mode" : "history",

pages/index/index.vue

@@ -33,24 +33,38 @@
 				<view class="top flex">
 					<view class="left">
 						<view class="title flex">
-							<text class="over2 PfScMedium">{{item.hospital_name}} {{item.depart_name}}
+							<text class="over2 PfScMedium">{{item.hospital_name}}
+							<!-- {{item.depart_name}} -->
 								 <!-- {{item.depart_name}} -->
 								  <!-- 科室 -->
 								</text>
-							<img :src="cssUrl+'index_comback.svg'" v-if="item.hospital_pos" @click="toLocation(item)">
+							<!-- <img :src="cssUrl+'index_comback.svg'" v-if="item.hospital_pos" @click="toLocation(item)"> -->
 						</view>
-						<view class="date over2 over4">
-							出诊：{{ item.workdate_desc }}
+						<view class="date over2 over4" v-if="item.address">
+							
+							{{item.address}}
+							
+							<!-- 出诊：{{ item.workdate_desc }} -->
 						</view>
 					</view>
 					<view class="right">
-						<view class="flex right-wrapper" style="justify-content:flex-end;" v-if="item.hospital_pos">
-							<view class="" @click="toLocation(item)">
+						<view class="flex right-wrapper" style="justify-content:center;" v-if="item.hospital_pos">
+							<!-- <view class="" @click="toLocation(item)">
 								<img :src="cssUrl+'index_nav.svg'" alt="">
 								<view>导航</view>
+							</view> -->
+							
+							<view v-if="item.address" class="flex copy_btn" @click="copyAddress(item.address)" style="justify-content:center;flex-wrap: wrap;">
+								<img :src="cssUrl+'copy_green.svg'" alt="">
+								<view>复制地址</view>
+							</view>
+							
 						</view>
 					</view>
 				</view>
+				
+				<view class="center">
+					出诊：{{ item.workdate_desc }}
 				</view>
 				
 				<view class="bot primary btn btn2" hover-class="hover" @click="toVisitors(item)">
@@ -197,6 +211,14 @@
 					}
 				});
 			},
+			copyAddress(address){
+				uni.setClipboardData({
+					data: address,
+					success: () => {
+						uni.showToast({ title: "地址已复制", icon: "none" });
+					}
+				});
+			},
 			setLoginUserInfo(info) {
 				var uinfo = new Object();
 				this.$setuinfo.setUinfo(JSON.stringify(info))
@@ -409,7 +431,7 @@
 				width: 100%;
 				margin-bottom: 36rpx;
 				.top{
-					min-height: 102rpx;
+					// min-height: 102rpx;
 					.left{
 						flex-grow: 1;
 						.title{
@@ -422,32 +444,50 @@
 						.date{
 							line-height: 40rpx;
 							font-size: 28rpx;
-							color: #666666;
+							color: #949699;
 							margin-top: 14rpx;
 						}
 					}
 					.right{
-						width: 200rpx;
+						// width: 200rpx;
+						width: 172rpx;
+						flex-shrink: 0;
 						height: 100%;
 						color: #666666;
+						display: flex;
+						justify-content: flex-end;
 						img{
 							width: 52rpx;
 							height: 52rpx;
-							background: #F4F4F4;
-							border-radius: 6rpx;
-							margin-right: 7rpx;
+							// background: #F4F4F4;
+							// border-radius: 6rpx;
+							// margin-right: 7rpx;
 						}
-						text{
-							width: 60rpx;
-							height: 54rpx;
+						.copy_btn{
 							display: block;
-							font-size: 26rpx;
-							color: #666666;
-							line-height: 37rpx;
+							line-height: normal;
 							text-align: center;
-							margin-top: 5rpx;
+							margin-top: 4rpx;
+							font-size: 24rpx;
+							color: #30C563;
+						}
 					}
 				}
+				.center{
+					justify-content: flex-start;
+					align-items: center;
+					width: 100%;
+					box-sizing: border-box;
+					min-height: 59rpx;
+					padding: 10rpx;
+					display: flex;
+					z-index: 1;
+					background: #F8F6F9;
+					font-size: 28rpx;
+					line-height: 39rpx;
+					color: #666666;
+					margin-top: 22rpx;
+					word-break: break-all;
 				}
 				.bot{
 					margin-top: 16rpx;

pages/modify_visitor/modify_visitor.vue

@@ -8,8 +8,11 @@
 		</view>
 
 		<view class="submit-wrapper btPadding" v-if="!vid">
-			<view :class="'btn btn3 submit'+(canSubmit?' primary':' noclick')" :hover-class="(canSubmit?'hover':'')" @click="submit">
-				确认就诊人
+			<view :class="'btn btn3 submit'+(canSubmit?' primary':' noclick')" :hover-class="(canSubmit?'hover':'')" @click="submit" v-if="!vid">
+				确认添加
+			</view>
+			<view :class="'btn btn3 submit'+(canSubmit?' primary':' noclick')" :hover-class="(canSubmit?'hover':'')" @click="submit" v-else>
+				确认修改
 			</view>
 		</view>
 		<view class="fixedBot btPadding" v-if="vid">
@@ -45,7 +48,16 @@
 		},
 		onLoad(option) {
 			if(option.type) this.type = option.type
-			if(option.vid) this.vid = option.vid
+			if(option.vid) {
+				this.vid = option.vid
+				uni.setNavigationBarTitle({
+				  title: '修改就诊人'
+				});
+			}else{
+				uni.setNavigationBarTitle({
+				  title: '添加就诊人'
+				});
+			}
 		},
 		onShow() {
 			if(this.vid) this.getVisitorInfo()