Ltb2020年11月6日15:16:47

pages/index/index.vue

@@ -141,10 +141,8 @@
 				 @touchend.prevent="touchend" 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" 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==2"
-						 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==2" 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">{{item.type}}</text>
 						<text class="flex-sub text-right">{{item.created_at}}</text>

pages/login/doctorRenzheng.vue

@@ -52,7 +52,7 @@
 					<view>身份证</view>
 				</view>
 				<view style="width: 70%;">
-					<u-input v-model="form.name" type="idcard" :border="false" placeholder="请填写身份证号" input-align="right" />
+					<u-input v-model="form.ID" type="idcard" :border="false" placeholder="请填写身份证号" input-align="right" />
 				</view>
 			</view>
 		</view>

pages/opinion/opinion.vue

@@ -1,5 +1,7 @@
 <template style="background-color: #b1b1b1;">
 	<view style="width: 100%;height: 100%;">
+		
+		
 		<view class="topbut">
 			<!-- 正序 -->
 			<view v-if="sort" @click="sort = false">
@@ -41,7 +43,7 @@
 			</view>
 			<!-- 右边按钮 -->
 			<view style="width: 20%;" class="flex justify-center">
-				<view style="padding: 12rpx 24rpx;border-radius: 20rpx;background-color:#eaeaea ;height: 50rpx;color: b1b1b1;" class="flex justify-center align-center">意见单</view>
+				<view style="padding: 8rpx 16rpx;border-radius: 20rpx;background-color:#eaeaea ;height: 50rpx;color: b1b1b1;" class="flex justify-center align-center">意见单</view>
 			</view>
 		</view>
 		<view style="width: 100%;height: 100rpx;"></view>
@@ -61,7 +63,8 @@
 				//排序
 				sort: true,
 				//列表
-				list: []
+				list: [],
+				
 			}
 		},
 		onLoad() {
@@ -85,7 +88,8 @@
 					console.log('我是data',data); 
 					that.list=data;
 				}
-			}
+			},
+			
 		}
 	};
 </script>

pages/opinion/opiniondetails.vue

@@ -1,5 +1,35 @@
 <template>
 	<view style="width: 100%;height: 100%;background-color: #F6F6F6;">
+		<!-- 表单弹窗 -->
+		<u-popup v-model="formshow" mode="center" border-radius="14" :closeable="false">
+			<view style="width: 75vw;height: 60vh">
+				<view class="flex justify-center align-center" style="height: 15%;font-size: 34rpx;font-weight: bold;">填写意见单</view>
+				<view style="height: 70%;padding: 0 40rpx;">
+					<!-- 病症 -->
+					<view class="flex align-center" style="margin-bottom: 20rpx;">
+						<text style="margin-right: 20rpx;">原因:</text>
+						<input placeholder="请填写补充原因" @input="yyblur" style="border-bottom: 1rpx solid #666666;" />
+					</view>
+					<!-- 结论 -->
+					<view>
+						<view style="margin-bottom: 20rpx;">结论:</view>
+						<view style="padding: 10rpx;">
+							<textarea @input="jlblur" placeholder="请补充内容" placeholder-style="color:#969696;font-size: 28rpx;" style="width: auto;height: 300rpx;" />
+							</view>
+					</view>
+				</view>
+				<!-- 两个按钮 -->
+				<view style="height: 15%;display: flex;justify-content: center;align-items: center">
+					<view style="display:flex;justify-content: center;align-items: center;width: 50%;">
+						<u-button shape="shape" size="mini" @click="formshow = false">取消</u-button>
+					</view>
+					<view style="display:flex;justify-content: center;align-items: center ;width: 50%;">
+						<u-button shape="shape" size="mini"  type="primary" @click="qr">确认</u-button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		
 		<u-gap height="30" bg-color="#f6f6f6"></u-gap>
 		<view style="padding: 20rpx 28rpx;background-color: #FFFFFF;">
 			<!-- 头部 -->
@@ -105,12 +135,16 @@
 				ID: '',
 				jielun: '',
 				byList:[],
+				
+				formshow:false,//提交表单弹窗
+				yy:'',//原因
+				jl:''//结论
 			}
 		},
 		methods: {
 			// 补充意见
 			addyj(e) {
-
+				 this.formshow = true
 			},
 			getDetaile:async function(id){
 				let res = await this.$request.post('suggest/getSuggestDetail',{'suggest_id':id});
@@ -129,7 +163,31 @@
 					// this.bcneirong=data;
 				}
 				console.log('我是返回来的值',res);
-			}
+			},
+			//提交
+			yyblur(e){
+				this.yy = e.detail.value
+			},
+			jlblur(e){
+				this.jl = e.detail.value
+			},
+			qr(e){
+				if(this.yy!=''){
+						if(this.jl!=''){
+							this.formshow = false
+						}else{
+							uni.showToast({
+								title:'请填写补充内容',
+								icon:'none'
+							})
+						}
+				}else{
+					uni.showToast({
+						title:'请填写原因',
+						icon:'none'
+					})
+				}
+			},
 
 		}
 	};

pages/patient/patientxq.vue

@@ -1,5 +1,27 @@
 <template>
 	<view style="width: 100%;height: 100%;">
+		<!-- 表单弹窗 -->
+		<u-popup v-model="formshow" mode="center" border-radius="14" :closeable="false">
+			<view style="width: 75vw;height: auto;margin: 30rpx 0;">
+				<view class="flex justify-center align-center" style=";font-size: 34rpx;font-weight: bold;margin-bottom:80rpx ;">填写意见单</view>
+				<view style="padding: 0 40rpx;margin-bottom: 40rpx;">
+					<!-- 病症 -->
+					<view class="flex align-center" style="margin-bottom: 20rpx;">
+						<text style="margin-right: 20rpx;">备注:</text>
+						<input placeholder="请填写备注" @input="bzblur" style="border-bottom: 1rpx solid #666666;" />
+					</view>
+				</view>
+				<!-- 两个按钮 -->
+				<view style="display: flex;justify-content: center;align-items: center">
+					<view style="display:flex;justify-content: center;align-items: center;width: 50%;">
+						<u-button shape="shape" size="medium" @click="formshow = false">取消</u-button>
+					</view>
+					<view style="display:flex;justify-content: center;align-items: center ;width: 50%;">
+						<u-button shape="shape" size="medium" type="primary" @click="qr">确认</u-button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
 		<view class="header-content">
 			<image src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/mybanner.png" style="width:100%;height:260rpx;"></image>
 		</view>
@@ -17,17 +39,29 @@
 				</view>
 				<!-- 按钮 -->
 				<view style="width: 25%;display: flex;align-items: center;">
-					<u-button shape="circle" :custom-style="customStyle" :hair-line="false">设置备注</u-button>
+					<u-button shape="circle" :custom-style="customStyle" :hair-line="false" @click="formshow = true">设置备注</u-button>
 				</view>
 			</view>
 			<!-- 用户资料 -->
 			<view class="zl">
-				anges...
-				16:31:10.759 项目 'dortor' 编译成功。前端运行日志，请另行在小程序开发工具的控制台查看。
-				16:31:33.184 开始差量编译...16:31:10.394 开始差量编译...
-				16:31:10.756 DONE Build complete. Watching for changes...
-				16:31:10.759 项目 'dortor' 编译成功。前端运行日志，请另行在小程序开发工具的控制台查看。
-				16:31:33.184 开始差量编译...
+				<view>
+					<view class="flex justify-center" style="font-size: 36rpx;font-weight: 600;margin-bottom: 20rpx;">
+						<text>{{fwb}}</text>
+					</view>
+					<view>服务包数量</view>
+				</view>
+				<view>
+					<view class="flex justify-center" style="font-size: 36rpx;font-weight: 600;margin-bottom: 20rpx;">
+						<text>{{dd}}</text>
+					</view>
+					<view>订单数量</view>
+				</view>
+				<view>
+					<view class="flex justify-center" style="font-size: 36rpx;font-weight: 600;margin-bottom: 20rpx;">
+						<text>{{da}}</text>
+					</view>
+					<view>档案数量</view>
+				</view>
 			</view>
 			<!-- 已购服务 -->
 			<view>
@@ -60,7 +94,7 @@
 							<view style="height: 12rpx;width: 12rpx;background-color: #666666;border-radius: 50%;margin: 0 10rpx;"></view>
 							<!-- true为已完成 false未完成 -->
 							<text>{{ritem.order_status}}</text>
-						
+
 						</view>
 						<view style="width: 20%;">
 							<u-button size="mini" shape="circle">{{ritem.product_type}}</u-button>
@@ -198,7 +232,14 @@
 				}],
 				//历史问诊
 				recordlist: [],
-				dalist: []
+				dalist: [],
+				//列表
+				fwb: '1', //服务包
+				dd: '2', //订单
+				da: '3', //档案
+				//装设置备注值
+				formshow: false,
+				inputbz: ''
 			}
 		},
 		onLoad(options) {
@@ -207,49 +248,70 @@
 			this.getguanzhu();
 		},
 		mounted() {
-		
+
 		},
 		methods: {
-			
+
 			//点击档案
 			clickda(e) {
 				console.log(this.dalist[e.currentTarget.dataset.index])
-				let idda=e.currentTarget.id
+				let idda = e.currentTarget.id
 				uni.navigateTo({
-					url: 'patientda?id='+idda
+					url: 'patientda?id=' + idda
 				})
 			},
 			//点击关注
-			gzclick:async function(e) {
-				
+			gzclick: async function(e) {
+
 				if (this.guanzhu) {
 					console.log('取消关注')
-					let res = await this.$request.post("doctor/userFollow", {'user_id':this.user_id,'is_ley':1})
+					let res = await this.$request.post("doctor/userFollow", {
+						'user_id': this.user_id,
+						'is_ley': 1
+					})
 					this.guanzhu = false
 				} else {
-					let res = await this.$request.post("doctor/userFollow", {'user_id':this.user_id,'is_ley':2})
+					let res = await this.$request.post("doctor/userFollow", {
+						'user_id': this.user_id,
+						'is_ley': 2
+					})
 					this.guanzhu = true
 				}
 			},
 			detailres: async function(e) {
-				let idXq=e
+				let idXq = e
 				let res = await this.$request.post("doctor/userListDetile", {
-					user_id:idXq
+					user_id: idXq
 				})
-				let user_arr=res.data.user_arr
-				this.user_id=user_arr.id
-				this.img=user_arr.avatar
-				this.name=user_arr.nickname
-				this.bz=user_arr.remark
-				this.recordlist=res.data.order_arr//历史问诊
-				this.dalist=res.data.patients_arr//患者档案
+				let user_arr = res.data.user_arr
+				this.user_id = user_arr.id
+				this.img = user_arr.avatar
+				this.name = user_arr.nickname
+				this.bz = user_arr.remark
+				this.recordlist = res.data.order_arr //历史问诊
+				this.dalist = res.data.patients_arr //患者档案
 				this.getguanzhu(user_arr.id);
 			},
-			getguanzhu:async function(id){
-				let res = await this.$request.post('doctor/getFollows',{'user_id':id});
-			
-				if(res.status==0){
-					this.guanzhu=res.data
+			getguanzhu: async function(id) {
+				let res = await this.$request.post('doctor/getFollows', {
+					'user_id': id
+				});
+
+				if (res.status == 0) {
+					this.guanzhu = res.data
+				}
+			},
+			bzblur(e) {
+				this.inputbz = e.detail.value
+			},
+			qr(e) {
+				if (this.inputbz != '') {
+					this.formshow = false
+				} else {
+					uni.showToast({
+						title: '请填写备注',
+						icon: 'none'
+					})
 				}
 			}
 		}
@@ -284,6 +346,9 @@
 
 	// 资料
 	.zl {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
 		padding: 34rpx 28rpx;
 		background-color: #ffffff;
 		border-radius: 10rpx;

pages/service/more.vue

@@ -169,7 +169,7 @@
 						</view>
 
 						<view style="width: 100%;display: flex;  justify-content: space-around;  flex-direction: row;  flex-wrap: wrap;">
-							<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in timeList1" :key="index">
+							<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in tw.timeList1" :key="index">
 								<u-checkbox-group @change="" style="width: 100%;height: 100%;margin-bottom: 20rpx;">
 									<view style="display: flex;align-items: center;">
 										<!-- 按钮 -->
@@ -193,7 +193,7 @@
 						</view>
 						<!-- 剩下的复选框 -->
 						<view style="width: 100%;display: flex;  justify-content: space-around;  flex-direction: row;  flex-wrap: wrap;">
-							<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in timeList2" :key="index">
+							<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in tw.timeList2" :key="index">
 								<u-checkbox-group @change="" style="width: 100%;height: 100%;margin-bottom: 20rpx;">
 									<view style="display: flex;align-items: center;">
 										<!-- 按钮 -->
@@ -218,7 +218,7 @@
 						</view>
 
 						<view style="width: 100%;display: flex;  justify-content: space-around;  flex-direction: row;  flex-wrap: wrap;">
-							<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in timeList3" :key="index">
+							<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in tw.timeList3" :key="index">
 								<u-checkbox-group @change="" style="width: 100%;height: 100%;margin-bottom: 20rpx;">
 									<view style="display: flex;align-items: center;">
 										<!-- 按钮 -->
@@ -293,7 +293,7 @@
 							</view>
 
 							<view style="width: 100%;display: flex;  justify-content: space-around;  flex-direction: row;  flex-wrap: wrap;">
-								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in timeList1" :key="index">
+								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in mz1.timeList1" :key="index">
 									<u-checkbox-group @change="" style="width: 100%;height: 100%;margin-bottom: 20rpx;">
 										<view style="display: flex;align-items: center;">
 											<!-- 按钮 -->
@@ -317,7 +317,7 @@
 							</view>
 							<!-- 剩下的复选框 -->
 							<view style="width: 100%;display: flex;  justify-content: space-around;  flex-direction: row;  flex-wrap: wrap;">
-								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in timeList2" :key="index">
+								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in mz1.timeList2" :key="index">
 									<u-checkbox-group @change="" style="width: 100%;height: 100%;margin-bottom: 20rpx;">
 										<view style="display: flex;align-items: center;">
 											<!-- 按钮 -->
@@ -342,7 +342,7 @@
 							</view>
 
 							<view style="width: 100%;display: flex;  justify-content: space-around;  flex-direction: row;  flex-wrap: wrap;">
-								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in timeList3" :key="index">
+								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in mz1.timeList3" :key="index">
 									<u-checkbox-group @change="" style="width: 100%;height: 100%;margin-bottom: 20rpx;">
 										<view style="display: flex;align-items: center;">
 											<!-- 按钮 -->
@@ -368,7 +368,7 @@
 						<view v-if="mzcurrent2 == 0">
 							<view class="flex align-center" style="margin-bottom: 20rpx;padding-left: 20rpx;">
 								<!-- 全选复选框 -->
-								<u-checkbox-group @change="changeA(10)" v-for="(aitem, aindex) in all10" :key="aindex" class="flex">
+								<u-checkbox-group @change="change(10)" v-for="(aitem, aindex) in all10" :key="aindex" class="flex">
 									<!-- 全选按钮 -->
 									<u-checkbox v-model="aitem.checked" shape="circle" size="40"></u-checkbox>
 								</u-checkbox-group>
@@ -376,7 +376,7 @@
 							</view>
 
 							<view style="width: 100%;display: flex;  justify-content: space-around;  flex-direction: row;  flex-wrap: wrap;">
-								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in timeList1" :key="index">
+								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in mz2.timeList1" :key="index">
 									<u-checkbox-group @change="" style="width: 100%;height: 100%;margin-bottom: 20rpx;">
 										<view style="display: flex;align-items: center;">
 											<!-- 按钮 -->
@@ -400,7 +400,7 @@
 							</view>
 							<!-- 剩下的复选框 -->
 							<view style="width: 100%;display: flex;  justify-content: space-around;  flex-direction: row;  flex-wrap: wrap;">
-								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in timeList2" :key="index">
+								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in mz2.timeList2" :key="index">
 									<u-checkbox-group @change="" style="width: 100%;height: 100%;margin-bottom: 20rpx;">
 										<view style="display: flex;align-items: center;">
 											<!-- 按钮 -->
@@ -425,7 +425,7 @@
 							</view>
 
 							<view style="width: 100%;display: flex;  justify-content: space-around;  flex-direction: row;  flex-wrap: wrap;">
-								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in timeList3" :key="index">
+								<view style=" width: 45%; height:60rpx;" class="" v-for="(item, index) in mz2.timeList3" :key="index">
 									<u-checkbox-group @change="" style="width: 100%;height: 100%;margin-bottom: 20rpx;">
 										<view style="display: flex;align-items: center;">
 											<!-- 按钮 -->
@@ -489,7 +489,7 @@
 					}
 				],
 				//电话 图文 门诊的分段器
-				dhcurrent: 2,
+				dhcurrent: 0,
 				twcurrent: 0,
 				mzcurrent1: 0,
 				mzcurrent2: 0,
@@ -699,7 +699,108 @@
 					}],
 				},
 				//门诊时间列表
-				mz: {
+				mz1: {
+					timeList1: [{
+						id: 0,
+						name: '00:00-01:00',
+						checked: false
+					}, {
+						id: 1,
+						name: '01:00-02:00',
+						checked: false
+					}, {
+						id: 2,
+						name: '02:00-03:00',
+						checked: false
+					}, {
+						id: 3,
+						name: '03:00-04:00',
+						checked: false
+					}, {
+						id: 4,
+						name: '04:00-05:00',
+						checked: false
+					}, {
+						id: 5,
+						name: '05:00-06:00',
+						checked: false
+					}, {
+						id: 6,
+						name: '06:00-07:00',
+						checked: false
+					}, {
+						id: 7,
+						name: '07:00-08:00',
+						checked: false
+					}],
+					timeList2: [{
+						id: 8,
+						name: '08:00-09:00',
+						checked: false
+					}, {
+						id: 9,
+						name: '09:00-10:00',
+						checked: false
+					}, {
+						id: 10,
+						name: '10:00-11:00',
+						checked: false
+					}, {
+						id: 11,
+						name: '11:00-12:00',
+						checked: false
+					}, {
+						id: 12,
+						name: '12:00-13:00',
+						checked: false
+					}, {
+						id: 13,
+						name: '13:00-14:00',
+						checked: false
+					}, {
+						id: 14,
+						name: '14:00-15:00',
+						checked: false
+					}, {
+						id: 15,
+						name: '15:00-16:00',
+						checked: false
+					}],
+					timeList3: [{
+						id: 16,
+						name: '16:00-17:00',
+						checked: false
+					}, {
+						id: 17,
+						name: '17:00-18:00',
+						checked: false
+					}, {
+						id: 18,
+						name: '18:00-19:00',
+						checked: false
+					}, {
+						id: 19,
+						name: '19:00-20:00',
+						checked: false
+					}, {
+						id: 20,
+						name: '20:00-21:00',
+						checked: false
+					}, {
+						id: 21,
+						name: '21:00-22:00',
+						checked: false
+					}, {
+						id: 22,
+						name: '22:00-23:00',
+						checked: false
+					}, {
+						id: 23,
+						name: '23:00-00:00',
+						checked: false
+					}],
+				},
+				mz2: {
 					timeList1: [{
 						id: 0,
 						name: '00:00-01:00',
@@ -879,9 +980,10 @@
 				console.log('门诊' + this.mz)
 				console.log('电话' + this.dhcurrent)
 				console.log('图文' + this.twcurrent)
-				console.log('门诊' + this.mzcurrent)
-				console.log()
-				console.log()
+				console.log('门诊' + this.mzcurrent),
+				uni.navigateTo({
+					url:'setservice'
+				})
 			},
 			test(e) {
 
@@ -901,8 +1003,143 @@
 			yychange(index) {
 				this.hospitalcurrent = index
 			},
-			change(index){
-				console.log('点击了',index)
+			change(index) {
+				console.log('点击了', index == true)
+				switch (index) {
+					case 1:
+						if (this.all1[0].checked == true) {
+							this.dh.timeList1.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.dh.timeList1.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 2:
+						if (this.all2[0].checked == true) {
+							this.dh.timeList2.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.dh.timeList2.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 3:
+						if (this.all3[0].checked == true) {
+							this.dh.timeList3.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.dh.timeList3.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 4:
+						if (this.all4[0].checked == true) {
+							this.tw.timeList1.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.tw.timeList1.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 5:
+						if (this.all5[0].checked == true) {
+							this.tw.timeList2.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.tw.timeList2.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 6:
+						if (this.all6[0].checked == true) {
+							this.tw.timeList3.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.tw.timeList3.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 7:
+						if (this.all7[0].checked == true) {
+							this.mz1.timeList1.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.mz1.timeList1.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 8:
+						if (this.all8[0].checked == true) {
+							this.mz1.timeList2.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.mz1.timeList2.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 9:
+						if (this.all9[0].checked == true) {
+							this.mz1.timeList3.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.mz1.timeList3.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 10:
+						if (this.all10[0].checked == true) {
+							this.mz2.timeList1.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.mz2.timeList1.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 11:
+						if (this.all11[0].checked == true) {
+							this.mz2.timeList2.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.mz2.timeList2.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					case 12:
+						if (this.all12[0].checked == true) {
+							this.mz2.timeList3.map(val => {
+								val.checked = true;
+							})
+						} else {
+							this.mz2.timeList3.map(val => {
+								val.checked = false;
+							})
+						}
+						break;
+					default:
+				}
 			}
 		}
 	};

pages/zixun/xiangqing.vue

@@ -19,17 +19,17 @@
 					<view>
 						<view style="margin-bottom: 20rpx;">结论因素:</view>
 						<view style="border: 1rpx solid #666666;border-radius: 15rpx;padding: 10rpx;">
-							<textarea @input="jlblur" placeholder="请填写病情情况、建议等" placeholder-style="color:#969696" style="width: auto;" />
+							<textarea @input="jlblur" placeholder="请填写病情情况、建议等" placeholder-style="color:#969696,font-size: 28rpx;" style="width: auto;height: 200rpx;" />
 							</view>
 					</view>
 				</view>
 				<!-- 两个按钮 -->
 				<view style="height: 15%;display: flex;justify-content: center;align-items: center">
 					<view style="display:flex;justify-content: center;align-items: center;width: 50%;">
-						<u-button shape="shape" size="medium" @click="formshow = false">取消</u-button>
+						<u-button shape="shape" size="mini" @click="formshow = false">取消</u-button>
 					</view>
 					<view style="display:flex;justify-content: center;align-items: center ;width: 50%;">
-						<u-button shape="shape" size="medium"  type="primary" @click="qr">确认</u-button>
+						<u-button shape="shape" size="mini"  type="primary" @click="qr">确认</u-button>
 					</view>
 				</view>
 			</view>
@@ -315,7 +315,9 @@
 			},
 			//查看意见
 			ckyj(e){
-				
+				uni.navigateTo({
+					url:'/pages/opinion/opiniondetails'
+				})
 			},
 			//首页
 			home(e){

pages/zixun/zixun.vue

@@ -16,8 +16,8 @@
 		<!-- value1种类  0为全部 1为电话 2为图文-->
 		<!-- value2状态  0为处理中 1为历史记录-->
 		<view v-for="(item,index) in list" :key='index' :data-index="index" @click="xiangqing">
-			<view v-if="value1==item.zl||value1==0">
-				<view class="list_view" v-if="value2==0&&(item.zt==1||item.zt==2)||value2==1&&(item.zt==3||item.zt==4||item.zt==5)">
+			<view >
+				<view class="list_view">
 					<!-- 状态和类型 -->
 					<!-- 状态 1未接单 2进行中 3已完成 4已取消 -->
 					<!-- 种类  1电话咨询 2图文咨询-->
@@ -78,15 +78,16 @@
 <script>
 	export default {
 		onShow() {
-		
+			this.getLists(this.num,this.value1,this.value2)
 		},
 		onLoad(e) {
 			// 获取列表
-			this.getLists(7);
+			this.getLists(this.num,this.value1,this.value2)
 
 		},
 		data() {
 			return {
+				//排序点击事件
 				value1: 0,
 				value2: 0,
 				options1: [{
@@ -94,11 +95,11 @@
 						value: 0,
 					},
 					{
-						label: '电话咨询',
+						label: '图文咨询',
 						value: 1,
 					},
 					{
-						label: '图文咨询',
+						label: '电话咨询',
 						value: 2,
 					}
 				],
@@ -112,32 +113,55 @@
 					},
 				],
 				list: [],
-				num: 2 //记录下拉的次数
+				num: 1 //记录下拉的次数 = 页数
 			}
 		},
 		methods: {
-			getLists: async function(n) {
+			getLists: async function(c,t,p) {
 				// 备注：  curPage当前页，pageSize一页显示多少条，
 				// typeAll：类型（不填写为全部类型，1=图文咨询，2=.电话咨询），processing（不填写为全部类型，0=处理中 ，1=历史记录）
 				// 根据备注去操作接口
 				let res = await this.$request.post('patient/orderPatientList', {
-					'curPage': 1,
-					'pageSize': n
+					'curPage': c,
+					'pageSize': 5,
+					'typeAll':  t,
+					'processing': p
 				})
 				if (res.status == 0) {
-					let data = res.data;
-					this.list = data;
+					// 如果要加载第二页
+					if(c!=1){
+						console.log('页数curPage',c)
+						console.log('类型typeAll',t)
+						console.log('状态processing',p)
+						let data = res.data;
+						this.list= this.list.concat(data)
+						// Array.prototype.push.apply(this.list, data);
+						console.log('list',this.list)
+					}else{
+						console.log('c',c)
+						console.log('t',t)
+						console.log('p',p)
+						let data = res.data;
+						this.list = data
+						console.log(this.list)
+					}
 				}
 			},
 			close1(e) {
 				this.value1 = e
-				// this.num = 0
-				// this.getLists(7);
+				//重新选择就清空
+				this.list = []
+				this.num= 1
+				//调用接口 页数 类型 状态
+				this.getLists(this.num,this.value1,this.value2)
 			},
 			close2(e) {
 				this.value2 = e
-				// this.num = 0 //清零状态
-				// this.getLists(7);
+				//重新选择就清空
+				this.list = []
+				this.num= 1
+				//调用接口 页数 类型 状态
+				this.getLists(this.num,this.value1,this.value2)
 			},
 			// 会话
 			huihua(e) {
@@ -157,12 +181,11 @@
 		//页面到底监听
 		onReachBottom() {
 			this.num++
-			var a = this.num * 7
-			console.log('到底' + a);
+			console.log('到底', this.num);
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
-			this.getLists(a);
+			this.getLists(this.num,this.value1,this.value2)
 		}
 	}
 </script>