9-30-1

api/chat.js

@@ -7,6 +7,14 @@ export function chatList(data) {
 		method: 'post',
 		data
 	});
+}
+//聊天记录
+export function mchatList(data) {
+	return request({
+		url: '/api/object.order/MchatList',
+		method: 'post',
+		data
+	});
 }
 //已读消息
 export function setRead(data) {

api/dd.js

@@ -25,4 +25,13 @@ export function acceptMission(data) {
 		method: 'post',
 		data
 	});
+}
+
+// 支付订单/api/object.mission/create_order
+export function createOrder(data) {
+	return request({
+		url: '/api/object.mission/create_order',
+		method: 'post',
+		data
+	});
 }

api/patient.js

@@ -40,6 +40,14 @@ export function patientFinish(data) {
 		data
 	});
 }
+//机构确认完成订单
+export function patientMisson(data) {
+	return request({
+		url: '/api/object.order/patientMisson',
+		method: 'post',
+		data
+	});
+}
 //医生确认完成
 export function doctorFinish(data) {
 	return request({

main.js

@@ -10,7 +10,7 @@ import './static/font/iconfont.css'
  *  css部分使用了App.vue下的全局样式和iconfont图标，有需要图标库的可以留言。
  *  示例使用了uni.scss下的变量, 除变量外已尽量移除特有语法,可直接替换为其他预处理器使用
  */
-const msg = (title, duration=1500, mask=false, icon='none')=>{
+const msg = (title, duration=2000, mask=false, icon='none')=>{
 	//统一提示方便全局修改
 	if(Boolean(title) === false){
 		return;

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "麻醉平台",
+    "name" : "共享预约平台",
     "appid" : "__UNI__561FEA0",
     "description" : "",
     "versionName" : "1.0.0",
@@ -73,7 +73,7 @@
         }
     },
     "h5" : {
-        "title" : "麻醉平台",
+        "title" : "共享预约平台",
         "domain" : "",
         "router" : {
             "base" : "/index/",

pages.json

@@ -77,7 +77,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTextStyle": "black",
-				"navigationBarTitleText": "麻醉服务平台",
+				"navigationBarTitleText": "共享预约平台",
 				"onReachBottomDistance": 50,
 				"app-plus": {
 					"titleNView": false
@@ -88,7 +88,7 @@
 			"path": "pages/index/home",
 			"style": {
 				"navigationBarTextStyle": "black",
-				"navigationBarTitleText": "麻醉服务平台",
+				"navigationBarTitleText": "共享预约平台",
 				"onReachBottomDistance": 50,
 				"app-plus": {
 					"titleNView": false
@@ -323,7 +323,7 @@
 		{
 			"path": "pages/doctor/expert",
 			"style": {
-				"navigationBarTitleText": "专家介绍",
+				"navigationBarTitleText": "",
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -342,6 +342,17 @@
 				}
 			}
 		},
+		{
+			"path": "pages/doctor/chartt",
+			"style": {
+				"navigationBarTextStyle": "black",
+				"navigationBarTitleText": "咨询",
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
 		{
 			"path": "pages/wallet/recharge",
 			"style": {
@@ -429,6 +440,15 @@
 			"style": {
 				"navigationBarTitleText": "发布订单"
 			}
+		},
+		{
+			"path": "pages/public/erweima",
+			"style": {
+				//#ifdef H5
+				"navigationStyle": "custom",
+				//#endif
+				"navigationBarTitleText": "关注二维码"
+			}
 		}
 	],
 	"globalStyle": {
@@ -447,21 +467,23 @@
 				"pagePath": "pages/index/home",
 				"iconPath": "static/tabBar/tab-home.png",
 				"selectedIconPath": "static/tabBar/tab-home-current.png",
-				"text": "首页"
+				"text": "首页",
+				"visible": true
 			},
 			{
 				"pagePath": "pages/patient/patient",
 				"iconPath": "static/tabBar/tab-cate.png",
 				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "咨询记录"
+				"text": "咨询记录",
+				"visible": true
 				// "visible": false
 			},
 			{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabBar/tab-study.png",
 				"selectedIconPath": "static/tabBar/tab-study-current.png",
-				"text": "科普学习"
-				// "visible": false
+				"text": "科普学习",
+				"visible": false
 			},
 			{
 				"pagePath": "pages/dd/dd",
@@ -474,7 +496,8 @@
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tabBar/tab-my.png",
 				"selectedIconPath": "static/tabBar/tab-my-current.png",
-				"text": "我的"
+				"text": "我的",
+				"visible": true
 			}
 		]
 	}

pages/dd/dd.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="navbar flex">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+				:class="{ current: tabCurrentIndex == index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
 		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab"
 			:style="{'height': height}">
@@ -37,7 +37,7 @@
 							</view>
 							<view class="flex fs">
 								<view class="info-name">职称：</view>
-								<view class="info-val">{{litem.doctor_level | showlevel}}</view>
+								<view class="info-val">{{litem.doctor_level | showlevel}}(含)以上职称</view>
 							</view>
 							<view class="flex fs">
 								<view class="info-name">专业：</view>
@@ -48,7 +48,7 @@
 								<view class="info-val">{{litem.tags.join('、')}}</view>
 							</view>
 							<view class="flex fs">
-								<view class="info-name">回报金额：</view>
+								<view class="info-name">劳务费用：</view>
 								<view class="info-val">{{litem.brokerage}}</view>
 							</view>
 							<view class="flex fs">
@@ -57,14 +57,48 @@
 							</view>
 
 						</view>
-						<view class="jd-info flex" v-if="litem.doctor">
+						<view class="jd-info flex" v-if="litem.doctor && litem.pay ==1">
 							<view class="">
 								姓名：{{litem.doctor.name}}
 							</view>
 							<view class="">
 								电话：{{litem.doctor.mobile}}
 							</view>
+							<view class="">
+								职称：{{litem.level}}
+							</view>
+							<view class="" style="width: 100%;">
+								所在医院：{{litem.doctorhospital}}
+							</view>
 						</view>
+						<!-- <view class="" @click="gozx(litem.doctor.uid)">
+							咨询
+						</view> -->
+						
+						<view class="jd-btn flex" style="justify-content: space-around;" v-if="tabCurrentIndex == 1">
+							<view class="btn" v-if="tabCurrentIndex == 1 && userInfo.type == 3 && !litem.pay"
+								@click.stop="gozf(litem)">
+								支付订单费用
+							</view>
+							<view class=" btn"
+								v-if="tabCurrentIndex == 1 && userInfo.type == 3 && litem.order_id && litem.pay"
+								@click.stop="lxys(litem)">
+								联系医生
+							</view>
+
+							<view class="btn"
+								v-if="tabCurrentIndex == 1 && userInfo.type == 3 && litem.order_id && litem.pay && litem.state == 0"
+								@click="wjdd(litem.order_id)">
+								订单完成
+							</view>
+							<view class="btn"
+								v-if="tabCurrentIndex == 1 && userInfo.type == 2 && litem.order_id && litem.pay"
+								@click.stop="lxjg(litem)">
+								联系机构
+							</view>
+						</view>
+						
+						
 						<view class="jd-btn" v-if="tabCurrentIndex == 0 && userInfo.type == 2">
 							<view class="btn" @click="jiedan(litem)">
 								确认接单
@@ -81,11 +115,61 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<!-- 支付弹出窗 -->
+		<uni-popup ref="popup1" type="bottom">
+			<view class="payment">
+				<view class="first flex " @click="payclose()">
+					<text class="word">选择支付方式</text>
+					<image src="../../static/img/img25.png"></image>
+				</view>
+				<view class="pay-type-list">
+					<view class="type-item b-b" @click="changePayType(1)">
+						<view class="img">
+							<image class="yue" src="../../static/img/img26.png"></image>
+						</view>
+						<view class="con"><text class="tit">微信支付</text></view>
+						<label class="radio">
+							<radio value="" color="#FC4141" :checked="payType == 1"></radio>
+						</label>
+					</view>
+					<view class="type-item flex_item" @click="changePayType(2)">
+						<view class="img">
+							<image class="yue" src="../../static/img/img017.png"></image>
+						</view>
+						<view class="con"><text class="tit">余额支付</text></view>
+						<label class="radio">
+							<radio value="" color="#FC4141" :checked="payType == 2"></radio>
+						</label>
+					</view>
+				</view>
+				<view class="one"></view>
+				<view class="Third flex">
+					<view class="two1">
+						<text class="two1-1 ">合计：</text>
+						<text class="two1-2">￥</text>
+						<text class="two1-2 size">{{ pay_price }}</text>
+					</view>
+					<view class="two2" :class="{ clickbg: payLoding }" @click.stop="!payLoding ? confirm() : ''">
+						<text>立即支付</text></view>
+				</view>
+				<view class="" style="height: 44px;">
 
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+	// #ifdef H5
+	import weixinObj from '@/libs/jweixin-module/index.js';
+	// #endif
+	import { weixindata } from '@/utils/wxAuthorized.js';
+	import {
+		patientFinish,
+		patientMisson
+	} from '@/api/patient.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 	import {
 		mapState,
 		mapMutations
@@ -95,15 +179,18 @@
 	} from '@/api/login.js';
 	import {
 		ddlist,
-		acceptMission
+		acceptMission,
+		createOrder
 	} from '@/api/dd.js'
 	import empty from '@/components/empty';
 	export default {
 		components: {
-			empty
+			empty,
+			uniPopup
 		},
 		data() {
 			return {
+				order_id: '',
 				height: '',
 				tabCurrentIndex: 0,
 				navList: [{
@@ -124,7 +211,11 @@
 						limit: 10, //每次信息条数
 						loaded: true
 					}
-				]
+				],
+				pay_price: '', //支付费用
+				payType: 1, //支付类型
+				payLoding: false, //判断是否支付中
+				chooseId: ''
 			}
 		},
 		onReady(res) {
@@ -140,30 +231,36 @@
 				fail: res => {}
 			});
 		},
+		onLoad(opt) {
+			if(opt.tabcurrent) {
+				this.tabCurrentIndex = opt.tabcurrent
+			}
+		},
 		onShow() {
+			let obj = this;
 			// 判断是否已经登录
 			console.log(this.hasLogin, 'user');
 			this.navList = [{
-						type: 0,
-						text: '待接订单',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: false
-					},
-					{
-						type: 1,
-						text: '已接订单',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: true
-					}
-				]
+					type: 0,
+					text: '待接订单',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10, //每次信息条数
+					loaded: false
+				},
+				{
+					type: 1,
+					text: '已接订单',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10, //每次信息条数
+					loaded: true
+				}
+			]
 			this.loadBaseData();
-			let obj = this;
+
 			getUserInfo({})
 				.then(function(e) {
 					// obj.userInfo = e.data;
@@ -233,7 +330,7 @@
 							pagePath: '/pages/dd/dd',
 							visible: true
 						})
-			
+
 						uni.setTabBarItem({
 							index: 4,
 							text: '我的',
@@ -280,19 +377,20 @@
 				.catch(function(e) {
 					console.log(e);
 				});
+
 		},
 		filters: {
 			showlevel(val) {
 				let str = '无'
 				if (val) {
 					if (val == 1) {
-						str = '医师'
+						str = '初级'
 					} else if (val == 2) {
-						str = '主治医师'
+						str = '中级'
 					} else if (val == 3) {
-						str = '副主任医师'
+						str = '副高级'
 					} else if (val == 4) {
-						str = '主任医师'
+						str = '正高级'
 					}
 				}
 				return str
@@ -318,6 +416,127 @@
 		},
 		methods: {
 			...mapMutations(['setUserInfo', 'setOrderInfo', 'logout']),
+			payclose() {
+				obj.$refs.popup1.close()
+			},
+			wjdd(item) {
+				let obj = this
+				patientMisson({
+						order_id: item,
+						// type: 3
+					})
+					.then(data => {
+						// obj.$api.msg(data.msg);
+						// obj.loadData('Refresh');
+						obj.navList = [{
+								type: 0,
+								text: '待接订单',
+								loadingType: 'more',
+								orderList: [],
+								page: 1, //当前页数
+								limit: 10, //每次信息条数
+								loaded: false
+							},
+							{
+								type: 1,
+								text: '已接订单',
+								loadingType: 'more',
+								orderList: [],
+								page: 1, //当前页数
+								limit: 10, //每次信息条数
+								loaded: true
+							}
+						]
+						obj.loadData()
+					})
+					.catch(e => {
+						console.log(e.message);
+					});
+			},
+			lxys(item) {
+				uni.navigateTo({
+					url: '/pages/doctor/chartt?id=' + item.order_id + '&name=' + item.doctor.name + '&uid=' + item
+						.doctor.uid
+				});
+			},
+			lxjg(item) {
+				//organ_uid
+				uni.navigateTo({
+					url: '/pages/doctor/chartt?id=' + item.order_id + '&name=' + item.organ_name + '&uid=' + item
+						.organ_uid
+				});
+			},
+			//选择支付方式
+			changePayType(type) {
+				this.payType = type;
+			},
+			confirm() {
+				let obj = this;
+				// 支付中
+				obj.payLoding = true;
+				// #ifdef H5
+				// 获取当前是否为微信浏览器
+				obj.froms = uni.getStorageSync('weichatBrowser') || '';
+				// #endif
+				createOrder({
+					payType: obj.payType == 1 ? 'weixin' : 'yue',
+					price: obj.pay_price,
+					id: obj.chooseId
+				}).then(({
+					data,
+					status,
+					msg
+				}) => {
+					if (obj.payType == 2) {
+						if (msg == '余额支付成功') {
+							obj.$api.msg(msg);
+							obj.$refs.popup1.close()
+							obj.payLoding = false;
+							obj.navList = [{
+									type: 0,
+									text: '待接订单',
+									loadingType: 'more',
+									orderList: [],
+									page: 1, //当前页数
+									limit: 10, //每次信息条数
+									loaded: false
+								},
+								{
+									type: 1,
+									text: '已接订单',
+									loadingType: 'more',
+									orderList: [],
+									page: 1, //当前页数
+									limit: 10, //每次信息条数
+									loaded: true
+								}
+							]
+							this.loadData()
+							
+						} else {
+							console.log(msg, 'msg');
+						}
+					} else {
+						obj.orderMoneyPay(data);
+					}
+
+
+				}).catch(err => {
+					obj.payLoding = false;
+				})
+			},
+			gozf(item) {
+				this.pay_price = item.brokerage
+				this.chooseId = item.id
+				console.log(item)
+				this.$refs.popup1.onTap();
+				this.$refs.popup1.open();
+			},
+			gozx(id) {
+				uni.navigateTo({
+					url: '/pages/doctor/chartt?id=' + id
+				});
+			},
 			// 
 			navto(url) {
 				uni.navigateTo({
@@ -380,6 +599,10 @@
 				}).then(res => {
 					let s = obj.navList[obj.tabCurrentIndex].orderList.indexOf(item)
 					obj.navList[obj.tabCurrentIndex].orderList.splice(s, 1);
+					uni.showToast({
+						title: '接单成功',
+						duration: 2000
+					});
 				})
 			},
 			// 加载初始数据
@@ -565,6 +788,64 @@
 						}
 					});
 			},
+			orderMoneyPay(data) {
+				// console.log(this,'this')
+				let obj = this;
+				let config = data.jsConfig;
+				weixindata().then(e => {
+					weixinObj.chooseWXPay({
+						timestamp: config.timestamp,
+						nonceStr: config.nonceStr,
+						package: config.package,
+						signType: config.signType,
+						paySign: config.paySign,
+						success: function(res) {
+							obj.$refs.popup1.close()
+							console.log(res);
+							obj.$api.msg(res);
+							obj.payLoding = false;
+							// 支付完成事件
+							obj.navList = [{
+									type: 0,
+									text: '待接订单',
+									loadingType: 'more',
+									orderList: [],
+									page: 1, //当前页数
+									limit: 10, //每次信息条数
+									loaded: false
+								},
+								{
+									type: 1,
+									text: '已接订单',
+									loadingType: 'more',
+									orderList: [],
+									page: 1, //当前页数
+									limit: 10, //每次信息条数
+									loaded: true
+								}
+							]
+							obj.loadData()
+						},
+						fail: function(res) {
+							console.log(res, '失败');
+							uni.showModal({
+								title: '错误',
+								content: res.errMsg,
+								showCancel: false
+							});
+						}
+					});
+				});
+
+				// uni.showModal({
+				// 	title: 'appid',
+				// 	content: JSON.stringify(config),
+				// 	showCancel: false,
+				// 	success: res => {},
+				// 	fail: () => {},
+				// 	complete: () => {}
+				// });
+			},
 		}
 	}
 </script>
@@ -698,6 +979,12 @@
 			border-top: dashed 1rpx #EAECED;
 			margin: auto;
 			width: 662rpx;
+			flex-wrap: wrap;
+
+			view {
+				width: 50%;
+				padding: 5rpx 0;
+			}
 		}
 
 		.jd-btn {
@@ -721,4 +1008,211 @@
 
 		}
 	}
+
+	.zfbtn {
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: #6786fb;
+		border-radius: 0 0 20rpx 20rpx;
+		color: #fff;
+		text-align: center;
+		font-size: 28rpx;
+	}
+
+	.payment {
+		background-color: #ffffff;
+		border-radius: 15rpx 15rpx 0rpx 0rpx;
+
+		.first {
+			border-bottom: 2rpx solid $border-color-light;
+			padding: 38rpx 25rpx;
+
+			.word {
+				font-size: $uni-font-size-base;
+				font-weight: bold;
+				color: $font-color-dark;
+			}
+
+			image {
+				width: 25rpx;
+				height: 25rpx;
+			}
+		}
+
+		.one {
+			height: 20rpx;
+			background-color: #f6f6f6;
+		}
+
+		.Third {
+			.two1 {
+				width: 55%;
+				background-color: #ffffff;
+				padding-left: 25rpx;
+
+				.two1-1 {
+					font-size: $uni-font-size-base;
+					font-weight: 400;
+					color: $font-color-dark;
+				}
+
+				.two1-2 {
+					font-size: $uni-font-size-sm;
+					font-weight: bold;
+					color: $color-red1;
+				}
+
+				.size {
+					font-size: $uni-font-size-lg + 4rpx;
+				}
+			}
+
+			.two2 {
+				width: 45%;
+				background: $color-red1;
+				color: #ffffff;
+				font-size: $uni-font-size-lg;
+				font-weight: 550;
+				text-align: center;
+				padding: 30rpx 0rpx;
+			}
+
+			.clickbg {
+				background-color: $color-gray !important;
+			}
+		}
+	}
+
+	.popup {
+		width: 536rpx;
+
+		.img {
+			width: 100%;
+		}
+
+		.row {
+			background: #ffffff;
+			overflow: hidden;
+			border-radius: 0 0 10rpx 10rpx;
+			padding: 45rpx 45rpx;
+			margin-top: -15rpx;
+
+			.row-1 {
+				font-size: $font-lg + 4rpx;
+				font-weight: 500;
+				color: rgba(51, 51, 51, 1);
+				line-height: 53rpx;
+				text-align: center;
+			}
+
+			.row-2 {
+				font-size: $uni-font-size-lg;
+				font-weight: 500;
+				color: $font-color-dark;
+				line-height: 44rpx;
+				text-align: center;
+				margin-top: 35rpx;
+			}
+
+			.row-3 {
+				width: 80%;
+				height: 70rpx;
+				margin: 0 auto;
+				margin-top: 40rpx;
+				background: linear-gradient(0deg, rgba(126, 153, 254, 1), rgba(151, 143, 250, 1));
+				border-radius: 34rpx;
+				justify-content: center;
+				font-size: $uni-font-size-lg + 4rpx;
+				font-weight: 500;
+				color: #f8f9f9;
+			}
+		}
+	}
+
+	.pay-type-list {
+		margin-top: 20upx;
+		background-color: #fff;
+		padding-left: 40upx;
+
+		.type-item {
+			height: 120upx;
+			padding: 20upx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position: relative;
+		}
+
+		.type-item1 {
+			height: 120upx;
+			padding: 20upx 0;
+			// display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position: relative;
+
+			.row-1 {
+				display: flex;
+			}
+
+			.row-2 {
+				margin-top: 12rpx;
+				font-size: 28rpx;
+				color: #c0c4cc;
+				text-align: center;
+			}
+		}
+
+		.icon {
+			width: 100upx;
+			font-size: 52upx;
+		}
+
+		.img {
+			color: #fe8e2e;
+			width: 50rpx;
+			height: 50rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.tit {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 4upx;
+		}
+
+		.con {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding-left: 25rpx;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+
+	.ddwc {
+		width: 40%;
+		background-color: #6786fb;
+		color: #fff;
+		text-align: center;
+		font-size: 28rpx;
+		line-height: 80rpx;
+		border-radius: 40rpx;
+	}
+
+	.lxys {
+		// margin-right: 20rpx;
+		border: 1px solid #6786fb;
+		background-color: #fff;
+		color: #6786fb;
+	}
 </style>

pages/dd/opendd.vue

@@ -40,7 +40,7 @@
 				</picker>
 			</view>
 			<view class="tab-item flex">
-				<view class="item-name">职称</view>
+				<view class="item-name">职称(以上)</view>
 				<input type="text" placeholder="请选择职称" class="item-val" v-model="doctor_level"
 					@click="handleTap2('picker3')" disabled>
 				<lb-picker ref="picker3" mode="selector" :list="levelList" @change="handleChange2" @touchmove.prevent
@@ -56,12 +56,12 @@
 				</lb-picker>
 			</view>
 			<view class="tab-item flex">
-				<view class="item-name">设备说明标签</view>
-				<input type="text" placeholder="标签请以逗号间隔" class="item-val" v-model="tags">
+				<view class="item-name">劳务费用</view>
+				<input type="number" placeholder="请输入劳务费用" class="item-val" v-model="brokerage">
 			</view>
 			<view class="tab-item flex">
-				<view class="item-name">回报金额</view>
-				<input type="text" placeholder="请输入回报金额" class="item-val" v-model="brokerage">
+				<view class="item-name">设备说明标签</view>
+				<input type="text" placeholder="标签请以逗号间隔" class="item-val" v-model="tags">
 			</view>
 			<view class="tab-item flex">
 				<view class="item-name">要求</view>
@@ -138,16 +138,16 @@
 				content: '',
 				levelList: [{
 					id: 1,
-					name: '医师'
+					name: '初级'
 				}, {
 					id: 2,
-					name: '主治医师'
+					name: '中级'
 				}, {
 					id: 3,
-					name: '副主任医师'
+					name: '副高级'
 				}, {
 					id: 4,
-					name: '主任医师'
+					name: '正高级'
 				}],
 				zyList: [],
 			}
@@ -156,6 +156,17 @@
 			this.load = false
 			this.getDocterTypeList()
 			this.organ_name = this.userInfo.ext_info.name
+			this.province = this.userInfo.ext_info.province
+			this.province_id = this.userInfo.ext_info.province_id
+			this.city = this.userInfo.ext_info.city
+			this.city_id = this.userInfo.ext_info.city_id
+			this.district = this.userInfo.ext_info.district
+			this.district_id = this.userInfo.ext_info.district_id
+			this.addr = this.province + this.city + this.district
+			
+		},
+		onShow() {
+			console.log(this.userInfo,'userInfo')
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
@@ -292,14 +303,14 @@
 					return obj.$api.msg('请输入职称')
 				}
 				if (obj.brokerage == '') {
-					return obj.$api.msg('请输入报酬')
-				}
-				if (obj.content == '') {
-					return obj.$api.msg('请输入要求')
-				}
-				if (obj.tags == '') {
-					return obj.$api.msg('请输入要求')
+					return obj.$api.msg('请输入劳务费用')
 				}
+				// if (obj.content == '') {
+				// 	return obj.$api.msg('请输入要求')
+				// }
+				// if (obj.tags == '') {
+				// 	return obj.$api.msg('请输入要求')
+				// }
 				obj.time_area = obj.fwData + ' ' + obj.fwtime
 				let tags = obj.tags.replace(/，/g, ',')
 				// obj.load = true

pages/doctor/chartt.vue

@@ -0,0 +1,1320 @@
+<template>
+	<view class="container">
+		<view class="top-header flex">
+			<view class="icon" @click="ToPatient">
+				<image src="/static/img/icon.png"></image>
+			</view>
+			<view class="name">{{ name || '暂无姓名' }}</view>
+			<view @click="ToHome">返回首页</view>
+		</view>
+		<view class="uni-column">
+			<view class="content" id="content" :style="{ height: style.contentViewHeight + 'px' }">
+				<scroll-view id="scrollview" class="Meslist" :scroll-y="true" :style="{ height: style.contentViewHeight + 'px' }"
+				 :scroll-with-animation="true" :scroll-top="scrollTop">
+					<view id="listBox">
+						<view v-for="(ls, index) in MsgList" :key="index">
+							<view class="m-item" :id="'message' + index">
+								<view class="m-left">
+									<image class="head_icon" :src="ls.avatar" v-if="ls.uid != userInfo.uid"></image>
+								</view>
+								<view class="m-content">
+									<view class="m-content-head" :class="{ 'm-content-head-right': ls.uid == userInfo.uid }">
+										<view :class="'m-content-head-' + 'home'" v-if="ls.uid == userInfo.uid">
+											<view v-if="ls.type == 1">
+												<view v-if="ls.content.indexOf('http')>-1">
+													<a :href="ls.content">{{ls.content}}</a>
+												</view>
+												<rich-text v-else :nodes="ls.content.replace(reg, emotion)"></rich-text>
+											</view>
+											<view v-if="ls.type == 2">
+												<image @click.stop="imgInfo(ls.content)" mode="widthFix" class="mes-image" :src="ls.content"></image>
+											</view>
+											<view v-if="ls.type == 4" >
+												<view v-if=" typesq(ls.content.split(',')[1])">
+													<a :href="`http://dxhred.igxys.com/questionnaire/before.html?id=${order_id}&token=${token}&name=${name}&type=${userInfo.type}`">
+														<view class="question-title">
+															 {{ ls.content.split(',')[1] }} 
+														</view>
+														<view class="question-img">
+															<image src="../../static/img/img99.jpg" mode=""></image>
+														</view>
+													</a>
+												</view>
+												<view v-if="typesh(ls.content.split(',')[1] )">
+													<a :href="`http://dxhred.igxys.com/questionnaire/index.html?id=${order_id}&token=${token}&name=${name}&type=${userInfo.type}`">
+														<view class="question-title">
+															 {{ ls.content.split(',')[1] }}
+														</view>
+														<view class="question-img">
+															<image src="../../static/img/img99.jpg" mode=""></image>
+														</view>
+													</a>
+												</view>
+												<!-- <a :href="`http://dxhred.igxys.com/questionnaire/before.html?id=${order_id}&token=${token}&name=${name}&type=${userInfo.type}`">
+													<view class="question-title">
+														 {{ ls.content.split(',')[1] }} 
+													</view>
+													<view class="question-img">
+														<image src="../../static/img/img99.jpg" mode=""></image>
+													</view>
+												</a> -->
+											</view>
+											<view v-if="ls.type == 5">
+												<view v-if=" typesq(ls.content.split(',')[1])">
+													<a :href="`http://dxhred.igxys.com/questionnaire/before.html?id=${order_id}&inquireid=${ls.content.split(',')[0].split('/')[ls.content.split(',')[0].split('/').length-1]}&token=${token}&name=${name}&type=${userInfo.type}`">
+														<view class="question-title">
+															{{ ls.content.split(',')[1] }} 
+														</view>
+														<view class="question-img">
+															<image src="../../static/img/img100.jpg" mode=""></image>
+														</view>
+													</a>
+												</view>
+												<view v-if="typesh(ls.content.split(',')[1] )">
+														<a :href="`http://dxhred.igxys.com/questionnaire/index.html?id=${order_id}&inquireid=${ls.content.split(',')[0].split('/')[ls.content.split(',')[0].split('/').length-1]}&token=${token}&name=${name}&type=${userInfo.type}`">
+															<view class="question-title">
+																{{ ls.content.split(',')[1] }}
+															</view>
+															<view class="question-img">
+																<image src="../../static/img/img100.jpg" mode=""></image>
+															</view>
+														</a>
+													</a>
+												</view>
+											</view>
+										</view>
+										
+										<view :class="'m-content-head-' + 'customer'" v-if="ls.uid != userInfo.uid">
+											<view v-if="ls.type == 1">
+												<!-- #ifdef H5 -->
+												<view v-if="ls.content.indexOf('http')>-1">
+													<a :href="ls.content">{{ls.content}}</a>
+												</view>
+												<!-- #endif -->
+												
+												<rich-text :nodes="ls.content.replace(reg, emotion)"></rich-text>
+											</view>
+											<view v-if="ls.type == 2">
+												<image @click.stop="imgInfo(ls.content)" mode="widthFix" class="mes-image" :src="ls.content"></image>
+											</view>
+												<view v-if="ls.type == 4" >
+													<view v-if=" typesq(ls.content.split(',')[1])">
+														<a :href="`http://dxhred.igxys.com/questionnaire/before.html?id=${order_id}&token=${token}&name=${name}&type=${userInfo.type}`">
+															<view class="question-title">
+																 {{ ls.content.split(',')[1] }}
+															</view>
+															<view class="question-img">
+																<image src="../../static/img/img99.jpg" mode=""></image>
+															</view>
+														</a>
+													</view>
+													<view v-if="typesh(ls.content.split(',')[1] )">
+														<a :href="`http://dxhred.igxys.com/questionnaire/index.html?id=${order_id}&token=${token}&name=${name}&type=${userInfo.type}`">
+															<view class="question-title">
+																 {{ ls.content.split(',')[1] }}
+															</view>
+															<view class="question-img">
+																<image src="../../static/img/img99.jpg" mode=""></image>
+															</view>
+														</a>
+													</view>
+												</view>
+												<view v-if="ls.type == 5" >
+													<view v-if=" typesq(ls.content.split(',')[1])">
+														<a :href="`http://dxhred.igxys.com/questionnaire/before.html?id=${order_id}&inquireid=${ls.content.split(',')[0].split('/')[ls.content.split(',')[0].split('/').length-1]}&token=${token}&name=${name}&type=${userInfo.type}`">
+															<view class="question-title">
+																{{ ls.content.split(',')[1] }} 
+															</view>
+															<view class="question-img">
+																<image src="../../static/img/img100.jpg" mode=""></image>
+															</view>
+														</a>
+													</view>
+													<view v-if="typesh(ls.content.split(',')[1] )">
+															<a :href="`http://dxhred.igxys.com/questionnaire/index.html?id=${order_id}&inquireid=${ls.content.split(',')[0].split('/')[ls.content.split(',')[0].split('/').length-1]}&token=${token}&name=${name}&type=${userInfo.type}`">
+																<view class="question-title">
+																	{{ ls.content.split(',')[1] }}
+																</view>
+																<view class="question-img">
+																	<image src="../../static/img/img100.jpg" mode=""></image>
+																</view>
+															</a>
+														</a>
+													</view>
+												</view>
+										</view>
+									</view>
+								</view>
+								<view class="m-right" v-if="userInfo.type == 2">
+									<image class="head_icon" :src="userInfo.ext_info.photo" v-if="ls.uid == userInfo.uid"></image>
+								</view>
+								<view class="m-right" v-if="userInfo.type != 2">
+									<image class="head_icon" :src="userInfo.avatar" v-if="ls.uid == userInfo.uid"></image>
+								</view>
+							</view>
+							<view class="time" v-if="ls.time == true">{{ls.add_time}}</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="foot">
+				<view class="footheight">
+					<view class="footer">
+						<view class="footer-left" @click="scImg()">
+							<image src="/static/img/upload.png"></image>
+						</view>
+						<!-- <view class="footer-left1" @click="open()" v-if="userInfo.type == 2"> -->
+						<!-- <view class="footer-left1" @click="open()" > -->
+							<!-- <image src="/static/img/file.png"></image> -->
+						<!-- </view> -->
+						<view class="footer-emotion" @tap="show"><text class="icon iconfont icon-face"></text></view>
+						<view class="footer-center"><input class="input-text" placeholder="清输入您的信息" type="text" v-model="inputValue"
+							 @focus="foc" :focus="focus" /></view>
+						<view class="footer-right" @tap="sendMessge">
+							<view id="msg-type">发送</view>
+						</view>
+					</view>
+					<emotion @emotion="handleEmotion" :height="200" v-if="showPannel"></emotion>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="Maskshow" class="Info-image">
+			<view class="mask">
+				<image :src="image" mode="aspectFit"></image>
+				<view class="foot-box flex">
+					<view class="send-btn btn" @click="ToReturn">返回</view>
+					<view class="send-btn" @click="send">发送</view>
+				</view>
+			</view>
+		</view>
+
+		<uni-popup ref="popup" type="bottom">
+			<view class="payment">
+				<view class="first flex " @click="payclose()">
+					<text class="word">选择调查文件</text>
+					<image src="../../static/img/img25.png"></image>
+				</view>
+				<view class="pay-type-list">
+					<!-- <view class="type-item b-b"> -->
+						<!-- <view class="img"><image class="yue" src="../../static/img/img26.png"></image></view> -->
+						<!-- <label class="radio"><radio value="" color="#6786fb;" @change="change"></radio></label> -->
+						<radio-group @change="radioChange">
+							<label class="type-item b-b" v-for="(item, index) in list" :key="item.value">
+								<view class="con"><text class="tit">{{ item.name }}</text></view>
+								<view>
+									<radio :value="JSON.stringify(item)" :checked="index === current" />
+								</view>
+							</label>
+						</radio-group>
+					<!-- </view> -->
+				</view>
+				<view class="one"></view>
+				<view class="Third flex">
+					<!-- <a :href="que_url">
+						<view class="two1" @click="choose()">
+							查询
+						</view>
+					</a> -->
+					
+					<view class="two2" :class="{ clickbg: payLoding }" @click.stop="!payLoding ? confirm() : ''"><text>选择</text></view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import messageShow from '@/components/imchat-emoji/messageshow.vue';
+	import Emotion from '@/components/imchat-emoji/Emotion/index.vue';
+	import {
+		chatList,
+		mchatList,
+		setRead
+	} from '@/api/chat.js';
+	import LbPicker from '@/components/lb-picker/index.vue'
+	import {
+		upload,
+		sendFile
+	} from '@/api/index.js';
+	import {
+		getTime
+	} from '@/utils/rocessor.js';
+	// import zhilinPicker from "@/components/zhilin-picker/zhilin-picker.vue"
+	export default {
+		components: {
+			uniPopup,
+			messageShow,
+			Emotion
+		},
+		data() {
+			return {
+				order_id: '',
+				name: '',
+				questions:false,
+				que_url:'',
+				ques_name:'',
+				style: {
+					pageHeight: 0,
+					contentViewHeight: 0,
+					footViewHeight: 90,
+					mitemHeight: 0
+				},
+				list: [{
+					id:163,
+					name: "术后麻醉回访单",
+					url: "http://dxhred.igxys.com/questionnaire/index.html",
+					report_url: "https://www.wjx.cn/resultquery.aspx?activity=100205894"
+				},
+				{
+					id:164,
+					name: "病史采集单",
+					url: "http://dxhred.igxys.com/questionnaire/before.html",
+					report_url: "https://www.wjx.cn/resultquery.aspx?activity=100205894"
+				}
+				], // 调查问卷列表
+				payLoding: false, //判断是否支付中
+				current: '',
+				checked: '',
+				url:'',
+				// show: false,
+				scrollTop: 0,
+				MsgList: [],
+				messages: '', //消息内容
+				inputValue: '', //输入框内容
+				showPannel: false,
+				focus: false,
+				socketTask: null,
+				socketOpen: false,
+				uid: '',
+				client_id: '',
+				cid: '',
+				reg: /\#[\S]{1,3}\;/gi,
+
+				image: '',
+				photo: false,
+				Maskshow: false,
+				iCount: '',
+				demoObj:{},
+				token: ''
+			};
+		},
+		
+		onLoad: function(option) {
+			this.order_id = option.id;
+			this.uid = option.uid;
+			this.name = option.name;
+			this.loadDate();
+			const res = uni.getSystemInfoSync();
+			this.style.pageHeight = res.windowHeight;
+			this.style.contentViewHeight = res.windowHeight - (uni.getSystemInfoSync().screenWidth / 750) * 240; //像素
+			this.connectSocketInit();
+		},
+		onShow() {
+			// this.setRead();
+			this.token = uni.getStorageSync('token');
+			console.log('嘻嘻嘻',this.token)
+		},
+		mounted() {
+			let obj = this;
+			obj.iCount = setInterval(function() {
+				obj.setRead();
+				console.log('setRead')
+			}, 3000);
+		},
+		onUnload() {
+			clearInterval(this.iCount);
+			console.log(11)
+		},
+		computed: {
+			...mapState(['userInfo','baseURL'])
+		},
+		methods: {
+			typesq: function(value) {
+				console.log(value);
+				if(value=='术前麻醉会诊单'||value=='麻醉前访视单'){
+					return true;
+				}else{
+					return false
+				}
+			},
+			typesh: function(value) {
+				if(value=='手术后回访单'||value=='术后麻醉回访单'){
+					return true;
+				}else{
+					return false
+				}
+			},
+			//单张上传图片
+			scImg() {
+				let obj = this;
+				upload({
+					file: ''
+				}).then(e => {
+					obj.image = e[0].url;
+					obj.photo = true;
+					obj.Maskshow = true;
+				}).catch((e) => {
+
+				});
+			},
+			// 选择调查问卷 弹窗
+			open() {
+				this.$refs.popup.open();
+				sendFile({}).then(({
+					data
+				}) => {
+					console.log('选择调查问卷 ',data)
+					// this.list = data;
+				
+				})
+			},
+			// 关闭调查问卷 弹窗
+			close() {
+				this.$refs.popup.close();
+			},
+			payclose(){
+				this.close()
+			},
+			radioChange(e) {
+				console.log('当前e.detail.value:',JSON.parse(e.detail.value))
+				this.demoObj = JSON.parse(e.detail.value)
+				console.log(33,this.demoObj)
+				this.ques_name = this.demoObj.name
+				console.log('当前测试的名字',this.ques_name)
+			},
+			// 调查问卷 确认
+			confirm: async function() {
+				console.log('点击确认',this.token)
+				console.log(111,this.demoObj)
+				// this.inputValue = this.demoObj.url
+				this.close()
+				
+				this.questions = true
+				let ques_url = this.demoObj.url + ','+ this.demoObj.name
+				console.log('ques_url',ques_url)
+				
+				this.getInputMessage(ques_url);
+				
+				this.showPannel = false;
+				// this.sendMessage(this.demoObj.url);
+			},
+			// 调查问卷 选择
+			choose: async function() {
+				// let obj = this;
+				console.log('点击选择')
+				console.log(111,this.demoObj.report_url)
+				this.que_url = this.demoObj.report_url
+				// this.inputValue = this.demoObj.url
+				this.close()
+
+			},
+			ToReturn() {
+				let obj = this;
+				obj.Maskshow = false;
+			},
+			send() {
+				let obj = this;
+				obj.Maskshow = false;
+				console.log('发送图片',obj.image)
+				obj.getInputMessage(obj.image);
+			},
+			//点击图片显示大图
+			imgInfo(item) {
+				//显示图片
+				let _this = this;
+				let imgsArray = [];
+				imgsArray[0] = item
+				uni.previewImage({
+					current: 0,
+					urls: imgsArray
+				});
+			},
+			setRead() {
+				let obj = this;
+				setRead({
+						order_id: obj.order_id
+					})
+					.then(data => {})
+					.catch(e => {
+						console.log(e.message);
+					});
+			},
+			ToPatient() {
+				uni.switchTab({
+					url: '/pages/dd/dd'
+				});
+			},
+			ToHome() {
+				uni.switchTab({
+					url: '/pages/index/home'
+				});
+			},
+			//创建一个 WebSocket 连接。
+			//ws://doctortest.igxys.com:20014
+			connectSocketInit() {
+				this.socketTask = uni.connectSocket({
+					url: 'ws://doctortest.igxys.com:20014',
+					success(data) {
+						console.log('websocket连接成功');
+					}
+				});
+				this.socketTask.onOpen(res => {
+					console.log('WebSocket连接正常打开中...！');
+					this.socketOpen = true;
+					// 注：只有连接正常打开中 ，才能正常收到消息
+					this.socketTask.onMessage(res => {
+						this.client_id = JSON.parse(res.data).client_id;
+						console.log(JSON.parse(res.data));
+						if (JSON.parse(res.data).code == 10501) {
+							console.log('服务器问题');
+							uni.showLoading({
+								title: '断线重连'
+							});
+							// this.closeSocket();
+						} else if (JSON.parse(res.data).code == 0) {
+							this.$api.msg(JSON.parse(res.data).msg);
+						} else {
+							console.log('连接成功');
+							// ls.content.indexOf('http')
+							let newmessage = JSON.parse(res.data);
+							let add_time = getTime(newmessage.timestamp)
+							
+							newmessage = {
+								avatar: newmessage.avatar,
+								content: newmessage.content,
+								nickname: newmessage.nickname,
+								order_id: newmessage.order_id,
+								type: newmessage.m_type,
+								uid: newmessage.uid,
+								add_time: add_time
+							}
+							
+							if(newmessage.type==5){
+								newmessage.content = newmessage.content.split(',');
+								newmessage.content[0].split('?')
+							}
+							
+							
+							if (newmessage.order_id == this.order_id) {
+								// let ques_name = this.que_url
+								this.MsgList = this.MsgList.concat(newmessage);
+								this.MsgList = this.MsgList.map(e => {
+									e.add_time = Date.parse(e.add_time).toString();
+									e.add_time = e.add_time.substr(0, 10);
+									return e;
+								});
+								for (let i = 0; i < this.MsgList.length; i++) {
+									let length = this.MsgList.length;
+									//当前记录时间
+									let newTime = this.MsgList[i].add_time;
+									//上一条记录时间
+									if (i + 1 < length) {
+										let lastTime = this.MsgList[i + 1].add_time;
+										let time = (this.MsgList[i + 1].add_time) - (this.MsgList[i].add_time);
+										if (time > 300) {
+											this.MsgList[i].time = true;
+										}
+									}
+								}
+								this.MsgList = this.MsgList.map(e => {
+									e.add_time = getTime(e.add_time);
+									return e;
+								});
+								console.log(334,this.MsgList)
+							}
+							this.$nextTick(function() {
+								this.scrollToBottom();
+							});
+						}
+					});
+					let join = '{"type":"handshake","role":"user","uid":' + this.userInfo.uid + '}';
+					console.log(join);
+					this.socketTask.send({
+						data: join,
+						success: res => {
+							console.log('消息发送成功');
+						}
+					});
+				});
+			},
+			sendMessge: function() {
+				var obj = this;
+				if (obj.inputValue.trim() == '') {
+					obj.inputValue = '';
+				} else {
+					//点击发送按钮
+					this.getInputMessage(obj.inputValue);
+					obj.inputValue = '';
+					this.showPannel = false;
+				}
+			},
+			// 不经过输入框 直接发送数据
+			// sendMessage: function (msg) {
+			// 	console.log('不经过输入框 直接发送数据',msg)
+			// },
+			//获取输入框数据
+			getInputMessage: function(message) {
+				let obj = this;
+				console.log('选择',message)
+				console.log('obj.socketOpen',obj.socketOpen)
+				if (obj.socketOpen) {
+					let msg = '';
+					if (obj.photo == true) {
+						msg = '{"content":"' + message + '","m_type":2,"order_id":"' + this.order_id + '","type":"send","uid":"' + this.uid +
+							'"}';
+							console.log('obj.photo:',msg)
+					} 
+					 else if( obj.questions == true)	{
+						msg = '{"content":"' + message + '","m_type":4,"order_id":"' + this.order_id + '","type":"send","uid":"' + this.uid +
+							'"}';
+							console.log('显示msg',msg)
+					}		
+					else {
+						msg = '{"content":"' + message + '","m_type":1,"order_id":"' + this.order_id + '","type":"send","uid":"' + this.uid +
+							'"}';
+							console.log('文字',msg)
+					}
+					console.log(msg,'msg++++++++++++++++++++++++')
+					obj.socketTask.send({
+						data: msg,
+						success: res => {
+							console.log(msg);
+							let newmessage = JSON.parse(msg);
+							console.log(newmessage)
+							let mes = {
+								content: newmessage.content,
+								m_type: newmessage.m_type,
+								order_id: newmessage.order_id,
+								type: newmessage.type,
+								uid: obj.userInfo.uid
+							};
+							console.log( newmessage.m_type,'消息发送成功');
+							if (mes.order_id == obj.order_id) {
+								var tmp = Date.parse(new Date()).toString();
+								tmp = tmp.substr(0, 10);
+								tmp = getTime(tmp);
+								mes = {
+									content: newmessage.content,
+									type: newmessage.m_type,
+									order_id: newmessage.order_id,
+									uid: obj.userInfo.uid,
+									add_time: tmp
+								}
+								obj.photo = false;
+								obj.questions = false
+								obj.MsgList = obj.MsgList.concat(mes);
+								obj.MsgList = obj.MsgList.map(e => {
+									e.add_time = Date.parse(e.add_time).toString();
+									e.add_time = e.add_time.substr(0, 10);
+									return e;
+								});
+								for (let i = 0; i < obj.MsgList.length; i++) {
+									let length = obj.MsgList.length;
+									//当前记录时间
+									let newTime = obj.MsgList[i].add_time;
+									//上一条记录时间
+									if (i + 1 < length) {
+										let lastTime = obj.MsgList[i + 1].add_time;
+										let time = (obj.MsgList[i + 1].add_time) - (obj.MsgList[i].add_time);
+										if (time > 300) {
+											obj.MsgList[i].time = true;
+										}
+									}
+								}
+								obj.MsgList = obj.MsgList.map(e => {
+									e.add_time = getTime(e.add_time);
+									return e;
+								});
+								console.log(obj.MsgList)
+								obj.$nextTick(function() {
+									obj.scrollToBottom();
+								});
+							}
+						},
+						fail: err => {
+							console.log(err);
+						}
+					});
+				} else {
+					obj.messages = message;
+				}
+				obj.setScrollH();
+			},
+			scrollToBottom: function() {
+				//哪里需要用到就在哪里使用
+				let obj = this;
+				let query = uni.createSelectorQuery().in(this);
+				query
+					.select('#listBox')
+					.fields({
+							dataset: true,
+							size: true,
+							scrollOffset: true,
+							rect: true
+						},
+						function(res) {
+							obj.scrollTop = res.height;
+						}
+					)
+					.exec();
+			},
+			// 设置高度 用emit辅助
+			setScrollH: function() {
+				let screenHeight = uni.getSystemInfoSync().windowHeight; //获取屏幕高度
+				// 通过query 获取其余盒子的高度
+				let query = uni.createSelectorQuery().in(this);
+				query.select('.foot').boundingClientRect();
+				// 通过query.exec返回的数组 进行减法 同时 去除margin 和border的
+				query.exec(res => {
+					let foot = res[0].height;
+					screenHeight = screenHeight - foot;
+				});
+			},
+			// 关闭websocket【离开这个页面的时候执行关闭】
+			closeSocket() {
+				let obj = this;
+				obj.socketTask.close({
+					success(res) {
+						obj.socketOpen = false;
+						console.log('关闭成功', res);
+					},
+					fail(err) {
+						console.log('关闭失败', err);
+					}
+				});
+			},
+			loadDate() {
+				let obj = this;
+				mchatList({
+						order_id: obj.order_id,
+						page: 1,
+						limit: 10000
+					})
+					.then(({
+						data
+					}) => {
+						console.log(345,data.list[0].content.indexOf('http')>-1)
+						obj.MsgList = data.list.reverse();
+						for (let i = 0; i < obj.MsgList.length; i++) {
+							let length = obj.MsgList.length;
+							//当前记录时间
+							let newTime = obj.MsgList[i].add_time;
+							//上一条记录时间
+							if (i + 1 < length) {
+								let lastTime = obj.MsgList[i + 1].add_time;
+								let time = (obj.MsgList[i + 1].add_time) - (obj.MsgList[i].add_time);
+								if (time > 300) {
+									obj.MsgList[i].time = true;
+									console.log('dayu')
+								}
+							}
+						}
+						obj.MsgList = obj.MsgList.map(e => {
+							e.add_time = getTime(e.add_time);
+							return e;
+						});
+						obj.$nextTick(function() {
+							obj.scrollToBottom();
+						});
+					})
+					.catch(e => {
+						console.log(e.message);
+					});
+			},
+			//语音识别
+			// startRecognize: function() {
+			// 	var options = {};
+			// 	var that = this;
+			// 	options.engine = 'iFly';
+			// 	that.inputValue = '';
+			// 	plus.speech.startRecognize(
+			// 		options,
+			// 		function(s) {
+			// 			console.log(s);
+			// 			that.inputValue += s;
+			// 		},
+			// 		function(e) {
+			// 			console.log('语音识别失败：' + e.message);
+			// 		}
+			// 	);
+			// },
+			show() {
+				this.showPannel = !this.showPannel;
+			},
+			// 光标触发隐藏表情
+			foc() {
+				this.showPannel = false;
+			},
+			handleEmotion(i) {
+				this.inputValue += i;
+			},
+			emotion(res) {
+				let word = res.replace(/\#|\;/gi, '');
+				const list = [
+					'微笑',
+					'撇嘴',
+					'色',
+					'发呆',
+					'得意',
+					'流泪',
+					'害羞',
+					'闭嘴',
+					'睡',
+					'大哭',
+					'尴尬',
+					'发怒',
+					'调皮',
+					'呲牙',
+					'惊讶',
+					'难过',
+					'酷',
+					'冷汗',
+					'抓狂',
+					'吐',
+					'偷笑',
+					'可爱',
+					'白眼',
+					'傲慢',
+					'饥饿',
+					'困',
+					'惊恐',
+					'流汗',
+					'憨笑',
+					'大兵',
+					'奋斗',
+					'咒骂',
+					'疑问',
+					'嘘',
+					'晕',
+					'折磨',
+					'衰',
+					'骷髅',
+					'敲打',
+					'再见',
+					'擦汗',
+					'抠鼻',
+					'鼓掌',
+					'糗大了',
+					'坏笑',
+					'左哼哼',
+					'右哼哼',
+					'哈欠',
+					'鄙视',
+					'委屈',
+					'快哭了',
+					'阴险',
+					'亲亲',
+					'吓',
+					'可怜',
+					'菜刀',
+					'西瓜',
+					'啤酒',
+					'篮球',
+					'乒乓',
+					'咖啡',
+					'饭',
+					'猪头',
+					'玫瑰',
+					'凋谢',
+					'示爱',
+					'爱心',
+					'心碎',
+					'蛋糕',
+					'闪电',
+					'炸弹',
+					'刀',
+					'足球',
+					'瓢虫',
+					'便便',
+					'月亮',
+					'太阳',
+					'礼物',
+					'拥抱',
+					'强',
+					'弱',
+					'握手',
+					'胜利',
+					'抱拳',
+					'勾引',
+					'拳头',
+					'差劲',
+					'爱你',
+					'NO',
+					'OK',
+					'爱情',
+					'飞吻',
+					'跳跳',
+					'发抖',
+					'怄火',
+					'转圈',
+					'磕头',
+					'回头',
+					'跳绳',
+					'挥手',
+					'激动',
+					'街舞',
+					'献吻',
+					'左太极',
+					'右太极'
+				];
+				let index = list.indexOf(word);
+				return `<img src="https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/${index}.gif" align="middle">`;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+
+		.container {
+			width: 100%;
+			height: 100%;
+			background: #ffffff;
+		}
+	}
+
+	.Info-image {
+		position: absolute;
+		top: 0;
+		height: 100%;
+		width: 100%;
+		background-color: rgba(0, 0, 0, 1);
+
+		.mask {
+			top: 20%;
+			left: 10%;
+			height: 100%;
+			width: 100%;
+			text-align: center;
+
+			image {
+				margin: 10 auto 0 auto;
+				width: 100% !important;
+				height: 90% !important;
+			}
+
+			.foot-box {
+				position: fixed;
+				bottom: 0;
+				width: 100%;
+				height: 150rpx;
+				padding: 0rpx 50rpx;
+				background-color: #2A2C39;
+
+				.send-btn {
+					width: 30%;
+					padding: 20rpx 0rpx;
+					color: #FFFFFF;
+					background-color: #1482d1;
+					font-size: 26rpx;
+					border-radius: 15rpx;
+				}
+
+				.btn {
+					color: #FFFFFF !important;
+					background-color: #818181 !important;
+				}
+			}
+		}
+	}
+
+	.top-header {
+		width: 100%;
+		padding: 30rpx 25rpx;
+		font-size: 30rpx;
+		color: #ffffff;
+		background: linear-gradient(52deg, rgba(126, 153, 254, 1), rgba(151, 143, 250, 1));
+
+		.icon {
+			image {
+				width: 35rpx;
+				height: 35rpx;
+			}
+		}
+
+		.name {
+			font-size: 35rpx;
+		}
+	}
+
+	.uni-column {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.content {
+		display: flex;
+		flex: 1;
+		/* margin-bottom: 100upx; */
+	}
+
+	.foot {
+		box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1);
+		position: fixed;
+		width: 100%;
+		height: auto;
+		left: 0upx;
+		bottom: 0;
+		overflow: hidden;
+	}
+
+	.footer {
+		display: flex;
+		flex-direction: row;
+		width: 100%;
+		height: 110rpx;
+		line-height: 100rpx;
+		overflow: hidden;
+		background-color: #ffffff;
+	}
+
+	.footer-left {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		padding: 0rpx 25rpx;
+
+		image {
+			width: 50rpx;
+			height: 40rpx;
+		}
+	}
+
+	.footer-left1 {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		padding: 0rpx 25rpx;
+
+		image {
+			width: 58rpx;
+			height: 48rpx;
+		}
+	}
+
+	.footer-emotion {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		color: #1482d1;
+		padding-right: 25rpx;
+	}
+
+	.footer-right {
+		background-color: #6786fb;
+		width: 130rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #FFFFFF;
+		line-height: 20rpx;
+		font-size: 28rpx;
+
+		image {
+			width: 50rpx;
+			height: 50rpx;
+		}
+	}
+
+	.footer-center {
+		border-left: 2rpx solid #cccccc;
+		padding-left: 20rpx;
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 26rpx;
+	}
+
+	.footer-center .input-text {
+		font-size: 26rpx;
+		flex: 1;
+		background: #fff;
+		font-family: verdana !important;
+		overflow: hidden;
+		border-radius: 15upx;
+	}
+
+	@font-face {
+		font-family: 'iconfont';
+		/* project id 1134039 */
+		src: url('http://at.alicdn.com/t/font_1134039_uait6xu86bf.eot');
+		src: url('http://at.alicdn.com/t/font_1134039_uait6xu86bf.eot?#iefix') format('embedded-opentype'), url('http://at.alicdn.com/t/font_1134039_uait6xu86bf.woff2') format('woff2'),
+			url('http://at.alicdn.com/t/font_1134039_uait6xu86bf.woff') format('woff'), url('http://at.alicdn.com/t/font_1134039_uait6xu86bf.ttf') format('truetype'),
+			url('http://at.alicdn.com/t/font_1134039_uait6xu86bf.svg#iconfont') format('svg');
+	}
+
+	.iconfont {
+		font-family: 'iconfont' !important;
+		font-size: 18px;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.icon {
+		color: #f3b72c !important;
+	}
+
+	.icon-face:before {
+		content: '\e71c';
+		font-size: 50upx;
+	}
+
+	.time {
+		padding-top: 45rpx;
+		padding-bottom: 5rpx !important;
+		width: 100%;
+		text-align: center;
+		font-size: 24rpx;
+		color: #69707F;
+	}
+
+	.m-item {
+		display: flex;
+		flex-direction: row;
+		padding-top: 40upx;
+	}
+
+	.m-left {
+		display: flex;
+		width: 120upx;
+		justify-content: center;
+		align-items: flex-start;
+	}
+
+	.m-content {
+		display: flex;
+		flex: 1;
+		flex-direction: column;
+		justify-content: center;
+		word-break: break-all;
+		font-size: 22rpx;
+	}
+
+	.m-right {
+		display: flex;
+		width: 120upx;
+		justify-content: center;
+		align-items: flex-start;
+	}
+
+	.head_icon {
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100%;
+	}
+
+	.m-content-head {
+		position: relative;
+	}
+	a{
+		display: block;
+		text-decoration: none;
+		color: #303133;
+		font-size: 28rpx;
+	}
+	.question-title{
+		display: block;
+		text-decoration: none;
+	}
+	.question-img{
+		margin-top: 8rpx;
+		width: 300rpx;
+		height: 280rpx;
+		// background-color: pink;
+		image{
+			width: 300rpx;
+			height: 280rpx;
+		}
+	}
+	.mes-image {
+		width: 300rpx;
+	}
+
+	.m-content-head-right {
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.m-content-head-customer {
+		text-align: left;
+		background: #f7f7fb;
+		border: 1px #f7f7fb solid;
+		border-radius: 20upx;
+		padding: 20upx 25rpx;
+		font-size: 26rpx !important;
+		display: inline-block;
+	}
+
+	.m-content-head-customer:before {
+		border: 15upx solid transparent;
+		border-right: 15upx solid #f7f7fb;
+		left: -26upx;
+		width: 0;
+		height: 0;
+		position: absolute;
+		content: ' ';
+	}
+
+	.m-content-head-home {
+		border: 1upx white solid;
+		font-size: 26rpx !important;
+		background: white;
+		border-radius: 20upx;
+		padding: 20upx;
+		background-color: #f7f7fb;
+	}
+
+	.m-content-head-home:after {
+		border: 15upx solid transparent;
+		border-left: 15upx solid #f7f7fb;
+		top: 20upx;
+		right: -26upx;
+		width: 0;
+		height: 0;
+		position: absolute;
+		content: ' ';
+	}
+
+	.pay-type-list {
+		margin-top: 20upx;
+		background-color: #fff;
+		padding-left: 40upx;
+
+		.type-item {
+			height: 120upx;
+			padding: 20upx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position: relative;
+		}
+
+		.type-item1 {
+			height: 120upx;
+			padding: 20upx 0;
+			// display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position: relative;
+
+			.row-1 {
+				display: flex;
+			}
+
+			.row-2 {
+				margin-top: 12rpx;
+				font-size: 28rpx;
+				color: #C0C4CC;
+				text-align: center;
+			}
+		}
+
+		.icon {
+			width: 100upx;
+			font-size: 52upx;
+		}
+
+		.img {
+			color: #fe8e2e;
+			width: 50rpx;
+			height: 50rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.tit {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 4upx;
+		}
+
+		.con {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding-left: 25rpx;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+
+	.payment {
+		background-color: #ffffff;
+		border-radius: 15rpx 15rpx 0rpx 0rpx;
+
+		.first {
+			border-bottom: 2rpx solid $border-color-light;
+			padding: 38rpx 25rpx;
+
+			.word {
+				font-size: $uni-font-size-base;
+				font-weight: bold;
+				color: $font-color-dark;
+			}
+
+			image {
+				width: 25rpx;
+				height: 25rpx;
+			}
+		}
+
+		.one {
+			height: 20rpx;
+			background-color: #f6f6f6;
+		}
+
+		.Third {
+			a{
+				width: 50%;
+				// background-color: pink;
+				display: block;
+				text-decoration: none;
+				// display: flex;
+			}
+			.two1 {
+				// width: 50%;
+				text-align: center;
+				color: #6786fb;
+				font-size: $uni-font-size-lg;
+				font-weight: 550;
+				text-align: center;
+				padding: 30rpx 0rpx;
+
+				.size {
+					font-size: $uni-font-size-lg + 4rpx;
+				}
+			}
+
+			.two2 {
+				width: 100%;
+				background: #6786fb;
+				color: #ffffff;
+				font-size: $uni-font-size-lg;
+				font-weight: 550;
+				text-align: center;
+				padding: 30rpx 0rpx;
+			}
+
+			.clickbg {
+				background-color: $color-gray !important;
+			}
+		}
+	}
+</style>

pages/doctor/chat.vue

@@ -272,7 +272,7 @@
 				},
 				{
 					id:164,
-					name: "术前麻醉会诊单",
+					name: "病史采集单",
 					url: "http://dxhred.igxys.com/questionnaire/before.html",
 					report_url: "https://www.wjx.cn/resultquery.aspx?activity=100205894"
 				}
@@ -336,7 +336,7 @@
 		methods: {
 			typesq: function(value) {
 				console.log(value);
-				if(value=='术前麻醉会诊单'||value=='麻醉前访视单'){
+				if(value=='病史采集单'||value=='麻醉前访视单'){
 					return true;
 				}else{
 					return false
@@ -583,6 +583,7 @@
 						data: msg,
 						success: res => {
 							console.log(msg);
+							console.log('发送成功')
 							let newmessage = JSON.parse(msg);
 							console.log(newmessage)
 							let mes = {
@@ -636,6 +637,14 @@
 							}
 						},
 						fail: err => {
+							uni.showModal({
+								title: '1111',
+								content:err,
+								showCancel: false,
+								success: res => {},
+								fail: () => {},
+								complete: () => {}
+							});
 							console.log(err);
 						}
 					});

pages/doctor/doclist.vue

@@ -17,7 +17,7 @@
 				<view class="center-word">
 					<text class="one">{{ item.name }}</text>
 					<text class="two">
-						职位：{{ item.doctor_level == 1 ? "医师" : item.doctor_level == 2 ? "主治医师" : item.doctor_level == 3 ? "副主任医师" : "主任医师"}}
+						职位：{{ item.doctor_level == 1 ? "初级" : item.doctor_level == 2 ? "中级" : item.doctor_level == 3 ? "副高级" : "正高级"}}
 					</text>
 				</view>
 				<view class="right-label flex">

pages/doctor/expert.vue

@@ -1,10 +1,10 @@
 <template>
-	<view class="container">
+	<view class="container" v-if="showpage">
 		<view class="top"></view>
 		<view class="user-box">
 			<image :src="list.photo || '/static/error/missing-face.png'"></image>
-			<view class="user-right">
-				<view class="user-name">{{ list.name }}</view>
+			<view class="user-right" v-if="list">
+				<view class="user-name" >{{ list.name }}</view>
 				<view class="user-address">
 					职位：{{ list.doctor_level == 1 ? '医师' : list.doctor_level == 2 ? '主治医师' : list.doctor_level == 3 ? '副主任医师' : '主任医师' }}
 				</view>
@@ -45,40 +45,65 @@
 					</view>
 				</view>
 				<view class="left-txt" v-if="list.comment_list == ''">暂无数据</view>
-				<view class="ask-list flex_item" v-if="list.comment_list != ''" v-for="(ls, index) in list.comment_list" :key="index">
+				<view class="ask-list flex_item" v-if="list.comment_list != ''" v-for="(ls, index) in list.comment_list"
+					:key="index">
 					<image :src="ls.avatar || '/static/error/missing-face.png'" class="ask-img"></image>
 					<view class="ask-txt ellipsis">{{ ls.comment }}</view>
 				</view>
 			</view>
-			<view class="pay-type-list dots" v-if="show">
-				<view class="type-item1" @click="changeDoctor(4)" v-if="userInfo.type != 3">
+			<!-- <view class="pay-type-list dots" v-if="show"> -->
+				<!-- <view class="type-item1" @click="changeDoctor(4)" v-if="userInfo.type != 3">
 					<view class="row-1">
 						<view class="con"><text class="tit">麻醉会诊</text></view>
-						<label class="radio"><radio value="" color="#FC4141" :checked="DoctorType == 4"></radio></label>
+						<label class="radio">
+							<radio value="" color="#FC4141" :checked="DoctorType == 4"></radio>
+						</label>
 					</view>
-					<!-- <view class="row-2">提供无限次麻醉咨询及围术期麻醉相关服务</view> -->
-				</view>
-				<view class="type-item1" v-if="userInfo.type != 3" @click="changeDoctor(1)">
+				</view> -->
+				<!-- <view class="type-item1" v-if="userInfo.type != 3" @click="changeDoctor(1)">
 					<view class="row-1">
-						<view class="con"><text class="tit">一般咨询</text></view>
-						<label class="radio"><radio value="" color="#FC4141" :checked="DoctorType == 1"></radio></label>
+						<view class="con"><text class="tit">咨询</text></view>
+						<label class="radio">
+							<radio value="" color="#FC4141" :checked="DoctorType == 1"></radio>
+						</label>
 					</view>
-					<view class="row-2">仅提供麻醉咨询，20次图文交互后结束服务</view>
+					<view class="row-2">仅提供咨询，10次图文交互后结束</view>
 				</view>
 				<view class="type-item1" @click="changeDoctor(2)" v-if="userInfo.type != 3">
 					<view class="row-1">
-						<view class="con"><text class="tit">围术期麻醉相关服务</text></view>
-						<label class="radio"><radio value="" color="#FC4141" :checked="DoctorType == 2"></radio></label>
+						<view class="con"><text class="tit">预约</text></view>
+						<label class="radio">
+							<radio value="" color="#FC4141" :checked="DoctorType == 2"></radio>
+						</label>
 					</view>
-					<view class="row-2">提供无限次麻醉咨询及围术期麻醉相关服务</view>
+					<view class="row-2">提供3个月内无限次咨询，及技术服务1次</view>
 				</view>
-				<view class="type-item flex_item" @click="changeDoctor(3)" v-if="userInfo.type == 3">
-					<view class="con"><text class="tit">外出预约</text></view>
-					<label class="radio"><radio value="" color="#FC4141" :checked="DoctorType1 == 3"></radio></label>
+				<view class="type-item1" @click="changeDoctor(3)" v-if="userInfo.type == 3">
+					<view class="row-1 flex">
+						<view class="con"><text class="tit">外出预约</text></view>
+						<label class="radio">
+							<radio value="" color="#FC4141" :checked="DoctorType1 == 3"></radio>
+						</label>
+					</view>
+					<view class="row-2">外出其他单位提供咨询指导及技术服务1次</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- 立即咨询 -->
-			<view class="sub-bottom" v-if="show" @click="DoctorType != 4?open():confirm()">确定</view>
+			<!-- <view class="sub-bottom" v-if="show" @click="DoctorType != 4?open():confirm()">确定</view> -->
+		</view>
+		<view class="" style="height: 100rpx;background-color: #fff;">
+			
+		</view>
+		<view class="btm-btn flex" v-if="show">
+			<view class="btn" @click="gozx()" v-if="userInfo.type != 3">
+				咨询
+			</view>
+			<view class="btn" @click="goYy()" v-if="userInfo.type != 3">
+				预约
+			</view>
+			<view class="btn" v-if="userInfo.type == 3" @click="gowc">
+				外出预约
+			</view>
 		</view>
 		<!-- 资讯医生弹出层 -->
 		<uni-popup ref="popup" type="center">
@@ -106,7 +131,9 @@
 					</button>
 				</view>
 			</view>
-			<view class="close_icon" @click="close"><image src="../../static/img/img016.png"></image></view>
+			<view class="close_icon" @click="close">
+				<image src="../../static/img/img016.png"></image>
+			</view>
 		</uni-popup>
 		<!-- 支付弹出窗 -->
 		<uni-popup ref="popup1" type="bottom">
@@ -117,14 +144,22 @@
 				</view>
 				<view class="pay-type-list">
 					<view class="type-item b-b" @click="changePayType(1)">
-						<view class="img"><image class="yue" src="../../static/img/img26.png"></image></view>
+						<view class="img">
+							<image class="yue" src="../../static/img/img26.png"></image>
+						</view>
 						<view class="con"><text class="tit">微信支付</text></view>
-						<label class="radio"><radio value="" color="#FC4141" :checked="payType == 1"></radio></label>
+						<label class="radio">
+							<radio value="" color="#FC4141" :checked="payType == 1"></radio>
+						</label>
 					</view>
 					<view class="type-item flex_item" @click="changePayType(2)">
-						<view class="img"><image class="yue" src="../../static/img/img017.png"></image></view>
+						<view class="img">
+							<image class="yue" src="../../static/img/img017.png"></image>
+						</view>
 						<view class="con"><text class="tit">余额支付</text></view>
-						<label class="radio"><radio value="" color="#FC4141" :checked="payType == 2"></radio></label>
+						<label class="radio">
+							<radio value="" color="#FC4141" :checked="payType == 2"></radio>
+						</label>
 					</view>
 				</view>
 				<view class="one"></view>
@@ -134,554 +169,708 @@
 						<text class="two1-2">￥</text>
 						<text class="two1-2 size">{{ pay_price }}</text>
 					</view>
-					<view class="two2" :class="{ clickbg: payLoding }" @click.stop="!payLoding ? confirm() : ''"><text>立即支付</text></view>
+					<view class="two2" :class="{ clickbg: payLoding }" @click.stop="!payLoding ? confirm() : ''">
+						<text>立即支付</text></view>
 				</view>
 			</view>
 		</uni-popup>
 	</view>
 </template>
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import { getDoctor, calculate, createOrder, orderpay } from '@/api/doctor.js';
-import { mapState, mapMutations } from 'vuex';
-import { weixindata } from '@/utils/wxAuthorized.js';
-// #ifdef H5
-import weixinObj from '@/libs/jweixin-module/index.js';
-// #endif
-export default {
-	components: {
-		uniPopup
-	},
-	data() {
-		return {
-			uid: '', //医生uid
-			list: '', //详情信息
-			pay_price: '', //支付费用
-			payType: 1, //支付类型
-			payLoding: false, //判断是否支付中
-			// #ifdef H5
-			froms: '', //当前是否为微信浏览器
-			// #endif
-			type: '', //判断是否从订单中进入
-			DoctorType: 2, //医生类型
-			DoctorType1: 3, //医生类型
-			order_id: '', //订单id
-			show: false
-		};
-	},
-	onLoad(option) {
-		this.uid = option.id;
-		if (option.spread) {
-			// 存储邀请人
-			this.spread = option.spread;
-			uni.setStorageSync('spread', option.spread);
-		}
-		this.loadDate();
-		this.Calculate();
-	},
-	computed: {
-		// #ifdef H5
-		...mapState(['userInfo', 'weichatObj'])
-		// #endif
-	},
-	watch: {
-		DoctorType(newValue, oldValue) {
-			let obj = this;
-			if (newValue != oldValue) {
-				obj.Calculate();
-			}
-		}
-	},
-	methods: {
-		//选择支付方式
-		changePayType(type) {
-			this.payType = type;
-		},
-		//选择医生类型
-		changeDoctor(type) {
-			this.DoctorType = type;
+	import {
+		getUserInfo
+	} from '@/api/login.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import {
+		getDoctor,
+		calculate,
+		createOrder,
+		orderpay
+	} from '@/api/doctor.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		weixindata
+	} from '@/utils/wxAuthorized.js';
+	// #ifdef H5
+	import weixinObj from '@/libs/jweixin-module/index.js';
+	// #endif
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	export default {
+		components: {
+			uniPopup
 		},
-		//获取医生详情
-		loadDate() {
-			let obj = this;
-			getDoctor({
-				id: obj.uid
-			})
-				.then(({ data }) => {
-					obj.list = data;
-				})
-				.catch(e => {
-					console.log('----', e.message);
-				});
+		data() {
+			return {
+				uid: '', //医生uid
+				list: '', //详情信息
+				pay_price: '', //支付费用
+				payType: 1, //支付类型
+				payLoding: false, //判断是否支付中
+				// #ifdef H5
+				froms: '', //当前是否为微信浏览器
+				// #endif
+				type: '', //判断是否从订单中进入
+				DoctorType: 2, //医生类型
+				DoctorType1: 3, //医生类型
+				order_id: '', //订单id
+				show: false,
+				showpage: false
+			};
 		},
-		//计算金额
-		Calculate() {
-			let obj = this;
-			let type = '';
-			if (obj.userInfo.type == 3) {
-				type = obj.DoctorType1;
-			} else {
-				type = obj.DoctorType;
+		onLoad(option) {
+			saveUrl()
+			this.uid = option.id;
+			if (option.spread) {
+				// 存储邀请人
+				this.spread = option.spread;
+				uni.setStorageSync('spread', option.spread);
 			}
-			console.log(type);
-			calculate({
-				doctor_id: obj.uid,
-				type: type
-			})
-				.then(({ data }) => {
-					obj.show = true;
-					obj.pay_price = data.pay_price;
-				})
-				.catch(e => {
-					console.log(e.message);
-					if (e.message == '该医生尚未完善出诊信息') {
-						setTimeout(function() {
-							uni.navigateTo({
-								url: '/pages/doctor/doclist'
-							});
-						}, 1200);
-					}
-					if (e.message == '该医生就职地区/医院与你的所在地区/医院不符') {
-						setTimeout(function() {
-							uni.navigateTo({
-								url: '/pages/doctor/doclist'
-							});
-						}, 1200);
+			
+			getUserInfo().then(res => {
+				console.log('进入到了doctor')
+				if(!res.data) {
+					console.log('进入了没有用户data，去登陆')
+					interceptor()
+				}
+				if(!res.data.ext_info) {
+					console.log('进入到了extinfo')
+					uni.navigateTo({
+						url: '/pages/index/identity'
+					})
+				}else {
+					if (option.isq && option.isq == 1) {
+						if (res.data.type == 3 || res.data.type == 2) {
+							uni.switchTab({
+								url: '/pages/user/user'
+							})
+						}else {
+							this.loadDate();
+							this.Calculate();
+						}
+					}else {
+						this.loadDate();
+						this.Calculate();
 					}
-				});
+				}
+			}).catch(err => {
+				console.log(err)
+			})
 		},
-		//确认支付
-		confirm: async function() {
-			let obj = this;
-			// 支付中
-			obj.payLoding = true;
+		computed: {
 			// #ifdef H5
-			// 获取当前是否为微信浏览器
-			obj.froms = uni.getStorageSync('weichatBrowser') || '';
+			...mapState(['userInfo', 'weichatObj','hasLogin'])
 			// #endif
-			// 判断是否为未支付订单中跳转进入
-			if (obj.type != 1) {
-				// 初次生成订单
-				obj.firstCreateOrder();
-			} else {
-				obj.orderMoneyPay();
-			}
 		},
-		// 初次订单创建
-		firstCreateOrder() {
-			let obj = this;
-			// 获取下单页面数据
-			let type = '';
-			if (obj.userInfo.type == 3) {
-				type = obj.DoctorType1;
-			} else {
-				type = obj.DoctorType;
+		watch: {
+			DoctorType(newValue, oldValue) {
+				let obj = this;
+				if (newValue != oldValue) {
+					obj.Calculate();
+				}
 			}
-			let data = {
-				doctor_id: obj.uid, //医生uid
-				type: type, //医生类型 1 普通预约 2 私人医生
-				pay_type: obj.payType //支付类型  1是微信 2是余额
-			};
-			// 生成订单
-			createOrder(data)
-				.then(({ data, status, msg }) => {
-					obj.order_id = data.order_id;
-					if (obj.payType == 2) {
-						if (msg == '余额支付成功') {
-							obj.$api.msg(msg);
-							obj.payLoding = false;
-							uni.navigateTo({
-								url: '/pages/doctor/chat?id=' + data.order_id + '&name=' + obj.list.name + '&uid=' + obj.uid
-							});
-						} else {
-							console.log(msg, 'msg');
+		},
+		methods: {
+			//选择支付方式
+			changePayType(type) {
+				this.payType = type;
+			},
+			//选择医生类型
+			changeDoctor(type) {
+				this.DoctorType = type;
+			},
+			//获取医生详情
+			loadDate() {
+				let obj = this;
+				getDoctor({
+						id: obj.uid
+					})
+					.then(({
+						data
+					}) => {
+						obj.showpage = true
+						obj.list = data;
+						
+					})
+					.catch(e => {
+						// console.log('----', e.message);
+					});
+			},
+			//计算金额
+			Calculate() {
+				let obj = this;
+				let type = '';
+				if (obj.userInfo.type == 3) {
+					type = obj.DoctorType1;
+				} else {
+					type = obj.DoctorType;
+				}
+				console.log(type);
+				calculate({
+						doctor_id: obj.uid,
+						type: type
+					})
+					.then(({
+						data
+					}) => {
+						obj.show = true;
+						obj.pay_price = data.pay_price;
+					})
+					.catch(e => {
+						console.log(e.message);
+						if (e.message == '该医生尚未完善出诊信息') {
+							setTimeout(function() {
+								uni.navigateTo({
+									url: '/pages/doctor/doclist'
+								});
+							}, 1200);
 						}
-					} else {
-						if (obj.DoctorType != 4) {
-							// 立即支付
-							obj.orderMoneyPay(data);
+						if (e.message == '该医生就职地区/医院与你的所在地区/医院不符') {
+							setTimeout(function() {
+								uni.navigateTo({
+									url: '/pages/doctor/doclist'
+								});
+							}, 1200);
+						}
+					});
+			},
+			//确认支付
+			confirm: async function() {
+				let obj = this;
+				// 支付中
+				obj.payLoding = true;
+				// #ifdef H5
+				// 获取当前是否为微信浏览器
+				obj.froms = uni.getStorageSync('weichatBrowser') || '';
+				// #endif
+				// 判断是否为未支付订单中跳转进入
+				if (obj.type != 1) {
+					// 初次生成订单
+					obj.firstCreateOrder();
+				} else {
+					obj.orderMoneyPay();
+				}
+			},
+			// 初次订单创建
+			firstCreateOrder() {
+				let obj = this;
+				// 获取下单页面数据
+				let type = '';
+				if (obj.userInfo.type == 3) {
+					type = obj.DoctorType1;
+				} else {
+					type = obj.DoctorType;
+				}
+				let data = {
+					doctor_id: obj.uid, //医生uid
+					type: type, //医生类型 1 普通预约 2 私人医生
+					pay_type: obj.payType //支付类型  1是微信 2是余额
+				};
+				// 生成订单
+				createOrder(data)
+					.then(({
+						data,
+						status,
+						msg
+					}) => {
+						obj.order_id = data.order_id;
+						if (obj.payType == 2) {
+							if (msg == '余额支付成功') {
+								obj.$api.msg(msg);
+								obj.payLoding = false;
+								uni.navigateTo({
+									url: '/pages/doctor/chat?id=' + data.order_id + '&name=' + obj.list.name +
+										'&uid=' + obj.uid
+								});
+							} else {
+								console.log(msg, 'msg');
+							}
 						} else {
-							uni.navigateTo({
-								url: '/pages/doctor/chat?id=' + data.order_id + '&name=' + obj.list.name + '&uid=' + obj.uid
-							});
+							if (obj.DoctorType != 4) {
+								// 立即支付
+								obj.orderMoneyPay(data);
+							} else {
+								uni.navigateTo({
+									url: '/pages/doctor/chat?id=' + data.order_id + '&name=' + obj.list.name +
+										'&uid=' + obj.uid
+								});
+							}
 						}
-					}
-				})
-				.catch(e => {
-					obj.payLoding = false;
-					console.log(e.message);
-				});
-		},
-		// 支付金额
-		orderMoneyPay(data) {
-			// console.log(this,'this')
-			let obj = this;
-			let config = data.jsConfig;
-			weixindata().then(e => {
-				weixinObj.chooseWXPay({
-					timestamp: config.timestamp,
-					nonceStr: config.nonceStr,
-					package: config.package,
-					signType: config.signType,
-					paySign: config.paySign,
-					success: function(res) {
-						console.log(res);
-						obj.$api.msg(res);
+					})
+					.catch(e => {
 						obj.payLoding = false;
-						uni.showModal({
-							title: '提示',
-							content: '您已支付成功，是否进入咨询？',
-							success: function(res) {
-								if (res.confirm) {
-									obj.payclose();
-									uni.navigateTo({
-										url: '/pages/doctor/chat?id=' + data.order_id + '&name=' + obj.list.name + '&uid=' + obj.uid
-									});
-								} else if (res.cancel) {
-									obj.payclose();
-									uni.switchTab({
-										url: '/pages/patient/patient'
-									});
+						console.log(e.message);
+					});
+			},
+			// 支付金额
+			orderMoneyPay(data) {
+				// console.log(this,'this')
+				let obj = this;
+				let config = data.jsConfig;
+				weixindata().then(e => {
+					weixinObj.chooseWXPay({
+						timestamp: config.timestamp,
+						nonceStr: config.nonceStr,
+						package: config.package,
+						signType: config.signType,
+						paySign: config.paySign,
+						success: function(res) {
+							console.log(res);
+							obj.$api.msg(res);
+							obj.payLoding = false;
+							uni.showModal({
+								title: '提示',
+								content: '您已支付成功，是否进入咨询？',
+								success: function(res) {
+									if (res.confirm) {
+										obj.payclose();
+										uni.navigateTo({
+											url: '/pages/doctor/chat?id=' + data
+												.order_id + '&name=' + obj.list
+												.name + '&uid=' + obj.uid
+										});
+									} else if (res.cancel) {
+										obj.payclose();
+										uni.switchTab({
+											url: '/pages/patient/patient'
+										});
+									}
 								}
-							}
-						});
-					},
-					fail: function(res) {
-						console.log(res, '失败');
-						uni.showModal({
-							title: '错误',
-							content: res.errMsg,
-							showCancel: false
-						});
-					}
+							});
+						},
+						fail: function(res) {
+							console.log(res, '失败');
+							obj.payLoding = false;
+							uni.showModal({
+								title: '错误',
+								content: res.errMsg,
+								showCancel: false
+							});
+						}
+					});
 				});
-			});
-
-			// uni.showModal({
-			// 	title: 'appid',
-			// 	content: JSON.stringify(config),
-			// 	showCancel: false,
-			// 	success: res => {},
-			// 	fail: () => {},
-			// 	complete: () => {}
-			// });
-		},
-		//确认咨询弹唱
-		open() {
-			this.$refs.popup.open();
-		},
-		//关闭咨询
-		close() {
-			this.$refs.popup.close();
-		},
-		//支付弹窗
-		payopen() {
-			this.$refs.popup1.onTap();
-			this.$refs.popup1.open();
-			this.close();
-		},
-		//支付支付弹窗
-		payclose() {
-			this.$refs.popup1.close();
-		},
-		Tomore() {
-			uni.navigateTo({
-				url: '/pages/user/reply?id=' + this.uid
-			});
+
+				// uni.showModal({
+				// 	title: 'appid',
+				// 	content: JSON.stringify(config),
+				// 	showCancel: false,
+				// 	success: res => {},
+				// 	fail: () => {},
+				// 	complete: () => {}
+				// });
+			},
+			//确认咨询弹唱
+			open() {
+				this.$refs.popup.open();
+			},
+			//关闭咨询
+			close() {
+				this.$refs.popup.close();
+			},
+			//支付弹窗
+			payopen() {
+				this.$refs.popup1.onTap();
+				this.$refs.popup1.open();
+				this.close();
+			},
+			//支付支付弹窗
+			payclose() {
+				this.$refs.popup1.close();
+			},
+			Tomore() {
+				uni.navigateTo({
+					url: '/pages/user/reply?id=' + this.uid
+				});
+			},
+			gozx() {
+				this.DoctorType = 1;
+				// DoctorType != 4?open():confirm()
+				if(this.DoctorType!= 4) {
+					this.open()
+				}else {
+					this.confirm()
+				}
+			},
+			goYy() {
+				this.DoctorType = 2;
+				// DoctorType != 4?open():confirm()
+				if(this.DoctorType!= 4) {
+					this.open()
+				}else {
+					this.confirm()
+				}
+			},
+			gowc() {
+				this.DoctorType = 3;
+				if(this.DoctorType!= 4) {
+					this.open()
+				}else {
+					this.confirm()
+				}
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	.container {
-		background-color: #ffffff;
+	page {
+		background-color: #fff;
+		min-height: 100%;
+		height: auto;
+		.container {
+			background-color: #ffffff;
+		}
 	}
-}
-.sub-bottom {
-	background: $background-color;
-	box-shadow: 0px 0px 13rpx 3rpx rgba(209, 212, 217, 0.31);
-	border-radius: 35rpx;
-	width: 80%;
-	font-size: $font-base + 2rpx;
-	font-weight: 500;
-	color: rgba(255, 255, 255, 1);
-	text-align: center;
-	padding: 20rpx 0rpx;
-	margin: 0rpx auto;
-	margin-top: 50rpx;
-}
-.mar-b {
-	margin-bottom: 33rpx;
-}
-.top {
-	width: 750rpx;
-	height: 250rpx;
-	background: linear-gradient(52deg, rgba(151, 143, 250, 1) 0%, rgba(126, 153, 254, 1) 100%);
-}
-
-.user-box {
-	width: 690rpx;
-	margin: -130rpx auto;
-	background: #fbfbfb;
-	box-shadow: 1rpx 4rpx 40rpx 0rpx rgba(51, 51, 51, 0.14);
-	border-radius: 26rpx;
-	display: flex;
-	padding: 65rpx 54rpx;
-	image {
-		width: 147rpx;
-		height: 147rpx;
-		border-radius: 50%;
+
+	.sub-bottom {
+		background: $background-color;
+		box-shadow: 0px 0px 13rpx 3rpx rgba(209, 212, 217, 0.31);
+		border-radius: 35rpx;
+		width: 80%;
+		font-size: $font-base + 2rpx;
+		font-weight: 500;
+		color: rgba(255, 255, 255, 1);
+		text-align: center;
+		padding: 20rpx 0rpx;
+		margin: 0rpx auto;
+		margin-top: 50rpx;
 	}
 
-	.user-right {
-		padding-left: 25rpx;
-		.user-name {
-			font-size: $font-base + 2rpx;
-			font-weight: bold;
-			color: rgba(51, 51, 51, 1);
-			line-height: 40rpx;
-		}
+	.mar-b {
+		margin-bottom: 33rpx;
+	}
+
+	.top {
+		width: 750rpx;
+		height: 250rpx;
+		background: linear-gradient(52deg, rgba(151, 143, 250, 1) 0%, rgba(126, 153, 254, 1) 100%);
+	}
 
-		.user-address {
-			padding: 10rpx 0rpx;
-			font-size: 26rpx;
-			color: #666666;
+	.user-box {
+		width: 690rpx;
+		margin: -130rpx auto;
+		background: #fbfbfb;
+		box-shadow: 1rpx 4rpx 40rpx 0rpx rgba(51, 51, 51, 0.14);
+		border-radius: 26rpx;
+		display: flex;
+		padding: 65rpx 54rpx;
+
+		image {
+			width: 147rpx;
+			height: 147rpx;
+			border-radius: 50%;
 		}
 
-		.user-num {
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #333333;
-			line-height: 40rpx;
+		.user-right {
+			padding-left: 25rpx;
+
+			.user-name {
+				font-size: $font-base + 2rpx;
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+				line-height: 40rpx;
+			}
+
+			.user-address {
+				padding: 10rpx 0rpx;
+				font-size: 26rpx;
+				color: #666666;
+			}
+
+			.user-num {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #333333;
+				line-height: 40rpx;
 
-			text {
-				color: $font-color;
+				text {
+					color: $font-color;
+				}
 			}
 		}
 	}
-}
-.list-box {
-	margin-top: 180rpx;
-	padding: 25rpx 25rpx;
-	.item-box {
-		margin-bottom: 54rpx;
-		.icon-box {
-			margin-bottom: 32rpx;
+
+	.list-box {
+		margin-top: 180rpx;
+		padding: 25rpx 25rpx;
+
+		.item-box {
+			margin-bottom: 54rpx;
+
+			.icon-box {
+				margin-bottom: 32rpx;
+			}
 		}
 	}
-}
-.left-icon {
-	width: 12rpx;
-	height: 42rpx;
-	background: $base-color;
-	border-radius: 6rpx;
-}
-.left-box {
-	width: 100%;
-}
-.left-tit {
-	font-size: 30rpx;
-	font-weight: bold;
-	color: rgba(51, 51, 51, 1);
-	line-height: 42rpx;
-	margin-left: 14rpx;
-}
-.more {
-	font-size: 24rpx;
-	color: #666666;
-}
-.left-txt {
-	font-size: 28rpx;
-	font-weight: 500;
-	color: rgba(102, 102, 102, 1);
-	line-height: 52rpx;
-}
-
-.ask-list {
-	margin-bottom: 25rpx;
-	.ask-img {
-		width: 92rpx;
-		height: 92rpx;
-		border-radius: 50%;
+
+	.left-icon {
+		width: 12rpx;
+		height: 42rpx;
+		background: $base-color;
+		border-radius: 6rpx;
+	}
+
+	.left-box {
+		width: 100%;
+	}
+
+	.left-tit {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+		line-height: 42rpx;
+		margin-left: 14rpx;
+	}
+
+	.more {
+		font-size: 24rpx;
+		color: #666666;
 	}
-	.ask-txt {
+
+	.left-txt {
 		font-size: 28rpx;
 		font-weight: 500;
-		width: 90%;
-		padding-left: 15rpx;
 		color: rgba(102, 102, 102, 1);
-		line-height: 48rpx;
-	}
-}
-.popup {
-	width: 536rpx;
-	.img {
-		width: 100%;
+		line-height: 52rpx;
 	}
-	.row {
-		background: #ffffff;
-		overflow: hidden;
-		border-radius: 0 0 10rpx 10rpx;
-		padding: 45rpx 45rpx;
-		margin-top: -15rpx;
-		.row-1 {
-			font-size: $font-lg + 4rpx;
-			font-weight: 500;
-			color: rgba(51, 51, 51, 1);
-			line-height: 53rpx;
-			text-align: center;
-		}
-		.row-2 {
-			font-size: $uni-font-size-lg;
-			font-weight: 500;
-			color: $font-color-dark;
-			line-height: 44rpx;
-			text-align: center;
-			margin-top: 35rpx;
+
+	.ask-list {
+		margin-bottom: 25rpx;
+
+		.ask-img {
+			width: 92rpx;
+			height: 92rpx;
+			border-radius: 50%;
 		}
-		.row-3 {
-			width: 80%;
-			height: 70rpx;
-			margin: 0 auto;
-			margin-top: 40rpx;
-			background: linear-gradient(0deg, rgba(126, 153, 254, 1), rgba(151, 143, 250, 1));
-			border-radius: 34rpx;
-			justify-content: center;
-			font-size: $uni-font-size-lg + 4rpx;
+
+		.ask-txt {
+			font-size: 28rpx;
 			font-weight: 500;
-			color: #f8f9f9;
+			width: 90%;
+			padding-left: 15rpx;
+			color: rgba(102, 102, 102, 1);
+			line-height: 48rpx;
 		}
 	}
-}
-.close_icon {
-	width: 52rpx;
-	height: 52rpx;
-	margin: 88rpx auto 0;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-//支付弹窗
-.dots {
-	padding-left: 0upx !important;
-}
-
-.pay-type-list {
-	margin-top: 20upx;
-	background-color: #fff;
-	padding-left: 40upx;
-	.type-item {
-		height: 120upx;
-		padding: 20upx 0;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding-right: 60upx;
-		font-size: 30upx;
-		position: relative;
-	}
 
-	.type-item1 {
-		height: 120upx;
-		padding: 20upx 0;
-		// display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding-right: 60upx;
-		font-size: 30upx;
-		position: relative;
-		.row-1 {
-			display: flex;
+	.popup {
+		width: 536rpx;
+
+		.img {
+			width: 100%;
 		}
-		.row-2 {
-			margin-top: 12rpx;
-			font-size: 28rpx;
-			color: #c0c4cc;
-			text-align: center;
+
+		.row {
+			background: #ffffff;
+			overflow: hidden;
+			border-radius: 0 0 10rpx 10rpx;
+			padding: 45rpx 45rpx;
+			margin-top: -15rpx;
+
+			.row-1 {
+				font-size: $font-lg + 4rpx;
+				font-weight: 500;
+				color: rgba(51, 51, 51, 1);
+				line-height: 53rpx;
+				text-align: center;
+			}
+
+			.row-2 {
+				font-size: $uni-font-size-lg;
+				font-weight: 500;
+				color: $font-color-dark;
+				line-height: 44rpx;
+				text-align: center;
+				margin-top: 35rpx;
+			}
+
+			.row-3 {
+				width: 80%;
+				height: 70rpx;
+				margin: 0 auto;
+				margin-top: 40rpx;
+				background: linear-gradient(0deg, rgba(126, 153, 254, 1), rgba(151, 143, 250, 1));
+				border-radius: 34rpx;
+				justify-content: center;
+				font-size: $uni-font-size-lg + 4rpx;
+				font-weight: 500;
+				color: #f8f9f9;
+			}
 		}
 	}
 
-	.icon {
-		width: 100upx;
-		font-size: 52upx;
-	}
-	.img {
-		color: #fe8e2e;
-		width: 50rpx;
-		height: 50rpx;
+	.close_icon {
+		width: 52rpx;
+		height: 52rpx;
+		margin: 88rpx auto 0;
+
 		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
-	.tit {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		margin-bottom: 4upx;
-	}
-	.con {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		padding-left: 25rpx;
-		font-size: $font-sm;
-		color: $font-color-light;
+
+	//支付弹窗
+	.dots {
+		padding-left: 0upx !important;
 	}
-}
-.payment {
-	background-color: #ffffff;
-	border-radius: 15rpx 15rpx 0rpx 0rpx;
-	.first {
-		border-bottom: 2rpx solid $border-color-light;
-		padding: 38rpx 25rpx;
-		.word {
-			font-size: $uni-font-size-base;
-			font-weight: bold;
+
+	.pay-type-list {
+		margin-top: 20upx;
+		background-color: #fff;
+		padding-left: 40upx;
+
+		.type-item {
+			height: 120upx;
+			padding: 20upx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position: relative;
+		}
+
+		.type-item1 {
+			height: 120upx;
+			padding: 20upx 0;
+			// display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position: relative;
+
+			.row-1 {
+				display: flex;
+			}
+
+			.row-2 {
+				margin-top: 12rpx;
+				font-size: 28rpx;
+				color: #c0c4cc;
+				text-align: center;
+			}
+		}
+
+		.icon {
+			width: 100upx;
+			font-size: 52upx;
+		}
+
+		.img {
+			color: #fe8e2e;
+			width: 50rpx;
+			height: 50rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	
+	.tit {
+			font-size: $font-lg;
 			color: $font-color-dark;
+			margin-bottom: 4upx;
 		}
-		image {
-			width: 25rpx;
-			height: 25rpx;
+
+		.con {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding-left: 25rpx;
+			font-size: $font-sm;
+			color: $font-color-light;
 		}
 	}
-	.one {
-		height: 20rpx;
-		background-color: #f6f6f6;
-	}
-	.Third {
-		.two1 {
-			width: 55%;
-			background-color: #ffffff;
-			padding-left: 25rpx;
-			.two1-1 {
+
+	.payment {
+		background-color: #ffffff;
+		border-radius: 15rpx 15rpx 0rpx 0rpx;
+
+		.first {
+			border-bottom: 2rpx solid $border-color-light;
+			padding: 38rpx 25rpx;
+
+			.word {
 				font-size: $uni-font-size-base;
-				font-weight: 400;
+				font-weight: bold;
 				color: $font-color-dark;
 			}
-			.two1-2 {
-				font-size: $uni-font-size-sm;
-				font-weight: bold;
-				color: $color-red1;
+
+			image {
+				width: 25rpx;
+				height: 25rpx;
 			}
-			.size {
-				font-size: $uni-font-size-lg + 4rpx;
+		}
+
+		.one {
+			height: 20rpx;
+			background-color: #f6f6f6;
+		}
+
+		.Third {
+			.two1 {
+				width: 55%;
+				background-color: #ffffff;
+				padding-left: 25rpx;
+
+				.two1-1 {
+					font-size: $uni-font-size-base;
+					font-weight: 400;
+					color: $font-color-dark;
+				}
+
+				.two1-2 {
+					font-size: $uni-font-size-sm;
+					font-weight: bold;
+					color: $color-red1;
+				}
+
+				.size {
+					font-size: $uni-font-size-lg + 4rpx;
+				}
+			}
+
+			.two2 {
+				width: 45%;
+				background: $color-red1;
+				color: #ffffff;
+				font-size: $uni-font-size-lg;
+				font-weight: 550;
+				text-align: center;
+				padding: 30rpx 0rpx;
+			}
+
+			.clickbg {
+				background-color: $color-gray !important;
 			}
 		}
-		.two2 {
-			width: 45%;
-			background: $color-red1;
-			color: #ffffff;
-			font-size: $uni-font-size-lg;
-			font-weight: 550;
+	}
+	.btm-btn {
+		background-color: #fff;
+		height: 100rpx;
+		width: 750rpx;
+		position: fixed;
+		bottom: 0;
+		justify-content: center;
+		align-items: center;
+		.btn {
+			width: 260rpx;
+			line-height: 80rpx;
 			text-align: center;
-			padding: 30rpx 0rpx;
-		}
-		.clickbg {
-			background-color: $color-gray !important;
+			border-radius: 40rpx;
+			background-color: #6786fb;
+			color: #fff;
+			font-size: $font-base + 2rpx;
+			font-weight: 500;
+			margin: 0 20rpx;
 		}
 	}
-}
 </style>

pages/index/home.vue

@@ -1,34 +1,176 @@
 <template>
 	<view class="container">
-		<view class="name" @click="add()">请选择进入</view>
-		<view class="image" @click="ToRegister(1)" v-if="userInfo.type != 2">
-			<image src="../../static/img/img030.png"></image>
-			<view class="identity">咨询预约</view>
-			<view class="info">一对一医生咨询预约</view>
-		</view>
-		<view class="image" @click="ToRegister(2)">
-			<image src="../../static/img/img031.png"></image>
-			<view class="identity">科普学习</view>
-			<view class="info">医疗知识课程直播详解</view>
+		<view class="container">
+			<!-- <view class="swiper">
+				<view class="swiper-box">
+					<swiper circular="true" autoplay="true" @change="swiperChange">
+						<swiper-item v-for="swiper in banner" :key="swiper.id">
+							<image :src="swiper.pic"></image>
+						</swiper-item>
+					</swiper>
+					<view class="indicator">
+						<view class="dots" v-for="(swiper, index) in banner" :class="[swiperCurrent >= index ? 'on' : '']"
+							:key="index"></view>
+					</view>
+				</view>
+			</view> -->
+			<view class="top-banner">
+				<image src="../../static/img/banner.png" mode="widthFix"></image>
+			</view>
+			<view class="banner" style="margin: 20rpx atuo;background-color: #fff;" @click="ToDoclist"
+				v-if="userInfo.type && (userInfo.type == 1 || userInfo.type == 3)">
+				<image src="../../static/img/goxzyy.png" mode="widthFix"
+					style="width: 700rpx;margin: auto;display: block;"></image>
+			</view>
+			<view class="Live-list"
+				v-if="userInfo.type && (userInfo.type == 1 || userInfo.type == 3) && (DoctorList.length > 0)">
+				<view class="list-name flex" @click="ToDoclist">
+					<view class="list-tip">
+						<view class="tip"></view>
+						咨询问诊
+					</view>
+					<view class="list-more">
+						更多
+						<text class="iconfont iconenter"></text>
+					</view>
+				</view>
+				<view v-for="(item, index) in DoctorList" :key="index" class="template flex_item"
+					@click="ToExpert(item.uid)">
+					<view class="left-img">
+						<image :src="item.photo"></image>
+					</view>
+					<view class="center-word">
+						<text class="one">{{ item.name }}</text>
+						<text class="two">
+							职位：{{ item.doctor_level == 1 ? "初级" : item.doctor_level == 2 ? "中级" : item.doctor_level == 3 ? "副高级" : "正高级"}}
+						</text>
+					</view>
+					<view class="right-label flex">
+						<image src="../../static/img/img014.png"></image>
+						咨询问诊
+					</view>
+				</view>
+			</view>
+			<view class="Live-list" v-if="broadList.length > 0">
+				<view class="list-name flex" @click="ToLive">
+					<view class="list-tip">
+						<view class="tip"></view>
+						正在直播
+					</view>
+					<view class="list-more">
+						更多
+						<text class="iconfont iconenter"></text>
+					</view>
+				</view>
+				<scroll-view class="floor-list" scroll-x>
+					<view class="scoll-wrapper position-relative">
+						<view class="floor-item" v-for="ls in broadList" @click="ToLiveDetails(ls)">
+							<view class="img-box">
+								<image class="list-image" :src="ls.image"></image>
+								<view class="tip">好评</view>
+							</view>
+							<view class="title clamp">{{ls.title}}</view>
+							<view class="tip-box flex_item">
+								<view v-for="item in ls.label" class="tip">{{item}}</view>
+							</view>
+							<view class="info ellipsis">{{ls.abstract}}</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="Live-list">
+				<view class="list-name flex" @click="ToCourse">
+					<view class="list-tip">
+						<view class="tip"></view>
+						精选好课
+					</view>
+					<view class="list-more">
+						更多
+						<text class="iconfont iconenter"></text>
+					</view>
+				</view>
+				<view id="list-box" class="list-box">
+					<view class="guess-section flex">
+						<view class="guess-item" v-for="ls in courseList" @click="ToCourseDetails(ls)">
+							<view class="imagewrapper">
+								<image :src="ls.image"></image>
+							</view>
+							<text class="title clamp">{{ls.title}}</text>
+							<view class="tip-box flex_item">
+								<view v-for="item in ls.label" class="tip">{{item}}</view>
+							</view>
+							<view class="info clamp">￥{{ls.money}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
 <script>
+	import {
+		getDoctorList
+	} from '@/api/doctor.js';
+	import {
+		course_list
+	} from '@/api/course.js';
 	import {
 		getUserInfo
 	} from '@/api/login.js';
 	export default {
 		data() {
 			return {
-				userInfo: ''
+				userInfo: '',
+				header_color: 'linear-gradient(52deg, rgba(151,143,250,1) 0%, rgba(126,153,254,1) 100%)', //轮播图背景色渐变
+				navP: 0, // 导航栏透明度
+				DoctorList: [],
+				limit: 10, //每次加载数据条数
+				page: 1, //当前页数
+				loadingType: 'more', //加载更多状态
+				loading: 0, //判断是否为点击搜索按钮跳转加载
+				addr_color: '',
+				swiperCurrent: 0, //轮播图
+				swiperHeight: 300,
+				banner: '', //轮播图
+				recommend: '', //列表数据
+				courseList: '', //专题列表
+				broadList: '', //直播列表
 			};
 		},
 		onLoad(option) {
+			let obj = this
 			if (option.spread) {
 				// 存储邀请人
 				this.spread = option.spread;
 				uni.setStorageSync('spread', option.spread);
 			}
+			getUserInfo({}).then(e => {
+				obj.userInfo = e.data
+				uni.setStorageSync('userInfo', e.data);
+				if (!obj.userInfo.ext_info) {
+					uni.navigateTo({
+						url: '/pages/index/identity'
+					})
+				}
+				let gz = uni.getStorageSync('gz') || 'more'
+				if (obj.userInfo.subscribe != 1 && gz == 'more') {
+					uni.showModal({
+						title: '温馨提醒',
+						content: '为更好的接收消息推送，请关注公众号。',
+						success: res => {
+							uni.setStorageSync('gz','loaded')
+							// 判断是否点击了确认
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/erweima'
+								});
+							}
+						}
+					});
+				}
+			})
+			this.loadData();
+			this.getDoctorList()
 		},
 		onShow() {
 			let obj = this;
@@ -109,11 +251,13 @@
 						});
 					}
 					if (obj.userInfo.type == 1) {
+						console.log('普通用户')
 						uni.setTabBarItem({
 							index: 0,
 							text: '首页',
 							iconPath: 'static/tabBar/tab-home.png',
-							selectedIconPath: 'static/tabBar/tab-home-current.png'
+							selectedIconPath: 'static/tabBar/tab-home-current.png',
+							visible: true
 						});
 						uni.setTabBarItem({
 							index: 1,
@@ -122,13 +266,13 @@
 							selectedIconPath: 'static/tabBar/tab-cate-current.png',
 							visible: true
 						});
-						uni.setTabBarItem({
-							index: 2,
-							text: '科普学习',
-							iconPath: 'static/tabBar/tab-study.png',
-							selectedIconPath: 'static/tabBar/tab-study-current.png',
-							visible: true
-						});
+						// uni.setTabBarItem({
+						// 	index: 2,
+						// 	text: '科普学习',
+						// 	iconPath: 'static/tabBar/tab-study.png',
+						// 	selectedIconPath: 'static/tabBar/tab-study-current.png',
+						// 	visible: true
+						// });
 						uni.setTabBarItem({
 							index: 3,
 							text: '接单',
@@ -140,7 +284,8 @@
 							index: 4,
 							text: '我的',
 							iconPath: 'static/tabBar/tab-my.png',
-							selectedIconPath: 'static/tabBar/tab-my-current.png'
+							selectedIconPath: 'static/tabBar/tab-my-current.png',
+							visible: true
 						});
 					}
 				})
@@ -168,55 +313,639 @@
 				// 	showCancel: false,
 				// });
 				this.$log.showLog();
+			},
+			loadData() {
+				let obj = this;
+				course_list({
+						page: obj.page,
+						limit: obj.limit
+					})
+					.then(data => {
+						obj.banner = data.data.banner;
+						obj.recommend = data.data.recommend;
+						obj.courseList = data.data.recommend['精品课程排行'].list;
+						if (data.data.recommend['在线直播'].list) {
+							obj.broadList = data.data.recommend['在线直播'].list;
+						}
+					})
+					.catch(e => {
+						console.log(e.message);
+					});
+			},
+			//获取医生列表
+			getDoctorList(type) {
+				let obj = this;
+				//这里是将订单挂载到tab列表下
+				if (type !== 'refresh') {
+					//没有更多数据直接跳出方法
+					if (obj.loadingType === 'nomore') {
+						return;
+					} else {
+						// 设置当前为数据载入中
+						obj.loadingType = 'loading';
+					}
+				} else {
+					//当重新加载数据时更新状态为可继续添加数据
+					obj.loadingType = 'more';
+				}
+				getDoctorList({
+						hospital: '',
+						keyword: '',
+						sort: '',
+						page: obj.page,
+						limit: obj.limit
+					})
+					.then(data => {
+						if (type === 'refresh') {
+							obj.DoctorList = [];
+						}
+						obj.DoctorList = obj.DoctorList.concat(data.data.list);
+						//判断是否还有下一页，有是more  没有是nomore
+						if (obj.limit == obj.DoctorList.length) {
+							obj.page++;
+							obj.loadingType = 'more';
+						} else {
+							obj.loadingType = 'nomore';
+						}
+						// 判断是否为刷新数据
+						if (type === 'refresh') {
+							// 判断是否为点击搜索按钮跳转加载
+							if (obj.loading == 1) {
+								uni.hideLoading();
+							} else {
+								uni.stopPullDownRefresh();
+							}
+						}
+					})
+					.catch(e => {
+						console.log(e.message);
+						if (e.message == '请登录') {
+							uni.showModal({
+								title: '提示',
+								content: '您未登录，是否马上登陆',
+								success: function(res) {
+									if (res.confirm) {
+										interceptor();
+									} else if (res.cancel) {
+										console.log('用户点击取消');
+									}
+								}
+							});
+						}
+						obj.loadingType = 'nomore';
+						// obj.$api.msg(e.message);
+						uni.hideLoading();
+					});
+			},
+			//专题列表
+			ToCourse() {
+				let recommend = this.recommend['精品课程排行'];
+				uni.navigateTo({
+					url: '/pages/course/course?recommend_id=' + recommend.id + '&type=' + recommend.type +
+						'&title=' + recommend.title + '&typesetting=' + recommend.typesetting
+				});
+			},
+			//专题详情
+			ToCourseDetails(item) {
+				console.log(item)
+				let id = item.link_id;
+				uni.navigateTo({
+					url: '/pages/course/detail?id=' + id
+				});
+			},
+			//医生详情
+			ToExpert(item) {
+				uni.navigateTo({
+					url: '/pages/doctor/expert?id=' + item
+				});
+			},
+			//医生列表
+			ToDoclist() {
+				uni.navigateTo({
+					url: '/pages/doctor/doclist'
+				});
+			},
+			//直播列表
+			ToLive() {
+				console.log(this.recommend)
+				let recommend = this.recommend['在线直播'];
+				uni.navigateTo({
+					url: '/pages/live/list?recommend_id=' + recommend.id + '&type=' + recommend.type +
+						'&title=' +
+						recommend.title + '&typesetting=' + recommend.typesetting
+				});
+			},
+			//直播详情
+			ToLiveDetails(ls) {
+				console.log(ls)
+				uni.navigateTo({
+					url: '/pages/live/details?id=' + ls.link_id
+				});
+			},
+			//轮播图
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.swiperCurrent = index;
 			}
 		}
 	};
 </script>
 
 <style lang="scss">
+	// page {
+	// 	background: #ffffff;
+	// 	height: 100%;
+	// }
+
+	// .container {
+	// 	width: 100%;
+	// 	// padding: 90rpx 60rpx;
+	// }
+
+	// .name {
+	// 	padding: 60rpx 0rpx;
+	// 	color: #323232;
+	// 	font-size: 50rpx;
+	// 	font-weight: bold;
+	// }
+
+	// .image {
+	// 	width: 100%;
+	// 	height: 250rpx;
+	// 	position: relative;
+	// 	margin-bottom: 65rpx;
+
+	// 	image {
+	// 		width: 100%;
+	// 		height: 100%;
+	// 	}
+
+	// 	.identity {
+	// 		position: absolute;
+	// 		top: 60rpx;
+	// 		left: 50rpx;
+	// 		color: #ffffff;
+	// 		font-size: 40rpx;
+	// 	}
+
+	// 	.info {
+	// 		position: absolute;
+	// 		left: 50rpx;
+	// 		top: 125rpx;
+	// 		color: #ffffff;
+	// 		font-size: 24rpx;
+	// 		opacity: 0.5;
+	// 	}
+	// }
+	// .top-img {
+	// 	width: 100%;
+	// 	margin-bottom: 20rpx;
+	// 	image {
+	// 		width: 100%;
+
+	// 	}
+	// }
 	page {
-		background: #ffffff;
-		height: 100%;
+		background: #f5f5f5;
+	}
+
+	.top_header {
+		padding: 25rpx 0rpx;
+
+		.top-address {
+			position: fixed;
+			top: 0;
+			width: 100% !important;
+			z-index: 999;
+			padding-bottom: 25rpx;
+
+			//地址
+			.header {
+				width: 100%;
+				padding: 0 4%;
+				height: 100rpx;
+				display: flex;
+				align-items: center;
+
+				.addr {
+					height: 60rpx;
+					flex-shrink: 0;
+					display: flex;
+					align-items: center;
+					font-size: 36rpx;
+					font-weight: bold;
+					width: 90%;
+					color: #ffffff;
+
+					.icon {
+						height: 60rpx;
+						margin-right: 15rpx;
+						display: flex;
+						align-items: center;
+						font-size: 42rpx;
+						color: #ffffff;
+					}
+				}
+
+				.config {
+					width: 120rpx;
+					height: 60rpx;
+					flex-shrink: 0;
+					display: flex;
+
+					.message {
+						width: 65rpx;
+						height: 65rpx;
+						display: flex;
+						justify-content: flex-end;
+						align-items: center;
+						font-size: 42rpx;
+						color: #ffffff;
+					}
+				}
+			}
+		}
+
+		.zhanwei {
+			width: 100% !important;
+			height: 60rpx;
+		}
+	}
+
+	.search-box {
+		height: 120rpx;
+	}
+
+	//搜索框
+	.input-box {
+		width: 80%;
+		margin-left: 25rpx;
+		height: 70rpx;
+		background-color: #ffffff;
+		border-radius: 50rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+
+		.icon {
+			display: flex;
+			align-items: center;
+			position: absolute;
+			top: 0;
+			left: 35rpx;
+			width: 60rpx;
+			height: 70rpx;
+			font-size: 34rpx;
+			color: #c0c0c0;
+		}
+
+		input {
+			padding-left: 100rpx;
+			height: 28rpx;
+			font-size: 28rpx;
+		}
+	}
+
+	.queding {
+		color: #ffffff;
+		font-size: 35rpx;
+		padding: 25rpx 25rpx;
+	}
+
+	//轮播图
+	.swiper {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+
+		.swiper-box {
+			width: 100%;
+			height: 346rpx;
+			overflow: hidden;
+			// box-shadow: 0upx 8upx 25upx rgba(0, 0, 0, 0.2);
+			//兼容ios，微信小程序
+			position: relative;
+			z-index: 1;
+
+			swiper {
+				width: 100%;
+				height: 346rpx;
+
+				swiper-item {
+					image {
+						width: 100%;
+						height: 346rpx;
+					}
+				}
+			}
+
+			.indicator {
+				position: absolute;
+				bottom: 20upx;
+				left: 20upx;
+				background-color: rgba(255, 255, 255, 0.4);
+				width: 150upx;
+				height: 5upx;
+				border-radius: 3upx;
+				overflow: hidden;
+				display: flex;
+
+				.dots {
+					width: 0upx;
+					background-color: rgba(255, 255, 255, 1);
+					transition: all 0.3s ease-out;
+
+					&.on {
+						width: (100%/3);
+					}
+				}
+			}
+		}
 	}
 
-	.container {
+	//正在直播
+	.Live-list {
+		margin-top: 25rpx;
 		width: 100%;
-		padding: 90rpx 60rpx;
+		background-color: #ffffff;
+		font-size: 24rpx;
+		padding: 35rpx 35rpx;
+
+		.list-name {
+			padding-bottom: 35rpx;
+
+			.list-tip {
+				position: relative;
+				padding-left: 25rpx;
+				color: #6786fb;
+				font-size: 32rpx;
+
+				.tip {
+					position: absolute;
+					left: 0rpx;
+					width: 10rpx;
+					height: 45rpx;
+					background-color: #6786fb;
+					border-radius: 25rpx;
+				}
+			}
+
+			.list-more {
+				color: #999999;
+				font-size: 24rpx;
+			}
+		}
+	}
+
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+
+		.floor-item {
+			width: 220rpx;
+			font-size: $font-sm + 2rpx;
+			margin-right: 25rpx;
+
+			.img-box {
+				position: relative;
+
+				.list-image {
+					width: 220rpx;
+					height: 144rpx;
+					border-radius: 15rpx;
+					box-shadow: 0px 6px 10px 0px rgba(0, 0, 0, 0.04);
+				}
+
+				.tip {
+					position: absolute;
+					right: 15rpx;
+					top: 0rpx;
+					background: #ff6700;
+					width: 45rpx;
+					text-align: center;
+					font-size: 18rpx;
+					color: #ffffff;
+					padding: 10rpx 0rpx;
+					border-bottom-left-radius: 25rpx;
+					border-bottom-right-radius: 25rpx;
+				}
+			}
+
+			.tip-box {
+				display: flex;
+				flex-wrap: wrap;
+				padding-top: 5rpx;
+
+				.tip {
+					background: rgba(103, 134, 251, 0.18);
+					color: #6786FB;
+					margin-right: 15rpx;
+					margin-top: 10rpx;
+					padding: 2rpx 10rpx;
+				}
+			}
+
+			.title {
+				font-size: 26rpx !important;
+				font-weight: 500;
+			}
+
+			.info {
+				color: #999999;
+				font-size: 24rpx;
+				padding-top: 15rpx;
+			}
+		}
+	}
+
+	/*公用边框样式*/
+	%icon {
+		margin-right: 10rpx;
+		display: inline-block;
+		padding: 2rpx 10rpx;
+		border: 1rpx solid $color-yellow;
+		color: $color-yellow;
+		line-height: 1;
+		font-size: $font-base;
+		border-radius: 10rpx;
+	}
+
+	//精选好课
+	.guess-section {
+		display: flex;
+		flex-wrap: wrap;
+
+		.guess-item {
+			position: relative;
+			overflow: hidden;
+			display: flex;
+			flex-direction: column;
+			width: 47%;
+			margin-bottom: 2%;
+			background-color: white;
+			padding-bottom: 30rpx;
+			// &:nth-child(2n + 1) {
+			// 	margin-right: 15rpx;
+			// }
+		}
+
+		.tip-box {
+			display: flex;
+			flex-wrap: wrap;
+			padding-top: 5rpx;
+
+			.tip {
+				background: rgba(103, 134, 251, 0.18);
+				color: #6786FB;
+				margin-right: 15rpx;
+				margin-top: 10rpx;
+				padding: 2rpx 10rpx;
+			}
+		}
+
+		.imagewrapper {
+			width: 100%;
+			height: 204rpx;
+			margin-bottom: 15rpx;
+
+			image {
+				border-radius: 15rpx;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.title {
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+
+		.info {
+			color: #e73932;
+			padding-top: 15rpx;
+			font-size: 30rpx;
+		}
 	}
 
-	.name {
-		padding: 60rpx 0rpx;
-		color: #323232;
-		font-size: 50rpx;
-		font-weight: bold;
+	.preferred_centent {
+		width: 100%;
+
+		.preferred_item {
+			width: 100%;
+			height: 100%;
+			border-top: 1px solid #f0f0f0;
+			padding: 35rpx 0rpx;
+
+			.goods_image image {
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 100%;
+			}
+
+			.goods_name {
+				padding-left: 25rpx;
+				width: 50%;
+
+				.goods_title {
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					font-size: 30rpx;
+					font-weight: 400;
+				}
+
+				.goods_info {
+					padding-top: 15rpx;
+					font-size: 24rpx;
+					color: #999999;
+				}
+			}
+
+			.btn-tpl {
+				margin-left: 10rpx;
+				border: 2rpx solid #305cec;
+				padding: 13rpx 20rpx;
+				color: #6786fb;
+				border-radius: 15rpx;
+
+				.tpl-img {
+					padding-right: 10rpx;
+
+					image {
+						margin-top: 8rpx;
+						width: 35rpx;
+						height: 35rpx;
+					}
+				}
+			}
+		}
 	}
 
-	.image {
+	.top-banner {
 		width: 100%;
-		height: 250rpx;
-		position: relative;
-		margin-bottom: 65rpx;
 
 		image {
 			width: 100%;
-			height: 100%;
 		}
+	}
 
-		.identity {
-			position: absolute;
-			top: 60rpx;
-			left: 50rpx;
-			color: #ffffff;
-			font-size: 40rpx;
+	.template {
+		width: 100%;
+		background: #ffffff;
+		overflow: hidden;
+		padding: 25rpx;
+		box-shadow: 0px 5px 5px 0px rgba(35, 24, 21, 0.06);
+		border-radius: 12rpx;
+		position: relative;
+
+		.left-img {
+			width: 140rpx;
+			height: 140rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+				;
+				border-radius: 100%;
+			}
 		}
 
-		.info {
-			position: absolute;
-			left: 50rpx;
-			top: 125rpx;
-			color: #ffffff;
-			font-size: 24rpx;
-			opacity: 0.5;
+		.center-word {
+			width: 52%;
+			padding-left: 25rpx;
+
+			.one {
+				font-size: $uni-font-size-lg - 2rpx;
+				font-weight: 500;
+				color: $uni-text-color;
+				line-height: 36rpx;
+				display: block;
+				margin-bottom: 10rpx;
+			}
+
+			.two {
+				font-size: $uni-font-size-sm;
+				font-weight: 500;
+				color: #666666;
+				line-height: 36rpx;
+				display: block;
+			}
+		}
+
+		.right-label {
+			padding: 16rpx;
+			border: 1px solid $base-color;
+			border-radius: 7rpx;
+			font-size: $font-sm - 1rpx;
+			font-weight: 500;
+			color: $base-color;
+			align-items: center;
+
+			image {
+				width: 30rpx;
+				height: 26rpx;
+				margin-right: 8rpx;
+			}
 		}
 	}
 </style>

pages/index/identity.vue

@@ -4,17 +4,17 @@
 		<view class="image" @click="ToRegister(1)">
 			<image src="../../static/img/img001.png"></image>
 			<view class="identity">用户</view>
-			<view class="info">完成注册后可联系麻醉医师</view>
+			<view class="info">完成注册后可联系医师</view>
 		</view>
 		<view class="image" @click="ToRegister(2)">
 			<image src="../../static/img/img002.png"></image>
-			<view class="identity">我是麻醉医师</view>
+			<view class="identity">我是医师</view>
 			<view class="info">完成注册 成为入驻医生</view>
 		</view>
 		<view class="image" @click="ToRegister(3)">
 			<image src="../../static/img/img003.png"></image>
 			<view class="identity">医疗机构</view>
-			<view class="info">完成注册后可联系麻醉医师</view>
+			<view class="info">完成注册后可联系医师</view>
 		</view>
 	</view>
 </template>

pages/index/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container" @click="onShowLog">
+	<view class="container" >
 		<view class="swiper">
 			<view class="swiper-box">
 				<swiper circular="true" autoplay="true" @change="swiperChange">

pages/patient/patient.vue

@@ -60,7 +60,7 @@
 								<view class="right">
 									<text class="title clamp" v-if="userInfo.type != 2">
 										{{ item.doctor_name }}({{
-											item.doctor_level == 1 ? '医师' : item.doctor_level == 2 ? '主治医师' : item.doctor_level == 3 ? '副主任医师' : '主任医师'
+											item.doctor_level == 1 ? '初级' : item.doctor_level == 2 ? '中级' : item.doctor_level == 3 ? '副高级' : '高级'
 										}})
 									</text>
 									<view v-else>
@@ -70,12 +70,12 @@
 									</view>
 									<view class="title clamp font-da">
 										<text v-if="item.type == 1">咨询</text>
-										<text v-if="item.type == 2">预约麻醉</text>
+										<text v-if="item.type == 2">预约</text>
 										<text v-if="item.type == 3">多点执业</text>
-										<text v-if="item.type == 4">麻醉会诊</text>
+										<text v-if="item.type == 4">会诊</text>
 									</view>
 									<view class="title red" v-if="userInfo.type != 2 && item.refund == 1">
-										您申请的退款将在平台审核后，退回您的账户，感谢您使用麻醉服务平台。</view>
+										您申请的退款将在平台审核后，退回您的账户，感谢您使用共享预约平台。</view>
 								</view>
 								<view class="appointment" v-if="item.refund == 0 && item.status != 0">
 									<text v-if="userInfo.type == 2">回复详情</text>
@@ -370,7 +370,7 @@
 					text: '科普学习',
 					iconPath: 'static/tabBar/tab-study.png',
 					selectedIconPath: 'static/tabBar/tab-study-current.png',
-					visible: true
+					visible: false
 				});
 				uni.setTabBarItem({
 					index: 3,

pages/patient/patient1.vue

@@ -84,7 +84,7 @@
 								<view class="right">
 									<text class="title clamp" v-if="userInfo.type != 2">
 										{{ item.doctor_name }}({{
-											item.doctor_level == 1 ? '医师' : item.doctor_level == 2 ? '主治医师' : item.doctor_level == 3 ? '副主任医师' : '主任医师'
+											item.doctor_level == 1 ? '初级' : item.doctor_level == 2 ? '中级' : item.doctor_level == 3 ? '副高级' : '正高级'
 										}})
 									</text>
 									<view v-if="userInfo.type == 2">

pages/public/DocRegister.vue

@@ -3,540 +3,600 @@
 		<view class="content_box">
 			<view class="row b-b">
 				<text class="tit">姓名</text>
-				<input class="input" type="text" v-model="name"  placeholder="请输入姓名" placeholder-class="placeholder" />
+				<input class="input" type="text" v-model="name" placeholder="请输入姓名" placeholder-class="placeholder" />
 			</view>
 			<view class="row b-b" @tap="handleTap1('picker2')">
 				<text class="tit">性别</text>
-				<input class="input" type="text"  @focus='outFocus' v-model="gender" placeholder="请选择性别" placeholder-class="placeholder" />
+				<input class="input" type="text" @focus='outFocus' v-model="gender" placeholder="请选择性别"
+					placeholder-class="placeholder" />
 			</view>
-			<lb-picker ref="picker2"
-			  mode="selector"
-			  :list="genderList"
-			  @change="handleChange1"
-			  @confirm="handleConfirm1"
-			  @cancel="handleCancel1"
-			  @touchmove.prevent 
-			  >
+			<lb-picker ref="picker2" mode="selector" :list="genderList" @change="handleChange1"
+				@confirm="handleConfirm1" @cancel="handleCancel1" @touchmove.prevent>
 			</lb-picker>
-			<view class="row b-b">
+			<!-- <view class="row b-b">
 				<text class="tit">身份证号</text>
-				<input class="input" type="number"  v-model="id_card" placeholder="请输入身份证号" placeholder-class="placeholder" />
-			</view>
+				<input class="input" type="text"  v-model="id_card" placeholder="请输入身份证号" placeholder-class="placeholder" />
+			</view> -->
 			<view class="row b-b">
 				<text class="tit">联系方式</text>
-				<input class="input" type="number"  v-model="mobile" placeholder="请输入联系方式" placeholder-class="placeholder" />
+				<input class="input" type="number" v-model="mobile" placeholder="请输入联系方式"
+					placeholder-class="placeholder" />
 			</view>
 			<view class="row b-b" @tap="showPicker('region')">
 				<text class="tit">省市区</text>
-				<input class="input"  @focus='outFocus' v-model="addr" placeholder="请选择省市区"></input>
+				<input class="input" @focus='outFocus' v-model="addr" placeholder="请选择省市区"></input>
 			</view>
-			<w-picker mode="region" @touchmove.prevent   :value="defaultRegion" default-type="value"  @confirm="onConfirm($event,'region')" @cancel="handleCancel" ref="region" ></w-picker>
+			<w-picker mode="region" @touchmove.prevent :value="defaultRegion" default-type="value"
+				@confirm="onConfirm($event,'region')" @cancel="handleCancel" ref="region"></w-picker>
 		</view>
 		<view class="content_box">
 			<view class="row b-b" @tap="Toshow">
 				<text class="tit">医院名称</text>
-				<input class="input" type="text" @focus='outFocus' v-model="hospital" placeholder="请选择医院名称" placeholder-class="placeholder" />
+				<input class="input" type="text" @focus='outFocus' v-model="hospital" placeholder="请选择医院名称"
+					placeholder-class="placeholder" />
 			</view>
-			<zhilin-picker
-				v-model="show"
-				:title="title"
-				:data="list"
-				:initSelected="initSelected"
-				:showSearch="true"
-				@change="onChange"
-				@searchInput='onSearchInput'
-				@confirm="onConfirm1"
-			/>
+			<zhilin-picker v-model="show" :title="title" :data="list" :initSelected="initSelected" :showSearch="true"
+				@change="onChange" @searchInput='onSearchInput' @confirm="onConfirm1" />
 			<view class="row b-b" @tap="handleTap2('picker3')">
 				<text class="tit">职称</text>
-				<input class="input" type="text" @focus='outFocus' v-model="doctor_level" placeholder="请选择职称" placeholder-class="placeholder" />
+				<input class="input" type="text" @focus='outFocus' v-model="doctor_level" placeholder="请选择职称"
+					placeholder-class="placeholder" />
 			</view>
-			<lb-picker ref="picker3"
-			  mode="selector"
-			  :list="levelList"
-			  @change="handleChange2"
-			  @touchmove.prevent 
-			  @confirm="handleConfirm2"
-			  @cancel="handleCancel">
+			<lb-picker ref="picker3" mode="selector" :list="levelList" @change="handleChange2" @touchmove.prevent
+				@confirm="handleConfirm2" @cancel="handleCancel">
 			</lb-picker>
 			<view class="row b-b" @tap="handleTap1('picker4')">
 				<text class="tit">专业</text>
-				<input class="input" type="text"  @focus='outFocus' v-model="zyname" placeholder="请选择专业" placeholder-class="placeholder" />
+				<input class="input" type="text" @focus='outFocus' v-model="zyname" placeholder="请选择专业"
+					placeholder-class="placeholder" />
 			</view>
-			<lb-picker ref="picker4"
-			  mode="selector"
-			  :list="zyList"
-			  @change="handleChange4"
-			  @confirm="handleConfirm4"
-			  @cancel="handleCancel4"
-			  @touchmove.prevent 
-			  >
+			<lb-picker ref="picker4" mode="selector" :list="zyList" @change="handleChange4" @confirm="handleConfirm4"
+				@cancel="handleCancel4" @touchmove.prevent>
 			</lb-picker>
-  		</view>
+		</view>
 		<view class="check_box flex_item">
-			<view><radio style="transform: scale(0.75)" @click="Getcheckbox" color="#6786FB" :checked="checked" /></view>
+			<view>
+				<radio style="transform: scale(0.75)" @click="Getcheckbox" color="#6786FB" :checked="checked" />
+			</view>
 			<view class="">我已阅读并同意<text @click="TOprivacy">《预约平台用户协议》</text></view>
 		</view>
+		<view class="check_box flex_item" style="font-size: 26rpx;">
+			<view class="">注册完成后，务必关注公众号<text style="color:#6786FB ;">【共享预约平台】</text>，否则无法接收到消息推送！</view>
+		</view>
 		<view class="add-btn" @click="confirm">下一步</view>
 	</view>
 </template>
 <script>
-import { mapState, mapMutations } from 'vuex';
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import wPicker from "@/components/w-picker/w-picker.vue"
-import zhilinPicker from "@/components/zhilin-picker/zhilin-picker.vue"
-import LbPicker from '@/components/lb-picker/index.vue'
-import { upload,getHospitalList,setDoctor } from '@/api/index.js';
-import { getUserInfo } from '@/api/login.js';
-import { getDocterTypeList } from '@/api/doctor.js'
-export default {
-	components: {
-		uniList,
-		uniListItem,
-		wPicker,
-		LbPicker,
-		zhilinPicker
-	},
-	data() {
-		return {
-			loading: false,
-			region:'',
-			defaultRegion:[],
-			defaultRegion1:[],
-			options:[],
-			checked:false,
-			name:'',//姓名
-			gender:'',//性别
-			gender_id:'',//性别id
-			genderList: [{
-				id:1,
-				name:'男'
-			},{
-				id:2,
-				name:'女'
-			},
-			{
-				id:0,
-				name:'其他'
-			}],
-			zyList: [],
-			zyListR:[],
-			zyname: '',
-			zyid: 0,
-			id_card:'',//身份证
-			mobile:'',//联系方式
-			addr:'',//省市区
-			code:'',//省市区行政编码
-			province:'',
-			province_id:'',
-			city:'',
-			city_id:'',
-			district:'',
-			district_id:'',
-			searchVal:'',//搜索医院
-			list: [],//医院列表
-			show: false,
-			initSelected: [],
-			title: '选择医院',
-			hospital:'',//医院
-			hospital_id:'',//医院id
-			// 1医师2主治医师3副主任医师4主任医师
-			levelList:[{
-				id:1,
-				name:'医师'
-			},{
-				id:2,
-				name:'主治医师'
-			},{
-				id:3,
-				name:'副主任医师'
-			},{
-				id:4,
-				name:'主任医师'
-			}],
-			doctor_level:'',//职称
-			level_id:'',////职称id
-			utype: '',
-		};
-	},
-	onLoad(option) {
-		this.ListDate();
-		this.getDocterTypeList()
-	},
-	watch:{
-		list(newValue, oldValue) {
-			if(newValue != oldValue){
-				this.hospital = ''
-			}
-		},
-		searchVal(){
-			this.ListDate();
-		},
-	},
-	methods: {
-		...mapMutations(['setUserInfo']),
-		getDocterTypeList() {
-			getDocterTypeList().then(res => {
-				console.log(res)
-				this.zyListR = res.data.data
-				this.zyList = res.data.data.map(item => {
-					return item.text
-				})
-				console.log(this.zyList,'this.zyList')
-			})
-		},
-		handleChange4() {
-			
-		},
-		handleCancel4(item) {
-			// console.log(item,'ddd')
-		},
-		handleConfirm4(item) {
-			this.zyname = item.value
-			this.zyid  = this.zyListR[item.index].id
-			console.log(this.zyname,this.zyid)
-		},
-		outFocus(e){
-			console.log(event.target)
-			event.target.blur()
-		},
-		//省市区弹窗
-		showPicker(type){
-			this.$refs[type].show();
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniList from '@/components/uni-list/uni-list.vue';
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import wPicker from "@/components/w-picker/w-picker.vue"
+	import zhilinPicker from "@/components/zhilin-picker/zhilin-picker.vue"
+	import LbPicker from '@/components/lb-picker/index.vue'
+	import {
+		upload,
+		getHospitalList,
+		setDoctor
+	} from '@/api/index.js';
+	import {
+		getUserInfo
+	} from '@/api/login.js';
+	import {
+		getDocterTypeList
+	} from '@/api/doctor.js'
+	export default {
+		components: {
+			uniList,
+			uniListItem,
+			wPicker,
+			LbPicker,
+			zhilinPicker
 		},
-		TOprivacy(){
-			uni.navigateTo({
-				url:'/pages/public/uagreement'
-			})
+		data() {
+			return {
+				loading: false,
+				region: '',
+				defaultRegion: [],
+				defaultRegion1: [],
+				options: [],
+				checked: false,
+				name: '', //姓名
+				gender: '', //性别
+				gender_id: '', //性别id
+				genderList: [{
+						id: 1,
+						name: '男'
+					}, {
+						id: 2,
+						name: '女'
+					},
+					{
+						id: 0,
+						name: '其他'
+					}
+				],
+				zyList: [],
+				zyListR: [],
+				zyname: '',
+				zyid: 0,
+				id_card: '', //身份证
+				mobile: '', //联系方式
+				addr: '', //省市区
+				code: '', //省市区行政编码
+				province: '',
+				province_id: '',
+				city: '',
+				city_id: '',
+				district: '',
+				district_id: '',
+				searchVal: '', //搜索医院
+				list: [], //医院列表
+				show: false,
+				initSelected: [],
+				title: '选择医院',
+				hospital: '', //医院
+				hospital_id: '', //医院id
+				// 1医师2主治医师3副主任医师4主任医师
+				levelList: [{
+					id: 1,
+					name: '初级'
+				}, {
+					id: 2,
+					name: '中级'
+				}, {
+					id: 3,
+					name: '副高级'
+				}, {
+					id: 4,
+					name: '正高级'
+				}],
+				doctor_level: '', //职称
+				level_id: '', ////职称id
+				utype: '',
+			};
 		},
-		//取消弹窗
-		handleCancel(){
-			
-		},
-		//省市区选择确定
-		onConfirm(res,type){
-			let obj = this;
-			obj.result=res;
-			obj.addr = res.result;
-			if(res.name){
-				obj.province = res.name[0];
-				obj.city = res.name[1];
-				obj.district = res.name[2];
-			}else{
-				obj.province = '北京市';
-				obj.city = '北京市';
-				obj.district = '东城区';
-			}
-			obj.province_id = res.value[0];
-			obj.city_id = res.value[1];
-			obj.district_id = res.value[2];
-			obj.hospital = '';//重置医院
-			obj.ListDate();
-		},
-		/*医院*/
-		Toshow(){
-			this.show = true;
-		},
-		onChange(val){
-			let obj = this;
-			console.log(val,'onChange')
-			let arr = val.split(',');
-			obj.hospital = arr[1];
-			obj.hospital_id = arr[0];
-			obj.city = arr[2];
-			obj.city_id = arr[3];
-			obj.district = arr[4];
-			obj.district_id = arr[5];
-			obj.province = arr[6];
-			obj.province_id = arr[7];
-			obj.addr = obj.province + obj.city + obj.district;
-			console.log(obj.hospital,obj.hospital_id)
-			console.log(obj.city,obj.city_id)
-			console.log(obj.district,obj.district_id)
-			console.log(obj.province,obj.province_id)
-		},
-		onConfirm1(val){
-		},
-		onSearchInput(val){
-			this.searchVal = val;
-		},
-		//加载医院列表
-		ListDate(){
-			let obj = this;
-			let data = '';
-			console.log(obj.searchVal)
-			if(!obj.searchVal){
-				data={
-					keyword:'',
-					province_id:obj.province_id,
-					city_id:obj.city_id,
-					district_id:obj.district_id,
-					sort:'id desc',
-					page:1,
-					limit:1500,
-				}
-			}else{
-				data={
-					keyword:obj.searchVal,
-					sort:'id desc',
-					page:1,
-					limit:1500,
-				}
+		onLoad(option) {
+			this.ListDate();
+			this.getDocterTypeList()
+			let ysinfo = uni.getStorageSync('ysinfo') || ''
+			console.log(ysinfo,'ysinfo6++++')
+			if (ysinfo) {
+				this.name = ysinfo.name
+				this.mobile = ysinfo.mobile
+				this.province = ysinfo.province
+				this.province_id = ysinfo.province_id
+				this.city = ysinfo.city
+				this.city_id = ysinfo.city_id
+				this.district = ysinfo.district
+				this.district_id = ysinfo.district_id
+				this.hospital_id = ysinfo.hospital_id
+				this.hospital = ysinfo.hospital
+				this.gender = ysinfo.gender
+				this.gender_id = ysinfo.gender_id,
+				this.doctor_level = ysinfo.doctor_level
+				this.level_id = ysinfo.level_id
+				this.zyname = ysinfo.zyname
+				this.zyid = ysinfo.zyid
+				this.addr = ysinfo.addr
 			}
-			getHospitalList(data).then(e => {
-				obj.list = e.data.list;
-			}).catch((e) => {
-				console.log(e)
-			});
 		},
-		//阅读并同意
-		Getcheckbox() {
-			let obj = this;
-			obj.checked = !obj.checked;
+		watch: {
+			// list(newValue, oldValue) {
+			// 	if (newValue != oldValue) {
+			// 		this.hospital = ''
+			// 	}
+			// },
+			searchVal() {
+				this.ListDate();
+			},
 		},
-		//提交
-		confirm() {
-			let obj = this;
-			if(obj.loading) {
-				return
-			}
-			if(obj.name == ''){
-				this.$api.msg('请填写姓名！');
-				return;
-			}
-			if(obj.gender_id == ''){
-				this.$api.msg('请选择姓别！');
-				return;
-			}
-			if(obj.mobile == ''){
-				this.$api.msg('请输入联系方式！');
-				return;
-			}
-			if(obj.hospital_id == ''){
-				this.$api.msg('请选择医院！');
-				return;
-			}
-			if(obj.level_id == ''){
-				this.$api.msg('请选择职称！');
-				return;
-			}
-			if(obj.zyid == '') {
-				this.$api.msg('请选择专业！');
-				return;
-			}
-			if(obj.checked == false){
-				this.$api.msg('阅读并同意医生《入驻协议》');
-				return;
-			}
-			obj.loading = true
-			setDoctor({	
-				name:obj.name,
-				mobile:obj.mobile,
-				province:obj.province,
-				province_id:obj.province_id,
-				city:obj.city,
-				city_id:obj.city_id,
-				district:obj.district,
-				district_id:obj.district_id,
-				hospital:obj.hospital_id,
-				gender:obj.gender_id,
-				id_card:obj.id_card,
-				doctor_level:obj.level_id,
-				type: obj.zyid
-			}).then(function(e) {
-				obj.loading = false
-				//注册医生完成后更新用户信息
-				obj.userInfo();
-				uni.navigateTo({
-					url: '/pages/public/DocRegisterIndex'
+		methods: {
+			...mapMutations(['setUserInfo']),
+			getDocterTypeList() {
+				getDocterTypeList().then(res => {
+					console.log(res)
+					this.zyListR = res.data.data
+					this.zyList = res.data.data.map(item => {
+						return item.text
+					})
+					console.log(this.zyList, 'this.zyList')
 				})
-			}).catch(e => {
-				obj.loading = false
-				console.log(e)
-			});
-		},
-		//选择身份后更新用户信息
-		userInfo() {
-			let obj = this;
-			getUserInfo({})
-				.then(function(e) {
-					uni.setStorageSync('userInfo', e.data);
+			},
+			handleChange4() {
+
+			},
+			handleCancel4(item) {
+				// console.log(item,'ddd')
+			},
+			handleConfirm4(item) {
+				this.zyname = item.value
+				this.zyid = this.zyListR[item.index].id
+				console.log(this.zyname, this.zyid)
+			},
+			outFocus(e) {
+				console.log(event.target)
+				event.target.blur()
+			},
+			//省市区弹窗
+			showPicker(type) {
+				this.$refs[type].show();
+			},
+			TOprivacy() {
+				uni.navigateTo({
+					url: '/pages/public/uagreement'
 				})
-				.catch(function(e) {
-					console.log(e);
+			},
+			//取消弹窗
+			handleCancel() {
+
+			},
+			//省市区选择确定
+			onConfirm(res, type) {
+				let obj = this;
+				obj.result = res;
+				obj.addr = res.result;
+				if (res.name) {
+					obj.province = res.name[0];
+					obj.city = res.name[1];
+					obj.district = res.name[2];
+				} else {
+					obj.province = '北京市';
+					obj.city = '北京市';
+					obj.district = '东城区';
+				}
+				obj.province_id = res.value[0];
+				obj.city_id = res.value[1];
+				obj.district_id = res.value[2];
+				obj.hospital = ''; //重置医院
+				obj.ListDate();
+			},
+			/*医院*/
+			Toshow() {
+				this.show = true;
+			},
+			onChange(val) {
+				let obj = this;
+				console.log(val, 'onChange')
+				let arr = val.split(',');
+				obj.hospital = arr[1];
+				obj.hospital_id = arr[0];
+				obj.city = arr[2];
+				obj.city_id = arr[3];
+				obj.district = arr[4];
+				obj.district_id = arr[5];
+				obj.province = arr[6];
+				obj.province_id = arr[7];
+				obj.addr = obj.province + obj.city + obj.district;
+				console.log(obj.hospital, obj.hospital_id)
+				console.log(obj.city, obj.city_id)
+				console.log(obj.district, obj.district_id)
+				console.log(obj.province, obj.province_id)
+			},
+			onConfirm1(val) {},
+			onSearchInput(val) {
+				this.searchVal = val;
+			},
+			//加载医院列表
+			ListDate() {
+				let obj = this;
+				let data = '';
+				console.log(obj.searchVal)
+				if (!obj.searchVal) {
+					data = {
+						keyword: '',
+						province_id: obj.province_id,
+						city_id: obj.city_id,
+						district_id: obj.district_id,
+						sort: 'id desc',
+						page: 1,
+						limit: 1500,
+					}
+				} else {
+					data = {
+						keyword: obj.searchVal,
+						sort: 'id desc',
+						page: 1,
+						limit: 1500,
+					}
+				}
+				getHospitalList(data).then(e => {
+					obj.list = e.data.list;
+				}).catch((e) => {
+					console.log(e)
 				});
-		},
-		//性别选择
-		handleTap1(name) {
-			this.$refs[name].show()
-		},
-		//性别选择
-		handleChange1 (item) {
-		},
-		//性别选择
-		handleConfirm1 (item) {
-			let obj = this;
-			obj.gender = item.item.name;
-			obj.gender_id = item.item.id;
-		},
-		//职称选择
-		handleTap2(name) {
-			this.$refs[name].show()
-		},
-		//职称选择
-		handleChange2(item) {
-		},
-		//
-		handleChange3(item) {
-			console.log(item)
-		},
-		//职称选择
-		handleConfirm2 (item) {
-			let obj = this;
-			obj.doctor_level = item.item.name;
-			obj.level_id = item.item.id;
-			console.log(obj.doctor_level,obj.level_id)
-		},
-	}
-};
+			},
+			//阅读并同意
+			Getcheckbox() {
+				let obj = this;
+				obj.checked = !obj.checked;
+			},
+			//提交
+			confirm() {
+				let obj = this;
+				if (obj.loading) {
+					return
+				}
+				if (obj.name == '') {
+					this.$api.msg('请填写姓名！');
+					return;
+				}
+				if (obj.gender_id == '') {
+					this.$api.msg('请选择姓别！');
+					return;
+				}
+				if (obj.mobile == '') {
+					this.$api.msg('请输入联系方式！');
+					return;
+				}
+				if (obj.hospital_id == '') {
+					this.$api.msg('请选择医院！');
+					return;
+				}
+				if (obj.level_id == '') {
+					this.$api.msg('请选择职称！');
+					return;
+				}
+				if (obj.zyid == '') {
+					this.$api.msg('请选择专业！');
+					return;
+				}
+				if (obj.checked == false) {
+					this.$api.msg('阅读并同意医生《入驻协议》');
+					return;
+				}
+				obj.loading = true
+				setDoctor({
+					name: obj.name,
+					mobile: obj.mobile,
+					province: obj.province,
+					province_id: obj.province_id,
+					city: obj.city,
+					city_id: obj.city_id,
+					district: obj.district,
+					district_id: obj.district_id,
+					hospital: obj.hospital_id,
+					gender: obj.gender_id,
+					// id_card:obj.id_card,
+					doctor_level: obj.level_id,
+					type: obj.zyid
+				}).then(function(e) {
+					obj.loading = false
+					//注册医生完成后更新用户信息
+					obj.userInfo();
+					uni.navigateTo({
+						url: '/pages/public/DocRegisterIndex'
+					})
+					uni.setStorageSync('ysinfo', {
+						name: obj.name,
+						mobile: obj.mobile,
+						province: obj.province,
+						province_id: obj.province_id,
+						city: obj.city,
+						city_id: obj.city_id,
+						district: obj.district,
+						district_id: obj.district_id,
+						hospital: obj.hospital,
+						hospital_id: obj.hospital_id,
+						gender_id: obj.gender_id,
+						gender: obj.gender,
+						doctor_level: obj.doctor_level,
+						level_id: obj.level_id,
+						zyid: obj.zyid,
+						zyname: obj.zyname,
+						addr : obj.province + obj.city + obj.district
+					})
+					
+				}).catch(e => {
+					obj.loading = false
+					console.log(e)
+				});
+			},
+			//选择身份后更新用户信息
+			userInfo() {
+				let obj = this;
+				getUserInfo({})
+					.then(function(e) {
+						uni.setStorageSync('userInfo', e.data);
+					})
+					.catch(function(e) {
+						console.log(e);
+					});
+			},
+			//性别选择
+			handleTap1(name) {
+				this.$refs[name].show()
+			},
+			//性别选择
+			handleChange1(item) {},
+			//性别选择
+			handleConfirm1(item) {
+				let obj = this;
+				obj.gender = item.item.name;
+				obj.gender_id = item.item.id;
+			},
+			//职称选择
+			handleTap2(name) {
+				this.$refs[name].show()
+			},
+			//职称选择
+			handleChange2(item) {},
+			//
+			handleChange3(item) {
+				console.log(item)
+			},
+			//职称选择
+			handleConfirm2(item) {
+				let obj = this;
+				obj.doctor_level = item.item.name;
+				obj.level_id = item.item.id;
+				console.log(obj.doctor_level, obj.level_id)
+			},
+		}
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: $page-color-base;
-	min-height: 100%;
-}
-.content_box {
-	background-color: #ffffff;
-	padding: 0rpx 25rpx;
-	width: 92%;
-	margin: 25rpx auto;
-	border-radius: 15rpx;
-	.examine_list{
-		width: 100%;
-		border-bottom: 2rpx solid #f0f0f0;
-		.textarea-box{
-			width: 95%;
-			margin: 25rpx auto;
-			.textarea{
-				width: 100%;
-				font-size: 28rpx;
-				min-height: 150rpx;
+	page {
+		background: $page-color-base;
+		min-height: 100%;
+	}
+
+	.content_box {
+		background-color: #ffffff;
+		padding: 0rpx 25rpx;
+		width: 92%;
+		margin: 25rpx auto;
+		border-radius: 15rpx;
+
+		.examine_list {
+			width: 100%;
+			border-bottom: 2rpx solid #f0f0f0;
+
+			.textarea-box {
+				width: 95%;
+				margin: 25rpx auto;
+
+				.textarea {
+					width: 100%;
+					font-size: 28rpx;
+					min-height: 150rpx;
+				}
 			}
 		}
 	}
-}
-.row {
-	display: flex;
-	align-items: center;
-	// position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-	border-bottom: 1rpx solid #f8f6f6;
 
-	.tit {
-		flex-shrink: 0;
-		width: 180rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
+	.row {
+		display: flex;
+		align-items: center;
+		// position: relative;
+		padding: 0 30rpx;
+		height: 110rpx;
+		background: #fff;
+		border-bottom: 1rpx solid #f8f6f6;
+
+		.tit {
+			flex-shrink: 0;
+			width: 180rpx;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+
+		.input {
+			flex: 1;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+
+		.iconlocation {
+			font-size: 36rpx;
+			color: $font-color-light;
+		}
 	}
-	.input {
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
+
+	.examine_name {
+		color: #171717;
+		font-size: 28rpx;
+		padding: 25rpx 25rpx;
 	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
+
+	.examine_img {
+		width: 100%;
+		text-align: center;
+		padding-bottom: 25rpx;
+
+		.image {
+			width: 150rpx;
+			height: 150rpx;
+		}
+
+		.image1 {
+			min-width: 150rpx;
+			max-width: 100%;
+			min-height: 150rpx;
+		}
 	}
-}
-.examine_name {
-	color: #171717;
-	font-size: 28rpx;
-	padding: 25rpx 25rpx;
-}
-.examine_img {
-	width: 100%;
-	text-align: center;
-	padding-bottom: 25rpx;
-	.image{
-		width: 150rpx;
-		height: 150rpx;
+
+	.add-img-box {
+		width: 100%;
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin-top: 50rpx;
 	}
-	.image1{
-		min-width: 150rpx;
-		max-width: 100%;
-		min-height: 150rpx;
+
+	.add-img-item {
+		border-radius: 24rpx;
+		position: relative;
+		margin-bottom: 25rpx;
+
+		.add-img {
+			min-width: 150rpx;
+			max-width: 100%;
+			min-height: 150rpx;
+		}
 	}
-}
-.add-img-box {
-	width: 100%;
-	flex-direction: row;
-	flex-wrap: wrap;
-	margin-top: 50rpx;
-}
-.add-img-item {
-	border-radius: 24rpx;
-	position: relative;
-	margin-bottom: 25rpx;
-	.add-img {
-		min-width: 150rpx;
-		max-width: 100%;
-		min-height: 150rpx;
+
+	.add-img-del {
+		position: absolute;
+		width: 40rpx;
+		height: 40rpx;
+		right: 20rpx;
+		// bottom: 155rpx;
+		//background-color: rgba(238, 0, 0, 1);
+		border-radius: 20rpx;
 	}
-}
-.add-img-del {
-	position: absolute;
-	width: 40rpx;
-	height: 40rpx;
-	right: 20rpx;
-	// bottom: 155rpx;
-	//background-color: rgba(238, 0, 0, 1);
-	border-radius: 20rpx;
-}
-.default-row {
-	margin-top: 16rpx;
-	.tit {
-		flex: 1;
+
+	.default-row {
+		margin-top: 16rpx;
+
+		.tit {
+			flex: 1;
+		}
+
+		switch {
+			transform: translateX(16rpx) scale(0.9);
+		}
+	}
+
+	.add-btn {
+		position: fixed;
+		bottom: 0rpx;
+		width: 100%;
+		height: 100rpx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: #6786FB;
+		line-height: 100rpx;
+		text-align: center;
 	}
-	switch {
-		transform: translateX(16rpx) scale(0.9);
+
+	.img_box {
+		padding: 35rpx 35rpx;
+		width: 250rpx;
+		height: 250rpx;
 	}
-}
-.add-btn {
-	position: fixed;
-	bottom: 0rpx;
-	width: 100%;
-	height: 100rpx;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: #6786FB;
-	line-height: 100rpx;
-	text-align: center;
-}
-.img_box {
-	padding: 35rpx 35rpx;
-	width: 250rpx;
-	height: 250rpx;
-}
-.img_box image {
-	width: 100%;
-	height: 100%;
-}
-.alert-box {
-	background-color: #ffffff;
-}
-.b-b:after {
-	position: relative !important;
-}
-.check_box {
-	padding: 25rpx 25rpx;
-	font-size: 28rpx;
-	text{
-		color: #6786FB;
+
+	.img_box image {
+		width: 100%;
+		height: 100%;
 	}
-}
 
+	.alert-box {
+		background-color: #ffffff;
+	}
+
+	.b-b:after {
+		position: relative !important;
+	}
+
+	.check_box {
+		padding: 25rpx 25rpx;
+		font-size: 28rpx;
+
+		text {
+			color: #6786FB;
+		}
+	}
 </style>

pages/public/DocRegisterIndex.vue

@@ -4,7 +4,7 @@
 			<view class="examine_list"> 
 				<view class="examine_name">个人简介</view>
 				<view class="textarea-box">
-					<textarea  class="textarea" v-model="introduction" maxlength="-1"  placeholder-style="color:#999999" placeholder="请填写个人简介" 
+					<textarea  class="textarea" v-model="introduction" maxlength="-1"  placeholder-style="color:#999999" placeholder="如：学历、毕业学校、工作经验、学术兼职、荣誉称号" 
 					@blur="bindTextAreaBlur" auto-height />
 				</view>
 			</view>
@@ -13,7 +13,7 @@
 			<view class="examine_list"> 
 				<view class="examine_name">擅长领域</view>
 				<view class="textarea-box">
-					<textarea  class="textarea" v-model="good_at" maxlength="-1"  placeholder-style="color:#999999" placeholder="请填写擅长领域" 
+					<textarea  class="textarea" v-model="good_at" maxlength="-1"  placeholder-style="color:#999999" placeholder="如：擅长什么手术、擅长什么疾病的治疗、对某某领域有研究、擅长什么操作。" 
 					@blur="bindTextAreaBlur1" auto-height />
 				</view>
 			</view>
@@ -129,8 +129,11 @@ export default {
 			 this.good_at = e.detail.value
 		},
 		reto(){
-			uni.switchTab({
-				url: '/pages/index/home'
+			// uni.switchTab({
+			// 	url: '/pages/index/home'
+			// })
+			uni.navigateTo({
+				url: '/pages/public/erweima'
 			})
 		},
 		//提交
@@ -164,15 +167,18 @@ export default {
 					// uni.switchTab({
 					// 	url: '/pages/index/home'
 					// })
-					document.addEventListener(
-						"WeixinJSBridgeReady",
-						function() {
-							WeixinJSBridge.call("closeWindow");
-						},
-						false
-					);
-					//ios手机
-					WeixinJSBridge.call("closeWindow");
+					// document.addEventListener(
+					// 	"WeixinJSBridgeReady",
+					// 	function() {
+					// 		WeixinJSBridge.call("closeWindow");
+					// 	},
+					// 	false
+					// );
+					// //ios手机
+					// WeixinJSBridge.call("closeWindow");
+					uni.navigateTo({
+						url: '/pages/public/erweima'
+					})
 				}, 2000);
 				})
 				.catch(e => {

pages/public/MecRegister.vue

@@ -7,11 +7,13 @@
 			</view>
 			<view class="row b-b">
 				<text class="tit">联系电话</text>
-				<input class="input" type="text"  v-model="phone" placeholder="请输入联系电话" placeholder-class="placeholder" />
+				<input class="input" type="text" v-model="phone" placeholder="请输入联系电话"
+					placeholder-class="placeholder" />
 			</view>
 			<view class="row b-b">
 				<text class="tit">负责人</text>
-				<input class="input" type="text"  v-model="leader" placeholder="请输入负责人姓名" placeholder-class="placeholder" />
+				<input class="input" type="text" v-model="leader" placeholder="请输入负责人姓名"
+					placeholder-class="placeholder" />
 			</view>
 		</view>
 		<view class="content_box">
@@ -19,10 +21,12 @@
 				<text class="tit">省市区</text>
 				<input class="input" @focus='outFocus' v-model="addr" placeholder="请选择省市区"></input>
 			</view>
-			<w-picker mode="region"  :value="defaultRegion" default-type="value"  @confirm="onConfirm($event,'region')" @cancel="handleCancel" ref="region" ></w-picker>
+			<w-picker mode="region" :value="defaultRegion" default-type="value" @confirm="onConfirm($event,'region')"
+				@cancel="handleCancel" ref="region"></w-picker>
 			<view class="row b-b">
 				<text class="tit">详细地址</text>
-				<input class="input" type="text"  v-model="address" placeholder="请输入商家地址" placeholder-class="placeholder" />
+				<input class="input" type="text" v-model="address" placeholder="请输入商家地址"
+					placeholder-class="placeholder" />
 			</view>
 		</view>
 		<!-- <view class="content_box">
@@ -32,283 +36,358 @@
 			</view>
 		</view> -->
 		<view class="check_box flex_item">
-			<view><radio style="transform: scale(0.75)" @click="Getcheckbox" color="#6786FB" :checked="checked" /></view>
-			<view class="" >我已阅读并同意<text @click="TOprivacy">《预约平台用户协议》</text></view>
+			<view>
+				<radio style="transform: scale(0.75)" @click="Getcheckbox" color="#6786FB" :checked="checked" />
+			</view>
+			<view class="">我已阅读并同意<text @click="TOprivacy">《预约平台用户协议》</text></view>
+		</view>
+		<view class="check_box flex_item" style="font-size: 26rpx;">
+			<view class="">注册完成后，务必关注公众号<text style="color:#6786FB ;">【共享预约平台】</text>，否则无法接收到消息推送！</view>
 		</view>
 		<view class="add-btn" @click="confirm">提交申请</view>
 	</view>
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex';
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import wPicker from "@/components/w-picker/w-picker.vue"
-import { setOrgan } from "@/api/index.js"
-import { getUserInfo } from '@/api/login.js';
-// import { upload } from '@/api/index.js';
-export default {
-	components: {
-		uniList,
-		uniListItem,
-		wPicker
-	},
-	data() {
-		return {
-			loading: false,
-			checked:false,
-			name:'',//机构名称
-			phone:"",
-			region:'',
-			defaultRegion:[],
-			defaultRegion1:[],
-			options:[],
-			leader :'',//负责人
-			addr:'',//省市区
-			address:'',//详细地址
-			// img:'/static/img/add.png',
-		};
-	},
-	onLoad(option) {
-		
-	},
-	methods: {
-		...mapMutations(['setUserInfo']),
-		TOprivacy(){
-			uni.navigateTo({
-				url:'/pages/public/uagreement'
-			})
-		},
-		//省市区弹窗
-		showPicker(type){
-			this.$refs[type].show();
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniList from '@/components/uni-list/uni-list.vue';
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import wPicker from "@/components/w-picker/w-picker.vue"
+	import {
+		setOrgan
+	} from "@/api/index.js"
+	import {
+		getUserInfo
+	} from '@/api/login.js';
+	// import { upload } from '@/api/index.js';
+	export default {
+		components: {
+			uniList,
+			uniListItem,
+			wPicker
 		},
-		// scImg(item) {
-		// 	upload({
-		// 		file: ''
-		// 	}).then(e => {
-				
-		// 	}).catch((e) => {
-				
-		// 	});
-		// },
-		//阅读并同意
-		Getcheckbox() {
-			let obj = this;
-			obj.checked = !obj.checked;
+		data() {
+			return {
+				loading: false,
+				checked: false,
+				name: '', //机构名称
+				phone: "",
+				region: '',
+				defaultRegion: [],
+				defaultRegion1: [],
+				options: [],
+				leader: '', //负责人
+				addr: '', //省市区
+				address: '', //详细地址
+				// img:'/static/img/add.png',
+			};
 		},
-		//取消弹窗
-		handleCancel(){
-			
-		},
-		outFocus(e){
-			console.log(event.target)
-			event.target.blur()
-		},
-		//省市区选择确定
-		onConfirm(res,type){
-			let obj = this;
-			obj.result=res;
-			console.log(res,'res')
-			obj.addr = res.result;
-			if(res.name){
-				obj.province = res.name[0];
-				obj.city = res.name[1];
-				obj.district = res.name[2];
-			}else{
-				obj.province = '北京市';
-				obj.city = '北京市';
-				obj.district = '东城区';
+		onLoad(option) {
+			let jginfo = uni.getStorageSync('jginfo') || ''
+			console.log(jginfo, '获取jginfo')
+			if (jginfo) {
+				this.name = jginfo.name
+				this.phone = jginfo.phone
+				this.province = jginfo.province
+				this.province_id = jginfo.province_id
+				this.city = jginfo.city
+				this.city_id = jginfo.city_id
+				this.district = jginfo.district
+				this.district_id = jginfo.district_id
+				this.leader = jginfo.leader
+				this.address = jginfo.address
+				this.addr = jginfo.addr
 			}
-			obj.province_id = res.value[0];
-			obj.city_id = res.value[1];
-			obj.district_id = res.value[2];
-			obj.hospital = '';//重置医院
 		},
-		//提交
-		confirm() {
-			let obj = this;
-			if(obj.loading) {
-				return
-			}
-			if(!obj.name){
-				obj.$api.msg('请填写机构名称');
-				return;
-			}
-			if(!obj.phone){
-				obj.$api.msg('请填写联系电话');
-				return;
-			}
-			if(!obj.leader){
-				obj.$api.msg('请填写负责人姓名');
-				return;
-			}
-			if(!obj.addr){
-				obj.$api.msg('请选择省市区');
-				return;
-			}
-			if(!obj.address){
-				obj.$api.msg('请填写详细地址');
-				return;
-			}
-			if(obj.checked == false){
-				obj.$api.msg('请阅读并同意机构入驻协议');
-				return;
-			}
-			obj.loading = true
-			setOrgan({
-				name: obj.name,
-				mobile: obj.phone,
-				province: obj.province,
-				province_id: obj.province_id,
-				city: obj.city,
-				city_id: obj.city_id,
-				district: obj.district,
-				district_id: obj.district_id,
-				leader:obj.leader,
-				detail_address:obj.address,
-				latitude:1,
-				longitude:1
-			})
-				.then(function(e) {
-					obj.loading = false
-					obj.$api.msg(e.msg);
-					obj.userInfo();
-					if(e.msg == '已提交，请等待审核！'){
-						setTimeout(function() {
-							// uni.switchTab({
-							// 	url: '/pages/index/home'
-							// })
-							document.addEventListener(
-								"WeixinJSBridgeReady",
-								function() {
-									WeixinJSBridge.call("closeWindow");
-								},
-								false
-							);
-							//ios手机
-							WeixinJSBridge.call("closeWindow");
-						}, 2000);
-					}
-				})
-				.catch(e => {
-					obj.loading = false
-					console.log(e)
-				});
-		},
-		//选择身份后更新用户信息
-		userInfo() {
-			getUserInfo({})
-				.then(function(e) {
-					console.log(e);
-					uni.setStorageSync('userInfo', e.data);
+		methods: {
+			...mapMutations(['setUserInfo']),
+			TOprivacy() {
+				uni.navigateTo({
+					url: '/pages/public/uagreement'
 				})
-				.catch(function(e) {
-					console.log(e);
-				});
-		},
-		//跳转机构入驻协议
-		// toagreement(){
-		// 	uni.navigateTo({
-		// 		url: '/pages/public/agreement'
-		// 	});
-		// },
-	}
-};
+			},
+			//省市区弹窗
+			showPicker(type) {
+				this.$refs[type].show();
+			},
+			// scImg(item) {
+			// 	upload({
+			// 		file: ''
+			// 	}).then(e => {
+
+			// 	}).catch((e) => {
+
+			// 	});
+			// },
+			//阅读并同意
+			Getcheckbox() {
+				let obj = this;
+				obj.checked = !obj.checked;
+			},
+			//取消弹窗
+			handleCancel() {
+
+			},
+			outFocus(e) {
+				console.log(event.target)
+				event.target.blur()
+			},
+			//省市区选择确定
+			onConfirm(res, type) {
+				let obj = this;
+				obj.result = res;
+				console.log(res, 'res')
+				obj.addr = res.result;
+				if (res.name) {
+					obj.province = res.name[0];
+					obj.city = res.name[1];
+					obj.district = res.name[2];
+				} else {
+					obj.province = '北京市';
+					obj.city = '北京市';
+					obj.district = '东城区';
+				}
+				obj.province_id = res.value[0];
+				obj.city_id = res.value[1];
+				obj.district_id = res.value[2];
+				obj.hospital = ''; //重置医院
+			},
+			//提交
+			confirm() {
+				let obj = this;
+				if (obj.loading) {
+					return
+				}
+				if (!obj.name) {
+					obj.$api.msg('请填写机构名称');
+					return;
+				}
+				if (!obj.phone) {
+					obj.$api.msg('请填写联系电话');
+					return;
+				}
+				if (!obj.leader) {
+					obj.$api.msg('请填写负责人姓名');
+					return;
+				}
+				if (!obj.addr) {
+					obj.$api.msg('请选择省市区');
+					return;
+				}
+				if (!obj.address) {
+					obj.$api.msg('请填写详细地址');
+					return;
+				}
+				if (obj.checked == false) {
+					obj.$api.msg('请阅读并同意机构入驻协议');
+					return;
+				}
+				obj.loading = true
+				// let jginfo = {
+				// 	name: obj.name,
+				// 	phone: obj.phone,
+				// 	province: obj.province,
+				// 	province_id: obj.province_id,
+				// 	city: obj.city,
+				// 	city_id: obj.city_id,
+				// 	district: obj.district,
+				// 	district_id: obj.district_id,
+				// 	leader: obj.leader,
+				// 	address: obj.address,
+				// 	addr: obj.addr
+				// }
+				// console.log(jginfo, 'jginfo++++++++++++++')
+				// uni.setStorageSync('jginfo', jginfo)
+				setOrgan({
+						name: obj.name,
+						mobile: obj.phone,
+						province: obj.province,
+						province_id: obj.province_id,
+						city: obj.city,
+						city_id: obj.city_id,
+						district: obj.district,
+						district_id: obj.district_id,
+						leader: obj.leader,
+						detail_address: obj.address,
+						latitude: 1,
+						longitude: 1
+					})
+					.then(function(e) {
+						obj.loading = false
+						obj.$api.msg(e.msg);
+						obj.userInfo();
+						let jginfo = {
+							name: obj.name,
+							phone: obj.phone,
+							province: obj.province,
+							province_id: obj.province_id,
+							city: obj.city,
+							city_id: obj.city_id,
+							district: obj.district,
+							district_id: obj.district_id,
+							leader: obj.leader,
+							address: obj.address,
+							addr: obj.addr
+						}
+						console.log(jginfo, 'jginfo++++++++++++++')
+						uni.setStorageSync('jginfo', jginfo)
+						if (e.msg == '已提交，请等待审核！') {
+							setTimeout(function() {
+								// uni.switchTab({
+								// 	url: '/pages/index/home'
+								// })
+								// document.addEventListener(
+								// 	"WeixinJSBridgeReady",
+								// 	function() {
+								// 		WeixinJSBridge.call("closeWindow");
+								// 	},
+								// 	false
+								// );
+								// //ios手机
+								// WeixinJSBridge.call("closeWindow");
+								uni.navigateTo({
+									url: '/pages/public/erweima'
+								})
+							}, 2000);
+						}
+					})
+					.catch(e => {
+						obj.loading = false
+						console.log(e)
+					});
+			},
+			//选择身份后更新用户信息
+			userInfo() {
+				getUserInfo({})
+					.then(function(e) {
+						console.log(e);
+						uni.setStorageSync('userInfo', e.data);
+					})
+					.catch(function(e) {
+						console.log(e);
+					});
+			},
+			//跳转机构入驻协议
+			// toagreement(){
+			// 	uni.navigateTo({
+			// 		url: '/pages/public/agreement'
+			// 	});
+			// },
+		}
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: $page-color-base;
-	padding-top: 25rpx;
-}
-.content_box {
-	background-color: #ffffff;
-	width: 92%;
-	margin: 0rpx auto;
-	border-radius: 15rpx;
-	margin-bottom: 25rpx;
-}
-.row {
-	display: flex;
-	align-items: center;
-	// position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-	border-bottom: 1rpx solid #f8f6f6;
+	page {
+		background: $page-color-base;
+		padding-top: 25rpx;
+	}
+
+	.content_box {
+		background-color: #ffffff;
+		width: 92%;
+		margin: 0rpx auto;
+		border-radius: 15rpx;
+		margin-bottom: 25rpx;
+	}
+
+	.row {
+		display: flex;
+		align-items: center;
+		// position: relative;
+		padding: 0 30rpx;
+		height: 110rpx;
+		background: #fff;
+		border-bottom: 1rpx solid #f8f6f6;
+
+		.tit {
+			flex-shrink: 0;
+			width: 180rpx;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
 
-	.tit {
-		flex-shrink: 0;
-		width: 180rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
+		.input {
+			flex: 1;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+
+		.iconlocation {
+			font-size: 36rpx;
+			color: $font-color-light;
+		}
 	}
-	.input {
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
+
+	.examine_name {
+		color: #171717;
+		font-size: 28rpx;
+		padding: 25rpx 25rpx;
 	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
+
+	.examine_img {
+		width: 100%;
+		text-align: center;
+		padding-bottom: 25rpx;
 	}
-}
-.examine_name {
-	color: #171717;
-	font-size: 28rpx;
-	padding: 25rpx 25rpx;
-}
-.examine_img {
-	width: 100%;
-	text-align: center;
-	padding-bottom: 25rpx;
-}
-.examine_img image {
-	width: 200rpx;
-	height: 200rpx;
-}
-.default-row {
-	margin-top: 16rpx;
-	.tit {
-		flex: 1;
+
+	.examine_img image {
+		width: 200rpx;
+		height: 200rpx;
 	}
-	switch {
-		transform: translateX(16rpx) scale(0.9);
+
+	.default-row {
+		margin-top: 16rpx;
+
+		.tit {
+			flex: 1;
+		}
+
+		switch {
+			transform: translateX(16rpx) scale(0.9);
+		}
 	}
-}
-.add-btn {
-	position: fixed;
-	bottom: 0rpx;
-	width: 100%;
-	height: 100rpx;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: #6786FB;
-	line-height: 100rpx;
-	text-align: center;
-}
-.img_box {
-	padding: 35rpx 35rpx;
-	width: 250rpx;
-	height: 250rpx;
-}
-.img_box image {
-	width: 100%;
-	height: 100%;
-}
-.alert-box {
-	background-color: #ffffff;
-}
-.b-b:after {
-	position: relative !important;
-}
-.check_box {
-	padding: 25rpx 25rpx;
-	font-size: 28rpx;
-	text{
-		color: #6786FB;
+
+	.add-btn {
+		position: fixed;
+		bottom: 0rpx;
+		width: 100%;
+		height: 100rpx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: #6786FB;
+		line-height: 100rpx;
+		text-align: center;
 	}
-}
 
+	.img_box {
+		padding: 35rpx 35rpx;
+		width: 250rpx;
+		height: 250rpx;
+	}
+
+	.img_box image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.alert-box {
+		background-color: #ffffff;
+	}
+
+	.b-b:after {
+		position: relative !important;
+	}
+
+	.check_box {
+		padding: 25rpx 25rpx;
+		font-size: 28rpx;
+
+		text {
+			color: #6786FB;
+		}
+	}
 </style>

pages/public/PatRegister.vue

@@ -15,13 +15,13 @@
 				<input class="input" type="text" v-model="mobile" placeholder="请输入联系方式" placeholder-class="placeholder" />
 			</view>
 			<view class="row b-b" @tap="showPicker('region')">
-				<text class="tit">省市区</text>
+				<text class="tit">就诊地区</text>
 				<input class="input" @focus='outFocus' v-model="addr" placeholder="请选择省市区"/>
 			</view>
 			<w-picker mode="region"  :value="defaultRegion" default-type="value"  @confirm="onConfirm($event,'region')" @cancel="handleCancel" ref="region" ></w-picker>
 			<view class="row b-b" @tap="Toshow">
 				<text class="tit">医院名称</text>
-				<input class="input" type="text" @focus='outFocus' v-model="hospital" placeholder="选择就医所在地的医院进行咨询预约，可在个人资料中进行修改" placeholder-class="placeholder" />
+				<input class="input" type="text" @focus='outFocus' v-model="hospital" placeholder="咨询的医院可在个人中心进行修改" placeholder-class="placeholder" />
 			</view>
 			<zhilin-picker
 				v-model="show"
@@ -38,6 +38,9 @@
 			<view><radio style="transform: scale(0.75)" @click="Getcheckbox" color="#6786FB" :checked="checked" /></view>
 			<view class="">我已阅读并同意<text @click="TOprivacy">《预约平台用户协议》</text></view>
 		</view>
+		<view class="check_box flex_item" style="font-size: 26rpx;">
+			<view class="">注册完成后，务必关注公众号<text style="color:#6786FB ;">【共享预约平台】</text>，否则无法接收到消息推送！</view>
+		</view>
 		<view class="add-btn" @click="confirm">提交申请</view>
 	</view>
 </template>
@@ -67,7 +70,6 @@ export default {
 			defaultRegion:[],
 			defaultRegion1:[],
 			options:[],
-			checked: '',
 			name: '', //姓名
 			gender: '', //性别
 			gender_id: '', //性别id
@@ -271,15 +273,18 @@ export default {
 						// 	url: '/pages/index/home'
 						// })
 						//安卓手机
-						document.addEventListener(
-							"WeixinJSBridgeReady",
-							function() {
-								WeixinJSBridge.call("closeWindow");
-							},
-							false
-						);
-						//ios手机
-						WeixinJSBridge.call("closeWindow");
+						// document.addEventListener(
+						// 	"WeixinJSBridgeReady",
+						// 	function() {
+						// 		WeixinJSBridge.call("closeWindow");
+						// 	},
+						// 	false
+						// );
+						// //ios手机
+						// WeixinJSBridge.call("closeWindow");
+						uni.navigateTo({
+							url: '/pages/public/erweima'
+						})
 					}, 2000);
 				})
 				.catch(e => {

pages/public/erweima.vue

@@ -0,0 +1,75 @@
+<template>
+	<view class="content">
+		<view class="flex fx">
+			<image src="../../static/img/erweima.png" mode=""></image>
+			<view class="" style="font-size: 32rpx;">
+				长按识别二维码，关注公众号
+			</view>
+			<view class="btn" @click="gohome">
+				返回首页
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {
+
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+
+		},
+		onReady() {
+
+		},
+		methods: {
+gohome() {
+	uni.switchTab({
+		url: '/pages/index/home'
+	})
+}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+		height: auto;
+		min-height: 100%;
+	}
+	.fx {
+		width: 750rpx;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		margin: auto;
+		image {
+			width: 400rpx;
+			height: 400rpx;
+		}
+		
+	}
+	.btn {
+		margin-top: 120rpx;
+		width: 300rpx;
+		line-height: 80rpx;
+		color: #fff;
+		background-color: #6786FB;
+		text-align: center;
+		border-radius: 15rpx;
+		font-size: 36rpx;
+	}
+</style>

pages/redirect/redirect.vue

@@ -99,6 +99,7 @@
 				let obj = this;
 				// 保存token
 				uni.setStorageSync('token', data.token);
+				let path = uni.getStorageSync('present');
 				// 获取用户基础信息
 				getUserInfo({}).then(e => {
 					obj.$log.addLog(e.data)
@@ -168,6 +169,11 @@
 						// 1是病人 2是医生 3是机构
 						// 校验用户类型和入口是否一致
 						if (!chooseType) {
+							if(path.indexOf('expert') != -1) {
+								uni.navigateTo({
+									url: path
+								})
+							}
 							uni.switchTab({
 								url: '/pages/index/home',
 								fail(e) {
@@ -273,7 +279,7 @@
 										text: '科普学习',
 										iconPath: 'static/tabBar/tab-study.png',
 										selectedIconPath: 'static/tabBar/tab-study-current.png',
-										visible: true
+										visible: false
 									});
 									uni.setTabBarItem({
 										index: 3,

pages/shareQrCode/card.vue

@@ -1,235 +1,140 @@
 <template>
-	<view id="container">
-		<img v-if="posterDataUrl" :src="posterDataUrl" class="poster-bg" width="100%" height="auto"/>
-		<view v-else class="item-box"  id="poster" >
-			<img class="poster-bg" src="../../static/img/img38.jpg"/>
-			<canvas class="qr" 
-			canvas-id="qrCode-canvas" 
-			id="qrCode-canvas"
-			:style="{ left: `${(canWeidth - 134) / 2}px`}"></canvas>
-		</view>
-		<!-- <view class="card">
-			<view class="header flex_item">
-				<view class="portrait"><image :src="userInfo.ext_info.photo"></image></view>
-				<view class="info">
-					<view class="name">{{userInfo.ext_info.name}}<text>{{ userInfo.ext_info.doctor_level == 1 ? '医师' : userInfo.ext_info.doctor_level == 2 ? '主治医师' : userInfo.ext_info.doctor_level == 3 ? '副主任医师' : '主任医师'}}</text></view>
-					<view class="tip">{{userInfo.ext_info.hospital_name}}</view>
-				</view>
-			</view>
-			<view class="tki-qrcode">
-				<canvas canvas-id="qrcode" />
-			</view>
-		</view> -->
-	</view>
-</template>
+	<view id="container">
+		<img v-if="posterDataUrl" :src="posterDataUrl" class="poster-bg" width="100%" height="auto" />
+		<view class="item-box" id="poster">
+			<image @load="make()" class="poster-bg" src="../../static/img/img38.jpg" mode="widthFix"></image>
+			<canvas class="qr" canvas-id="qrCode-canvas" id="qrCode-canvas"></canvas>
+		</view>
+	</view>
+</template>
 <script>
-	import { mapState } from 'vuex';
-	import uQRCode from '@/components/Sansnn-uQRCode/uqrcode.js'
-	import html2canvas from 'html2canvas'
+	import {
+		mapState
+	} from 'vuex';
+	import uQRCode from '@/components/Sansnn-uQRCode/uqrcode.js'
+	import html2canvas from 'html2canvas'
 	import QRCode from 'qrcode'
-	import { weixindata } from '@/utils/wxAuthorized';
-	import { shareLoad } from '@/utils/wxAuthorized';
+	import {
+		weixindata
+	} from '@/utils/wxAuthorized';
+	import {
+		shareLoad
+	} from '@/utils/wxAuthorized';
 	export default {
 		data() {
-			return {
-				url: '',
-				src:'',
-				posterDataUrl:'',
-				poster: '',// 合成图片
-				canHeight: 0,
-				canWeidth: 0,
-				size: 180,
-				ratio: 1, //页面比例用于计算
+			return {
+				url: '',
+				src: '',
+				posterDataUrl: '',
+				poster: '', // 合成图片
+				canHeight: 0,
+				canWeidth: 0,
+				size: 180,
+				ratio: 1, //页面比例用于计算
 			};
 		},
 		computed: {
 			...mapState(['userInfo']),
-		},
-		onLoad() {
-			this.loadData();
-			this.shareDate()
-			this.$nextTick(() => {
-			const query = uni.createSelectorQuery().in(this);
-				query.select('#container').boundingClientRect(data => {
-				this.ratio = data.width / 750;
-				}).exec();
-				// 获取画布宽高信息
-				query.select('#qrCode-canvas').fields(
-					{size: true},e => {
-						console.log('获取画布宽高信息',e)
-						this.canHeight = e.height;
-						this.canWeidth = e.width;
-					}).exec();
-			});
-			
 		},
-		// onLoad() {
-		// 	console.log(this.userInfo)
-		// 	this.loadData();
-		// },
-		methods: {
-			// 请求载入数据
-			async loadData() {
-				let obj = this;
-				obj.url = 'http://doctortest.igxys.com/index/#/pages/doctor/expert' + '?id=' + obj.userInfo.uid+'&spread='+obj.userInfo.uid;
-				obj.make();
-				obj.shareDate()
-			},
+		onLoad() {
+			let obj = this;
+			obj.url = 'http://doctortest.igxys.com/index/#/pages/doctor/expert' + '?id=' + obj.userInfo.uid + '&spread=' +
+				obj.userInfo.uid + '&isq=1';
+			this.shareDate();
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this);
+			query.select('#container').boundingClientRect(data => {
+				this.ratio = data.width / 750;
+			}).exec();
+			// 获取画布宽高信息
+			query.select('#qrCode-canvas').fields({
+				size: true
+			}, e => {
+				console.log('获取画布宽高信息', e)
+				this.canHeight = e.height;
+				this.canWeidth = e.width;
+			}).exec();
+		},
+		methods: {
 			//生成二维码
-			  make() {
-				  let obj = this;
-				  //先用 QRCode 生成二维码 canvas，然后用 html2canvas 合成整张海报并转成 base64 显示出来
-				  		this.$nextTick(() => {
-				  		     setTimeout(function(){
-				  				let canvas = document.getElementById('qrCode-canvas').children[0];
-				  				console.log(canvas,'canvas')
-				  				console.log(obj.url)
-				  				QRCode.toCanvas(canvas,obj.url,(error) => {
-				  					if (error) {
-				  						console.log(error,'error')
-				  					} else {
-				  						//qrcode 生成的二维码会带有一些默认样式，需要调整下
-				  						canvas.style.width = '140px'
-				  						canvas.style.height = '140px'
-				  						canvas.style.padding = '0px'
-										canvas.style.borderRadius = '10px'
-				  						let poster = document.getElementById('poster')
-				  						html2canvas(poster).then(canvas => {
-				  						 // console.log(canvas.toDataURL("image/png").replace("image/png", "image/octet-stream"))
-				  						 obj.posterDataUrl = canvas.toDataURL();
-				  						});
-				  					}
-				  				})
-				  			},500);
-				      	});
-				  
-				  
-				  
-			      // uQRCode.make({
-			      //   canvasId: 'qrcode',
-			      //   componentInstance: this,
-			      //   text: obj.url,
-			      //   size: 280,
-			      //   margin: 3,
-			      //   backgroundColor: '#ffffff',
-			      //   foregroundColor: '#000000',
-			      //   fileType: 'png',
-			      //   correctLevel: uQRCode.defaults.correctLevel,
-			      //   success: res => {
-			      //     console.log(res)
-			      //   }
-			      // })
-			    },
-			
+			make() {
+				let obj = this;
+				//先用 QRCode 生成二维码 canvas，然后用 html2canvas 合成整张海报并转成 base64 显示出来
+				this.$nextTick(() => {
+					let canvas = document.getElementById('qrCode-canvas').children[0];
+					// console.log(canvas, 'canvas')
+					// console.log(obj.url)
+					QRCode.toCanvas(canvas, obj.url, (error) => {
+						if (error) {
+							console.log(error, 'error')
+						} else {
+							//qrcode 生成的二维码会带有一些默认样式，需要调整下
+							canvas.style.width = '140px'
+							canvas.style.height = '140px'
+							canvas.style.padding = '0px'
+							canvas.style.borderRadius = '10px'
+							let poster = document.getElementById('poster')
+							html2canvas(poster).then(canvas => {
+								// console.log(canvas.toDataURL("image/png").replace("image/png", "image/octet-stream"))
+								obj.posterDataUrl = canvas.toDataURL();
+							});
+						}
+					})
+				});
+			},
 			shareDate() {
 				let obj = this;
-				let url = 'http://doctortest.igxys.com/index/#/pages/doctor/expert' + '?id=' + obj.userInfo.uid+'&spread='+obj.userInfo.uid;
+				let url = 'http://doctortest.igxys.com/index/#/pages/doctor/expert' + '?id=' + obj.userInfo.uid +
+					'&spread=' + obj.userInfo.uid;
 				let bool = uni.getStorageSync('weichatBrowser') || '';
-				let doctor_name = obj.userInfo.ext_info.doctor_level == 1 ? '医师' : obj.userInfo.ext_info.doctor_level == 2 ? '主治医师' : obj.userInfo.ext_info.doctor_level == 3 ? '副主任医师' : '主任医师'
+				let doctor_name = obj.userInfo.ext_info.doctor_level == 1 ? '初级' : obj.userInfo.ext_info.doctor_level ==
+					2 ? '中级' : obj.userInfo.ext_info.doctor_level == 3 ? '副高级' : '正高级'
 				let data = {
 					link: url, // 分享链接
 					imgUrl: obj.userInfo.ext_info.photo, // 分享图标
-					desc:obj.userInfo.ext_info.hospital_name + doctor_name,
-					title: obj.userInfo.ext_info.name ,
+					desc: obj.userInfo.ext_info.hospital_name + doctor_name,
+					title: obj.userInfo.ext_info.name,
 					success: function() {}
 				};
-				console.log(data,'datadatadata')
-				// console.log(shareLoad);
+				// console.log(data, 'datadatadata')
 				shareLoad(data);
 			},
 		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		height: 100%;
-	}
-	#container{
-		width: 100%;
-		height: 1400rpx;
-		.item-box{
-			width: 100%;
-			height: 100%;
-			margin: 0rpx auto;
-			background-size: 100% 100%;
-			.poster-bg{
-				position: relative;
-				height: 100%;
-				width: 100%;
-				margin: 0rpx auto;
-				}
-				.qr{
-					width: 100%;
-					height: 100%;
-					position: absolute;
-					top:9.6rem;
-					// left:6.5rem;
-				}
-		}
 	}
-	// page{
-	// 	background-color: #F5F5F5;
-	// 	height: 100%;
-	// 	.container{
-	// 		height: 100%;
-	// 		padding: 45rpx 0rpx;
-	// 	}
-	// }
-	// .tki-qrcode{
-	// 	width: 100%;
-	// }
-	// canvas{
-	// 	width: 600rpx;
-	// 	height: 600rpx;
-	// }
-	// .card{
-	// 	padding: 50rpx 50rpx;
-	// 	width: 90%;
-	// 	margin: 0rpx auto;
-	// 	background-color: #FFFFFF;
-	// 	border-radius: 25rpx;
-	// 	font-size: 30rpx;
-	// 	text-align: center;
-	// 	.header{
-	// 		padding-bottom: 30rpx;
-	// 		.portrait{
-	// 			width: 150rpx;
-	// 			height: 150rpx;
-	// 			image{
-	// 				border-radius: 100rpx;
-	// 				width: 100%;
-	// 				height: 100%;
-	// 			}
-	// 		}
-	// 		.info{
-	// 			margin-left: 25rpx;
-	// 			text-align: left;
-	// 			.name{
-	// 				font-size: 36rpx;
-	// 				font-weight: bold;
-	// 				text{
-	// 					font-weight:normal !important;
-	// 					padding-left: 25rpx;
-	// 					font-size: 30rpx;
-	// 				}
-	// 			}
-	// 			.tip{
-	// 				text-align: left;
-	// 				padding-top: 15rpx;
-	// 			}
-	// 		}
-	// 	}
-	// 	.shareText{
-	// 		margin-bottom: 50rpx;
-	// 	}
-	// 	.shareDate{
-	// 		width: 100%;
-	// 		padding: 25rpx 0rpx;
-	// 		margin: 0rpx auto;
-	// 		background-color: #5E96F5;
-	// 		color: #FFFFFF;
-	// 		border-radius: 25rpx;
-	// 	}
-	// }
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+
+	#container {
+		width: 100%;
+		height: 1400rpx;
+
+		.item-box {
+			position: fixed;
+			top: -100%;
+			left: -750rpx;
+			width: 750rpx;
+			height: 100%;
+			margin: 0rpx auto;
+			background-size: 100% 100%;
+
+			.poster-bg {
+				width: 750rpx;
+				position: relative;
+				margin: 0rpx auto;
+			}
+
+			.qr {
+				width: 280rpx;
+				height: 280rpx;
+				position: absolute;
+				top: 410rpx;
+				left: 240rpx;
+			}
+		}
+	}
 </style>

pages/shareQrCode/index.vue

@@ -3,8 +3,11 @@
 		<img v-if="posterDataUrl" :src="posterDataUrl" class="poster-bg" width="100%" height="auto"/>
 		<view v-else class="item-box"  id="poster" >
 			<img class="poster-bg" src="../../static/img/img38.jpg"/>
-			<canvas 
+<!-- 			<canvas 
 			:style="{ left: `${(canWeidth - 134) / 2}px`}"
+			class="qr" canvas-id="qrCode-canvas" id="qrCode-canvas"></canvas> -->
+			<canvas
+			:style="{ left: `${(canWeidth - 134) / 2}px`}"
 			class="qr" canvas-id="qrCode-canvas" id="qrCode-canvas"></canvas>
 		</view>
 	</view>
@@ -40,7 +43,8 @@ export default {
 				{size: true},e => {
 					console.log('获取画布宽高信息',e)
 					this.canHeight = e.height;
-					this.canWeidth = e.width;
+					this.canWeidth = e.width;
+					// this.ratio
 				}).exec();
 		});
 	},
@@ -64,7 +68,7 @@ export default {
 				link: url, // 分享链接
 				imgUrl: obj.userInfo.avatar, // 分享图标
 				desc:obj.userInfo.nickname,
-				title: obj.userInfo.nickname+'邀请您进入麻醉服务平台',
+				title: obj.userInfo.nickname+'邀请您进入共享预约平台',
 				success: function() {},
 			};
 			console.log(data,'datadatadata')
@@ -141,10 +145,13 @@ export default {
 				margin: 0rpx auto;
 				}
 				.qr{
-					width: 100%;
-					height: 100%;
-					position: absolute;
-					top:9.6rem;
+					width: 100%;
+					height: 100%;
+					position: absolute;
+					top:9.6rem;
+					// right: 0;
+					// bottom: 0;
+					// top:9.6rem;
 					// left:6.5rem;
 				}
 		}

pages/user/user.vue

@@ -261,7 +261,8 @@
 								text: '接单',
 								iconPath: 'static/tabBar/jd.png',
 								selectedIconPath: 'static/tabBar/jd-act.png',
-								pagePath: '/pages/dd/dd'
+								pagePath: '/pages/dd/dd',
+								visible:true
 							})
 							uni.setTabBarItem({
 								index: 4,
@@ -289,7 +290,7 @@
 								text: '科普学习',
 								iconPath: 'static/tabBar/tab-study.png',
 								selectedIconPath: 'static/tabBar/tab-study-current.png',
-								visible: true
+								visible: false
 							});
 							uni.setTabBarItem({
 								index: 3,
@@ -330,7 +331,8 @@
 								text: '发布订单',
 								iconPath: 'static/tabBar/jd.png',
 								selectedIconPath: 'static/tabBar/jd-act.png',
-								pagePath: '/pages/dd/dd'
+								pagePath: '/pages/dd/dd',
+								visible: true
 							})
 							uni.setTabBarItem({
 								index: 4,

pages/userinfo/doctor.vue

@@ -77,7 +77,7 @@
 					<text class="titi">元</text>
 				</view>
 				<view class="row-2" v-if="ischeckConsult">
-					<text >仅提供麻醉咨询，20次图文交互</text>
+					<text >仅提供咨询，10次图文交互后结束</text>
 				</view>
 				
 			</view>
@@ -93,7 +93,7 @@
 					<text class="titi">元</text>
 				</view>
 				<view class="row-2" v-if="ischeckOrder">
-					<text >提供麻醉咨询及围术期麻醉相关服务</text>
+					<text >提供3个月内无限次咨询，及技术服务1次</text>
 				</view>
 			</view>
 			<view class="row b-b">
@@ -103,16 +103,16 @@
 							<checkbox value="isMore" color="#FFCC33" style="transform:scale(0.7)" checked="ischeckMore"/>
 						</label>
 					</checkbox-group>
-					<text class="tit">多点执业/次</text>
+					<text class="tit">外出服务/次</text>
 					<input class="input" @input='inputnum2(out_price)' type="text"  v-model="out_price" placeholder="请输入私人医生费用" placeholder-class="placeholder" />
 					<text class="titi">元</text>
 				</view>
 				<view class="row-2" v-if="ischeckMore">
-					<text >外出其他医院麻醉，多点执业手续自己办理</text>
+					<text >外出其他单位提供咨询指导及技术服务1次</text>
 				</view>
 			</view>
 		</view>
-		<view class="content_box">
+		<!-- <view class="content_box">
 			<view class="checkbox">
 				 <view class="examine_name">工作日选择</view>
 				 <checkbox-group @change="checkboxChange" class="checklist flex_item">
@@ -124,12 +124,12 @@
 					</label>
 				 </checkbox-group>
 			</view>
-		</view>
+		</view> -->
 		<view class="content_box">
 			<view class="examine_list"> 
 				<view class="examine_name">个人简介</view>
 				<view class="textarea-box">
-					<textarea  class="textarea" v-model="introduction" maxlength="-1"  placeholder-style="color:#999999" placeholder="请填写个人简介" 
+					<textarea  class="textarea" v-model="introduction" maxlength="-1"  placeholder-style="color:#999999" placeholder="如：学历、毕业学校、工作经验、学术兼职、荣誉称号" 
 					@blur="bindTextAreaBlur" auto-height />
 				</view>
 			</view>
@@ -138,7 +138,7 @@
 			<view class="examine_list"> 
 				<view class="examine_name">擅长领域</view>
 				<view class="textarea-box">
-					<textarea  class="textarea" v-model="good_at" maxlength="-1"  placeholder-style="color:#999999" placeholder="请填写擅长领域" 
+					<textarea  class="textarea" v-model="good_at" maxlength="-1"  placeholder-style="color:#999999" placeholder="如：擅长什么手术、擅长什么疾病的治疗、对某某领域有研究、擅长什么操作。" 
 					@blur="bindTextAreaBlur1" auto-height />
 				</view>
 			</view>
@@ -217,16 +217,16 @@ export default {
 			// 1医师2主治医师3副主任医师4主任医师
 			levelList:[{
 				id:1,
-				name:'医师'
+				name:'初级'
 			},{
 				id:2,
-				name:'主治医师'
+				name:'中级'
 			},{
 				id:3,
-				name:'副主任医师'
+				name:'副高级'
 			},{
 				id:4,
-				name:'主任医师'
+				name:'正高级'
 			}],
 			doctor_level:'',//职称
 			level_id:'',////职称id
@@ -313,16 +313,16 @@ export default {
 		obj.hospital = obj.ext_info.hospital_name;
 		obj.hospital_id = obj.ext_info.hospital;
 		if(obj.ext_info.doctor_level == 1){
-			obj.doctor_level = '医师'
+			obj.doctor_level = '初级'
 		}
 		if(obj.ext_info.doctor_level == 2){
-			obj.doctor_level = '主治医师'
+			obj.doctor_level = '中级'
 		}
 		if(obj.ext_info.doctor_level == 3){
-			obj.doctor_level = '副主任医师'
+			obj.doctor_level = '副高级'
 		}
 		if(obj.ext_info.doctor_level == 4){
-			obj.doctor_level = '主任医师'
+			obj.doctor_level = '正高级'
 		}
 		obj.level_id = obj.ext_info.doctor_level;
 		obj.gender_id = obj.ext_info.gender;
@@ -690,7 +690,7 @@ page {
 	min-height: 100%;
 	.content{
 		min-height: 100%;
-		padding-bottom: 120rpx;
+		// padding-bottom: 120rpx;
 	}
 }
 .content_box {
@@ -741,7 +741,14 @@ page {
 	background: #fff;
 	border-bottom: 1rpx solid #f8f6f6;
 	.row-1{
-		display: flex;
+		display: flex;
+		align-items: center;
+		.titi {
+			font-size: 28rpx;
+		}
+		.input {
+			padding-right: 10rpx;
+		}
 	}
 	.row-2{
 		margin-top: 12rpx;
@@ -796,8 +803,8 @@ page {
 	}
 }
 .add-btn {
-	position: fixed;
-	bottom: 0rpx;
+	// position: fixed;
+	// bottom: 0rpx;
 	width: 100%;
 	height: 100rpx;
 	font-size: $font-lg;

unpackage/dist/build/h5/index.html

@@ -1,3 +1,3 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>麻醉平台</title><script src=https://g.alicdn.com/de/prismplayer/2.7.2/aliplayer-h5-min.js></script><script>document.addEventListener('DOMContentLoaded', function() {
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>共享预约平台</title><script src=https://g.alicdn.com/de/prismplayer/2.7.2/aliplayer-h5-min.js></script><script>document.addEventListener('DOMContentLoaded', function() {
                 document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-            })</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.5153375b.js></script><script src=/index/static/js/index.64e28504.js></script></body></html>
+            })</script><link rel=stylesheet href=/index/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.1d3c365d.js></script><script src=/index/static/js/index.41b06196.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-doctor-index.5cfcbf81.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-doctor-index"],{"2d23":function(n,t,e){"use strict";e.r(t);var o=e("6f89"),u=e("7764");for(var i in u)"default"!==i&&function(n){e.d(t,n,(function(){return u[n]}))}(i);var c,a=e("f0c5"),r=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,"3f946255",null,!1,o["a"],c);t["default"]=r.exports},"6f89":function(n,t,e){"use strict";var o;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return o}));var u=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("v-uni-view",[e("v-uni-button",{on:{click:function(t){arguments[0]=t=n.$handleEvent(t),n.startRecord.apply(void 0,arguments)}}},[n._v("开始录音")]),e("v-uni-button",{on:{click:function(t){arguments[0]=t=n.$handleEvent(t),n.endRecord.apply(void 0,arguments)}}},[n._v("停止录音")]),e("v-uni-button",{on:{click:function(t){arguments[0]=t=n.$handleEvent(t),n.playVoice.apply(void 0,arguments)}}},[n._v("播放录音")]),e("v-uni-button",{on:{click:function(t){arguments[0]=t=n.$handleEvent(t),n.uploadvoice.apply(void 0,arguments)}}},[n._v("上传文件")])],1)},i=[]},7764:function(n,t,e){"use strict";e.r(t);var o=e("aea3"),u=e.n(o);for(var i in o)"default"!==i&&function(n){e.d(t,n,(function(){return o[n]}))}(i);t["default"]=u.a},aea3:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o={data:function(){return{text:"uni-app",voicePath:""}},onLoad:function(){},methods:{startRecord:function(){}}};t.default=o}}]);

unpackage/dist/build/h5/static/js/pages-doctor-index.78a3a710.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-doctor-index"],{"2d23":function(n,t,e){"use strict";e.r(t);var o=e("3178"),u=e("7764");for(var i in u)"default"!==i&&function(n){e.d(t,n,(function(){return u[n]}))}(i);var c,a=e("f0c5"),r=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,"7e23e014",null,!1,o["a"],c);t["default"]=r.exports},3178:function(n,t,e){"use strict";var o;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return o}));var u=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("v-uni-view",[e("v-uni-button",{on:{click:function(t){arguments[0]=t=n.$handleEvent(t),n.startRecord.apply(void 0,arguments)}}},[n._v("开始录音")]),e("v-uni-button",{on:{click:function(t){arguments[0]=t=n.$handleEvent(t),n.endRecord.apply(void 0,arguments)}}},[n._v("停止录音")]),e("v-uni-button",{on:{click:function(t){arguments[0]=t=n.$handleEvent(t),n.playVoice.apply(void 0,arguments)}}},[n._v("播放录音")]),e("v-uni-button",{on:{click:function(t){arguments[0]=t=n.$handleEvent(t),n.uploadvoice.apply(void 0,arguments)}}},[n._v("上传文件")])],1)},i=[]},7764:function(n,t,e){"use strict";e.r(t);var o=e("aea3"),u=e.n(o);for(var i in o)"default"!==i&&function(n){e.d(t,n,(function(){return o[n]}))}(i);t["default"]=u.a},aea3:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o={data:function(){return{text:"uni-app",voicePath:""}},onLoad:function(){},methods:{startRecord:function(){}}};t.default=o}}]);