ltb2020年11月4日18:22:42

pages.json

@@ -60,7 +60,8 @@
 		{
 			"path": "pages/zixun/zixun",
 			"style": {
-				"navigationBarTitleText": "患者咨询"
+				"navigationBarTitleText": "患者咨询",
+				"onReachBottomDistance":20
 				// "navigationBarTitleText": "门诊预约",
 				// "navigationBarTitleText": "门诊历史"
 			}

pages/Scheduling.vue

@@ -7,76 +7,121 @@
 		<!-- 医院 -->
 		<u-select v-model="hospitalshow" :list="hospitalList" @confirm="confirmhospital"></u-select>
 		<!-- 新增-->
-		<view style="padding: 30rpx 35rpx;" class="flex justify-between" v-if="!old">
-			<view style="color: #666666;" @click="show = true">
-				<text style="margin-right: 20rpx;">选择排班周</text>
-				<u-icon name="arrow-down" color="#666666" size="28" v-if="!show"></u-icon>
-				<u-icon name="arrow-up" color="#666666" size="28" v-else></u-icon>
+		<view v-if="!old">
+			<view style="padding: 30rpx 35rpx;" class="flex justify-between">
+				<view style="color: #666666;" @click="show = true">
+					<text style="margin-right: 20rpx;">选择排班周</text>
+					<u-icon name="arrow-down" color="#666666" size="28" v-if="!show"></u-icon>
+					<u-icon name="arrow-up" color="#666666" size="28" v-else></u-icon>
+				</view>
+				<view style="color: #666666;" @click="old = true">历史排班</view>
 			</view>
-			<view style="color: #666666;" @click="old = true">历史排班</view>
-		</view>
 
-
-		<!-- 历史 -->
-		<view style="padding: 30rpx 35rpx;" class="flex justify-between" v-else>
-			<view style="color: #666666;" @click="oldshow = true">
-				<text style="margin-right: 20rpx;">选择历史排班周</text>
-				<u-icon name="arrow-down" color="#666666" size="28" v-if="!show"></u-icon>
-				<u-icon name="arrow-up" color="#666666" size="28" v-else></u-icon>
+			<!-- 标题 -->
+			<view class="flex" style="background-color: #FFFFFF;">
+				<!-- 时间 -->
+				<view class="title" style="width: 20%;">时间</view>
+				<u-line color="#cecece" direction="col" />
+				<!-- 上午 -->
+				<view class="title" style="width: 26%;">上午</view>
+				<u-line color="#cecece" direction="col" />
+				<!-- 下午 -->
+				<view class="title" style="width: 26%;">下午</view>
+				<u-line color="#cecece" direction="col" />
+				<!-- 晚上 -->
+				<view class="title" style="width: 26%;">晚上</view>
 			</view>
-			<view style="color: #666666;" @click="old=false">新增排班</view>
-		</view>
 
-		<!-- 标题 -->
-		<view class="flex" style="background-color: #FFFFFF;">
-			<!-- 时间 -->
-			<view class="title" style="width: 20%;">时间</view>
-			<u-line color="#cecece" direction="col" />
-			<!-- 上午 -->
-			<view class="title" style="width: 26%;">上午</view>
-			<u-line color="#cecece" direction="col" />
-			<!-- 下午 -->
-			<view class="title" style="width: 26%;">下午</view>
-			<u-line color="#cecece" direction="col" />
-			<!-- 晚上 -->
-			<view class="title" style="width: 26%;">晚上</view>
-		</view>
-
-		<!-- 表格一条内容  循环七遍-->
-		<view v-for="(item,index) in hospitalWeek" :key='index'>
-			<u-line color="#cecece" />
-			<!-- 星期一 -->
-			<view class="flex" style="background-color: #FFFFFF;">
+			<!-- 表格一条内容  循环七遍-->
+			<view v-for="(item,index) in hospitalWeek" :key='index'>
+				<u-line color="#cecece" />
+				<!-- 星期一 -->
+				<view class="flex" style="background-color: #FFFFFF;">
 
-				<view class="content" style="width: 20%;font-weight: bold;">
-					<view>
-						<view style="text-align: center;">{{item.value}}</view>
-						<view style="text-align: center;">{{item.title}}</view>
+					<view class="content" style="width: 20%;font-weight: bold;">
+						<view>
+							<view style="text-align: center;">{{item.value}}</view>
+							<view style="text-align: center;">{{item.title}}</view>
+						</view>
 					</view>
+					<u-line color="#cecece" direction="col" />
+					<!-- 上午 -->
+					<view class="content" style="width: 26%;" @click="clickMorning(index)">
+						<view style="width: 80%;text-align: center;word-break:break-all">{{item.morning}}</view>
+						<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
+					</view>
+					<u-line color="#cecece" direction="col" />
+					<!-- 下午 -->
+					<view class="content" style="width: 26%;" @click="clickAfternoon(index)">
+						<view style="width: 80%;text-align: center;word-break:break-all">{{item.afternoon}}</view>
+						<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
+					</view>
+					<u-line color="#cecece" direction="col" />
+					<!-- 晚上 -->
+					<view class="content" style="width: 26%;" @click="clicknight(index)">
+						<view style="width: 80%;text-align: center;word-break:break-all">{{item.night}}</view>
+						<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 历史 -->
+		<view v-else>
+			<view style="padding: 30rpx 35rpx;" class="flex justify-between">
+				<view style="color: #666666;" @click="oldshow = true">
+					<text style="margin-right: 20rpx;">选择历史排班周</text>
+					<u-icon name="arrow-down" color="#666666" size="28" v-if="!show"></u-icon>
+					<u-icon name="arrow-up" color="#666666" size="28" v-else></u-icon>
 				</view>
+				<view style="color: #666666;" @click="old=false">新增排班</view>
+			</view>
+			<view class="flex" style="background-color: #FFFFFF;">
+				<!-- 时间 -->
+				<view class="title" style="width: 20%;">时间</view>
 				<u-line color="#cecece" direction="col" />
 				<!-- 上午 -->
-				<view class="content" style="width: 26%;" @click="clickMorning(index)">
-					<view style="width: 80%;text-align: center;word-break:break-all">{{item.morning}}</view>
-					<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
-				</view>
+				<view class="title" style="width: 26%;">上午</view>
 				<u-line color="#cecece" direction="col" />
 				<!-- 下午 -->
-				<view class="content" style="width: 26%;" @click="clickAfternoon(index)">
-					<view style="width: 80%;text-align: center;word-break:break-all">{{item.afternoon}}</view>
-					<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
-				</view>
+				<view class="title" style="width: 26%;">下午</view>
 				<u-line color="#cecece" direction="col" />
 				<!-- 晚上 -->
-				<view class="content" style="width: 26%;" @click="clicknight(index)">
-					<view style="width: 80%;text-align: center;word-break:break-all">{{item.night}}</view>
-					<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
+				<view class="title" style="width: 26%;">晚上</view>
+			</view>
+			
+			<!-- 表格一条内容  循环七遍-->
+			<view v-for="(item,index) in oldWeek" :key='index'>
+				<u-line color="#cecece" />
+				<!-- 星期一 -->
+				<view class="flex" style="background-color: #FFFFFF;">
+			
+					<view class="content" style="width: 20%;font-weight: bold;">
+						<view>
+							<view style="text-align: center;">{{item.value}}</view>
+							<view style="text-align: center;">{{item.title}}</view>
+						</view>
+					</view>
+					<u-line color="#cecece" direction="col" />
+					<!-- 上午 -->
+					<view class="content" style="width: 26%;" >
+						<view style="width: 80%;text-align: center;word-break:break-all">{{item.morning}}</view>
+					</view>
+					<u-line color="#cecece" direction="col" />
+					<!-- 下午 -->
+					<view class="content" style="width: 26%;" >
+						<view style="width: 80%;text-align: center;word-break:break-all">{{item.afternoon}}</view>
+					</view>
+					<u-line color="#cecece" direction="col" />
+					<!-- 晚上 -->
+					<view class="content" style="width: 26%;" >
+						<view style="width: 80%;text-align: center;word-break:break-all">{{item.night}}</view>
+					</view>
 				</view>
 			</view>
 		</view>
-
 		<!-- 保存 -->
-		<view class="bottomButton" @click="bc">
+		<view class="bottomButton" @click="bc" v-if="!old">
 			保存
 		</view>
 
@@ -85,8 +130,14 @@
 
 <script>
 	export default {
+		onLoad() {
+			this.time = this.getTime();
+			console.log(this.time)
+		},
 		data() {
 			return {
+				//时间
+				time:'',
 				//切换历史和新增
 				old: false,
 				//新增的排班选择   最多排四周
@@ -119,7 +170,7 @@
 					value: '4',
 					label: '历史'
 				}],
-				//一周的数据   title不可更改  value日期   其余 上 下 晚
+				//新增一周的数据   title不可更改  value日期   其余 上 下 晚
 				hospitalWeek: [{
 					title: '周一',
 					value: '10-26',
@@ -163,6 +214,50 @@
 					afternoon: '',
 					night: ''
 				}],
+				//历史记录的数组
+				oldWeek: [{
+					title: '周一',
+					value: '10-26',
+					morning: '历史',
+					afternoon: '历史',
+					night: '历史'
+				}, {
+					title: '周二',
+					value: '10-27',
+					morning: '历史',
+					afternoon: '历史',
+					night: '历史'
+				}, {
+					title: '周三',
+					value: '10-28',
+					morning: '历史',
+					afternoon: '历史',
+					night: '历史'
+				}, {
+					title: '周四',
+					value: '10-29',
+					morning: '历史',
+					afternoon: '历史',
+					night: '历史'
+				}, {
+					title: '周五',
+					value: '10-30',
+					morning: '历史',
+					afternoon: '历史',
+					night: '历史'
+				}, {
+					title: '周六',
+					value: '10-31',
+					morning: '历史',
+					afternoon: '历史',
+					night: '历史'
+				}, {
+					title: '周日',
+					value: '11-01',
+					morning: '历史',
+					afternoon: '历史',
+					night: '历史'
+				}],
 				//选择医院
 				hospital: '',
 				hospitalList: [{
@@ -183,7 +278,15 @@
 				position: {
 					day: '',
 					time: '' //1早2下3晚
-				}
+				},
+				
+				
+				
+				
+				
+				
+				nowTime: new Date(), // 当前时间
+				nowWeek: '星期', //星期几
 			}
 		},
 		methods: {
@@ -224,6 +327,35 @@
 			//保存
 			bc(e) {
 				console.log(hospitalWeek)
+			},
+			//获取时间
+			getTime(){
+			      var date = new Date();
+			      var seperator1 = "-";
+			      var seperator2 = ":";
+			      //以下代码依次是获取当前时间的年月日时分秒
+			      var year = date.getFullYear();
+			      var month = date.getMonth() + 1;
+			      var strDate = date.getDate();
+			      var minute = date.getMinutes();
+			      var hour = date.getHours();
+			      var second = date.getSeconds();
+			      //固定时间格式
+			      if (month >= 1 && month <= 9) {
+			        month = "0" + month;
+			      }
+			      if (strDate >= 0 && strDate <= 9) {
+			        strDate = "0" + strDate;
+			      }
+			      var currentdate =  year + seperator1 + month + seperator1 + strDate 
+				  
+				  
+				  var dateArray = nowTime.split("-");
+				  var date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
+				  var week = "星期" + "日一二三四五六".charAt(date.getDay());
+				  this.nowWeek = week // 赋值本地数据
+				  alert(week)
+				  return currentdate;
 			}
 		}
 	}

pages/index/index.vue

@@ -10,7 +10,7 @@
 					<view v-if="true" class="m-bg-white bdr4 pb20 header-box" style="border-radius: 32rpx;">
 						<view class="plr20 pt20 m-dpflex m-justify-start " style="margin-bottom: 60rpx;">
 							<view>
-								<image binderror="_binderror" mode="scaleToFill" :src="src" style="width: 60px;height: 60px;border-radius: 50%;"></image>
+								<image binderror="_binderror" mode="scaleToFill" :src="src" style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
 								<view v-if="!renzheng" class="flex justify-center align-center" style="border-radius:30rpx ;font-size: 20rpx;padding: 10rpx;background-color: #EEAA3F;color: #FFFFFF;position: relative;top: -20rpx;"
 								 @click="gorz">未认证</view>
 								<view v-else class="flex justify-center align-center" style="border-radius:30rpx ;font-size: 20rpx;padding: 10rpx;background-color: #84BB43;color: #FFFFFF;position: relative;top: -20rpx;">已认证</view>

pages/login/doctorRenzheng.vue

@@ -125,43 +125,35 @@
 			<u-gap height="30" bg-color="#f0f2f5"></u-gap>
 		</view>
 		<!-- 照片上传 -->
-		<view style="padding: 46rpx 28rpx;border-bottom: 0.5rpx solid #EFEFEF;">
+		<view style="border-bottom: 0.5rpx solid #EFEFEF;padding: 10rpx 25rpx;">
 			<view style="margin-bottom: 30rpx;">
 				<text style="font-size: 30rpx;font-weight: bold;">上传医师执业证书</text>
 				<text style="color: #999999;font-size: 26rpx;">（清晰照片和信息页）</text>
 			</view>
-
-			<view style="width: 142rpx;height: 142rpx;border-radius: 16rpx;background-color: #f4f4f4;" class="flex justify-center align-center">
-				<!-- <view style="width: 60rpx;height: 60rpx;">
-					
-				</view> -->
-				<u-upload :action="action" width="60" height="60" :file-list="fileList" ></u-upload>
+			<!-- 上传 -->
+			<view>
+				<u-upload :action="action" :file-list="certificate" max-count="2"></u-upload>
 			</view>
-
 		</view>
-		<view style="padding: 46rpx 28rpx;border-bottom: 0.5rpx solid #EFEFEF;">
+		<view style="border-bottom: 0.5rpx solid #EFEFEF;padding: 10rpx 25rpx;">
 			<view style="margin-bottom: 30rpx;">
 				<text style="font-size: 30rpx;font-weight: bold;">上传身份证</text>
 				<text style="color: #999999;font-size: 26rpx;">（人像面和国徽面）</text>
 			</view>
-
-			<view style="width: 142rpx;height: 142rpx;border-radius: 16rpx;background-color: #f4f4f4;" class="flex justify-center align-center">
-				<view>
-					<image src="../../static/addPhoto.png" mode=""></image>
-				</view>
+			<!-- 上传 -->
+			<view>
+				<u-upload :action="action" :file-list="idPhoto" max-count="2"></u-upload>
 			</view>
 
 		</view>
-		<view style="padding: 46rpx 28rpx;border-bottom: 0.5rpx solid #EFEFEF;">
+		<view style="border-bottom: 0.5rpx solid #EFEFEF;padding: 10rpx 25rpx;">
 			<view style="margin-bottom: 30rpx;">
 				<text style="font-size: 30rpx;font-weight: bold;">上传医生资格证</text>
 				<text style="color: #999999;font-size: 26rpx;">（清晰照片业和信息页）</text>
 			</view>
-
-			<view style="width: 142rpx;height: 142rpx;border-radius: 16rpx;background-color: #f4f4f4;" class="flex justify-center align-center">
-				<view>
-					<image src="../../static/addPhoto.png" mode="" style="width: 60rpx;height: 60rpx;"></image>
-				</view>
+			<!-- 上传 -->
+			<view>
+				<u-upload :action="action" :file-list="doctorQualification" max-count="2"></u-upload>
 			</view>
 
 		</view>
@@ -170,6 +162,7 @@
 			提交
 		</view>
 	</view>
+
 </template>
 
 <script>
@@ -338,8 +331,20 @@
 			// 保存
 			bc() {
 				console.log(this.province)
-
-			}
+				uni.switchTab({
+					url:'../index/index'
+				})
+			},
+			ChooseImage() {
+				uni.chooseImage({
+					count: 1, //默认9
+					sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album', 'camera'], //从相册选择
+					success: (res) => {
+						this.certificate = res.tempFilePaths
+					}
+				});
+			},
 		}
 	};
 </script>

pages/zixun/xiangqing.vue

@@ -26,7 +26,7 @@
 				<!-- 两个按钮 -->
 				<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,bz=null,by=null,jl=null">取消</u-button>
+						<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>

pages/zixun/zixun.vue

@@ -1,9 +1,8 @@
-
 <template style="background-color: #b8b8b8;">
 	<view style="width: 100%;height: 100%;">
 		<view class="topmenu">
 			<u-dropdown>
-				 <u-dropdown-item v-model="value1" :title="options1[value1].label" :options="options1" @change="close1"></u-dropdown-item>
+				<u-dropdown-item v-model="value1" :title="options1[value1].label" :options="options1" @change="close1"></u-dropdown-item>
 				<u-dropdown-item v-model="value2" :title="options2[value2].label" :options="options2" @change="close2"></u-dropdown-item>
 			</u-dropdown>
 		</view>
@@ -18,7 +17,7 @@
 		<!-- 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)">
+				<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)">
 					<!-- 状态和类型 -->
 					<!-- 状态 1未接单 2进行中 3已完成 4已取消 -->
 					<!-- 种类  1电话咨询 2图文咨询-->
@@ -79,13 +78,12 @@
 <script>
 	export default {
 		onShow() {
-			this.getLists();
-			
+			this.getLists(7);
 		},
 		onLoad(e) {
 			// 获取列表
-			this.getLists();
-			
+			this.getLists(7);
+
 		},
 		data() {
 			return {
@@ -114,84 +112,90 @@
 					},
 				],
 				list: [
-				// 	{
-				// 	zt: 1, //状态
-				// 	zl: 1, //种类 
-				// 	name: '张三',
-				// 	age: '一岁零2个月',
-				// 	order: 'ZX202000010',
-				// 	time: '2020年10月28日17:11:10'
-				// }, {
-				// 	zt: 2, //状态
-				// 	zl: 1, //种类 
-				// 	name: '张三',
-				// 	age: '一岁零2个月',
-				// 	order: 'ZX202000010',
-				// 	time: '2020年10月28日17:11:10'
-				// }, {
-				// 	zt:3, //状态 
-				// 	zl:1, //种类
-				// 	name: '张三',
-				// 	age: '一岁零2个月',
-				// 	order: 'ZX202000010',
-				// 	time: '2020年10月28日17:11:10'
-				// }, {
-				// 	zt: 4, //状态
-				// 	zl: 1, //种类
-				// 	name: '张三',
-				// 	age: '一岁零2个月',
-				// 	order: 'ZX202000010',
-				// 	time: '2020年10月28日17:11:10'
-				// }, {
-				// 	zt: 1, //状态 
-				// 	zl: 2, //种类
-				// 	name: '张三',
-				// 	age: '一岁零2个月',
-				// 	order: 'ZX202000010',
-				// 	time: '2020年10月28日17:11:10'
-				// }, {
-				// 	zt: 2, //状态 
-				// 	zl: 2, //种类
-				// 	name: '张三',
-				// 	age: '一岁零2个月',
-				// 	order: 'ZX202000010',
-				// 	time: '2020年10月28日17:11:10'
-				// }, {
-				// 	zt: 3, //状态
-				// 	zl: 2, //种类 
-				// 	name: '张三',
-				// 	age: '一岁零2个月',
-				// 	order: 'ZX202000010',
-				// 	time: '2020年10月28日17:11:10'
-				// }, {
-				// 	zt: 4, //状态 
-				// 	zl: 2, //种类 
-				// 	name: '张三',
-				// 	age: '一岁零2个月',
-				// 	order: 'ZX202000010',
-				// 	time: '2020年10月28日17:11:10'
-				// }
+						{
+						zt: 1, //状态
+						zl: 1, //种类 
+						name: '张三',
+						age: '一岁零2个月',
+						order: 'ZX202000010',
+						time: '2020年10月28日17:11:10'
+					}, {
+						zt: 2, //状态
+						zl: 1, //种类 
+						name: '张三',
+						age: '一岁零2个月',
+						order: 'ZX202000010',
+						time: '2020年10月28日17:11:10'
+					}, {
+						zt:3, //状态 
+						zl:1, //种类
+						name: '张三',
+						age: '一岁零2个月',
+						order: 'ZX202000010',
+						time: '2020年10月28日17:11:10'
+					}, {
+						zt: 4, //状态
+						zl: 1, //种类
+						name: '张三',
+						age: '一岁零2个月',
+						order: 'ZX202000010',
+						time: '2020年10月28日17:11:10'
+					}, {
+						zt: 1, //状态 
+						zl: 2, //种类
+						name: '张三',
+						age: '一岁零2个月',
+						order: 'ZX202000010',
+						time: '2020年10月28日17:11:10'
+					}, {
+						zt: 2, //状态 
+						zl: 2, //种类
+						name: '张三',
+						age: '一岁零2个月',
+						order: 'ZX202000010',
+						time: '2020年10月28日17:11:10'
+					}, {
+						zt: 3, //状态
+						zl: 2, //种类 
+						name: '张三',
+						age: '一岁零2个月',
+						order: 'ZX202000010',
+						time: '2020年10月28日17:11:10'
+					}, {
+						zt: 4, //状态 
+						zl: 2, //种类 
+						name: '张三',
+						age: '一岁零2个月',
+						order: 'ZX202000010',
+						time: '2020年10月28日17:11:10'
+					}
 				],
+				num: 2 //记录下拉的次数
 			}
 		},
 		methods: {
-			getLists:async function(){
-				let res = await this.$request.post('patient/orderPatientList',{'curPage':1,'pageSize':20})
-				if(res.status==0){
+			getLists: async function(n) {
+				let res = await this.$request.post('patient/orderPatientList', {
+					
+					'curPage': 1,
+					'pageSize': n
+				})
+				if (res.status == 0) {
 					let data = res.data;
-					console.log('我是打他：',data)
+					console.log('我是打他：', data)
 					this.list = data;
-					console.log('我是list',this.list)
+					console.log('我是list', this.list)
 				}
 			},
 			close1(e) {
-				console.log('value1',e);
-				console.log('list=',this.list)
 				this.value1 = e
+				// this.num = 0
+				// this.getLists(7);
 			},
 			close2(e) {
-				console.log('value2',e);
 				this.value2 = e
+				// this.num = 0 //清零状态
+				// this.getLists(7);
 			},
 			// 会话
 			huihua(e) {
@@ -204,9 +208,19 @@
 			xiangqing(e) {
 				console.log(this.list[e.currentTarget.dataset.index])
 				uni.navigateTo({
-					url: 'xiangqing?data='+this.list[e.currentTarget.dataset.index]
+					url: 'xiangqing?data=' + this.list[e.currentTarget.dataset.index]
 				})
 			}
+		},
+		//页面到底监听
+		onReachBottom() {
+			this.num++
+			var a = this.num * 7
+			console.log('到底' + a);
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+			this.getLists(a);
 		}
 	}
 </script>