Ltb2020年11月19日14:49:34

修改首页名称长度显示
患者管理搜索
注册页面调整
认证姓名长度限制，身份证长度限制

pages/index/index.vue

@@ -17,9 +17,11 @@
 							</view>
 							<view style="margin-left: 30rpx;">
 								<view style="font-size: 32rpx;font-weight: 600;margin-bottom: 20rpx;">
-									{{docterInfo.name}}
-									<u-tag style="margin-left: 10rpx;" :text="lable1" bg-color="#E5F5FF" color="#0B73B9" border-color="#ffffff" />
-									<u-tag style="margin-left: 10rpx;" :text="lable2" bg-color="#E5F5FF" color="#0B73B9" border-color="#ffffff" />
+									{{docterInfo.name| ellipsis}}
+									<u-tag style="margin-left: 10rpx;" :text="lable1" bg-color="#E5F5FF" color="#0B73B9" border-color="#ffffff"
+									 v-if="!lable1==''" />
+									<u-tag style="margin-left: 10rpx;" :text="lable2" bg-color="#E5F5FF" color="#0B73B9" border-color="#ffffff"
+									 v-if="!lable2==''" />
 								</view>
 								<view style="color:#666666 ;">
 									{{docterInfo.sign}}
@@ -117,7 +119,7 @@
 							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">服务设置</view>
 						</u-grid-item>
-						<u-grid-item  @click="evaluate">
+						<u-grid-item @click="evaluate">
 							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/pj.png"
 							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">我的评价</view>
@@ -141,8 +143,10 @@
 				 @touchend.prevent="touchend" @click="navt(item)" class="padding-lr-sm padding-tb-sm bg-white margin-top-sm" style="border-radius: 32rpx;">
 					<view class="flex justify-start align-center">
 						<!-- 1为订单通知 2为系统通知 3为通知类型 -->
-						<image src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/ddtz.png" v-if="item.type==1||item.type==2||item.type==3" style="width: 30rpx;height: 30rpx;"></image>
-						<image src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/xttz.png" v-else-if="item.type==4"style="width: 30rpx;height: 30rpx;"></image>
+						<image src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/ddtz.png" v-if="item.type==1||item.type==2||item.type==3"
+						 style="width: 30rpx;height: 30rpx;"></image>
+						<image src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/xttz.png" v-else-if="item.type==4"
+						 style="width: 30rpx;height: 30rpx;"></image>
 						<image src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/tzlx.png" v-else style="width: 30rpx;height: 30rpx;"></image>
 						<text class="text-lg margin-left-xs" style="margin-right: 20rpx;" v-if="item.type==1">确认接单</text>
 						<text class="text-lg margin-left-xs" style="margin-right: 20rpx;" v-else-if="item.type==2">订单逾期</text>
@@ -157,7 +161,7 @@
 						<text class="text-lg margin-left-xs" style="margin-right: 20rpx;" v-else-if="item.type==11">服务开通结果</text>
 						<text class="text-lg margin-left-xs" style="margin-right: 20rpx;" v-else-if="item.type==12">提醒排班</text>
 						<text class="text-lg margin-left-xs" style="margin-right: 20rpx;" v-else-if="item.type==13">排班</text>
-						
+
 						<view v-if="item.status==1" class="flex align-center">
 							<view style="width: 14rpx;height: 14rpx;border-radius: 50%;background-color:#FF4F61 ;"></view>
 							<text class="margin-left-xs" style="font-size: 24rpx;color: #FF4F61;">未读</text>
@@ -275,7 +279,12 @@
 		methods: {
 			getDocterInfo: async function() {
 				let res = await this.$request.post("doctor/doctorInfor", {});
-				this.docterInfo.name = res.data.name;
+				if (res.data.name.length > 5) {
+					this.docterInfo.name = res.data.name.substring(0, 5) + "...";
+				}else{
+					this.docterInfo.name = res.data.name;
+				}
+				
 				this.src = res.data.avatar;
 				this.docterInfo.eva_num = res.data.eva_num;
 				this.docterInfo.is_then = res.data.is_then;
@@ -293,21 +302,21 @@
 				});
 				if (res.data.length == 0) {
 					uni.showToast({
-						title: '到底了',
+						title: '没有更多数据',
 						duration: 3000,
 						icon: 'none'
 					})
 					return false;
 				}
-				if(this.page==1){
+				if (this.page == 1) {
 					this.docterMessageList = [];
 					this.docterMessageList = res.data
-				}else{
+				} else {
 					this.docterMessageList = this.docterMessageList.concat(res.data)
 				}
 				// this.docterMessageList = res.data
-				console.log('我是docterMessageList',this.docterMessageList);
-				console.log('我是接口数据',res.data);
+				console.log('我是docterMessageList', this.docterMessageList);
+				console.log('我是接口数据', res.data);
 			},
 			//全部已读
 			allread: async function() {
@@ -354,83 +363,90 @@
 					});
 				}.bind(this), 1000);
 			},
-			
+			ellipsis(value) {
+				if (!value) return ''
+				if (value.length > 5) {
+					return value.slice(0, 5) + '...'
+				}
+				return value
+			},
+
 			/**
 			 * 通知跳转
 			 * @author Liu Yuanhang
 			 * @param {Object} e
 			 */
-			navt(e){
+			navt(e) {
 				// 1.确认接单通知 2.订单逾期通知 3.订单完成通知 4.评价通知 5.服务包通知 
 				// 6.社区端发送的通知 7.总后台发送的通知，8.认证申请通知，9.认证结果通知，
 				// 10服务开通通知，11。服务开通结果通知，12，提醒排班，13.排班通知
 				let id;
-				if(e.type==1){
+				if (e.type == 1) {
 					// 1.确认接单通知 跳转到订单详情
 					id = e.relation_id
-					if(e==0){
+					if (e == 0) {
 						uni.showToast({
-							icon:'none',
-							duration:2000,
-							title:'错误！'
+							icon: 'none',
+							duration: 2000,
+							title: '错误！'
 						})
-					}	
+					}
 					uni.navigateTo({
 						url: '/pages/zixun/xiangqing?data=' + id
 					})
-				}else if(e.type==2){
+				} else if (e.type == 2) {
 					// 2.订单逾期通知 跳转订单详情
 					id = e.relation_id
-					if(e==0){
+					if (e == 0) {
 						uni.showToast({
-							icon:'none',
-							duration:2000,
-							title:'错误！'
+							icon: 'none',
+							duration: 2000,
+							title: '错误！'
 						})
 					}
 					uni.navigateTo({
 						url: '/pages/zixun/xiangqing?data=' + id
 					})
-				}else if(e.type==3){
+				} else if (e.type == 3) {
 					// 2.订单完成通知 跳转订单详情
 					id = e.relation_id
-					if(e==0){
+					if (e == 0) {
 						uni.showToast({
-							icon:'none',
-							duration:2000,
-							title:'错误！'
+							icon: 'none',
+							duration: 2000,
+							title: '错误！'
 						})
 					}
 					uni.navigateTo({
 						url: '/pages/zixun/xiangqing?data=' + id
 					})
-				}else if(e.type==4){
+				} else if (e.type == 4) {
 					// 4.评价通知 跳转评价详情
 					id = e.relation_id
-					if(e!=0){
+					if (e != 0) {
 						uni.showToast({
-							icon:'none',
-							duration:2000,
-							title:'错误！'
+							icon: 'none',
+							duration: 2000,
+							title: '错误！'
 						})
 					}
 					uni.navigateTo({
 						url: '/pages/me_evaluate'
 					})
-				}else if(e.type==5){
+				} else if (e.type == 5) {
 					// 5.服务包通知 点击查看用户详情
 					id = e.relation_id
-					if(e!=0){
+					if (e != 0) {
 						uni.showToast({
-							icon:'none',
-							duration:2000,
-							title:'错误！'
+							icon: 'none',
+							duration: 2000,
+							title: '错误！'
 						})
 					}
 					uni.navigateTo({
 						url: '/pages/patient/patientxq?id=' + id
 					})
-				}else if(e.type==6){
+				} else if (e.type == 6) {
 					// 6.社区端发送的通知
 					uni.showModal({
 						title: "社区通知",
@@ -438,8 +454,7 @@
 						confirmText: "知道了",
 						showCancel: false,
 					})
-				}
-				else if(e.type==7){
+				} else if (e.type == 7) {
 					// 7.总后台发送的通知
 					uni.showModal({
 						title: "后台通知",
@@ -447,7 +462,7 @@
 						confirmText: "知道了",
 						showCancel: false,
 					})
-				}else if(e.type==8){
+				} else if (e.type == 8) {
 					// 8.认证申请通知
 					uni.showModal({
 						title: "认证申请",
@@ -455,7 +470,7 @@
 						confirmText: "知道了",
 						showCancel: false,
 					})
-				}else if(e.type==9){
+				} else if (e.type == 9) {
 					// 9.认证结果通知，
 					uni.showModal({
 						title: "认证结果",
@@ -463,7 +478,7 @@
 						confirmText: "知道了",
 						showCancel: false,
 					})
-				}else if(e.type==10){
+				} else if (e.type == 10) {
 					// 10服务开通通知
 					uni.showModal({
 						title: "服务开通",
@@ -471,7 +486,7 @@
 						confirmText: "知道了",
 						showCancel: false,
 					})
-				}else if(e.type==11){
+				} else if (e.type == 11) {
 					// 11。服务开通结果通知
 					uni.showModal({
 						title: "服务开通结果",
@@ -479,24 +494,24 @@
 						confirmText: "知道了",
 						showCancel: false,
 					})
-				}else if(e.type==12){
+				} else if (e.type == 12) {
 					// 12，提醒排班 跳转到排班
 					uni.navigateTo({
 						url: '/pages/Scheduling'
 					})
-					
-				}else if(e.type==13){
+
+				} else if (e.type == 13) {
 					// 13.排班通知 跳转到排班
-					 uni.navigateTo({
-					 	url: '/pages/Scheduling'
-					 })
-				 }
-				
+					uni.navigateTo({
+						url: '/pages/Scheduling'
+					})
+				}
+
 				console.log(e);
 			},
-			
+
 			//如果点击模块   需要判断认证
-			judgerenzheng: function(){
+			judgerenzheng: function() {
 				if (!this.hasLogin) {
 					uni.showModal({
 						title: "提示",
@@ -504,101 +519,106 @@
 						confirmText: "去登录",
 						showCancel: false,
 						success() {
-							uni.reLaunch({
+							uni.navigateTo({
 								url: "../login/login"
 							})
 						}
 					})
 					return false;
-				}else{
+				} else {
 					return true
 				}
 			},
 
 			// 跳转服务设置
 			setservice(e) {
-				if(this.judgerenzheng()){
+				if (this.judgerenzheng()) {
 					uni.navigateTo({
-					url: '/pages/service/setservice'
-				})
+						url: '/pages/service/setservice'
+					})
 				}
-				
+
 			},
 			//跳转患者管理
 			patient(e) {
-				if(this.judgerenzheng()){
-				uni.navigateTo({
-					url: '/pages/patient/patient'
-				})
+				if (this.judgerenzheng()) {
+					uni.navigateTo({
+						url: '/pages/patient/patient'
+					})
 				}
 			},
 			editdocter() {
-				if(this.judgerenzheng()){
-				uni.navigateTo({
-					url: '../index/index'
-				})}
+				if (this.judgerenzheng()) {
+					uni.navigateTo({
+						url: '../index/index'
+					})
+				}
 			},
 			touchend() {
-				if(this.judgerenzheng()){
-				console.log('结束')
-				clearInterval(this.Loop);
+				if (this.judgerenzheng()) {
+					console.log('结束')
+					clearInterval(this.Loop);
 				}
 			},
 
 			//跳转患者咨询
 			zixun() {
-				if(this.judgerenzheng()){
-				uni.navigateTo({
-					url: '/pages/zixun/zixun'
-				})}
+				if (this.judgerenzheng()) {
+					uni.navigateTo({
+						url: '/pages/zixun/zixun'
+					})
+				}
 			},
 			//排班
 			pb() {
-				if(this.judgerenzheng()){
-				uni.navigateTo({
-					url: '/pages/Scheduling'
-				})}
+				if (this.judgerenzheng()) {
+					uni.navigateTo({
+						url: '/pages/Scheduling'
+					})
+				}
 			},
 			//意见
 			yijian() {
-				if(this.judgerenzheng()){
-				uni.navigateTo({
-					url: '/pages/opinion/opinion'
-				})}
+				if (this.judgerenzheng()) {
+					uni.navigateTo({
+						url: '/pages/opinion/opinion'
+					})
+				}
 			},
 			//门诊
 			mz() {
-				if(this.judgerenzheng()){
-				uni.navigateTo({
-					url: '/pages/menzhen/menzhen'
-				})}
+				if (this.judgerenzheng()) {
+					uni.navigateTo({
+						url: '/pages/menzhen/menzhen'
+					})
+				}
 			},
 			//个人信息 右上角的编辑按钮
 			grxx() {
-				if(this.judgerenzheng()){
-				uni.navigateTo({
-					url: '/pages/information/information'
-				})
+				if (this.judgerenzheng()) {
+					uni.navigateTo({
+						url: '/pages/information/information'
+					})
 				}
 			},
 			//点击未认证
 			gorz() {
-				if(this.judgerenzheng()){
-				this.rzModal = true
+				if (this.judgerenzheng()) {
+					this.rzModal = true
 				}
 			},
-			evaluate(){
-				if(this.judgerenzheng()){
-				uni.navigateTo({
-					url: '/pages/me_evaluate'
-				})
+			evaluate() {
+				if (this.judgerenzheng()) {
+					uni.navigateTo({
+						url: '/pages/me_evaluate'
+					})
 				}
 			},
 			qdrz() {
-				if(this.judgerenzheng()){
-				uni.navigateTo({
-					url: '/pages/login/doctorRenzheng'
-				})
+				if (this.judgerenzheng()) {
+					uni.navigateTo({
+						url: '/pages/login/doctorRenzheng'
+					})
 				}
 			}
 		},

pages/login/doctorRenzheng.vue

@@ -31,7 +31,7 @@
 					<view>医生姓名</view>
 				</view>
 				<view style="width: 70%;">
-					<u-input v-model="form.name" type="text" :border="false"  placeholder="请填写真实姓名" input-align="right" />
+					<u-input v-model="form.name" type="text" :border="false"  placeholder="请填写真实姓名" input-align="right" maxlength="6"/>
 				</view>
 			</view>
 			<u-line color="#f0f2f5" />
@@ -52,7 +52,7 @@
 					<view>身份证</view>
 				</view>
 				<view style="width: 70%;">
-					<u-input v-model="form.ID" type="idcard" :border="false" placeholder="请填写身份证号" input-align="right" />
+					<u-input v-model="form.ID" type="idcard" :border="false" placeholder="请填写身份证号" input-align="right" maxlength="18"/>
 				</view>
 			</view>
 		</view>

pages/login/login.vue

@@ -180,11 +180,11 @@
 					this.$refs.runCode.$emit('runCode'); //触发倒计时（一般用于请求成功验证码后调用）
 					setTimeout(function() {
 						_this.$refs.runCode.$emit('runCode', 0); //假装模拟下需要 终止倒计时
-						uni.showToast({
-							icon: 'none',
-							position: 'bottom',
-							title: '模拟倒计时终止'
-						});
+						// uni.showToast({
+						// 	icon: 'none',
+						// 	position: 'bottom',
+						// 	title: '模拟倒计时终止'
+						// });
 					}, 3000)
 				} else {
 					uni.showToast({

pages/login/reg.vue

@@ -11,7 +11,7 @@
 			下划线：   注册账号  账号密码登录
 		-->
 		<!-- 输入框 -->
-		<view style="height: 30vh;padding: 0 100rpx;">
+		<view style="height: auto;padding: 0 100rpx;">
 			<!-- 手机号 -->
 			<view style="padding-bottom: 36rpx;display: flex;border-bottom: 1rpx solid #E0E0E0;margin-bottom: 60rpx;">
 				<!-- 图标 手机图标-->
@@ -44,7 +44,7 @@
 			</view>
 		</view>
 		<!-- 按钮 -->
-		<view style="height: 30vh;padding: 0 80rpx;">
+		<view style="height: auto;padding: 0 80rpx;">
 			<!-- 登录 -->
 			<u-button @click="startReg()" type="primary" shape="circle" :loading="isRotate">注册并登录</u-button>
 			<view style="margin: 60rpx 0 80rpx 0;">

pages/patient/patient.vue

@@ -2,9 +2,9 @@
 	<view style="width: 100%;height: 100%;">
 		<view style="height: 100rpx;width: 100%;display: flex;align-items: center;justify-content: center;background-color: #FFFFFF;">
 			<u-search placeholder="搜索用户姓名" v-model="keyword" :show-action='false' style="width: 90%;" search-icon-color="red"
-			 @search="search"></u-search>
+			 @change="change"></u-search>
 		</view>
-		<view style="padding: 20rpx 28rpx;">
+		<view style="padding: 20rpx 28rpx;" v-if="keyword == ''">
 			<u-collapse v-for="(item, index) in followList" :item-style="itemStyle" :key="index" accordion>
 				<u-collapse-item>
 					<!-- 标题 -->
@@ -13,17 +13,32 @@
 						<text style="color: #666666;">{{item.sum}}</text>
 					</view>
 					<!-- 面板内容 -->
-					<view style="height:310px;overflow:auto;overflow-x:hidden;">
+					<!-- <view style="height:auto;overflow:auto;overflow-x:hidden;"> -->
+					<view>
 						<view v-for="(nitem,nindex) in item.content" style="display: flex;align-items: center;padding: 10rpx 0;overflow:auto"
-						 @click="xq" :id="nitem.user_id" :key='index'>
-							<image :src="nitem.avatar" mode="aspectFit" style="height: 68rpx;width: 68rpx;border-radius: 50%;margin-right: 20rpx;"></image>
-							<text style="font-size: 28rpx;margin: 28rpx;color: #000000;">{{nitem.nickname}}</text>
-							<text style="font-size: 28rpx;">{{nitem.remark==null?'':nitem.remark}}</text>
+						 @click="xq" :id="nitem.user_id" :key='nindex'>
+							<image :src="nitem.avatar==null?'../../static/login/moren.png':nitem.avatar" mode="aspectFit" style="height: 68rpx;width: 68rpx;border-radius: 50%;margin-right: 20rpx;"></image>
+							<text style="font-size: 28rpx;margin: 28rpx;color: #000000;">{{nitem.nickname==null?'未知':nitem.nickname}}</text>
+							<text style="font-size: 28rpx;">{{nitem.remark==null?'未知':nitem.remark}}</text>
 						</view>
 					</view>
 				</u-collapse-item>
 			</u-collapse>
 		</view>
+		<view v-else>
+			<view v-for="item, index in followList" :key="index">
+				<view style="padding-left: 50rpx;font-weight: bold;font-size: 30rpx;background-color: #EEEEEF;">{{item.title}}</view>
+				<view v-for="citem,cindex in item.content" :key='cindex'>
+					<view v-if="citem.nickname.indexOf(keywordSearch)>=0" class="flex align-center" style="height: 150rpx;padding: 10rpx;margin: 0 30rpx;"  @click="xq" :id="nitem.user_id">
+						<image :src="citem.avatar==null?'../../static/login/moren.png':citem.avatar" mode="aspectFit" style="height: 75rpx;width: 75rpx;border-radius: 50%;margin-right: 20rpx;"></image>
+						<text style="font-size: 28rpx;margin: 28rpx;color: #000000;">{{citem.nickname==null?'未知':citem.nickname}}</text>
+						<text style="font-size: 28rpx;">{{citems.remark==null?'未知':citem.remark}}</text>
+					</view>
+				</view>
+				
+			</view>
+			
+		</view>
 	</view>
 </template>
 
@@ -33,7 +48,7 @@
 			return {
 				//搜索
 				keyword: '',
-
+				keywordSearch:'',
 				itemStyle: {
 					marginBottom: '20rpx',
 					background: '#FFFFFF',
@@ -45,52 +60,88 @@
 					title: '咨询患者',
 					sum: '',
 					content: [{
-						name: '张三1',
+						nickname: '张三1',
 						position: '不知道什么病'
 					}, {
-						name: '张三2',
+						nickname: '张三2',
 						position: '癌症'
 					}, {
-						name: '张三3',
+						nickname: '张三3',
 						position: '羊癫疯'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
+					}, {
+						nickname: '张三...',
+						position: '癌症'
 					}]
 				}, {
 					title: '门诊患者',
 					sum: '',
 					content: [{
-						name: '张三4',
+						nickname: '张三4',
 						position: '不知道什么病'
 					}, {
-						name: '张三5',
+						nickname: '张三5',
 						position: '癌症'
 					}, {
-						name: '张三6',
+						nickname: '张三6',
 						position: '羊癫疯'
 					}]
 				}, {
 					title: '关注患者',
 					sum: '',
 					content: [{
-						name: '张三7',
+						nickname: '张三7',
 						position: '不知道什么病'
 					}, {
-						name: '张三8',
+						nickname: '张三8',
 						position: '癌症'
 					}, {
-						name: '张三9',
+						nickname: '张三9',
 						position: '羊癫疯'
 					}]
 				}, {
 					title: '服务包患者',
 					sum: '',
 					content: [{
-						name: '张三.',
+						nickname: '张三.',
 						position: '不知道什么病'
 					}, {
-						name: '张三...',
+						nickname: '张三...',
 						position: '癌症'
 					}, {
-						name: '张三...',
+						nickname: '张三...',
 						position: '羊癫疯'
 					}]
 				}]
@@ -98,8 +149,9 @@
 		},
 		methods: {
 			//搜索
-			search(e) {
-				console.log(e)
+			change(e) {
+				this.keywordSearch = e.trim()
+				console.log(this.keywordSearch)
 			},
 			//详情
 			xq(e) {
@@ -135,7 +187,7 @@
 				this.followList[a].sum = this.followList[a].content.length
 				console.log(this.followList[a].sum)
 			}
-			this.getLists();
+			// this.getLists();
 		}
 	}
 </script>

pages/patient/patientxq.vue

@@ -89,7 +89,7 @@
 				<view class="lswz_card" v-for="(ritem,index) in recordlist" :key="index">
 					<!-- 上部分 完成 问诊渠道-->
 					<view style="display: flex;margin-bottom: 25rpx;">
-						<view style="width: 80%;display: flex;color: #666666;align-items:center;">
+						<view style="width: 70%;display: flex;color: #666666;align-items:center;">
 							<!-- 小点 -->
 							<view style="height: 12rpx;width: 12rpx;background-color: #666666;border-radius: 50%;margin: 0 10rpx;"></view>
 							<!-- true为已完成 false未完成 --> 
@@ -100,7 +100,7 @@
 							<text v-else>已取消</text>
 
 						</view>
-						<view style="width: 20%;">
+						<view style="width: 30%;display: flex;align-items: center;justify-content: center;">
 							<u-button size="mini" shape="circle" v-if="ritem.product_type == 1">电话咨询</u-button>
 							<u-button size="mini" shape="circle" v-else-if="ritem.product_type == 2">图文咨询</u-button>
 							<u-button size="mini" shape="circle" v-else-if="ritem.product_type == 3">门诊预约</u-button>