提交修复备注等

pages/Scheduling.vue

@@ -314,7 +314,7 @@
 			},
 
 			cliold: async function(e) {
-
+				
 				let times = e[0].label;
 				times = times.split(" 至 ");
 				let startime = times[0];

pages/patient/patientxq.vue

@@ -315,11 +315,12 @@
 						'id': this.user_id,
 						'remak': this.inputbz
 					});
-					console.log("res.status", res.resolved)
+ 
 					if (res.status == 0) {
 						uni.showToast({
 							title: '设置成功！'
 						})
+						this.bz = this.inputbz
 						this.formshow = false
 					} else {
 						uni.showToast({

pages/service/setservice.vue

@@ -14,9 +14,10 @@
 			<view style="width: 20%;">{{item.zhonglei}}</view>
 			<!-- 开通状态 -->
 			<view style="width: 40%;">
-				<text v-if="item.Opening == 2" style="text-decoration: underline; color: #888888;" @click="this.tcShow=true,num=index" >未开通</text>
+				<text v-if="item.Opening == 0||item.Opening == false" style="text-decoration: underline; color: #888888;" @click="this.tcShow=true,num=index" >未开通</text>
 				<text v-if="item.Opening == 1" style="color: #888888;">申请中</text>
-				
+				<text v-if="item.Opening == 3" style="color: #888888;">已拒绝</text>
+		
 			</view>
 			<!-- 服务状态 -->
 			<view style="width: 20%;color: #999999;">
@@ -25,7 +26,7 @@
 			</view>
 			<!-- 控制器 -->
 			<view style="width: 15%;">
-			<u-switch v-model="item.state" :data-index="item.state" active-color="#84bb43" inactive-color="#eee" @change="openSave" :disabled="item.Opening"></u-switch>
+			<u-switch v-model="item.state" :data-index="item.state" active-color="#84bb43" inactive-color="#eee" @change="openSave" :disabled="item.disp"></u-switch>
 			</view>
 			
 		</view>
@@ -52,19 +53,22 @@
 				num:'',//点击的下标
 				//zhonglei咨询种类
 				//state服务开启状态 true为开 false为关
-				//Opening开通状态 0为开通 1为申请中 2为未开通
+				//Opening开通状态 0为开通 1为申请中 2为未开通  修改为2=已通过，3=已经拒绝
 				serbicelist: [{
 					zhonglei: '电话咨询',
 					state: false,
-					Opening: 0
+					Opening: 0,
+					disp:true,
 				}, {
 					zhonglei: '图文咨询',
 					state: false,
-					Opening: 0
+					Opening: 1,
+					disp:true,
 				}, {
 					zhonglei: '门诊预约',
 					state: false,
-					Opening: 0
+					Opening: 0,
+					disp:true,
 				}]
 			}
 		},
@@ -75,10 +79,37 @@
 			 */
 			getStatus:async function(){
 				let res = await this.$request.post('doctor/getSettingList',{'type':1});
+				console.log('我是res',res);
 				if(res.status==0){
 					this.serbicelist[0].state = res.data.is_phone;
 					this.serbicelist[1].state = res.data.is_chat;
 					this.serbicelist[2].state = res.data.is_appoint
+					if(res.data.is_appoint_status){
+						this.serbicelist[2].Opening=res.data.is_appoint_status.status
+						if(res.data.is_appoint_status.status==2){
+							this.serbicelist[2].disp=false;
+						}
+					}else{
+						this.serbicelist[2].Opening=0
+					}
+				
+					if(res.data.is_chat_status){
+						this.serbicelist[1].Opening=res.data.is_chat_status.status
+						if(res.data.is_chat_status.status==2){
+							this.serbicelist[1].disp=false;
+						}
+					}else{
+						this.serbicelist[1].Opening=0
+					}
+					
+					if(res.data.is_phone_status){
+						this.serbicelist[0].Opening=res.data.is_phone_status.status
+						if(res.data.is_phone_status.status==2){
+							this.serbicelist[0].disp=false;
+						}
+					}else{
+						this.serbicelist[0].Opening=0
+					}
 				}
 			},
 			
@@ -111,13 +142,28 @@
 				})
 			},
 			// 确认申请
-			qrsq(){
-				this.serbicelist[this.num].Opening = 1,
-				this.num = ''
-			}
+			qrsq:async function(){
+				let types = 0;
+				if(this.num==0){
+					types = 2;
+				}else if(this.num==1){
+					types = 1;
+				}else{
+					types = 3;
+				}
+				let res = await this.$request.post("ServiceApply/serviceExamine",{"service_type":types});
+				console.log('res,',res);
+				if(res.status==0){
+					uni.showToast({
+						'title':'请求成功',
+						duration:3000
+					})
+					this.serbicelist[this.num].Opening = 1;
+				}
+			},
 
 		}
-	};
+	}
 </script>
 
 <style>

pages/zixun/xiangqing.vue

@@ -219,9 +219,11 @@
 				ID: '', //身份证
 				//病情描述
 				ms: '',
-				potolList: [],
-
-
+ 
+				potolList:[],
+				
+				xphone:'',
+ 
 				//下部数据
 				placeTime: '', //下单时间
 				receivingTime: '', //接单时间
@@ -260,15 +262,24 @@
 		},
 		methods: {
 			phone:async function(){
-							let res = await this.$request.post("patient/callPhones",{'patient_id':this.patient_id});
-							console.log(res);
-						},
-			getInfo: async function(id) {
-				let res = await this.$request.post("patient/orderPatientDetail", {
-					'patient_id': id
-				});
 
-				if (res.status == 0) {
+				let res = await this.$request.post("patient/callPhones",{'patient_id':this.patient_id});
+				if(res.status==0){
+					let phone = res.data;
+					// 去拨打电话即可
+					console.log(res);
+				}else{
+					uni.showToast({
+						title:res.message,
+						icon:'none',
+						duration:3000
+					})
+				}
+			},
+			getInfo:async function(id){
+				let res = await this.$request.post("patient/orderPatientDetail",{'patient_id':id});		
+				if(res.status==0){
+
 					let list = res.data;
 					this.info = res.data
 					this.orderID = list.order_sn;
@@ -357,21 +368,20 @@
 			qr: async function(e) {
 				let that = this;
 				let order_id = that.pageid
-				if (that.bz != '') {
-					if (that.by != '') {
-						if (that.jl != '') {
+
+				if(that.bz!=''){
+					if(that.by!=''){
+						if(that.jl!=''){
+							let datas = {'order_id':order_id,'symptoms':bingzheng,'pathogen':bingyin,'suggest':jianyi,'patient_id':that.patient_id};
+							if(this.zl==1){
+								datas['xphone'] = this.xphone;
+							}
 							that.formshow = false
-							let bingzheng = that.bz;
-							let bingyin = that.by;
-							let jianyi = that.jl;
-							let res = await that.$request.post('patient/orderPatientok', {
-								'order_id': order_id,
-								'symptoms': bingzheng,
-								'pathogen': bingyin,
-								'suggest': jianyi,
-								'patient_id': that.patient_id
-							});
-							if (res.status == 0) {
+							let bingzheng=that.bz;
+							let bingyin=that.by;
+							let jianyi=that.jl;
+							let res = await that.$request.post('patient/orderPatientok',datas);
+							if(res.status==0){
 								uni.showToast({
 									title: "操作成功",
 									duration: 3000,