Ltb2020年11月2日09:14:33

pages.json

@@ -11,7 +11,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": "首页",
+				"onReachBottomDistance":50
 			}
 		},
 		{
@@ -188,13 +189,13 @@
 				"text": "会话"
 			}
 		]
+	},
+	"condition": { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [{
+			"name": "test", //模式名称
+			"path": "pages/login/doctorRenzheng", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
 	}
-	// "condition": { //模式配置，仅开发期间生效
-	// 	"current": 0, //当前激活的模式(list 的索引项)
-	// 	"list": [{
-	// 		"name": "test", //模式名称
-	// 		"path": "pages/Scheduling", //启动页面，必选
-	// 		"query": "" //启动参数，在页面的onLoad函数里面得到
-	// 	}]
-	// }
 }

pages/Scheduling.vue

@@ -1,9 +1,272 @@
 <template>
+<<<<<<< Updated upstream
 
+=======
+	<view style="width: 100%;height: 100%;">
+		<!-- 新 -->
+		<u-select v-model="show" :list="list" @confirm=""></u-select>
+		<!-- 历史 -->
+		<u-select v-model="oldshow" :list="oldlist" @confirm=""></u-select>
+		<!-- 医院 -->
+		<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>
+			<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>
+			<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 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 class="bottomButton" @click="bc">
+			保存
+		</view>
+
+	</view>
+>>>>>>> Stashed changes
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				//切换历史和新增
+				old: false,
+				//新增的排班选择   最多排四周
+				show: false,
+				list: [{
+					value: '1',
+					label: '2020.10.26 - 2020-11-1'
+				}, {
+					value: '2',
+					label: '2020.11.2 - 2020-11-8'
+				}, {
+					value: '3',
+					label: '2020.11.9 - 2020-11-15'
+				}, {
+					value: '4',
+					label: '2020.11.16 - 2020-11-22'
+				}],
+				//历史的排班选择
+				oldshow: false,
+				oldlist: [{
+					value: '1',
+					label: '历史'
+				}, {
+					value: '2',
+					label: '历史'
+				}, {
+					value: '3',
+					label: '历史'
+				}, {
+					value: '4',
+					label: '历史'
+				}],
+				//一周的数据   title不可更改  value日期   其余 上 下 晚
+				hospitalWeek: [{
+					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: [{
+					value: '1',
+					label: '不选择'
+				}, {
+					value: '2',
+					label: '医院'
+				}, {
+					value: '3',
+					label: '醫院'
+				}, {
+					value: '4',
+					label: 'hospital'
+				}],
+				hospitalshow: false,
+				//当前点击的位置
+				position: {
+					day: '',
+					time: ''//1早2下3晚
+				}
+			}
+		},
+		methods: {
+			// 早下晚的点击事件
+			clickMorning(index) {
+				this.position.day = index
+				this.position.time = 1
+				this.hospitalshow = true
+			},
+			clickAfternoon(index) {
+				this.position.day = index
+				this.position.time = 2
+				this.hospitalshow = true
+			},
+			clicknight(index) {
+				this.position.day = index
+				this.position.time = 3
+				this.hospitalshow = true
+			},
+			//医院选择器的确认点击事件
+			confirmhospital(e) {
+				console.log(e[0].label)
+				console.log(this.hospital)
+				if (this.position.time == 1) {
+					this.hospitalWeek[this.position.day].morning = e[0].label
+					console.log('早')
+				} else if (this.position.time == 2) {
+					this.hospitalWeek[this.position.day].afternoon = e[0].label
+					console.log('下')
+				} else if (this.position.time == 3) {
+					this.hospitalWeek[this.position.day].night = e[0].label
+					console.log('晚')
+				}
+				
+			},
+
+
+			//保存
+			bc(e) {
+				console.log(hospitalWeek)
+			}
+		}
+	}
 </script>
 
 <style>
+	page {
+		background-color: #f0f0f0
+	}
+
+	.title {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 30rpx 0;
+		font-weight: bold;
+	}
+
+	.content {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 30rpx 0;
+
+	}
+
+	/* 底部按钮 */
+	.bottomButton {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #0000ff;
+		color: #FFFFFF;
+		z-index: 1;
+
+	}
 </style>

pages/index/index.vue

@@ -8,6 +8,7 @@
 				<view class="plr15">
 					<!-- 登录切换 -->
 					<view v-if="true" class="m-bg-white bdr4 pb20 header-box" style="border-radius: 32rpx;">
+<<<<<<< Updated upstream
 						<view class="plr20 pt20 m-dpflex m-justify-start m-align-center">
 							<image binderror="_binderror" mode="scaleToFill" :src="docterInfo.avatar"
 							 style="width: 60px;height: 60px;border-radius: 50%;"></image>
@@ -19,15 +20,31 @@
 								</view>
 								<view class="margin-left-sm margin-top-xs">
 									{{docterInfo.label}}
+=======
+						<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>
+								<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>
+							</view>
+							<view style="margin-left: 30rpx;">
+								<view style="font-size: 32rpx;font-weight: 600;margin-bottom: 20rpx;">
+									医生名称
+									<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" />
+								</view>
+								<view style="color:#666666 ;">
+									给患者展示的信息(宣传语)
+>>>>>>> Stashed changes
 								</view>
 							</view>
-							<view class="pr tr m-flex">
+							<view class="pr tr m-flex" style="height: 100%;">
 								<navigator hoverClass="none">
-									<image class="header-img" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/bianji.png" @click="grxx"></image>
+									<image class="header-img" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/bianji.png"
+									 @click="grxx"></image>
 								</navigator>
 							</view>
 						</view>
-						<view class="pr m-bottom-line mt15 mb10"></view>
 						<view class="pr m-xcenter mt30 plr20">
 							<view class="m-flex tl f14 m-ycenter dpb">			 
 								<view class="m-gray-big f20 fb pr10">{{docterInfo.service_days}}</view>
@@ -49,14 +66,33 @@
 					</view>
 					<view v-else class="m-bg-white bdr4 pb20 header-box" style="border-radius: 32rpx;">
 						<view class="plr20 pt20 m-dpflex m-justify-start m-align-center">
-							<image binderror="_binderror" mode="scaleToFill" src="https://ossweb-img.qq.com/images/lol/web201310/skin/big84000.jpg"
-							 style="width: 60px;height: 60px;border-radius: 50%;"></image>
+							<image binderror="_binderror" mode="scaleToFill" :src="nosrc" style="width: 60px;height: 60px;border-radius: 50%;"></image>
 							<view class="">
-								<view class="line1 f20 fb plr15 flex justify-center align-center">
-									请登录
+								<view style="padding-left: 20rpx;">
+									<view style="font-size: 24rpx;color: #666666;margin-bottom: 10rpx;">你还未登录</view>
+									<view style="font-size: 32rpx;color: #EEAA3F;">点击登录</view>
 								</view>
 							</view>
 						</view>
+						<view class="pr m-bottom-line mt15 mb10"></view>
+						<view class="pr m-xcenter mt30 plr20">
+							<view class="m-flex tl f14 m-ycenter dpb">
+								<view class="m-gray-big f20 fb pr10">0</view>
+								<view class="m-gray-letter mt5 f12">服务天数</view>
+							</view>
+							<view bindtap="" class="m-flex tl f14 m-ycenter">
+								<view class="m-gray-big f20 fb">0</view>
+								<view class="m-gray-letter mt5 f12">服务人次</view>
+							</view>
+							<view bindtap="" class="m-flex tl f14 m-ycenter">
+								<view class="m-gray-big f20 fb">0</view>
+								<view class="m-gray-letter mt5 f12">评价（张）</view>
+							</view>
+							<view bindtap="" class="m-flex tl f14 m-ycenter">
+								<view class="m-gray-big f20 fb">5.0</view>
+								<view class="m-gray-letter mt5 f12">评分</view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -64,35 +100,43 @@
 				<view class="gridstyle">
 					<u-grid :col="4" :border="false">
 						<u-grid-item @click="zixun">
-							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/hzzx.png" shape="circle"></u-image>
+							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/hzzx.png"
+							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">患者咨询</view>
 						</u-grid-item>
 						<u-grid-item @click="mz">
-							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/mzyy.png" shape="circle"></u-image>
+							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/mzyy.png"
+							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">门诊预约</view>
 						</u-grid-item>
 						<u-grid-item @click="pb">
-							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/mzpb.png" shape="circle"></u-image>
+							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/mzpb.png"
+							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">门诊排班</view>
 						</u-grid-item>
 						<u-grid-item @click="patient">
-							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/hzgl.png" shape="circle"></u-image>
+							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/hzgl.png"
+							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">患者管理</view>
 						</u-grid-item>
 						<u-grid-item @click="yijian">
-							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/yjgl.png" shape="circle"></u-image>
+							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/yjgl.png"
+							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">意见管理</view>
 						</u-grid-item>
 						<u-grid-item @click="setservice">
-							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/fwsz.png" shape="circle"></u-image>
+							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/fwsz.png"
+							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">服务设置</view>
 						</u-grid-item>
 						<u-grid-item>
-							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/daiding.png" shape="circle"></u-image>
+							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/daiding.png"
+							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">待定模块</view>
 						</u-grid-item>
 						<u-grid-item>
-							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/daiding.png" shape="circle"></u-image>
+							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/daiding.png"
+							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">待定模块</view>
 						</u-grid-item>
 					</u-grid>
@@ -109,8 +153,14 @@
 				 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为通知类型 -->
+<<<<<<< Updated upstream
 						<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/ddtz.png" v-if="item.orderlx==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.orderlx==2"
+						 style="width: 30rpx;height: 30rpx;"></image>
+>>>>>>> Stashed changes
 						<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>
@@ -133,6 +183,7 @@
 				我们
 			</view>
 		</view>
+		<u-modal v-model="rzModal" :content="content" confirm-text="去认证" confirm-color="#0B73B9" width="80%" :show-cancel-button="true" content="您还没有成为认证医生！" :title-style="{fontWeight:'550'}" @confirm="qdrz"></u-modal>
 	</view>
 </template>
 <script>
@@ -153,6 +204,7 @@
 		},
 		data() {
 			return {
+<<<<<<< Updated upstream
 				docterInfo:{
 					name:"",
 					avatar:"",
@@ -164,6 +216,37 @@
 					service_persons:""
 				},
 				docterMessageList:[]
+=======
+				//认证弹窗
+				rzModal:false,
+				
+				//没登录头像
+				nosrc: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big84000.jpg',
+				//登陆的头像
+				src: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big84000.jpg',
+				//认证
+				renzheng:false,//true已认证
+				//标签
+				lable1: '30年经验',
+				lable2: '快狠准',
+				list: [{
+
+					orderlx: 1 // 显示的订单
+				}, {
+					orderlx: 2 // 显示的订单
+				}, {
+					orderlx: 3 // 显示的订单
+				}, {
+					orderlx: 1 // 显示的订单
+				}, {
+					orderlx: 2 // 显示的订单
+				}, {
+					orderlx: 3 // 显示的订单
+				}, {
+					orderlx: 1 // 显示的订单
+				}]
+
+>>>>>>> Stashed changes
 			}
 		},
 		onShow() {
@@ -240,15 +323,15 @@
 			
 			
 			// 跳转服务设置
-			setservice(e){
+			setservice(e) {
 				uni.navigateTo({
-					url:'/pages/service/setservice'
+					url: '/pages/service/setservice'
 				})
 			},
 			//跳转患者管理
-			patient(e){
+			patient(e) {
 				uni.navigateTo({
-					url:'/pages/patient/patient'
+					url: '/pages/patient/patient'
 				})
 			},
 			editdocter(){
@@ -262,31 +345,55 @@
 			},
 				 
 			//跳转患者咨询
-			zixun(){
+			zixun() {
 				uni.navigateTo({
-					url:'/pages/zixun/zixun'
+					url: '/pages/zixun/zixun'
 				})
 			},
-			pb(){
+			//排班
+			pb() {
 				uni.navigateTo({
-					url:'/pages/Scheduling'
+					url: '/pages/Scheduling'
 				})
 			},
-			yijian(){
+			//意见
+			yijian() {
 				uni.navigateTo({
-					url:'/pages/opinion/opinion'
+					url: '/pages/opinion/opinion'
 				})
 			},
-			mz(){
+			//门诊
+			mz() {
 				uni.navigateTo({
-					url:'/pages/menzhen/menzhen'
+					url: '/pages/menzhen/menzhen'
 				})
 			},
-			grxx(){
+			//个人信息 右上角的编辑按钮
+			grxx() {
 				uni.navigateTo({
-					url:'/pages/information/information'
+					url: '/pages/information/information'
 				})
+			},
+			//点击未认证
+			gorz(){
+				this.rzModal= true
+			},
+			qdrz(){
+				uni.navigateTo({
+					url:'/pages/login/doctorRenzheng'
+				})
+<<<<<<< Updated upstream
 			}			
+=======
+			}
+		},
+		//页面到底监听
+		onReachBottom(){
+			console.log('到底');
+			        setTimeout(function () {
+			            uni.stopPullDownRefresh();
+			        }, 1000);
+>>>>>>> Stashed changes
 		}
 	}
 </script>

pages/login/doctorRenzheng.vue

@@ -1,16 +1,173 @@
 <template>
-	<view class="main">
-		<u-form :model="form" ref="uForm" label-position="top">
-			<u-form-item label="医生姓名">
-				<u-input placeholder="请填写真实姓名" v-model="form.name" />
-			</u-form-item>
-			<u-form-item label="性别">
-				<u-input v-model="form.sex" type="select" />
-			</u-form-item>
-			<u-form-item label="身份证号">
-				<u-input placeholder="请填写身份证号" v-model="form.idcard" />
-			</u-form-item>
-		</u-form>
+	<view style="width: 100%;height: 100%;">
+		<!-- 性别选择器 -->
+		<u-select v-model="sexshow" :list="sexlist" @confirm="sexconfirm"></u-select>
+		<!-- 省 -->
+		<u-select v-model="provinceshow" :list="provincelist" @confirm="provinceconfirm"></u-select>
+		<!-- 市 -->
+		<u-select v-model="cityshow" :list="citylist" @confirm="cityconfirm"></u-select>
+		<!-- 区县 -->
+		<u-select v-model="areashow" :list="arealist" @confirm="areaconfirm"></u-select>
+		<!-- 医院 -->
+		<u-select v-model="hospitalshow" :list="hospitallist" @confirm="hospitalconfirm"></u-select>
+		<!-- 科室 -->
+		<u-select v-model="departmentshow" :list="departmentlist" @confirm="departmentconfirm"></u-select>
+		<!-- 资质 -->
+		<u-select v-model="qualificationsshow" :list="qualificationslist" @confirm="qualificationsconfirm"></u-select>
+
+
+
+		<u-gap height="30" bg-color="#f0f2f5"></u-gap>
+		<!-- 姓名 性别 身份证 -->
+		<view style="padding: 0 28rpx;">
+			<view class="flex align-center" style="margin: 20rpx 0;">
+				<view style="width: 30%;font-weight: bold;" class="felx align-center">
+					<view>医生项姓名</view>
+				</view>
+				<view style="width: 70%;">
+					<u-input v-model="form.name" type="text" :border="false" placeholder="请填写真实姓名" input-align="right" />
+				</view>
+			</view>
+			<u-line color="#f0f2f5" />
+			<view class="flex align-center" style="margin: 20rpx 0;">
+				<view style="width: 30%;font-weight: bold;" class="felx align-center">
+					<view>性别</view>
+				</view>
+				<view style="width: 60%;margin-right: 40rpx;">
+					<u-input v-model="form.sex" type="text" :border="false" placeholder="请选择性别" input-align="right" />
+				</view>
+				<view style="5%" class="flex justify-center align-center">
+					<u-icon name="arrow-down" color="#dddfe1" @click="sexshow = true"></u-icon>
+				</view>
+			</view>
+			<u-line color="#f0f2f5" />
+			<view class="flex align-center" style="margin: 20rpx 0;">
+				<view style="width: 30%;font-weight: bold;" class="felx align-center">
+					<view>身份证</view>
+				</view>
+				<view style="width: 70%;">
+					<u-input v-model="form.name" type="idcard" :border="false" placeholder="请填写身份证号" input-align="right" />
+				</view>
+			</view>
+		</view>
+
+		<u-gap height="30" bg-color="#f0f2f5"></u-gap>
+		<!-- 工作机构 -->
+		<view v-for="item,index in form.work" :key='index'>
+			<view style="padding: 45rpx 28rpx 30rpx 28rpx;background-color: #FFFFFF;">
+				<view style="margin-bottom: 50rpx;font-weight: bold;font-size: 30rpx;">
+					{{item.name}}
+				</view>
+				<view class="flex">
+					<!--  ****************省份**************** -->
+					<view class="xiala" @click="provinceshow=true,province=index" style="border-right: 1rpx solid #dddfe1;">
+						<!-- 	图标 -->
+						<view style="margin:0 20rpx;">
+							<u-icon name="arrow-down" color="#dddfe1"></u-icon>
+						</view>
+						<!-- 文字 -->
+						<view style="color:#999999">{{item.province}}</view>
+					</view>
+					<!-- ********************* 城市*************** -->
+					<view class="xiala" @click="cityshow=true,city=index">
+						<!-- 图标 -->
+						<view style="margin:0 20rpx;">
+							<u-icon name="arrow-down" color="#dddfe1"></u-icon>
+						</view>
+						<!-- 文字 -->
+						<view style="color:#999999">{{item.city}}</view>
+					</view>
+				</view>
+				<u-gap height="40" bg-color="#ffffff"></u-gap>
+				<view class="flex">
+					<!-- **********************区县******************* -->
+					<view class="xiala" @click="areashow=true,area=index" style="border-right: 1rpx solid #dddfe1;">
+						<!-- 图标 -->
+						<view style="margin:0 20rpx;">
+							<u-icon name="arrow-down" color="#dddfe1"></u-icon>
+						</view>
+						<!-- 文字 -->
+						<view style="color:#999999">{{item.area}}</view>
+					</view>
+					<!-- **********************医院********************** -->
+					<view class="xiala" @click="hospitalshow=true,hospital=index">
+						<!-- 图标 -->
+						<view style="margin:0 20rpx;">
+							<u-icon name="arrow-down" color="#dddfe1"></u-icon>
+						</view>
+						<!-- 文字 -->
+						<view style="color:#999999">{{item.hospital}}</view>
+					</view>
+				</view>
+
+				<view style="margin:50rpx 0;font-weight: bold;font-size: 30rpx;">科室资质</view>
+				<view class="flex">
+					<!-- ********************************科室************************************ -->
+					<view class="xiala" @click="departmentshow=true,department=index" style="border-right: 1rpx solid #dddfe1;">
+						<!-- 图标 -->
+						<view style="margin:0 20rpx;">
+							<u-icon name="arrow-down" color="#dddfe1"></u-icon>
+						</view>
+						<!-- 文字 -->
+						<view style="color:#999999">{{item.department}}</view>
+					</view>
+					<!-- ***********************************资质***************** -->
+					<view class="xiala" @click="qualificationsshow=true,qualifications=index">
+						<!-- 图标 -->
+						<view style="margin:0 20rpx;">
+							<u-icon name="arrow-down" color="#dddfe1"></u-icon>
+						</view>
+						<!-- 文字 -->
+						<view style="color:#999999">{{item.qualifications}}</view>
+					</view>
+				</view>
+			</view>
+			<u-gap height="30" bg-color="#f0f2f5"></u-gap>
+		</view>
+		<!-- 照片上传 -->
+		<view style="padding: 46rpx 28rpx;border-bottom: 0.5rpx solid #EFEFEF;">
+			<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>
+
+		</view>
+		<view style="padding: 46rpx 28rpx;border-bottom: 0.5rpx solid #EFEFEF;">
+			<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>
+
+		</view>
+		<view style="padding: 46rpx 28rpx;border-bottom: 0.5rpx solid #EFEFEF;">
+			<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>
+
+		</view>
+		<u-gap height="200" bg-color="#f0f2f5"></u-gap>
+		<view class="bottomButton" @click="bc">
+			提交
+		</view>
 	</view>
 </template>
 
@@ -27,20 +184,188 @@
 		},
 		data() {
 			return {
+				//保存选择的列数
+				province: '', //省
+				city: '', //市
+				area: '', //区
+				hospital: '', //医院
+				department: '', //科室
+				qualifications: '', //资质
 				form: {
-					name: '',
-					sex: ''
+					name: '', //姓名
+					sex: '', //性别
+					ID: '', //身份证
+					work: [{ //工作机构
+						name: '工作机构一',
+						province: '选择省份', //省
+						city: '选择城市', //市
+						area: '选择县区', //区
+						hospital: '选择医院', //医院
+						department: '科室名称', //科室
+						qualifications: '默认资质' //资质
+					}, {
+						name: '工作机构二',
+						province: '选择省份', //省
+						city: '选择城市', //市
+						area: '选择县区', //区
+						hospital: '选择医院', //医院
+						department: '科室名称', //科室
+						qualifications: '默认资质' //资质
+					}, {
+						name: '工作机构三',
+						province: '选择省份', //省
+						city: '选择城市', //市
+						area: '选择县区', //区
+						hospital: '选择医院', //医院
+						department: '科室名称', //科室
+						qualifications: '默认资质' //资质
+					}],
+					certificate: '', //证书
+					idPhoto: '', //身份证
+					doctorQualification: '' //医生资格
 				},
+				//性别选择
+				sexshow: false,
+				sexlist: [{
+						value: '1',
+						label: '男'
+					},
+					{
+						value: '2',
+						label: '女'
+					}
+				],
+				//省
+				provinceshow: false,
+				provincelist: [{
+						value: '1',
+						label: '广东省'
+					},
+					{
+						value: '2',
+						label: '广西省'
+					}
+				],
+				//市
+				cityshow: false,
+				citylist: [{
+						value: '1',
+						label: '广州'
+					},
+					{
+						value: '2',
+						label: '深圳'
+					}
+				],
+				//区
+				areashow: false,
+				arealist: [{
+						value: '1',
+						label: '罗湖区'
+					},
+					{
+						value: '2',
+						label: '高要区'
+					}
+				],
+				//医院
+				hospitalshow: false,
+				hospitallist: [{
+						value: '1',
+						label: '****医院'
+					},
+					{
+						value: '2',
+						label: '***医院'
+					}
+				],
+				//科室
+				departmentshow: false,
+				departmentlist: [{
+						value: '1',
+						label: '外科'
+					},
+					{
+						value: '2',
+						label: '内科'
+					}
+				],
+				//资质
+				qualificationsshow: false,
+				qualificationslist: [{
+						value: '1',
+						label: '高'
+					},
+					{
+						value: '2',
+						label: '低'
+					}
+				],
 			}
 		},
 		methods: {
+			// 性别
+			sexconfirm(e) {
+				console.log(e);
+				this.form.sex = e[0].label
+				console.log(this.form.sex);
+			},
+			//省
+			provinceconfirm(e) {
+				this.form.work[this.province].province = e[0].label
+			},
+			//市
+			cityconfirm(e) {
+				this.form.work[this.city].city = e[0].label
+			},
+			//区
+			areaconfirm(e) {
+				this.form.work[this.area].area = e[0].label
+			},
+			//医院
+			hospitalconfirm(e) {
+				this.form.work[this.hospital].hospital = e[0].label
+			},
+			//科室
+			departmentconfirm(e) {
+				this.form.work[this.department].department = e[0].label
+			},
+			//资质
+			qualificationsconfirm(e) {
+				this.form.work[this.qualifications].qualifications = e[0].label
+			},
+			bc() {
+				console.log(this.province)
 
+			}
 		}
 	};
 </script>
 
 <style scoped lang="scss">
-	.main {
-		padding: 0 30rpx;
+	page {
+		background-color: #f0f2f5;
+	}
+
+	.bottomButton {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #0B73B9;
+		color: #FFFFFF;
+		z-index: 1;
+		font-size: 32rpx;
+	}
+
+	.xiala {
+		width: 50%;
+		flex-direction: row-reverse;
+		align-items: center;
+		display: flex;
 	}
 </style>

pages/service/setservice.vue

@@ -7,7 +7,7 @@
 			<u-icon name="arrow-right" color="#c9c9c9" @click="next"></u-icon>
 		</view>
 		<!-- 开关选择器 -->
-		<view v-for="(item,index) in serbicelist" class="list">
+		<view v-for="(item,index) in serbicelist" class="list" :key='index'>
 			<!-- 左边文字 -->
 			<view style="width: 20%;">{{item.zhonglei}}</view>
 			<!-- 开通状态 -->