老狐\25396 vor 4 Jahren
Ursprung
Commit
61a38e80e2

+ 18 - 15
pages/opinion/opiniondetails.vue

xqd xqd
@@ -3,28 +3,35 @@
 		<!-- 表单弹窗 -->
 		<u-popup v-model="formshow" mode="center" border-radius="14" :closeable="false">
 			<view style="width: 75vw;height: 60vh">
-				<view class="flex justify-center align-center" style="height: 15%;font-size: 34rpx;font-weight: bold;">填写意见单</view>
-				<view style="height: 70%;padding: 0 40rpx;">
+				<view class="flex justify-center align-center" style="height: 20%;font-size: 34rpx;font-weight: bold;">补充意见</view>
+				<view style="height: 60%;padding: 0 40rpx;">
 					<!-- 病症 -->
-					<view class="flex align-center" style="margin-bottom: 20rpx;">
-						<text style="margin-right: 20rpx;">原因:</text>
-						<input placeholder="请填写补充原因" @input="yyblur" style="border-bottom: 1rpx solid #666666;" />
+					<view class="flex align-center" style="padding-bottom: 20rpx;margin-bottom: 20rpx;border-bottom: 1rpx solid #999999;">
+						<text style="margin-right: 20rpx;font-weight: 500;font-size: 28rpx;">原因:</text>
+						<input placeholder="请填写补充原因" @input="yyblur" style="" />
 					</view>
+					
+					<!-- <view class="flex align-center" style="padding-bottom: 20rpx;margin-bottom: 20rpx;border-bottom: 1rpx solid #999999;">
+						<text style="margin-right: 20rpx;font-weight: 500;font-size: 28rpx;">病症:</text>
+						<input placeholder="请填写病症名称" @input="bzblur"/>
+					</view> -->
 					<!-- 结论 -->
 					<view>
-						<view style="margin-bottom: 20rpx;">结论:</view>
+						<view style="margin-bottom: 20rpx;font-weight: 500;font-size: 28rpx;">结论:</view>
+						<!-- <view style="margin-bottom: 20rpx;">结论:</view> -->
 						<view style="padding: 10rpx;">
-							<textarea @input="jlblur" placeholder="请补充内容" placeholder-style="color:#969696;font-size: 28rpx;" style="width: auto;height: 300rpx;" />
-							</view>
+							<u-input v-model="jl" type="textarea" :auto-height="true" placeholder="请补充内容"
+							 :clearable="false" height='220' :border="true" borderColor="#C0C0C0"/>
+						</view>
 					</view>
 				</view>
 				<!-- 两个按钮 -->
-				<view style="height: 15%;display: flex;justify-content: center;align-items: center">
+				<view style="height: 20%;display: flex;justify-content: center;align-items: center">
 					<view style="display:flex;justify-content: center;align-items: center;width: 50%;">
-						<u-button shape="shape" size="mini" @click="formshow = false">取消</u-button>
+						<u-button shape="shape" size="medium" @click="formshow = false">取消</u-button>
 					</view>
 					<view style="display:flex;justify-content: center;align-items: center ;width: 50%;">
-						<u-button shape="shape" size="mini"  type="primary" @click="qr">确认</u-button>
+						<u-button shape="shape" size="medium"  type="primary" @click="qr">确认</u-button>
 					</view>
 				</view>
 			</view>
@@ -98,10 +105,6 @@
 					</view>
 				</view>
 			</view>
-			
-			
-			
-			
 		</view>
 	</view>
 </template>

+ 33 - 18
pages/patient/patient.vue

xqd xqd xqd
@@ -5,24 +5,26 @@
 			 @change="change"></u-search>
 		</view>
 		<view style="padding: 20rpx 28rpx;" v-if="keyword == ''">
-			<u-collapse v-for="(item, index) in followList" :item-style="itemStyle" :key="index" accordion>
-				<u-collapse-item>
-					<!-- 标题 -->
-					<view slot="title" style="font-size: 30rpx;">
-						<text style="font-weight: bold;margin-right: 20rpx;">{{item.title}}</text>
-						<text style="color: #666666;">{{item.sum !=0?item.sum:''}}</text>
-					</view>
-					<!-- 面板内容 -->
-					<view class="he" style="height:310rpx">
-						<view v-for="nitem,nindex in item.content" style="display: flex;align-items: center;padding: 10rpx 0;overflow:auto;height: auto;"
-						 @click="xq" :id="nitem.user_id" :key='index'>
-							<image :src="nitem.avatar" mode="aspectFit" style="height: 68rpx;width: 68rpx;border-radius: 50%;margin-right: 20rpx;"></image>
-							<text style="font-size: 28rpx;margin: 28rpx;color: #000000;">{{nitem.nickname}}</text>
-							<text style="font-size: 28rpx;">{{nitem.remark==null?'':nitem.remark}}</text>
+			<u-collapse  :item-style="itemStyle"  accordion ref="collapse">
+				<view v-for="(item, index) in followList" :key="index">
+					<u-collapse-item>
+						<!-- 标题 -->
+						<view slot="title" style="font-size: 30rpx;">
+							<text style="font-weight: bold;margin-right: 20rpx;">{{item.title}}</text>
+							<text style="color: #666666;">{{item.sum !=0?item.sum:''}}</text>
 						</view>
-					</view>
-					
-				</u-collapse-item>
+						<!-- 面板内容 -->
+						<view class="he" :style="item.sum!=0?(item.sum<5?'height:'+item.sum*100+'rpx;':'height:500rpx'):''">
+							<view v-for="nitem,nindex in item.content" style="display: flex;align-items: center;padding: 10rpx 0;overflow:auto;height: auto;"
+							 @click="xq" :id="nitem.user_id" :key='index'>
+								<image :src="nitem.avatar" mode="aspectFit" style="height: 68rpx;width: 68rpx;border-radius: 50%;margin-right: 20rpx;"></image>
+								<text style="font-size: 28rpx;margin: 28rpx;color: #000000;">{{nitem.nickname}}</text>
+								<text style="font-size: 28rpx;">{{nitem.remark==null?'':nitem.remark}}</text>
+							</view>
+						</view>
+
+					</u-collapse-item>
+				</view>
 			</u-collapse>
 		</view>
 		<view v-else>
@@ -95,6 +97,7 @@
 				})
 			},
 			getLists: async function(e) {
+				var that = this
 				let res = await this.$request.post("doctor/userList", {})
 				console.log('医生列表:', res)
 				if (res.status == 0) {
@@ -110,13 +113,25 @@
 					this.followList[3].content = res.data.user_pack.data
 					this.followList[3].sum = res.data.user_pack.count
 
+					this.$nextTick(() => {
+						that.$refs.collapse.init()
+					})
+
 				}
 
-			}
+			},
+			// collapse: async function() {
+			// 	this.$nextTick(() => {
+			// 		this.$refs.collapse.init()
+			// 	})
+
+			// }
 		},
 		onShow() {
 			this.getLists();
 			console.log(this.followList)
+		},
+		onLoad() {
 
 		}
 

+ 10 - 7
pages/patient/patientxq.vue

xqd xqd
@@ -2,14 +2,17 @@
 	<view style="width: 100%;height: 100%;">
 		<!-- 表单弹窗 -->
 		<u-popup v-model="formshow" mode="center" border-radius="14" :closeable="false">
-			<view style="width: 75vw;height: auto;margin: 30rpx 0;">
+			<view style="width: 75vw;height: auto;margin: 30rpx 0;height: 50vh;">
 				<view class="flex justify-center align-center" style=";font-size: 34rpx;font-weight: bold;margin-bottom:80rpx ;">修改备注</view>
-				<view style="padding: 0 40rpx;margin-bottom: 40rpx;">
+				<view style="padding: 0 40rpx;margin-bottom: 40rpx;height: 60%;">
 					<!-- 病症 -->
-					<view class="flex align-center" style="margin-bottom: 20rpx;">
-						<text style="margin-right: 20rpx;">备注:</text>
-						<input placeholder="请填写备注" @input="bzblur" style="border-bottom: 1rpx solid #666666;" />
+
+					<view style="margin-bottom: 20rpx;font-weight: 500;font-size: 28rpx;">备注:</view>
+					<view style="border: 1rpx solid #C0C0C0;margin-bottom: 20rpx;height: 240rpx;border-radius: 12rpx;padding: 15rpx;">
+						<input placeholder="请填写备注" @input="bzblur" />
 					</view>
+
+
 				</view>
 				<!-- 两个按钮 -->
 				<view style="display: flex;justify-content: center;align-items: center">
@@ -306,13 +309,13 @@
 			bzblur(e) {
 				this.inputbz = e.detail.value
 			},
-			qr:async function(e){
+			qr: async function(e) {
 				if (this.inputbz != '') {
 					let res = this.$request.post("doctor/remacks", {
 						'id': this.user_id,
 						'remak': this.inputbz
 					});
-					console.log("res.status",res.resolved)
+					console.log("res.status", res.resolved)
 					if (res.status == 0) {
 						uni.showToast({
 							title: '设置成功!'

+ 88 - 78
pages/zixun/xiangqing.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -3,38 +3,37 @@
 		<!-- 表单弹窗 -->
 		<u-popup v-model="formshow" mode="center" border-radius="14" :closeable="false">
 			<view style="width: 75vw;height: 60vh">
-				<view class="flex justify-center align-center" style="height: 15%;font-size: 34rpx;font-weight: bold;">填写意见单</view>
-				<view style="height: 70%;padding: 0 40rpx;">
+				<view class="flex justify-center align-center" style="height: 20%;font-size: 32rpx;font-weight: 500;">填写意见单</view>
+				<view style="height: 60%;padding: 0 40rpx;">
 					<!-- 病症 -->
-					<view class="flex align-center" style="margin-bottom: 20rpx;">
-						<text style="margin-right: 20rpx;">病症:</text>
-						<input placeholder="请填写病症名称" @input="bzblur" style="border-bottom: 1rpx solid #666666;" />
+					<view class="flex align-center" style="padding-bottom: 20rpx;margin-bottom: 20rpx;border-bottom: 1rpx solid #999999;">
+						<text style="margin-right: 20rpx;font-weight: 500;font-size: 28rpx;">病症:</text>
+						<input placeholder="请填写病症名称" @input="bzblur"/>
 					</view>
 					<!-- 病因-->
-					<view class="flex align-center" style="margin-bottom: 20rpx;">
-						<text style="margin-right: 20rpx;">病因:</text>
-						<input placeholder="请填写患病因素" @input="byblur" style="border-bottom: 1rpx solid #666666;" />
+					<view class="flex align-center" style="padding-bottom: 20rpx;margin-bottom: 20rpx;border-bottom: 1rpx solid #999999;">
+						<text style="margin-right: 20rpx;font-weight: 500;font-size: 28rpx;">病因:</text>
+						<input placeholder="请填写患病因素" @input="byblur"/>
 					</view>
 					<!-- 结论 -->
 					<view>
-						<view style="margin-bottom: 20rpx;">结论因素:</view>
-						<view style="border: 1rpx solid #666666;border-radius: 15rpx;padding: 10rpx;">
-							<textarea @input="jlblur" placeholder="请填写病情情况、建议等" placeholder-style="color:#969696,font-size: 28rpx;" style="width: auto;height: 200rpx;" />
-							</view>
+						<view style="margin-bottom: 20rpx;font-weight: 500;font-size: 28rpx;">结论因素:</view>
+						<u-input v-model="jl" type="textarea" :auto-height="true" placeholder="请填写病情情况、建议等"
+						 :clearable="false" height='139' :border="true" borderColor="#C0C0C0"/>
 					</view>
 				</view>
 				<!-- 两个按钮 -->
-				<view style="height: 15%;display: flex;justify-content: center;align-items: center">
+				<view style="height: 20%;display: flex;justify-content: center;align-items: center">
 					<view style="display:flex;justify-content: center;align-items: center;width: 50%;">
-						<u-button shape="shape" size="mini" @click="formshow = false">取消</u-button>
+						<u-button shape="shape" size="medium" @click="formshow = false">取消</u-button>
 					</view>
 					<view style="display:flex;justify-content: center;align-items: center ;width: 50%;">
-						<u-button shape="shape" size="mini"  type="primary" @click="qr">确认</u-button>
+						<u-button shape="shape" size="medium" type="primary" @click="qr">确认</u-button>
 					</view>
 				</view>
 			</view>
 		</u-popup>
-		
+
 		<u-gap height="30" bg-color="#f6f6f6"></u-gap>
 		<view style="padding: 20rpx 28rpx;background-color: #FFFFFF;">
 			<!-- 头部 -->
@@ -96,7 +95,7 @@
 				<view class="right">{{receivingTime}}</view>
 			</view>
 			<view class="nr">
-				 
+
 				<view class="left">订单状态:</view>
 				<view class="right" v-if="zt==1">未支付</view>
 				<view class="right" v-else-if="zt==2">待接单</view>
@@ -157,7 +156,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 状态是进行中并且是电话咨询 -->
 		<view class="bottomButton" v-else-if="zl == 1 && zt==3">
 			<!-- 左边的首页按钮 -->
@@ -174,8 +173,8 @@
 				</view>
 			</view>
 		</view>
-		
-		
+
+
 		<!-- 当订单状态为未接单  zt==1 -->
 		<view class="bottomButton" v-else-if="zt ==4">
 			<!-- 左边的首页按钮 -->
@@ -198,7 +197,7 @@
 <script>
 	export default {
 		onLoad(options) {
-			console.log('获取ID:',options.data);
+			console.log('获取ID:', options.data);
 			this.pageid = options.data
 			this.getInfo(options.data);
 		},
@@ -207,8 +206,8 @@
 		},
 		data() {
 			return {
-				pageid:'',
-				patient_id:'',
+				pageid: '',
+				patient_id: '',
 				/**********************      图文咨询,包括某些电话咨询      *********************/
 				// 上部数据
 				orderID: '', //订单号
@@ -220,8 +219,8 @@
 				ID: '', //身份证
 				//病情描述
 				ms: '',
-				potolList:[],
-				
+				potolList: [],
+
 
 				//下部数据
 				placeTime: '', //下单时间
@@ -251,18 +250,21 @@
 					backgroundColor: '#FFFFFF'
 				},
 				//表单
-				formshow:false,//提交表单弹窗
-				bz:'',//病症
-				by:'',//病因
-				jl:'',//结论
-				info:""
+				formshow: false, //提交表单弹窗
+				bz: '', //病症
+				by: '', //病因
+				jl: '', //结论
+				info: "",
+				placeholderStyle: "color:'#00ff00'"
 			}
 		},
 		methods: {
-			getInfo:async function(id){
-				let res = await this.$request.post("patient/orderPatientDetail",{'patient_id':id});
-		
-				if(res.status==0){
+			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;
@@ -274,25 +276,27 @@
 					this.placeTime = list.created_at;
 					this.xiadankh = list.nickname;
 					this.receivingTime = list.receiving_time
-			 
-					if(list.product_type==2){
+
+					if (list.product_type == 2) {
 						// 图文咨询:
 						this.ms = list.symptoms;
 						this.potolList = list.medical_imgs;
-					}else{
+					} else {
 						this.callTime = list.one_call;
 						this.callList = list.call_list
 					}
 					this.zt = list.order_status;
-					
+
 				}
 			},
 			// 确认订单
-			queren:async function(e) {
-				let that=this;
+			queren: async function(e) {
+				let that = this;
 				let order_id = that.pageid
-				let res = await that.$request.post('patient/putOrderPatient',{'order_id':order_id});
-				if(res.status==0){
+				let res = await that.$request.post('patient/putOrderPatient', {
+					'order_id': order_id
+				});
+				if (res.status == 0) {
 					uni.showModal({
 						title: "提示",
 						content: "接单成功!",
@@ -306,88 +310,94 @@
 				that.zt = 2
 			},
 			//完成订单
-			
+
 			wancheng(e) {
 				this.zt = 3
 			},
 			//发起会话
-			huihu(e){
+			huihu(e) {
 				console.log("1111")
 				uni.navigateTo({
-					url:"../conversation/conversationWindow?patient="+JSON.stringify(this.info)+"&type=1"
+					url: "../conversation/conversationWindow?patient=" + JSON.stringify(this.info) + "&type=1"
 				})
 			},
-			huihua(e){
+			huihua(e) {
 				console.log("222")
 				uni.navigateTo({
-					url:"../conversation/conversationWindow?patient="+JSON.stringify(this.info)+"&type=2"
+					url: "../conversation/conversationWindow?patient=" + JSON.stringify(this.info) + "&type=2"
 				})
 			},
 			//查看意见
-			ckyj(e){
+			ckyj(e) {
 				uni.navigateTo({
-					url:'/pages/opinion/opiniondetails?id='+this.pageid+'&type=2'
+					url: '/pages/opinion/opiniondetails?id=' + this.pageid + '&type=2'
 				})
 			},
 			//首页
-			home(e){
+			home(e) {
 				uni.switchTab({
-					url:'/pages/index/index'
+					url: '/pages/index/index'
 				})
 			},
 			//病症提交
-			bzblur(e){
+			bzblur(e) {
 				this.bz = e.detail.value
 			},
-			byblur(e){
-				 this.by =e.detail.value
+			byblur(e) {
+				this.by = e.detail.value
 			},
-			jlblur(e){
+			jlblur(e) {
 				this.jl = e.detail.value
 			},
 			//意见单  确认
-			qr:async function(e){
-				let that=this;	
+			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 != '') {
 							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', {
+								'order_id': order_id,
+								'symptoms': bingzheng,
+								'pathogen': bingyin,
+								'suggest': jianyi,
+								'patient_id': that.patient_id
+							});
+							if (res.status == 0) {
 								uni.showToast({
-									title:"操作成功",
-									duration:3000,
+									title: "操作成功",
+									duration: 3000,
 									success() {
 										that.getInfo(order_id)
 									}
 								})
 							}
-						
-						}else{
+
+						} else {
 							uni.showToast({
-								title:'请填写结论',
-								icon:'none'
+								title: '请填写结论',
+								icon: 'none'
 							})
 						}
-					}else{
+					} else {
 						uni.showToast({
-							title:'请填写病因',
-							icon:'none'
+							title: '请填写病因',
+							icon: 'none'
 						})
 					}
-				}else{
+				} else {
 					uni.showToast({
-						title:'请填写病症',
-						icon:'none'
+						title: '请填写病症',
+						icon: 'none'
 					})
 				}
 			},
 			//意见单  取消
-		
+
 		}
 	};
 </script>

+ 1 - 1
uview-ui/components/u-input/u-input.vue

xqd
@@ -131,7 +131,7 @@ export default {
 		},
 		placeholderStyle: {
 			type: String,
-			default: 'color: #c0c4cc;'
+			default: 'color: #c0c4cc;font-size: 28rpx;'
 		},
 		confirmType: {
 			type: String,