1
0

2 Commity 2b13e4588d ... 9742cce702

Autor SHA1 Správa Dátum
  XSLu08042 9742cce702 Merge branch 'master' of http://1.14.104.71:10880/root/his_user_miniapp 2 týždňov pred
  XSLu08042 a2c7164fbd 1、疗法详情页不强制登录 2 týždňov pred

+ 20 - 16
pages_index/components/choosePatient/choosePatient.vue

@@ -3,23 +3,27 @@
 		<view class="patient-box">
 			<view class="patient-head">
 				<view class="patient-title">选择就诊人</view>
-				<view class="patient-title x-f addbtn" style="color: #fff;font-weight: normal;" @click="addPatient()"><u-icon name="plus" size="36rpx" color="#fff"></u-icon>添加</view>
+				<view class="patient-title x-f addbtn" style="color: #fff;" @click="addPatient()"><u-icon name="plus" size="36rpx" color="#fff" :bold="true"></u-icon>添加</view>
 			</view>
 			<scroll-view scroll-x :scroll-into-view="scrollIntoView" :scroll-with-animation="true" class="patient-list" v-if="patientList&&patientList.length>0">
 				<view :id="'patient_'+i" :class="current == i ? 'patient-item patient-active':'patient-item'" v-for="(item,i) in patientList" :key="item.patientId" @click="handlePatient(item,i)">
-					<view class="patient-name textOne">{{item.patientName}}</view>
-					<view class="patient-info">
-						<text class="text" v-if="item.sex==1">男</text>
-						<text class="text" v-if="item.sex==2">女</text>
-						<text class="text">{{$getAge(item.birthday)}}岁</text>
-					</view>
-					<view class="checkmarkempty">
-						<u-icon v-show="current == i" name="checkmark" size="28rpx" color="#fff"></u-icon>
+					<view style="display: flex;flex-direction: column;align-items: flex-start;justify-content: center;flex:1;overflow: hidden;">
+						<view class="patient-name one-t">{{item.patientName}}</view>
+						<view class="patient-info">
+							<text class="text" v-if="item.sex==1">男</text>
+							<text class="text" v-if="item.sex==2">女</text>
+							<text class="text">{{$getAge(item.birthday)}}岁</text>
+						</view>
+						<view class="checkmarkempty">
+							<u-icon v-show="current == i" name="checkmark" size="28rpx" color="#fff"></u-icon>
+						</view>
 					</view>
 				</view>
-				<view :id="'patient_'+patientList.length" class="patient-item additem"  @click="addPatient()">
-					<u-icon name="plus" size="36rpx" color="#FF5C03" style="font-weight: bold;"></u-icon>
-					<view class="patient-name" style="color: #ff5c03;">添加</view>
+				<view :id="'patient_'+patientList.length" class="patient-item"  @click="addPatient()">
+					<view class="additem">
+						<u-icon name="plus" size="36rpx" color="#FF5C03" :bold="true"></u-icon>
+						<view class="patient-name" style="color: #ff5c03;margin-bottom: 0;margin-top: 10rpx;">添加</view>
+					</view>
 				</view>
 			</scroll-view>
 		</view>
@@ -89,6 +93,8 @@
 	.additem {
 		text-align: center;
 		color: #ff5c03 !important;
+		@include u-flex(column, center, center);
+		height: 100%;
 	}
 	.addbtn {
 		background-color: #FF5C03;
@@ -117,14 +123,11 @@
 			font-weight: bold;
 		}
 		&-list {
+			margin-top: 20rpx;
 			white-space: nowrap;
 			width: 100%;
-			@include u-flex(row, center, flex-start);
 		}
 		&-item {
-			height: 54px;
-			overflow: hidden;
-			margin-top: 20rpx;
 			width: 200rpx;
 			margin-right: 16rpx;
 			display: inline-block;
@@ -154,6 +157,7 @@
 			}
 		}
 		&-name {
+			width: 100%;
 			overflow: hidden;
 			margin-bottom: 10rpx;
 			font-size: 30rpx;

+ 3 - 3
pages_index/packageDetails.vue

@@ -267,9 +267,9 @@
 						);	
 					}
 					else{
-						uni.navigateTo({
-							url:'/pages/auth/login'
-						})
+						// uni.navigateTo({
+						// 	url:'/pages/auth/login'
+						// })
 					}
 				}
 			);