瀏覽代碼

no message

宇宙无敌M1处理器的MacBook Pro 4 年之前
父節點
當前提交
eb8ca29b63

+ 325 - 319
pages/common_tools/my_consulting/consultingInfo.vue

xqd
@@ -1,320 +1,326 @@
-<template>
-	<view class="main">
-		<load-refresh ref="loadRefresh" :isPaging="false" :isRefresh="true" refreshType="loader" refreshTime="2000"
-		 heightReduce="10" backgroundCover="#fff" @refresh="refresh">
-			<view slot="content-list">
-				<view class="list">
-					<!-- 头像 -->
-					<view class="portrait">
-						<view style="padding-top: 20rpx;">
-							<!-- <image class="img" :src=""></image> -->
-							<u-avatar :src="orderInfo.docter.avatar" mode="circle"></u-avatar>
-						</view>
-					</view>
-					<!-- 文字 -->
-					<view class="text">
-						<!-- 名字+标签 -->
-						<view class="name">
-							<view style="margin-right: 15rpx;">{{orderInfo.docter.name}}</view>
-							<view class="label" v-for="(itm,idx) in orderInfo.docter.label_texts" :key="index">{{itm.label_name}}</view>
-						</view>
-						<!-- 科室 -->
-						<view class="department">
-							<text>科室:</text>
-							<text style="color: #333333;">{{orderInfo.docter.office.name}}</text>
-							<text style="color: #333333;">{{orderInfo.docter.qualification.name}}</text>
-						</view>
-					</view>
-				</view>
-				<view class="padding-sm bg-white margin-top-sm">
-					<view class="text-lg text-black text-bold">
-						订单信息
-					</view>
-					<view class="text-gray margin-top-xs padding-tb-xs">
-						<text class="text-leftstyle">订单号:</text>
-						<text class="font_style">{{orderInfo.order_sn}}</text>
-					</view>
-					<view class="text-gray margin-top-xs padding-tb-xs">
-						<text class="text-leftstyle">状态:</text><text v-if="orderInfo.order_status==1" class="font_style" style="color: rgb(238, 170, 63);">未支付</text>
-						<text v-else-if="orderInfo.order_status==2" class="font_style" style="color: rgb(238, 170, 63);">待接单</text>
-						<text v-else-if="orderInfo.order_status==3" class="font_style" style="color: rgb(238, 170, 63);">进行中</text>
-						<text v-else-if="orderInfo.order_status==4" class="font_style" style="color: rgb(238, 170, 63);">已完成</text>
-						<text v-else-if="orderInfo.order_status==5" class="font_style" style="color: rgb(238, 170, 63);">已取消</text>
-					</view>
-					<view class="text-gray margin-top-xs padding-tb-xs">
-						<text class="text-leftstyle">下单时间:</text><text class="font_style">{{orderInfo.created_at}}</text>
-					</view>
-					<view class="text-gray margin-top-xs padding-tb-xs" v-if="orderInfo.end_time!=0">
-						<text class="text-leftstyle">结束时间:</text><text class="font_style">{{formatDate(orderInfo.end_time * 1000)}}</text>
-					</view>
-					<view class="text-gray margin-top-xs padding-tb-xs" v-if="orderInfo.product_type==1">
-						<text class="text-leftstyle">咨询时长:</text><text class="font_style">{{orderInfo.consult_duration}}秒</text>
-					</view>
-					<view class="text-gray margin-top-xs padding-tb-xs">
-						<text class="text-leftstyle">咨询患者:</text><text class="font_style">{{orderInfo.order_patient.name}}</text>
-					</view>
-					<view class="text-gray margin-top-xs padding-tb-xs">
-						<text class="text-leftstyle">已付款:</text><text class="font_style">¥{{orderInfo.total_amount/100}}</text>
-					</view>
-				</view>
-				<view class="cu-tabbar-height"></view>
-				<view class="cu-tabbar-height"></view>
-				<view class="cu-bar bg-white tabbar" v-if="orderInfo.order_status==4&&orderInfo.product_type==2" style="position: fixed;bottom: 0;width: 100%;display: flex;justify-content: flex-end;height: 108rpx;">
-					<u-button shape="circle" :custom-style="customStyle" @click="gotochat" :ripple="true">咨询会话</u-button>
-					<u-button shape="circle" :custom-style="customStyle" @click="gotopinjia" :ripple="true">查看评价</u-button>
-					<u-button shape="circle" :custom-style="customStylebtn" @click="gosuggest" :ripple="true">意见单</u-button>
-				</view>
-				<view class="cu-bar bg-white tabbar" v-else-if="orderInfo.order_status==3" style="position: fixed;bottom: 0;width: 100%;">
-					<view class="submit" style="background-color: #0B73B9;color: white;" @click="gotochat">
-						{{orderInfo.product_type==1?'回拨':'咨询会话'}}
-					</view>
-				</view>
-			</view>
-		</load-refresh>
-	</view>
-</template>
-
-<script>
-	export default {
-		onLoad(options) {
-			this.order_id = options.id
-		},
-		mounted() {
-			this.getordersInfo()
-		},
-		data() {
-			return {
-				order_id: "",
-				orderInfo: {},
-				customStyle: {
-					marginRight: '20rpx'
-				},
-				customStylebtn: {
-					marginRight: '20rpx',
-					color: "#0B73B9",
-					borderColor: "#0B73B9"
-				},
-				outtime: ""
-			}
-		},
-		onShow() {
-
-		},
-		// onPullDownRefresh() {
-		// 	this.getordersInfo()
-		// 	uni.stopPullDownRefresh()
-		// },
-		methods: {
-			refresh() {
-				this.getordersInfo()
-			},
-			gosuggest() {
-				uni.navigateTo({
-					url: "opinionInfo?id=" + this.orderInfo.suggest.id
-				})
-			},
-			gotopinjia() {
-				uni.navigateTo({
-					url: "../me_evaluate"
-				})
-			},
-			getordersInfo: async function() {
-				let res = await this.$request.post("/api/v1/order/orderDetail", {
-					order_id: this.order_id
-				}, false)
-				console.log(res)
-				if (res.status == 0) {
-					this.orderInfo = res.data
-					this.$refs.loadRefresh.loadOver()
-					console.log(this.orderInfo)
-					// this.outtime = this.formatDate(this.orderInfo.end_time * 1000)
-				}
-			},
-			gotochat() {
-				if (this.orderInfo.product_type == 1) {
-					if (this.orderInfo.callback_phone == '') {
-						uni.showModal({
-							title: "提示",
-							content: "回拨需等首次医生拨打后才可回拨",
-							showCancel: false,
-							confirmText: "知道了",
-						})
-						return false
-					}
-					uni.makePhoneCall({
-						phoneNumber: this.orderInfo.callback_phone
-					})
-				} else if (this.orderInfo.product_type == 2) {
-					uni.navigateTo({
-						url: "conversation?doctor=" + JSON.stringify(this.orderInfo.docter) + "&doctorstatus=" + this.orderInfo.order_status
-					})
-				}
-			}
-		}
-	};
-</script>
-
-<style scoped lang="scss">
-	.main {}
-
-	.text-leftstyle {
-		text-align: right;
-		width: 140rpx;
-		display: inline-block;
-	}
-
-	.font_style {
-		color: rgb(51, 51, 51);
-	}
-
-	.footer {
-		width: 100%;
-		height: auto;
-		display: flex;
-		position: fixed;
-		bottom: 0;
-	}
-
-	.round {
-		height: 45rpx;
-		width: 50rpx;
-		border-radius: 50%;
-		background-color: #ececec;
-	}
-
-	.card {
-		padding: 30rpx 30rpx;
-		box-sizing: border-box;
-
-		.card_view {
-			width: 100%;
-			background-color: #ffffff;
-			border-radius: 15rpx;
-
-			.title {
-				width: 100%;
-				height: 20vh;
-				display: flex;
-				justify-content: center;
-				align-items: flex-end;
-
-				.img {
-					width: 90%;
-					height: 90%;
-				}
-			}
-
-			.describe {
-				width: 100%;
-				height: 1;
-				padding: 100rpx 40rpx 20rpx 40rpx;
-			}
-		}
-	}
-
-	.list {
-		margin: 20rpx 0 10rpx 0;
-		padding: 20rpx 0;
-		align-items: center;
-		display: flex;
-		width: 100%;
-		border-radius: 15rpx;
-		background-color: #FFFFFF;
-		box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.08);
-
-		.portrait {
-			width: 20%;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-
-
-			.img {
-				width: 100rpx;
-				height: 100rpx;
-				border-radius: 50%;
-			}
-
-			.bun_true {
-				text-align: center;
-				width: 80rpx;
-				height: 36rpx;
-				background-color: #D92975;
-				margin: 0 10rpx;
-				border-radius: 60rpx;
-				position: relative;
-				top: -20rpx;
-				font-size: 20rpx;
-				color: #FFFFFF;
-				padding: 3rpx 0;
-			}
-
-			.bun_false {
-				border: 1rpx solid #D92975;
-				text-align: center;
-				width: 80rpx;
-				height: 36rpx;
-				background-color: #FFFFFF;
-				margin: 0 10rpx;
-				border-radius: 60rpx;
-				position: relative;
-				top: -20rpx;
-				font-size: 20rpx;
-				color: #D92975;
-				padding: 3rpx 0;
-			}
-		}
-
-		//文字
-		.text {
-			width: 70%;
-
-			//名字+标签
-			.name {
-				font-size: 30rpx;
-				font-weight: bold;
-				display: flex;
-				align-items: center;
-
-				.label {
-					font-weight: 400;
-					margin-right: 15rpx;
-					background-color: #E5F5FF;
-					color: #0B73B9;
-					width: 100rpx;
-					height: 28rpx;
-					font-size: 20rpx;
-					border-radius: 10rpx;
-					text-align: center;
-				}
-			}
-
-			//科室
-			.department {
-				margin-top: 15rpx;
-				color: #666666;
-
-				text {
-					margin-right: 15rpx;
-				}
-			}
-
-			// 选项
-			.option {
-				display: flex;
-
-				view {
-					background-color: #E4E4E4;
-					width: 100rpx;
-					height: 48rpx;
-					border-radius: 12px;
-					margin-right: 15rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-				}
-			}
-		}
-	}
+<template>
+	<view class="main">
+		<load-refresh ref="loadRefresh" :isPaging="false" :isRefresh="true" refreshType="loader" refreshTime="2000"
+		 heightReduce="10" backgroundCover="#fff" @refresh="refresh">
+			<view slot="content-list">
+				<view class="list">
+					<!-- 头像 -->
+					<view class="portrait">
+						<view style="padding-top: 20rpx;">
+							<!-- <image class="img" :src=""></image> -->
+							<u-avatar :src="orderInfo.docter.avatar" mode="circle"></u-avatar>
+						</view>
+					</view>
+					<!-- 文字 -->
+					<view class="text">
+						<!-- 名字+标签 -->
+						<view class="name">
+							<view style="margin-right: 15rpx;">{{orderInfo.docter.name}}</view>
+							<view class="label" v-for="(itm,idx) in orderInfo.docter.label_texts" :key="index">{{itm.label_name}}</view>
+						</view>
+						<!-- 科室 -->
+						<view class="department">
+							<text>科室:</text>
+							<text style="color: #333333;">{{orderInfo.docter.office.name}}</text>
+							<text style="color: #333333;">{{orderInfo.docter.qualification.name}}</text>
+						</view>
+					</view>
+				</view>
+				<view class="padding-sm bg-white margin-top-sm">
+					<view class="text-lg text-black text-bold">
+						订单信息
+					</view>
+					<view class="text-gray margin-top-xs padding-tb-xs">
+						<text class="text-leftstyle">订单号:</text>
+						<text class="font_style">{{orderInfo.order_sn}}</text>
+					</view>
+					<view class="text-gray margin-top-xs padding-tb-xs">
+						<text class="text-leftstyle">状态:</text><text v-if="orderInfo.order_status==1" class="font_style" style="color: rgb(238, 170, 63);">未支付</text>
+						<text v-else-if="orderInfo.order_status==2" class="font_style" style="color: rgb(238, 170, 63);">待接单</text>
+						<text v-else-if="orderInfo.order_status==3" class="font_style" style="color: rgb(238, 170, 63);">进行中</text>
+						<text v-else-if="orderInfo.order_status==4" class="font_style" style="color: rgb(238, 170, 63);">已完成</text>
+						<text v-else-if="orderInfo.order_status==5" class="font_style" style="color: rgb(238, 170, 63);">已取消</text>
+					</view>
+					<view class="text-gray margin-top-xs padding-tb-xs">
+						<text class="text-leftstyle">下单时间:</text><text class="font_style">{{orderInfo.created_at}}</text>
+					</view>
+					<view class="text-gray margin-top-xs padding-tb-xs" v-if="orderInfo.end_time!=0">
+						<text class="text-leftstyle">结束时间:</text><text class="font_style">{{formatDate(orderInfo.end_time * 1000)}}</text>
+					</view>
+					<view class="text-gray margin-top-xs padding-tb-xs" v-if="orderInfo.product_type==1">
+						<text class="text-leftstyle">咨询时长:</text><text class="font_style">{{orderInfo.consult_duration}}秒</text>
+					</view>
+					<view class="text-gray margin-top-xs padding-tb-xs">
+						<text class="text-leftstyle">咨询患者:</text><text class="font_style">{{orderInfo.order_patient.name}}</text>
+					</view>
+					<view class="text-gray margin-top-xs padding-tb-xs">
+						<text class="text-leftstyle">已付款:</text><text class="font_style">¥{{orderInfo.total_amount/100}}</text>
+					</view>
+				</view>
+				<view class="cu-tabbar-height"></view>
+				<view class="cu-tabbar-height"></view>
+				<view class="cu-bar bg-white tabbar" v-if="orderInfo.order_status==4&&orderInfo.product_type==2" style="position: fixed;bottom: 0;width: 100%;display: flex;justify-content: flex-end;height: 108rpx;">
+					<u-button shape="circle" :custom-style="customStyle" @click="gotochat" :ripple="true">咨询会话</u-button>
+					<u-button shape="circle" :custom-style="customStyle" @click="gotopinjia" :ripple="true">查看评价</u-button>
+					<u-button shape="circle" :custom-style="customStylebtn" @click="gosuggest" :ripple="true">意见单</u-button>
+				</view>
+				<view class="cu-bar bg-white tabbar" v-else-if="orderInfo.order_status==3" style="position: fixed;bottom: 0;width: 100%;">
+					<view class="submit" style="background-color: #0B73B9;color: white;" @click="gotochat">
+						{{orderInfo.product_type==1?'回拨':'咨询会话'}}
+					</view>
+				</view>
+			</view>
+		</load-refresh>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad(options) {
+			this.order_id = options.id
+		},
+		mounted() {
+			this.getordersInfo()
+		},
+		data() {
+			return {
+				order_id: "",
+				orderInfo: {},
+				customStyle: {
+					marginRight: '20rpx'
+				},
+				customStylebtn: {
+					marginRight: '20rpx',
+					color: "#0B73B9",
+					borderColor: "#0B73B9"
+				},
+				outtime: ""
+			}
+		},
+		onShow() {
+
+		},
+		// onPullDownRefresh() {
+		// 	this.getordersInfo()
+		// 	uni.stopPullDownRefresh()
+		// },
+		methods: {
+			refresh() {
+				this.getordersInfo()
+			},
+			gosuggest() {
+				uni.navigateTo({
+					url: "opinionInfo?id=" + this.orderInfo.suggest.id
+				})
+			},
+			gotopinjia() {
+				uni.navigateTo({
+					url: "../me_evaluate"
+				})
+			},
+			getordersInfo: async function() {
+				let res = await this.$request.post("/api/v1/order/orderDetail", {
+					order_id: this.order_id
+				}, false)
+				console.log(res)
+				if (res.status == 0) {
+					this.orderInfo = res.data
+					this.$refs.loadRefresh.loadOver()
+					console.log(this.orderInfo)
+					// this.outtime = this.formatDate(this.orderInfo.end_time * 1000)
+				}
+			},
+			gotochat() {
+				if (this.orderInfo.product_type == 1) {
+					if (this.orderInfo.callback_phone == '') {
+						uni.showModal({
+							title: "提示",
+							content: "回拨需等首次医生拨打后才可回拨",
+							showCancel: false,
+							confirmText: "知道了",
+						})
+						return false
+					}
+					uni.makePhoneCall({
+						phoneNumber: this.orderInfo.callback_phone
+					})
+				} else if (this.orderInfo.product_type == 2) {
+					console.log(this.orderInfo.docter)
+					let obj = {
+						id: this.orderInfo.docter.id,
+						name: this.orderInfo.docter.name,
+						avatar: this.orderInfo.docter.avatar
+					}
+					uni.navigateTo({
+						url: "conversation?doctor=" + JSON.stringify(obj) + "&doctorstatus=" + this.orderInfo.order_status
+					})
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.main {}
+
+	.text-leftstyle {
+		text-align: right;
+		width: 140rpx;
+		display: inline-block;
+	}
+
+	.font_style {
+		color: rgb(51, 51, 51);
+	}
+
+	.footer {
+		width: 100%;
+		height: auto;
+		display: flex;
+		position: fixed;
+		bottom: 0;
+	}
+
+	.round {
+		height: 45rpx;
+		width: 50rpx;
+		border-radius: 50%;
+		background-color: #ececec;
+	}
+
+	.card {
+		padding: 30rpx 30rpx;
+		box-sizing: border-box;
+
+		.card_view {
+			width: 100%;
+			background-color: #ffffff;
+			border-radius: 15rpx;
+
+			.title {
+				width: 100%;
+				height: 20vh;
+				display: flex;
+				justify-content: center;
+				align-items: flex-end;
+
+				.img {
+					width: 90%;
+					height: 90%;
+				}
+			}
+
+			.describe {
+				width: 100%;
+				height: 1;
+				padding: 100rpx 40rpx 20rpx 40rpx;
+			}
+		}
+	}
+
+	.list {
+		margin: 20rpx 0 10rpx 0;
+		padding: 20rpx 0;
+		align-items: center;
+		display: flex;
+		width: 100%;
+		border-radius: 15rpx;
+		background-color: #FFFFFF;
+		box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.08);
+
+		.portrait {
+			width: 20%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+
+
+			.img {
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 50%;
+			}
+
+			.bun_true {
+				text-align: center;
+				width: 80rpx;
+				height: 36rpx;
+				background-color: #D92975;
+				margin: 0 10rpx;
+				border-radius: 60rpx;
+				position: relative;
+				top: -20rpx;
+				font-size: 20rpx;
+				color: #FFFFFF;
+				padding: 3rpx 0;
+			}
+
+			.bun_false {
+				border: 1rpx solid #D92975;
+				text-align: center;
+				width: 80rpx;
+				height: 36rpx;
+				background-color: #FFFFFF;
+				margin: 0 10rpx;
+				border-radius: 60rpx;
+				position: relative;
+				top: -20rpx;
+				font-size: 20rpx;
+				color: #D92975;
+				padding: 3rpx 0;
+			}
+		}
+
+		//文字
+		.text {
+			width: 70%;
+
+			//名字+标签
+			.name {
+				font-size: 30rpx;
+				font-weight: bold;
+				display: flex;
+				align-items: center;
+
+				.label {
+					font-weight: 400;
+					margin-right: 15rpx;
+					background-color: #E5F5FF;
+					color: #0B73B9;
+					width: 100rpx;
+					height: 28rpx;
+					font-size: 20rpx;
+					border-radius: 10rpx;
+					text-align: center;
+				}
+			}
+
+			//科室
+			.department {
+				margin-top: 15rpx;
+				color: #666666;
+
+				text {
+					margin-right: 15rpx;
+				}
+			}
+
+			// 选项
+			.option {
+				display: flex;
+
+				view {
+					background-color: #E4E4E4;
+					width: 100rpx;
+					height: 48rpx;
+					border-radius: 12px;
+					margin-right: 15rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+		}
+	}
 </style>

+ 0 - 1
pages/common_tools/my_consulting/conversation.vue

xqd
@@ -64,7 +64,6 @@
 		},
 		onLoad(op) {
 			this.doctorstatus = op.doctorstatus
-			console.log(this.doctorstatus)
 			this.imService = getApp().globalData.imService;
 			if (!this.imService || !this.imService.currentUser) {
 				uni.navigateTo({

+ 0 - 1
pages/common_tools/my_consulting/my_appointment.vue

xqd
@@ -150,7 +150,6 @@
 					success: (res) => {
 						if (res.confirm) {
 							uni.requestSubscribeMessage({
-								tmplIds: ['368_VJaSVZQay3E5-yPelJKJn3R_Hu56dVflxazHiCY'],
 								success: (res) => {
 									this.confirmorder(item, index)
 								},

+ 0 - 1
pages/common_tools/my_consulting/my_consulting.vue

xqd
@@ -311,7 +311,6 @@
 					success: (res) => {
 						if (res.confirm) {
 							uni.requestSubscribeMessage({
-								tmplIds: ['368_VJaSVZQay3E5-yPelJKJn3R_Hu56dVflxazHiCY'],
 								success: (res) => {
 									this.confirmorder(item, index)
 								},

+ 0 - 8
pages/doctor_related/doctor_info.vue

xqd xqd
@@ -42,16 +42,12 @@
 				<u-grid :col="3" :border="false">
 					<view @click="gotoxuanze" data-index="1" data-name="电话咨询" :data-istrue="doctor.is_phone">
 						<u-grid-item :bg-color="barindex==1&&doctor.is_phone==1?'#efefef':'#fff'">
-							<u-image width="120rpx" height="120rpx" :src="doctor.is_phone==1&&doctor.is_can_phone==1?'https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indexphone.png':'/static/img/phone_gray.png'"
 							 shape="circle"></u-image>
-							<view class="grid-text margin-top-sm" :style="doctor.is_phone==1&&doctor.is_can_phone==1?'color:black;':'color:rgb(219,219,219)'">电话咨询</view>
 						</u-grid-item>
 					</view>
 					<view class="" @click="gotoxuanze" data-index="2" data-name="图文咨询" :data-istrue="doctor.is_chat">
 						<u-grid-item :bg-color="barindex==2&&doctor.is_chat==1?'#efefef':'#fff'">
-							<u-image width="120rpx" height="120rpx" :src="doctor.is_chat==1&&doctor.is_can_chat==1?'https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indextu.png':'/static/img/chat_gray.png'"
 							 shape="circle"></u-image>
-							<view class="grid-text margin-top-sm" :style="doctor.is_chat==1&&doctor.is_can_chat==1?'color:black;':'color:rgb(219,219,219)'">图文咨询</view>
 						</u-grid-item>
 					</view>
 					<view class="" @click="gotoxuanze" data-index="3" data-name="门诊预约" :data-istrue="doctor.is_appoint">
@@ -127,10 +123,6 @@
 				</view>
 				分享
 			</button>
-			<button v-if="barindex==1" class="submit text-white" :disabled="isphone||doctor.is_can_phone!=1" @click="phonezixun"
-			 :style="!isphone&&doctor.is_can_phone==1?'background-color: rgb(11,115,186);font-size: 26rpx;':'font-size: 26rpx;color:gray'">电话咨询</button>
-			<button v-else-if="barindex==2" class="submit text-white" :disabled="istuwen||doctor.is_can_chat!=1" @click="phonezixun"
-			 :style="!istuwen&&doctor.is_can_chat==1?'background-color: rgb(11,115,186);font-size: 26rpx;':'font-size: 26rpx;color:gray'">图文咨询</button>
 			<button v-else class="submit text-white" @click="phonezixun" :disabled="ismenzhen||daytime==''||is_can_appoint==0"
 			 :style="!ismenzhen&&daytime!=''&&is_can_appoint!=0?'background-color: rgb(11,115,186);font-size: 26rpx;':'font-size: 26rpx;color:gray'">门诊预约</button>
 		</view>

+ 1 - 1
pages/doctor_related/select_doctor.vue

xqd
@@ -455,7 +455,7 @@
 		margin-left: 15rpx;
 		background-color: #E5F5FF;
 		color: #0B73B9;
-		width: 100rpx;
+		// width: 100rpx;
 		height: 28rpx;
 		font-size: 20rpx;
 		border-radius: 10rpx;

+ 6 - 3
pages/index/agreement.vue

xqd xqd xqd
@@ -1,6 +1,7 @@
 <template>
 	<view class="main">
-		<rich-text :nodes="nodeEl"></rich-text>
+		<!-- <rich-text :nodes="nodeEl"></rich-text> -->
+		<u-parse :html="nodeEl"></u-parse>
 	</view>
 </template>
 
@@ -8,11 +9,11 @@
 	export default {
 		data() {
 			return {
-				nodeEl: ""
+				nodeEl:''
 			}
 		},
 		onLoad(op) {
-			this.nodeEl = op.data
+			this.nodeEl = decodeURIComponent(op.data)
 		}
 	}
 </script>
@@ -20,5 +21,7 @@
 <style scoped>
 	.main {
 		min-height: 100vh;
+		margin-left: 10rpx;
+		margin-right: 10rpx;
 	}
 </style>

+ 1 - 1
pages/index/index.vue

xqd
@@ -551,7 +551,7 @@
 		margin-left: 15rpx;
 		background-color: #E5F5FF;
 		color: #0B73B9;
-		width: 100rpx;
+		// width: 100rpx;
 		height: 28rpx;
 		font-size: 20rpx;
 		border-radius: 10rpx;

+ 2 - 1
pages/index/message.vue

xqd
@@ -161,13 +161,14 @@
 					this.$request.post("/api/v1/docter/docterDetail", {
 						docter_id: item.docter_id
 					}).then(res => {
+						console.log(res)
 						let obj = {
 							id: res.id,
 							name: res.name,
 							avatar: res.avatar
 						}
 						uni.navigateTo({
-							url: "../common_tools/my_consulting/conversation?doctor=" + JSON.stringify(obj) + "&doctorstatus=" + 3
+							url: "../common_tools/my_consulting/conversation?doctor=" + JSON.stringify(obj) + "&doctorstatus="
 						})
 					})
 				}else if(item.type == 1 || item.type == 4&&item.product_type == 3||item.type == 4&&item.product_type == 4||item.type == 4&&item.product_type == 5){

+ 2 - 1
pages/login/login.vue

xqd xqd
@@ -124,6 +124,7 @@
 			this.isphone()
 			this.$util.getAgreement().then(res => {
 				this.nodeEl = res.data.login_protocol
+				console.log(res)
 			}).catch(err => {
 
 			})
@@ -132,7 +133,7 @@
 		methods: {
 			gotoxieyi() {
 				uni.navigateTo({
-					url: "../index/agreement?data=" + this.nodeEl
+					url: "../index/agreement?data=" + encodeURIComponent(this.nodeEl)
 				})
 			},
 			isShowAgree() {

+ 1 - 1
pages/personal/recharge.vue

xqd
@@ -106,7 +106,7 @@
 		methods: {
 			gotoxieyi() {
 				uni.navigateTo({
-					url: "../index/agreement?data=" + this.recharge_protocol
+					url: "../index/agreement?data=" + encodeURIComponent(this.recharge_protocol)
 				})
 			},
 			replaceMoney(item) {

+ 1 - 1
pages/service_packs/packs_details.vue

xqd
@@ -131,7 +131,7 @@
 		methods: {
 			gotoxieyi() {
 				uni.navigateTo({
-					url: "../index/agreement?data=" + this.service_protocol
+					url: "../index/agreement?data=" + encodeURIComponent(this.service_protocol)
 				})
 			},
 			playphone() {