渣渣宝 4 lat temu
rodzic
commit
836fb614a6

+ 13 - 11
pages.json

xqd xqd xqd xqd xqd
@@ -1,18 +1,18 @@
 {
 	"easycom": {
-		"autoscan":true,
-		"custom":{
+		"autoscan": true,
+		"custom": {
 			"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue",
-			"^uni-(.*)":"@dcloudio/uniui/lib/uni-$1/uni-$1.vue"
+			"^uni-(.*)": "@dcloudio/uniui/lib/uni-$1/uni-$1.vue"
 		}
-		
+
 	},
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"onReachBottomDistance":20
+				"onReachBottomDistance": 20
 			}
 		},
 		{
@@ -45,7 +45,9 @@
 		{
 			"path": "pages/conversation/conversationWindow",
 			"style": {
-				"navigationBarTitleText": "会话窗口"
+				"navigationBarTitleText": "会话窗口",
+				"enablePullDownRefresh": true, //设置为true表示当前页面开启下拉刷新
+				"backgroundTextStyle": "dark" //下拉 loading 的样式,仅支持 dark/light
 			}
 		},
 		//通话记录
@@ -61,7 +63,7 @@
 			"path": "pages/zixun/zixun",
 			"style": {
 				"navigationBarTitleText": "患者咨询",
-				"onReachBottomDistance":20
+				"onReachBottomDistance": 20
 				// "navigationBarTitleText": "门诊预约",
 				// "navigationBarTitleText": "门诊历史"
 			}
@@ -76,13 +78,13 @@
 		},
 		/*********************门诊预约*********************/
 		//门诊预约 门诊历史   
-		 {
+		{
 			"path": "pages/menzhen/menzhen",
 			"style": {
 				"navigationBarTitleText": "门诊预约",
-				"onReachBottomDistance":20
+				"onReachBottomDistance": 20
 			}
-		 },
+		},
 		//门诊预约详情   
 		{
 			"path": "pages/menzhen/menzhenxq",
@@ -128,7 +130,7 @@
 			"path": "pages/opinion/opinion",
 			"style": {
 				"navigationBarTitleText": "意见管理",
-				"onReachBottomDistance":20
+				"onReachBottomDistance": 20
 			}
 		},
 		//意见详情opiniondetails

+ 10 - 8
pages/conversation/conversation.vue

xqd xqd xqd
@@ -10,15 +10,15 @@
 		<view class="cu-list menu-avatar margin-top-xs" v-if="qiehuan">
 			<view class="cu-item u-border-bottom" v-for="(item,index) in list" :key="index" @click="goliaotian(index)">
 				<view class="cu-avatar radius lg" :style="'background-image:url('+item.avatar+');'">
-					<view class="cu-tag badge">10</view>
+					<view class="cu-tag badge"></view>
 				</view>
 				<view class="content">
 					<view class="text-grey">
 						<text class="text-cut">{{item.nickname}}</text>
-						<view class="cu-tag round bg-orange sm">{{item.remark}}</view>
 					</view>
 					<view class="text-gray text-sm flex">
-						<text class="text-cut">信息发送者:最近一条消息</text>
+						<!-- 信息发送者:最近一条消息 -->
+						<text class="text-cut"></text>
 					</view>
 				</view>
 				<view class="action">
@@ -31,12 +31,14 @@
 		<view class="cu-list menu-avatar margin-top-xs" v-else @click="call">
 			<view class="cu-item u-border-bottom" v-for="(item,index) in listPhone" :key="index" @click="call">
 				<view class="cu-avatar radius lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Taric.png);border-radius: 50%;">
-					<view class="cu-tag badge">10</view>
+					<view class="cu-tag badge"></view>
 				</view>
 				<view class="content">
 					<view class="text-grey">
-						<text class="text-cut">用户昵称</text>
-						<view class="cu-tag round bg-orange sm">备注</view>
+						<!-- 用户昵称 -->
+						<text class="text-cut"></text>
+						<!-- 备注 -->
+						<view class="cu-tag round bg-orange sm"></view>
 					</view>
 				</view>
 			</view>
@@ -96,8 +98,8 @@
 				qiehuan: true,
 				index:0,
 				keyword: "",
-				list:[],
-				listPhone:[],
+				list:[{},{}],
+				listPhone:[{},{}],
 			}
 		},
 		methods: {

+ 2 - 1
pages/conversation/conversationWindow.vue

xqd xqd
@@ -63,7 +63,7 @@
 		components: {
 			GoEasyAudioPlayer
 		},
-		onLoad(op) {
+		onLoad :function(op) {
 			if(op.type==2){
 				this.sures=false;
 			}
@@ -90,6 +90,7 @@
 			if (this.messages.length != 0) {
 				this.imService.markPrivateMessageAsRead(this.friend.uuid);
 			}
+			 this.loadMoreHistoryMessage();
 
 		},
 		mounted() {

+ 3 - 2
pages/index/index.vue

xqd xqd
@@ -228,7 +228,7 @@
 					service_persons: "0"
 				},
 				page: 1,
-				doctorlabel:[{lable:'最多六个中文'},{lable:'和十二个英文'},{lable:'aaaaaaaaaaaa'},{lable:'只显示四个'},{lable:'不显示'}],
+				doctorlabel:[],
 				docterMessageList: [],
 				//认证弹窗
 				rzModal: false,
@@ -301,7 +301,8 @@
 				this.src = res.data.avatar;
 				this.docterInfo.eva_num = res.data.eva_num;
 				this.docterInfo.is_then = res.data.is_then;
-				this.lable1 = res.data.label;
+				console.log(res.data)
+				this.doctorlabel = res.data.label;
 				this.docterInfo.sign = res.data.sign;
 				this.docterInfo.score = res.data.score;
 				this.docterInfo.service_days = res.data.service_days;

+ 2 - 30
pages/menzhen/menzhen.vue

xqd xqd
@@ -67,7 +67,7 @@
 			</view>
 		</view>
 	<view style="width: 100%;height: 100rpx;"></view>
-	<u-empty text="暂无数据" :show="list.length>0?false:true" mode="order" margin-top="250"></u-empty>
+	<u-empty text="暂无数据"  mode="order" margin-top="250" v-if="list.length<=0"></u-empty>
 	</view>
 </template>
 
@@ -112,35 +112,7 @@
 						value: 1,
 					},
 				],
-				list: [{
-					zt: 0, //状态
-					name: '张三',
-					age: '一岁零2个月',
-					order: 'ZX202000010',
-					time: '2020年10月28日17:11:10',
-					appointment: '2020年10月29日16:05:59'
-				}, {
-					zt: 1, //状态
-					name: '张三',
-					age: '一岁零2个月',
-					order: 'ZX202000010',
-					time: '2020年10月28日17:11:10',
-					appointment: '2020年10月29日16:05:59'
-				}, {
-					zt: 0, //状态 
-					name: '张三',
-					age: '一岁零2个月',
-					order: 'ZX202000010',
-					time: '2020年10月28日17:11:10',
-					appointment: '2020年10月29日16:05:59'
-				}, {
-					zt: 1, //状态
-					name: '张三',
-					age: '一岁零2个月',
-					order: 'ZX202000010',
-					time: '2020年10月28日17:11:10',
-					appointment: '2020年10月29日16:05:59'
-				}],
+				list: [],
 				num:1
 			}
 		},

+ 5 - 5
pages/menzhen/menzhenxq.vue

xqd
@@ -129,13 +129,13 @@
 				orderID: 'ZX202000010', //订单号
 
 				//中部数据
-				name: '张一', //名字
-				age: '一岁零2个月', //年龄
-				ID: '513021198904041789', //身份证
-				appointment:'2020年10月29日16:34:34',
+				name: '', //名字
+				age: '', //年龄
+				ID: '', //身份证
+				appointment:'',
 				//下部数据
 				placeTime: '', //下单时间
-				xiadankh: '张大', //下单客户
+				xiadankh: '', //下单客户
 				zt: 0, // 状态 0未履行 1已完成
 				local:'',
 				

+ 6 - 2
pages/opinion/opinion.vue

xqd xqd
@@ -76,13 +76,15 @@
 			timeSort(e){
 				this.sort = !this.sort
 				this.list = []
-				 
-				//调用接口 页数 类型 状态
+				this.$nextTick(function(){
+					//调用接口 页数 类型 状态
 				if(this.sort){//正序
 					this.getList(1)
 				}else{//倒序
 					this.getList(2)
 				}
+				})
+				
 				
 			},
 			next(e){
@@ -97,7 +99,9 @@
 			getList:async function(orderby=0){
 				let obj = {"curPage":1,'pageSize':10,'orders':orderby};
 				let that = this;
+				console.log("obj",obj)
 				let res = await that.$request.post('suggest/suggestList',obj);
+				console.log("res",res)
 				if(res.status==0 && res.data!=''){
 					let data = res.data;
 					console.log('我是data',data); 

+ 27 - 6
pages/scheduling/month_Scheduling.vue

xqd xqd xqd xqd xqd
@@ -188,10 +188,14 @@
 			}
 		},
 		methods: {
-			close:async function(){
+			close:async function(){
+				console.log(1111)
+				
+				
 			 this.popupShow=false;
 			 let SaveLists=[];
-			 let SaveDate = this.saveDay;
+			 let SaveDate = this.saveDay;
+			 console.log(1111)
 			 if(this.saveDay!=0){
 				 if(this.hospitalID!=0){
 					 if(SaveDate.mon==this.hospitalID){
@@ -211,7 +215,8 @@
 							 'type':s,
 							 'organization_id':this.hospitalID,
 						 }
-						 console.log(tj);
+						 console.log(tj);
+						 console.log(1111)
 						 // if(typeof tj=='object'){
 							//  tj = JSON.stringify(tj);
 						 // }
@@ -241,7 +246,19 @@
 					let newList=[];
 					if(data.length==0){
 						uni.showModal({
-							title:'请先认证医院'
+							title:'请先认证医院',
+							success: function(res) {
+								if (res.confirm) {
+									uni.redirectTo({
+										url:"/pages/login/doctorRenzheng"
+									})
+								}else {
+									uni.navigateBack({
+										delta:1
+									})
+								}
+								
+							}
 						})
 					}else{
 						for(let i=0;i<data.length;i++){
@@ -256,7 +273,11 @@
 					this.getListTime(this.hospitalList[0].value)
 					this.hospital = this.hospitalList[0].label
 					this.hospitalID = this.hospitalList[0].value+""
-					
+					for(let x = 0; x < this.monthList.length-this.empty; x++){
+						this.monthList[x+this.empty].mon = this.schedulingList[x].mon=="0"?0:this.schedulingList[x].mon==this.hospitalID?1:2 
+						this.monthList[x+this.empty].aft = this.schedulingList[x].aft=="0"?0:this.schedulingList[x].aft==this.hospitalID?1:2 
+						this.monthList[x+this.empty].nig = this.schedulingList[x].nig=="0"?0:this.schedulingList[x].nig==this.hospitalID?1:2 
+					}
 				}
 			},
 			
@@ -479,7 +500,7 @@
 							}
 							break;
 					}
-					this.$forceUpdate();
+					// this.$forceUpdate();
 				}else{
 					console.log('到我了!');
 				}

+ 60 - 59
pages/scheduling/week_Scheduling.vue

xqd xqd xqd xqd xqd xqd
@@ -34,11 +34,10 @@
 				 shape="circle" @click="modify(3,index)" throttleTime="1000">晚上</u-button>
 			</view>
 		</view>
-		
+
 		<!-- 提交 -->
 		<view class="flex justify-center" style="margin-top: 40rpx;">
-			<u-button size="medium"
-			 shape="circle" @click="submit">确认提交</u-button>
+			<u-button size="medium" shape="circle" @click="submit">确认提交</u-button>
 		</view>
 	</view>
 </template>
@@ -50,7 +49,7 @@
 				this.getHostail()
 				this.getWeek();
 			})
-	
+
 		},
 		data() {
 			return {
@@ -62,17 +61,17 @@
 
 				weekTitlelist: [{
 					text: '周一'
-					}, {
+				}, {
 					text: '周二'
-					}, {
+				}, {
 					text: '周三'
-					}, {
+				}, {
 					text: '周四'
-					}, {
+				}, {
 					text: '周五'
-					}, {
+				}, {
 					text: '周六'
-					}, {
+				}, {
 					text: '周日'
 				}, ],
 				weekList: [{
@@ -155,21 +154,21 @@
 			}
 		},
 		methods: {
-			
-			getHostail:async function(){
-				let res=await this.$request.post("doctor/organizationList");
-				if(res.status==0){
-					let data=res.data;
-					let newList=[];
-					if(data.length==0){
+
+			getHostail: async function() {
+				let res = await this.$request.post("doctor/organizationList");
+				if (res.status == 0) {
+					let data = res.data;
+					let newList = [];
+					if (data.length == 0) {
 						uni.showModal({
-							title:'请先认证医院'
+							title: '请先认证医院'
 						})
-					}else{
-						for(let i=0;i<data.length;i++){
+					} else {
+						for (let i = 0; i < data.length; i++) {
 							newList.push({
-								value:data[i].value,
-								label:data[i].label,
+								value: data[i].value,
+								label: data[i].label,
 							})
 						}
 					}
@@ -178,38 +177,38 @@
 					this.hospitalID = this.hospitalList[0].value + ""
 				}
 			},
-			
-			getWeek:async function(){
+
+			getWeek: async function() {
 				let res = await this.$request.post("doctor/getLinsDetailnew");
-				console.log('res',res);
+				console.log('res', res);
 				let weekList = this.weekTitlelist;
-				if(res.status==0){
-					let newList=[];
-					let data=res.data.list;
-					if(data.length==0){
-						for(let y=0;y<7;y++){
+				if (res.status == 0) {
+					let newList = [];
+					let data = res.data.list;
+					if (data.length == 0) {
+						for (let y = 0; y < 7; y++) {
 							newList.push({
-								mon:0,
-								aft:0,
-								nig:0
+								mon: 0,
+								aft: 0,
+								nig: 0
 							})
 						}
-					}else{
-						for(let y=0;y<7;y++){
-								for(let i=0;i<data.length;i++){
-									if(weekList[y].text==data[i].week){
-										newList.push({
-											mon:data[i].ident.zao_id,
-											aft:data[i].ident.xia_id,
-											nig:data[i].ident.wan_id,
-										})
-									}
+					} else {
+						for (let y = 0; y < 7; y++) {
+							for (let i = 0; i < data.length; i++) {
+								if (weekList[y].text == data[i].week) {
+									this.weekList[y].mon = data[i].ident.zao_id
+									this.weekList[y].aft = data[i].ident.xia_id
+									this.weekList[y].nig = data[i].ident.wan_id
+									// mon:data[i].ident.zao_id,
+									// aft:data[i].ident.xia_id,
+									// nig:data[i].ident.wan_id,
+								}
 							}
-							
 						}
 					}
-					this.weekList=newList;
-						
+					// this.weekList = newList;
+
 				}
 			},
 			/**
@@ -250,30 +249,32 @@
 				console.log(this.weekList)
 				this.$forceUpdate();
 			},
-			submit:async function(){
-				let newData=[];
-				let list=this.weekList;
-				for(let i=0;i<list.length;i++){
+			submit: async function() {
+				let newData = [];
+				let list = this.weekList;
+				for (let i = 0; i < list.length; i++) {
 					newData.push({
-						week:i+1,
-						identifi:{
-							zao:list[i].mon,
-							zhong:list[i].aft,
-							wan:list[i].nig,
+						week: i + 1,
+						identifi: {
+							zao: list[i].mon,
+							zhong: list[i].aft,
+							wan: list[i].nig,
 						}
 					})
 				}
-				if(typeof newData=='object'){
+				if (typeof newData == 'object') {
 					newData = JSON.stringify(newData);
 				}
-				let res = await this.$request.post("doctor/week_scheduling",{'data':newData});
+				let res = await this.$request.post("doctor/week_scheduling", {
+					'data': newData
+				});
 				if (res.status == 0) {
 					uni.showToast({
 						duration: 2000,
 						title: '排班成功',
 						success() {
-							uni.switchTab({
-								url: '/pages/index/index'
+							uni.navigateBack({
+								delta:1
 							})
 						}
 					})

+ 148 - 294
pages/service/more.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -11,7 +11,8 @@
 		<!-- 服务时间选择 -->
 		<u-select v-model="serviceShow" :list="serviceTimelist" @confirm="selectService"></u-select>
 		<!-- 医院选择 -->
-		<u-select v-model="hospitalShow" :list="form.is_appoint.hospitalList" @confirm="selectHospital" label-name="name" value-name="id"></u-select>
+		<u-select v-model="hospitalShow" :list="form.is_appoint.hospitalList" @confirm="selectHospital" label-name="name"
+		 value-name="id"></u-select>
 
 		<!-- 电话咨询 -->
 		<view class="v" v-show="showList[0].flag&&(SubsectionList[curNow].name=='电话咨询')">
@@ -197,7 +198,8 @@
 					</view>
 					<!-- 右 -->
 					<view class="right">
-						<u-input v-model="form.is_appoint.hospitalList[hospitalcurrent].appoint_price" type="digit" :border="true" placeholder="请输入金额" />
+						<u-input v-model="form.is_appoint.hospitalList[hospitalcurrent].appoint_price" type="digit" :border="true"
+						 placeholder="请输入金额" />
 					</view>
 				</view>
 				<!-- 服务时间 -->
@@ -274,7 +276,8 @@
 					</view>
 					<!-- 右 -->
 					<view class="right">
-						<u-input v-model="form.is_appoint.hospitalList[hospitalcurrent].service_num" type="digit" :border="true" placeholder="请输入人次" />
+						<u-input v-model="form.is_appoint.hospitalList[hospitalcurrent].service_num" type="digit" :border="true"
+						 placeholder="请输入人次" />
 					</view>
 				</view>
 				<!-- 预约天数 -->
@@ -286,14 +289,15 @@
 					</view>
 					<!-- 右 -->
 					<view class="right">
-						<u-input v-model="form.is_appoint.hospitalList[hospitalcurrent].show_days" type="digit" :border="true" placeholder="请输入人次" />
+						<u-input v-model="form.is_appoint.hospitalList[hospitalcurrent].show_days" type="digit" :border="true"
+						 placeholder="请输入人次" />
 					</view>
 				</view>
 			</view>
 			<view style="width: 100%;height: 60vh;display: flex;justify-content: center;align-items: center;" v-else>
 				<view style="width: 90%;">
 					<view style="width: 100%;text-align: center;margin-bottom: 40rpx;font-size: 40rpx;">请选择医院</view>
-					<u-button shape="circle" type="primary" @click="hospitalShow = true">请选择医院</u-button>
+					<u-button shape="circle" type="primary" @click="xzyy">请选择医院</u-button>
 				</view>
 			</view>
 		</view>
@@ -303,7 +307,7 @@
 		<view style="padding: 20rpx 26rpx 200rpx 26rpx;background-color: #f3f3f3;color:#C0C0C0" v-show="showList[2].flag&&(SubsectionList[curNow].name=='门诊预约')">
 			提示:就诊人信息用于平台审核和医疗业务使用,不会外传。请正却确填写就诊人信息,如需修改身份信息可电话联系客服修改(13330431369)
 		</view>
-		<view class="bottomButton" @click="bc">保存</view>
+		<view class="bottomButton" @click="pd">保存</view>
 	</view>
 </template>
 
@@ -314,6 +318,9 @@
 			this.$nextTick(function() {
 				this.addTime()
 			})
+			console.log(this.form.is_appoint.hospitalList.length)
+			
+			
 
 		},
 		mounted() {
@@ -794,7 +801,7 @@
 				/********************保存的数据****************************/
 				form: {
 					is_phone: { //电话
-						base_price: "20", //基础价格
+						base_price: "", //基础价格
 						mor_time: "", //上午服务时间
 						aft_time: "", //上午服务时间
 						nig_time: "", //晚上服务时间
@@ -802,7 +809,7 @@
 						type: "1"
 					},
 					is_chat: { //图文
-						base_price: "20", //基础价格
+						base_price: "", //基础价格
 						step_price: "", //步进价格
 						mor_time: "", //上午服务时间
 						aft_time: "", //上午服务时间
@@ -812,95 +819,7 @@
 					},
 					is_appoint: { //门诊
 						type: "3",
-						hospitalList: [{
-								id: 50, //医院Id
-								name:"测试1",
-								show_days: 0, //可预约天数
-								service_times: 0, //就诊时长
-								appoint_price: "52.00", //基础价格
-								service_num:0,
-								service_time: {
-									mon: {
-										"amStartTime": "08:00", //上午服务时间
-										"amEndTime": "12:00",
-										"amPerson": 3 //上午可预约号源
-									},
-									aft: {
-										"pmStartTime": "14:00", //下午服务时间
-										"pmEndTime": "18:00",
-										"pmPerson": 5 //下午可预约号源
-									},
-									nig: {
-										"nightStartTime": "18:00", //晚上服务时间
-										"nightEndTime": "23:00",
-										"nightPerson": 4 //晚上可预约号源
-									}
-								},
-
-								// label: "",
-								// name: "测试医院6",
-								// base_price: "20", //基础价格
-								// mor_time: "", //上午服务时间
-								// mor_num: 0, //上午可预约号源
-								// aft_time: "", //下午服务时间
-								// aft_num: 0, //下午可预约号源
-								// nig_time: "", //晚上服务时间
-								// nig_num: 0, //晚上可预约号源
-								// see_doc_time: "", //就诊时长
-								// service_order: 0, //同时服务订单数
-								// appointment: 0, //可预约天数
-							},
-							{
-								id: 1, //医院Id
-								name:"测试2",
-								show_days: 0, //可预约天数
-								service_times: 0, //就诊时长
-								appoint_price: "52.00", //基础价格
-								service_num:0,
-								service_time: {
-									mon: {
-										"amStartTime": "08:00", //上午服务时间
-										"amEndTime": "12:00",
-										"amPerson": 3 //上午可预约号源
-									},
-									aft: {
-										"pmStartTime": "14:00", //下午服务时间
-										"pmEndTime": "18:00",
-										"pmPerson": 5 //下午可预约号源
-									},
-									nig: {
-										"nightStartTime": "18:00", //晚上服务时间
-										"nightEndTime": "23:00",
-										"nightPerson": 4 //晚上可预约号源
-									}
-								},
-							},
-							{
-								id: 3, //医院Id
-								name:"测试5",
-								show_days: 0, //可预约天数
-								service_times: 0, //就诊时长
-								appoint_price: "52.00", //基础价格
-								service_num:0,
-								service_time: {
-									mon: {
-										"amStartTime": "08:00", //上午服务时间
-										"amEndTime": "12:00",
-										"amPerson": 3 //上午可预约号源
-									},
-									aft: {
-										"pmStartTime": "14:00", //下午服务时间
-										"pmEndTime": "18:00",
-										"pmPerson": 5 //下午可预约号源
-									},
-									nig: {
-										"nightStartTime": "18:00", //晚上服务时间
-										"nightEndTime": "23:00",
-										"nightPerson": 4 //晚上可预约号源
-									}
-								},
-							},
-						],
+						hospitalList: [],
 					},
 				}
 
@@ -1082,13 +1001,16 @@
 				console.log("晚上时间", this.nightSlot)
 				this.form.is_appoint.hospitalList[this.hospitalcurrent].service_times = e[0].label
 				if (this.morningSlot != 0) {
-					this.form.is_appoint.hospitalList[this.hospitalcurrent].service_time.mon.amPerson = parseInt(this.morningSlot / e[0].label)
+					this.form.is_appoint.hospitalList[this.hospitalcurrent].service_time.mon.amPerson = parseInt(this.morningSlot / e[
+						0].label)
 				}
 				if (this.afternoonSlot != 0) {
-					this.form.is_appoint.hospitalList[this.hospitalcurrent].service_time.aft.pmPerson = parseInt(this.afternoonSlot / e[0].label)
+					this.form.is_appoint.hospitalList[this.hospitalcurrent].service_time.aft.pmPerson = parseInt(this.afternoonSlot /
+						e[0].label)
 				}
 				if (this.nightSlot != 0) {
-					this.form.is_appoint.hospitalList[this.hospitalcurrent].service_time.nig.nightPerson = parseInt(this.nightSlot / e[0].label)
+					this.form.is_appoint.hospitalList[this.hospitalcurrent].service_time.nig.nightPerson = parseInt(this.nightSlot / e[
+						0].label)
 				}
 			},
 
@@ -1097,12 +1019,12 @@
 			 */
 			selectHospital(e) {
 
-				for(let a = 0;a<this.form.is_appoint.hospitalList.length;a++){
-					if(e[0].value == this.form.is_appoint.hospitalList[a].id){
+				for (let a = 0; a < this.form.is_appoint.hospitalList.length; a++) {
+					if (e[0].value == this.form.is_appoint.hospitalList[a].id) {
 						this.hospitalcurrent = a
 					}
 				}
-				
+
 				console.log(this.hospitalcurrent)
 
 				//清空暂存数据
@@ -1116,164 +1038,72 @@
 				this.curNow = index;
 			},
 			/*    保存       */
-			bc: async function(e) {
+			// 提示一下
+			pd() {
+				let that = this
+				uni.showModal({
+						title: "请确定信息填写完整,否则无法保存",
+						success: function(res) {
+							if (res.confirm) {
+								that.bc()
+							}
+						}
+				});
+			},
+
+
+			bc: async function() {
 				let that = this;
-				/**
-				 * 电话
-				 * */
-				// that.form.is_phone.service_time = '';
-				// that.form.is_chat.service_time = '';
-				// that.form.is_appoint.hospitals[0].service_time = '';
-				// that.form.is_appoint.hospitals[1].service_time = '';
-				// for (let i in that.dh.timeList1) { //遍历选中 保存id
-				// 	if (that.dh.timeList1[i].checked) {
-				// 		that.form.is_phone.service_time = that.form.is_phone.service_time + "," + that.dh.timeList1[i].id
-				// 	}
-				// }
-				// for (let i in that.dh.timeList2) { //遍历选中 保存id
-				// 	if (that.dh.timeList2[i].checked) {
-				// 		that.form.is_phone.service_time = that.form.is_phone.service_time + "," + that.dh.timeList2[i].id
-				// 	}
-				// }
-				// for (let i in that.dh.timeList3) { //遍历选中 保存id
-				// 	if (that.dh.timeList3[i].checked) {
-				// 		that.form.is_phone.service_time = that.form.is_phone.service_time + "," + that.dh.timeList3[i].id
-				// 	}
-				// }
-				// //判断开头第一个是否为逗号,是就删除逗号
-				// if (that.form.is_phone.service_time.startsWith(",")) {
-				// 	that.form.is_phone.service_time = that.form.is_phone.service_time.substr(1);
-				// }
-				// /**
-				//  * 图文
-				//  * */
-
-				// for (let i in that.tw.timeList1) { //遍历选中 保存id
-				// 	if (that.tw.timeList1[i].checked) {
-				// 		that.form.is_chat.service_time = that.form.is_chat.service_time + "," + that.tw.timeList1[i].id
-				// 	}
-				// }
-				// for (let i in that.tw.timeList2) { //遍历选中 保存id
-				// 	if (that.tw.timeList2[i].checked) {
-				// 		that.form.is_chat.service_time = that.form.is_chat.service_time + "," + that.tw.timeList2[i].id
-				// 	}
-				// }
-				// for (let i in that.tw.timeList3) { //遍历选中 保存id
-				// 	if (that.tw.timeList3[i].checked) {
-				// 		that.form.is_chat.service_time = that.form.is_chat.service_time + "," + that.tw.timeList3[i].id
-				// 	}
-				// }
-				// //判断开头第一个是否为逗号,是就删除逗号
-				// if (that.form.is_chat.service_time.startsWith(",")) {
-
-				// 	that.form.is_chat.service_time = that.form.is_chat.service_time.substr(1);
-				// }
-				// /**
-				//  * 门诊
-				//  * */
-				// for (let i in that.mz1.timeList1) { //遍历选中 保存id
-				// 	if (that.mz1.timeList1[i].checked) {
-				// 		that.form.is_appoint.hospitals[0].service_time = that.form.is_appoint.hospitals[0].service_time + "," + that.mz1
-				// 			.timeList1[i].id
-				// 	}
-				// }
-				// for (let i in that.mz1.timeList2) { //遍历选中 保存id
-				// 	if (that.mz1.timeList2[i].checked) {
-				// 		that.form.is_appoint.hospitals[0].service_time = that.form.is_appoint.hospitals[0].service_time + "," + that.mz1
-				// 			.timeList2[i].id
-				// 	}
-				// }
-				// for (let i in that.mz1.timeList3) { //遍历选中 保存id
-				// 	if (that.mz1.timeList3[i].checked) {
-				// 		that.form.is_appoint.hospitals[0].service_time = that.form.is_appoint.hospitals[0].service_time + "," + that.mz1
-				// 			.timeList3[i].id
-				// 	}
-				// }
-				// //判断开头第一个是否为逗号,是就删除逗号
-				// if (that.form.is_appoint.hospitals[0].service_time.startsWith(",")) {
-
-				// 	that.form.is_appoint.hospitals[0].service_time = that.form.is_appoint.hospitals[0].service_time.substr(1);
-				// }
-				// /**
-				//  * 门诊
-				//  * */
-				// for (let i in that.mz2.timeList1) { //遍历选中 保存id
-				// 	if (that.mz2.timeList1[i].checked) {
-				// 		that.form.is_appoint.hospitals[1].service_time = that.form.is_appoint.hospitals[1].service_time + "," + that.mz2
-				// 			.timeList1[i].id
-				// 	}
-				// }
-				// for (let i in that.mz2.timeList2) { //遍历选中 保存id
-				// 	if (that.mz2.timeList2[i].checked) {
-				// 		that.form.is_appoint.hospitals[1].service_time = that.form.is_appoint.hospitals[1].service_time + "," + that.mz2
-				// 			.timeList2[i].id
-				// 	}
-				// }
-				// for (let i in that.mz2.timeList3) { //遍历选中 保存id
-				// 	if (that.mz2.timeList3[i].checked) {
-				// 		that.form.is_appoint.hospitals[1].service_time = that.form.is_appoint.hospitals[1].service_time + "," + that.mz2
-				// 			.timeList3[i].id
-				// 	}
-				// }
-				// //判断开头第一个是否为逗号,是就删除逗号
-				// if (that.form.is_appoint.hospitals[1].service_time.startsWith(",")) {
-				// 	that.form.is_appoint.hospitals[1].service_time = that.form.is_appoint.hospitals[1].service_time.substr(1);
-				// }
-
-
-
-				var forms = JSON.parse(JSON.stringify(that.form));
-				let phone_am = forms.is_phone.mor_time!=''?forms.is_phone.mor_time.split(' - '):'';
-				let phone_pm = forms.is_phone.aft_time!=''?forms.is_phone.aft_time.split(' - '):'';
-			    let phone_ni = forms.is_phone.nig_time!=''?forms.is_phone.nig_time.split(' - '):'';  
-				forms.is_phone.amStartTime = phone_am!=''?phone_am[0]:'';
-				forms.is_phone.amEndTime = phone_am!=''?phone_am[1]:'';
-				forms.is_phone.pmStartTime = phone_pm!=''?phone_pm[0]:'';
-				forms.is_phone.pmEndTime = phone_pm!=''?phone_pm[1]:'';
-				forms.is_phone.nightStartTime = phone_ni!=''?phone_ni[0]:'';
-				forms.is_phone.nightEndTime = phone_ni!=''?phone_ni[1]:'';
-				
-				
-				let chat_am = forms.is_chat.mor_time!=''?forms.is_chat.mor_time.split(' - '):'';
-				let chat_pm = forms.is_chat.aft_time!=''?forms.is_chat.aft_time.split(' - '):'';
-				let chat_ni = forms.is_chat.nig_time!=''?forms.is_chat.nig_time.split(' - '):'';  
-				forms.is_chat.amStartTime = chat_am!=''?chat_am[0]:'';
-				forms.is_chat.amEndTime = chat_am!=''?chat_am[1]:'';
-				forms.is_chat.pmStartTime = chat_pm!=''?chat_pm[0]:'';
-				forms.is_chat.pmEndTime = chat_pm!=''?chat_pm[1]:'';
-				forms.is_chat.nightStartTime = chat_ni!=''?chat_ni[0]:'';
-				forms.is_chat.nightEndTime = chat_ni!=''?chat_ni[1]:'';
-				
-				let newMenList=[];
-				for(let i=0;i<forms.is_appoint.hospitalList.length;i++){
-					newMenList.push(
-					 { 
-						"base_price":forms.is_appoint.hospitalList[i].appoint_price,
-						"service_times":forms.is_appoint.hospitalList[i].service_times,
-						"service_num":forms.is_appoint.hospitalList[i].service_num,
-						"amStartTime":forms.is_appoint.hospitalList[i].service_time.mon.amStartTime,
-						"amEndTime":forms.is_appoint.hospitalList[i].service_time.mon.amEndTime,
-						"amPerson":forms.is_appoint.hospitalList[i].service_time.mon.amPerson,
-						"pmStartTime":forms.is_appoint.hospitalList[i].service_time.aft.pmStartTime,
-						"pmEndTime":forms.is_appoint.hospitalList[i].service_time.aft.pmEndTime,
-						"pmPerson":forms.is_appoint.hospitalList[i].service_time.aft.pmPerson,
-						"nightStartTime":forms.is_appoint.hospitalList[i].service_time.nig.nightStartTime,
-						"nightEndTime":forms.is_appoint.hospitalList[i].service_time.nig.nightEndTime,
-						"nightPerson":forms.is_appoint.hospitalList[i].service_time.nig.nightPerson,
-						"show_days":forms.is_appoint.hospitalList[i].show_days,
-						"org_id":forms.is_appoint.hospitalList[i].id,
-					 }
-					)
-				}
-				forms.is_appoint=newMenList;
+				var forms = JSON.parse(JSON.stringify(that.form));
+				let phone_am = forms.is_phone.mor_time != '' ? forms.is_phone.mor_time.split(' - ') : '';
+				let phone_pm = forms.is_phone.aft_time != '' ? forms.is_phone.aft_time.split(' - ') : '';
+				let phone_ni = forms.is_phone.nig_time != '' ? forms.is_phone.nig_time.split(' - ') : '';
+				forms.is_phone.amStartTime = phone_am != '' ? phone_am[0] : '';
+				forms.is_phone.amEndTime = phone_am != '' ? phone_am[1] : '';
+				forms.is_phone.pmStartTime = phone_pm != '' ? phone_pm[0] : '';
+				forms.is_phone.pmEndTime = phone_pm != '' ? phone_pm[1] : '';
+				forms.is_phone.nightStartTime = phone_ni != '' ? phone_ni[0] : '';
+				forms.is_phone.nightEndTime = phone_ni != '' ? phone_ni[1] : '';
+
+
+				let chat_am = forms.is_chat.mor_time != '' ? forms.is_chat.mor_time.split(' - ') : '';
+				let chat_pm = forms.is_chat.aft_time != '' ? forms.is_chat.aft_time.split(' - ') : '';
+				let chat_ni = forms.is_chat.nig_time != '' ? forms.is_chat.nig_time.split(' - ') : '';
+				forms.is_chat.amStartTime = chat_am != '' ? chat_am[0] : '';
+				forms.is_chat.amEndTime = chat_am != '' ? chat_am[1] : '';
+				forms.is_chat.pmStartTime = chat_pm != '' ? chat_pm[0] : '';
+				forms.is_chat.pmEndTime = chat_pm != '' ? chat_pm[1] : '';
+				forms.is_chat.nightStartTime = chat_ni != '' ? chat_ni[0] : '';
+				forms.is_chat.nightEndTime = chat_ni != '' ? chat_ni[1] : '';
+
+				let newMenList = [];
+				for (let i = 0; i < forms.is_appoint.hospitalList.length; i++) {
+					newMenList.push({
+						"base_price": forms.is_appoint.hospitalList[i].appoint_price,
+						"service_times": forms.is_appoint.hospitalList[i].service_times,
+						"service_num": forms.is_appoint.hospitalList[i].service_num,
+						"amStartTime": forms.is_appoint.hospitalList[i].service_time.mon.amStartTime,
+						"amEndTime": forms.is_appoint.hospitalList[i].service_time.mon.amEndTime,
+						"amPerson": forms.is_appoint.hospitalList[i].service_time.mon.amPerson,
+						"pmStartTime": forms.is_appoint.hospitalList[i].service_time.aft.pmStartTime,
+						"pmEndTime": forms.is_appoint.hospitalList[i].service_time.aft.pmEndTime,
+						"pmPerson": forms.is_appoint.hospitalList[i].service_time.aft.pmPerson,
+						"nightStartTime": forms.is_appoint.hospitalList[i].service_time.nig.nightStartTime,
+						"nightEndTime": forms.is_appoint.hospitalList[i].service_time.nig.nightEndTime,
+						"nightPerson": forms.is_appoint.hospitalList[i].service_time.nig.nightPerson,
+						"show_days": forms.is_appoint.hospitalList[i].show_days,
+						"org_id": forms.is_appoint.hospitalList[i].id,
+					})
+				}
+				forms.is_appoint = newMenList;
 				if (typeof forms != 'string') {
 					forms = JSON.stringify(forms)
 				}
 				let res = await that.$request.post('doctor/saveSettingList', {
 					data: forms,
 					type: 2
-				});
-				
+				});
+
 				if (res.status == 0) {
 					uni.showToast({
 						icon: 'none',
@@ -1283,12 +1113,12 @@
 					})
 				}
 				console.log('res对象:', res);
-				// 延迟2
-				setTimeout(function() {
-					uni.switchTab({
-						url: '../index/index'
-					})
-				}, 2000);
+				// 延迟1
+				// setTimeout(function() {
+				// 	uni.switchTab({
+				// 		url: '../index/index'
+				// 	})
+				// }, 1000);
 
 			},
 			/**
@@ -1337,46 +1167,52 @@
 						this.form.is_chat.step_price = res.data.list.chat.step_price;
 						this.form.is_chat.person = res.data.list.chat.person;
 
-						this.form.is_chat.mor_time = res.data.list.chat.service_time[1] != undefined ? res.data.list.chat.service_time[1]
+						this.form.is_chat.mor_time = res.data.list.chat.service_time[1] != undefined ? res.data.list.chat.service_time[
+								1]
 							.amStartTime + ' - ' + res.data.list.chat.service_time[1].amEndTime : '';
-						this.form.is_chat.aft_time = res.data.list.chat.service_time[2] != undefined ? res.data.list.chat.service_time[2]
+						this.form.is_chat.aft_time = res.data.list.chat.service_time[2] != undefined ? res.data.list.chat.service_time[
+								2]
 							.pmStartTime + ' - ' + res.data.list.chat.service_time[2].pmEndTime : '';
-						this.form.is_chat.nig_time = res.data.list.chat.service_time[3] != undefined ? res.data.list.chat.service_time[3]
+						this.form.is_chat.nig_time = res.data.list.chat.service_time[3] != undefined ? res.data.list.chat.service_time[
+								3]
 							.nightStartTime + ' - ' + res.data.list.chat.service_time[3].nightEndTime : '';
 
 					}
-					
-					if (res.data.list.men.length != 0) {
-						let dataList = res.data.list.men;
-						let lists = [];
-						for(let i=0;i<dataList.length;i++){
-							lists.push({
-								id: dataList[i].org_id, //医院Id
-								name:dataList[i].org_name,
-								show_days: dataList[i].show_days, //可预约天数
-								service_times: dataList[i].service_times, //就诊时长
-								appoint_price: dataList[i].appoint_price, //基础价格
-								service_num:dataList[i].service_num,
-								service_time: {
-									mon: {
-										"amStartTime": dataList[i].service_time[1].amStartTime, //上午服务时间
-										"amEndTime": dataList[i].service_time[1].amEndTime,
-										"amPerson": dataList[i].service_time[1].amPerson //上午可预约号源
-									},
-									aft: {
-										"pmStartTime": dataList[i].service_time[2].pmStartTime, //下午服务时间
-										"pmEndTime": dataList[i].service_time[2].pmEndTime,
-										"pmPerson": dataList[i].service_time[2].pmPerson, //下午可预约号源
-									},
-									nig: {
-										"nightStartTime": dataList[i].service_time[3].nightStartTime, //晚上服务时间
-										"nightEndTime": dataList[i].service_time[3].nightEndTime,
-										"nightPerson": dataList[i].service_time[3].nightPerson //晚上可预约号源
-									}
-								},	
-							})
-						}	
+
+					if (res.data.list.men.length != 0) {
+						let dataList = res.data.list.men;
+						let lists = [];
+						for (let i = 0; i < dataList.length; i++) {
+							lists.push({
+								id: dataList[i].org_id, //医院Id
+								name: dataList[i].org_name,
+								show_days: dataList[i].show_days, //可预约天数
+								service_times: dataList[i].service_times, //就诊时长
+								appoint_price: dataList[i].appoint_price, //基础价格
+								service_num: dataList[i].service_num,
+								service_time: {
+									mon: {
+										"amStartTime": dataList[i].service_time[1].amStartTime, //上午服务时间
+										"amEndTime": dataList[i].service_time[1].amEndTime,
+										"amPerson": dataList[i].service_time[1].amPerson //上午可预约号源
+									},
+									aft: {
+										"pmStartTime": dataList[i].service_time[2].pmStartTime, //下午服务时间
+										"pmEndTime": dataList[i].service_time[2].pmEndTime,
+										"pmPerson": dataList[i].service_time[2].pmPerson, //下午可预约号源
+									},
+									nig: {
+										"nightStartTime": dataList[i].service_time[3].nightStartTime, //晚上服务时间
+										"nightEndTime": dataList[i].service_time[3].nightEndTime,
+										"nightPerson": dataList[i].service_time[3].nightPerson //晚上可预约号源
+									}
+								},
+							})
+						}
 						this.form.is_appoint.hospitalList = lists;
+						if(this.form.is_appoint.hospitalList.length==1){
+							this.hospitalcurrent = 0
+						}
 					}
 					/* 渲染时间 */
 					//电话的时间
@@ -1560,6 +1396,24 @@
 			mzchange2(index) {
 				this.mzcurrent2 = index
 			},
+			xzyy(){
+				console.log(this.form.is_appoint.hospitalList.length)
+				console.log(this.form.is_appoint.hospitalList)
+				if(this.form.is_appoint.hospitalList.length != 0){
+					this.hospitalShow=true
+				}else{
+					uni.showModal({
+							title: "您还没有已认证的医院,确认去认证?",
+							success: function(res) {
+								if (res.confirm) {
+									uni.redirectTo({
+										url:"/pages/login/doctorRenzheng"
+									})
+								}
+							}
+					});
+				}
+			}
 
 		}
 	};

+ 2 - 2
pages/zixun/xiangqing.vue

xqd xqd
@@ -175,7 +175,7 @@
 		</view>
 
 
-		<!-- 当订单状态为未接单  zt==1 -->
+
 		<view class="bottomButton" v-else-if="zt ==4">
 			<!-- 左边的首页按钮 -->
 			<view style="width: 20%;" class="flex align-center justify-center">
@@ -183,7 +183,7 @@
 			</view>
 			<!-- 右边的其他按钮 -->
 			<view style="width: 80%;" class="flex justify-end align-center">
-				<view class="b">
+				<view class="b" v-if="zl == 2">
 					<u-button shape="circle" :custom-style="bStyle" @click="huihua">会话记录</u-button>
 				</view>
 				<view class="b">