From 415a58fedfbea1769ae15a2739ab72383cbaa06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 12 Oct 2023 15:54:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   2 +-
 api/pagesB/mysigning/index.js                 |  12 +
 api/pagesC/Onlinesigning/index.js             |   2 +-
 pages/medicalservice/medicalservice.scss      |   2 +-
 .../consultationplatform.vue                  |   6 +-
 .../createnewconsultation.vue                 |  49 +++-
 pagesB/doctordetails/doctordetails.vue        |   6 +-
 .../familymemberdetail/familymemberdetail.vue |   6 +-
 .../imagetextConsultation.vue                 |   4 -
 pagesB/managefamily/managefamily.scss         |   3 -
 pagesB/modifyAddress/modifyAddress.scss       |   4 +-
 .../myfamilydoctorteam/myfamilydoctorteam.vue |   6 +-
 pagesB/mysigning/mysigning.scss               | 220 ++++++++++++++++++
 pagesB/mysigning/mysigning.vue                | 210 ++++++-----------
 .../performancedetails/performancedetails.vue |   6 +-
 pagesC/Onlinesigning/Onlinesigning.scss       |   6 +-
 pagesC/Onlinesigning/Onlinesigning.vue        |   2 +-
 pagesC/choosedoctor/choosedoctor.scss         |   4 -
 .../selectInstitution/selectInstitution.vue   |   4 -
 19 files changed, 365 insertions(+), 189 deletions(-)
 create mode 100644 api/pagesB/mysigning/index.js
 create mode 100644 pagesB/mysigning/mysigning.scss

diff --git a/App.vue b/App.vue
index daa6b1c..556fefc 100644
--- a/App.vue
+++ b/App.vue
@@ -11,7 +11,7 @@
 
 	/*每个页面公共css */
 	page {
-		// background-color: #F4F5F7;
+		background-color: #F4F5F7;
 	}
 
 	.app {
diff --git a/api/pagesB/mysigning/index.js b/api/pagesB/mysigning/index.js
new file mode 100644
index 0000000..60d95ed
--- /dev/null
+++ b/api/pagesB/mysigning/index.js
@@ -0,0 +1,12 @@
+import request from "@/api/request.js"
+//解约
+export function rescindapplysave(data, region) {
+	return request({
+		url: `/applet/rescind/apply/save`,
+		method: 'post',
+		data: data,
+		header: {
+			region: region
+		}
+	})
+}
\ No newline at end of file
diff --git a/api/pagesC/Onlinesigning/index.js b/api/pagesC/Onlinesigning/index.js
index 8259b73..708cd5b 100644
--- a/api/pagesC/Onlinesigning/index.js
+++ b/api/pagesC/Onlinesigning/index.js
@@ -44,4 +44,4 @@ export function getPackageByCrowdNo(data, region) {
 			region: region
 		}
 	})
-}
+}
\ No newline at end of file
diff --git a/pages/medicalservice/medicalservice.scss b/pages/medicalservice/medicalservice.scss
index 6d74e75..e9766c6 100644
--- a/pages/medicalservice/medicalservice.scss
+++ b/pages/medicalservice/medicalservice.scss
@@ -114,4 +114,4 @@
 				padding-left: 10rpx;
 			}
 		}
-	}
\ No newline at end of file
+	}
diff --git a/pagesB/consultationplatform/consultationplatform.vue b/pagesB/consultationplatform/consultationplatform.vue
index 621585a..4752b80 100644
--- a/pagesB/consultationplatform/consultationplatform.vue
+++ b/pagesB/consultationplatform/consultationplatform.vue
@@ -86,11 +86,7 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F4F5F7;
-	}
-
-	.app {
+.app {
 
 		.card {
 			background-color: #fff;
diff --git a/pagesB/createnewconsultation/createnewconsultation.vue b/pagesB/createnewconsultation/createnewconsultation.vue
index e0e28f5..3498f69 100644
--- a/pagesB/createnewconsultation/createnewconsultation.vue
+++ b/pagesB/createnewconsultation/createnewconsultation.vue
@@ -39,6 +39,13 @@
 				<input v-model="formdata.phone" class="uinput noimageuinput" placeholder="请输入患者联系电话" type="text"
 					placeholder-class="phsy" />
 			</view>
+			<view class="text">
+				选择医生
+			</view>
+			<view class="select">
+				<text>请选择医生</text>
+				<image src="../../static/huijiantou.png" mode=""></image>
+			</view>
 		</view>
 		<view class="title">
 			<view class="left">
@@ -227,10 +234,6 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F4F5F7;
-	}
-
 	.app {
 		padding-top: 10rpx;
 		width: 100%;
@@ -273,6 +276,44 @@
 			border-radius: 5rpx;
 			padding-bottom: 50rpx;
 
+			.select {
+				width: 90%;
+				height: 80rpx;
+				background: #F6F6F6;
+				margin: 12rpx auto;
+				border-radius: 5rpx;
+				display: flex;
+				position: relative;
+
+				text {
+					padding: 0 60rpx 0 20rpx;
+					line-height: 80rpx;
+					font-size: 22rpx;
+					font-weight: 400;
+					height: 80rpx;
+					color: #8E8E8E;
+					// text-overflow: -o-ellipsis-lastline;
+					// overflow: hidden;
+					// text-overflow: ellipsis;
+					// display: -webkit-box;
+					// -webkit-line-clamp: 1;
+					// line-clamp: 1;
+					// -webkit-box-orient: vertical;
+					// white-space:normal;
+					// word-break:break-all;
+				}
+
+				image {
+					width: 9rpx;
+					height: 17rpx;
+					position: absolute;
+					right: 40rpx;
+					top: 50%;
+					-webkit-transform: translateY(-50%);
+					transform: translateY(-50%);
+				}
+			}
+
 			.textarea {
 				font-size: 18rpx;
 				font-weight: 400;
diff --git a/pagesB/doctordetails/doctordetails.vue b/pagesB/doctordetails/doctordetails.vue
index fd675a8..79afda0 100644
--- a/pagesB/doctordetails/doctordetails.vue
+++ b/pagesB/doctordetails/doctordetails.vue
@@ -74,11 +74,7 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F4F5F7;
-	}
-
-	.app {
+.app {
 		width: 96%;
 		margin: 16rpx auto;
 		color: #666666;
diff --git a/pagesB/familymemberdetail/familymemberdetail.vue b/pagesB/familymemberdetail/familymemberdetail.vue
index 44c29ac..0a157e6 100644
--- a/pagesB/familymemberdetail/familymemberdetail.vue
+++ b/pagesB/familymemberdetail/familymemberdetail.vue
@@ -47,11 +47,7 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F4F5F7;
-	}
-
-	.app {
+.app {
 		background-color: #fff;
 		width: 96%;
 		margin: 20rpx auto 0;
diff --git a/pagesB/imagetextConsultation/imagetextConsultation.vue b/pagesB/imagetextConsultation/imagetextConsultation.vue
index 3e98e15..b02bd46 100644
--- a/pagesB/imagetextConsultation/imagetextConsultation.vue
+++ b/pagesB/imagetextConsultation/imagetextConsultation.vue
@@ -114,10 +114,6 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F4F5F7;
-	}
-
 	.app {
 		width: 96%;
 		margin: 20rpx auto;
diff --git a/pagesB/managefamily/managefamily.scss b/pagesB/managefamily/managefamily.scss
index 88417b3..0f53ff2 100644
--- a/pagesB/managefamily/managefamily.scss
+++ b/pagesB/managefamily/managefamily.scss
@@ -1,6 +1,3 @@
-	page {
-		background-color: #F4F5F7;
-	}
 
 	.app {
 		color: #333333;
diff --git a/pagesB/modifyAddress/modifyAddress.scss b/pagesB/modifyAddress/modifyAddress.scss
index f8d76d5..48b2abe 100644
--- a/pagesB/modifyAddress/modifyAddress.scss
+++ b/pagesB/modifyAddress/modifyAddress.scss
@@ -1,6 +1,4 @@
-	page {
-		background-color: #F4F5F7;
-	}
+
 .app {
 		background-color: #F4F5F7;
 		width: 100%;
diff --git a/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue b/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue
index ea53e42..4a76f56 100644
--- a/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue
+++ b/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue
@@ -80,10 +80,6 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F4F5F7;
-	}
-
 	.app {
 		width: 96%;
 		margin: 20rpx auto;
@@ -178,4 +174,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pagesB/mysigning/mysigning.scss b/pagesB/mysigning/mysigning.scss
new file mode 100644
index 0000000..666be57
--- /dev/null
+++ b/pagesB/mysigning/mysigning.scss
@@ -0,0 +1,220 @@
+.app {
+		width: 96%;
+		margin: 20rpx auto;
+		background-color: #fff;
+		padding-bottom: 50rpx;
+		font-size: 31rpx;
+
+		.mask {
+			background-color: #fff;
+			width: 100%;
+			position: relative;
+			height: 100%;
+			padding-top: 80rpx;
+
+			.titletext {
+				width: 100%;
+				padding: 40rpx 30rpx 0;
+				display: flex;
+
+				.select {
+					width: 60%;
+					height: 63rpx;
+					border: 2rpx solid #d0d0d0;
+					border-radius: 5rpx;
+					display: flex;
+					position: relative;
+					flex: 1;
+
+					text {
+						height: 63rpx;
+						padding: 0 60rpx 0 20rpx;
+						line-height: 63rpx;
+						font-weight: 400;
+						color: gray;
+						font-size: 24rpx;
+						// text-overflow: -o-ellipsis-lastline;
+						// overflow: hidden;
+						// text-overflow: ellipsis;
+						// display: -webkit-box;
+						// -webkit-line-clamp: 1;
+						// line-clamp: 1;
+						// -webkit-box-orient: vertical;
+						// white-space:normal;
+						// word-break:break-all;
+					}
+
+					image {
+						width: 9rpx;
+						height: 17rpx;
+						position: absolute;
+						right: 40rpx;
+						top: 50%;
+						-webkit-transform: translateY(-50%);
+						transform: translateY(-50%);
+					}
+				}
+			}
+
+			.btnss {
+				display: flex;
+				text-align: center;
+				border-top: 1rpx solid #f6f6f6;
+				font-size: 32rpx;
+				line-height: 100rpx;
+				width: 100%;
+				position: absolute;
+				bottom: 0;
+
+				.cancel {
+					width: 50%;
+					height: 100rpx;
+					border-right: 0.5rpx solid #f6f6f6;
+				}
+
+				.Rescind {
+					width: 50%;
+					height: 100rpx;
+					color: #55d0df;
+					border-left: 0.5rpx solid #f6f6f6;
+				}
+			}
+
+			textarea {
+				padding: 10rpx 20rpx;
+				font-size: 24rpx;
+				border: 1rpx solid #d0d0d0;
+				flex: 1;
+			}
+
+			text {
+				display: inline-block;
+				padding-left: 20rpx;
+				width: 200rpx;
+				height: 50rpx;
+				font-size: 28rpx;
+				line-height: 50rpx;
+				color: #333333;
+			}
+		}
+
+		.btns {
+			width: 100%;
+			display: flex;
+			justify-content: space-evenly;
+			padding-bottom: 100rpx;
+
+			.leftbtn,
+			.rightbtn {
+				width: 290rpx;
+				height: 62rpx;
+				background: #FFFFFF;
+				border: 1px solid #26A888;
+				border-radius: 5rpx;
+				text-align: center;
+				font-weight: 500;
+				color: #26A888;
+				line-height: 62rpx;
+			}
+
+			.rightbtn {
+				color: #fff;
+				background: #26A888;
+			}
+		}
+
+		.lookbtn {
+			margin: 50rpx auto 0;
+			width: 497rpx;
+			height: 62rpx;
+			background: #FFFFFF;
+			border: 1px solid #26A888;
+			border-radius: 5rpx;
+			font-weight: 500;
+			color: #26A888;
+			text-align: center;
+			line-height: 62rpx;
+		}
+
+		.border {
+			width: 94%;
+			height: 2rpx;
+			margin: 60rpx auto 30rpx;
+			background: #E6E6E6;
+		}
+
+		.item {
+			width: 100%;
+			padding: 30rpx 50rpx 0 50rpx;
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #333333;
+			word-break: break-all;
+		}
+
+		.flexitem {
+			display: flex;
+			justify-content: space-between;
+
+			.right {
+				display: flex;
+				align-items: flex-end;
+
+				image {
+					width: 30rpx;
+					height: 30rpx;
+				}
+
+				text {
+					padding-left: 10rpx;
+				}
+			}
+		}
+
+		.name {
+			width: 100%;
+			font-size: 38rpx;
+			font-weight: 500;
+			color: #333333;
+			padding: 60rpx 50rpx 0 50rpx;
+			display: flex;
+			align-items: flex-end;
+
+			.text {
+				margin-right: 40rpx;
+			}
+
+			.card {
+				font-size: 18rpx;
+				font-weight: 400;
+				color: #FFA115;
+				padding: 0 15rpx;
+				height: 35rpx;
+				line-height: 35rpx;
+				background: #FFFFFF;
+				border: 1px solid #FFA115;
+				border-radius: 5rpx;
+				margin-right: 14rpx;
+				text-align: center;
+			}
+		}
+
+		.title {
+			width: 100%;
+			padding: 20rpx 0 0 30rpx;
+			display: flex;
+			align-items: flex-end;
+
+			.text {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #000000;
+				padding-left: 20rpx;
+			}
+
+			image {
+				width: 35rpx;
+				height: 35rpx;
+			}
+		}
+	}
\ No newline at end of file
diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue
index 5f64989..f790f7c 100644
--- a/pagesB/mysigning/mysigning.vue
+++ b/pagesB/mysigning/mysigning.vue
@@ -73,17 +73,48 @@
 		<view class="border">
 		</view>
 		<view class="btns">
-			<view class="leftbtn">
+			<view class="leftbtn" @tap='maskshow = true'>
 				申请解约
 			</view>
 			<view class="rightbtn" @tap='gocontractsigningprotocol'>
 				查看签约协议
 			</view>
 		</view>
+		<u-popup v-model="maskshow" mode="center" length="90%" closeable height="50%">
+			<view class="mask" @tap.stop=''>
+				<view class="titletext">
+					<text>解约类型：</text>
+					<view class="select" @tap='maskshowtwo=true'>
+						<text v-if="list.rescindName">{{list.rescindName}}</text>
+						<text v-else>请选择解约类型</text>
+						<image src="../../static/huijiantou.png" mode=""></image>
+					</view>
+				</view>
+				<view class="titletext">
+					<text>解约原因：</text>
+					<textarea name="" id="" cols="30" rows="10" style="width: 60%;color: gray;" placeholder="请输入解决原因"
+						v-model="list.rescindReason"></textarea>
+				</view>
+				<view class="btnss">
+					<view class="cancel" @click="maskshowtwo=false">
+						取消
+					</view>
+					<view class="Rescind" @click="rescindapplysaveinfo">
+						解约
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-toast ref="uToast" />
+		<u-select v-model="maskshowtwo" mode="single-column" :list="maskshowtwolist" @confirm="maskshowtwoconfirm"
+			z-index='10076'></u-select>
 	</view>
 </template>
 
 <script>
+	import {
+		rescindapplysave
+	} from '@/api/pagesB/mysigning/index.js'
 	import {
 		detail,
 	} from '@/api/pages/homepage/homepage.js'
@@ -91,15 +122,54 @@
 		data() {
 			return {
 				list: {},
+				maskshow: false,
+				maskshowtwo: false,
+				maskshowtwolist: [{
+						value: 1,
+						label: '主动解约'
+					},
+					{
+						value: 2,
+						label: '迁出'
+					}, {
+						value: 3,
+						label: '死亡'
+					}, {
+						value: 4,
+						label: '到期'
+					}, {
+						value: 5,
+						label: '其他'
+					},
+				],
 			};
 		},
 		methods: {
+			//解约
+			rescindapplysaveinfo() {
+				rescindapplysave(this.list).then(res => {
+					if (res.code == 200) {
+						this.$refs.uToast.show({
+							title: '您已解约成功',
+							type: 'success',
+						})
+						setTimeout(() => {
+							uni.switchTab({
+								url: "/pages/homepage/homepage"
+							})
+						}, 2000)
+					}
+				})
+			},
 			// 签约信息
 			detailinfo() {
 				// detail(uni.getStorageSync('userinfo').cardNo, this.region).then(res => {
 				detail('372424194703207523', '1').then(res => {
 					if (res.code == 200) {
 						this.list = res.data
+						this.list.rescindType = null
+						this.list.rescindName = null
+						this.list.rescindReason = null
 						this.list.crowdsName = this.list.crowdsName.split(',')
 						this.list.packagesName = this.list.packagesName.split(',')
 					}
@@ -132,6 +202,10 @@
 				// 	url: `/pagesC/seekadvicefrom/seekadvicefrom?item=${JSON.stringify(this.list)}`
 				// })
 			},
+			maskshowtwoconfirm(e) {
+				this.list.rescindType = e[0].value
+				this.list.rescindName = e[0].label
+			},
 		},
 		onLoad(options) {
 			this.detailinfo();
@@ -140,135 +214,5 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F4F5F7;
-	}
-
-	.app {
-		width: 96%;
-		margin: 20rpx auto;
-		background-color: #fff;
-		padding-bottom: 50rpx;
-		font-size: 31rpx;
-
-		.btns {
-			width: 100%;
-			display: flex;
-			justify-content: space-evenly;
-			padding-bottom: 100rpx;
-
-			.leftbtn,
-			.rightbtn {
-				width: 290rpx;
-				height: 62rpx;
-				background: #FFFFFF;
-				border: 1px solid #26A888;
-				border-radius: 5rpx;
-				text-align: center;
-				font-weight: 500;
-				color: #26A888;
-				line-height: 62rpx;
-			}
-
-			.rightbtn {
-				color: #fff;
-				background: #26A888;
-			}
-		}
-
-		.lookbtn {
-			margin: 50rpx auto 0;
-			width: 497rpx;
-			height: 62rpx;
-			background: #FFFFFF;
-			border: 1px solid #26A888;
-			border-radius: 5rpx;
-			font-weight: 500;
-			color: #26A888;
-			text-align: center;
-			line-height: 62rpx;
-		}
-
-		.border {
-			width: 94%;
-			height: 2rpx;
-			margin: 60rpx auto 30rpx;
-			background: #E6E6E6;
-		}
-
-		.item {
-			width: 100%;
-			padding: 30rpx 50rpx 0 50rpx;
-			font-size: 30rpx;
-			font-weight: 400;
-			color: #333333;
-			word-break: break-all;
-		}
-
-		.flexitem {
-			display: flex;
-			justify-content: space-between;
-
-			.right {
-				display: flex;
-				align-items: flex-end;
-
-				image {
-					width: 30rpx;
-					height: 30rpx;
-				}
-
-				text {
-					padding-left: 10rpx;
-				}
-			}
-		}
-
-		.name {
-			width: 100%;
-			font-size: 38rpx;
-			font-weight: 500;
-			color: #333333;
-			padding: 60rpx 50rpx 0 50rpx;
-			display: flex;
-			align-items: flex-end;
-
-			.text {
-				margin-right: 40rpx;
-			}
-
-			.card {
-				font-size: 18rpx;
-				font-weight: 400;
-				color: #FFA115;
-				padding: 0 15rpx;
-				height: 35rpx;
-				line-height: 35rpx;
-				background: #FFFFFF;
-				border: 1px solid #FFA115;
-				border-radius: 5rpx;
-				margin-right: 14rpx;
-				text-align: center;
-			}
-		}
-
-		.title {
-			width: 100%;
-			padding: 20rpx 0 0 30rpx;
-			display: flex;
-			align-items: flex-end;
-
-			.text {
-				font-size: 28rpx;
-				font-weight: 500;
-				color: #000000;
-				padding-left: 20rpx;
-			}
-
-			image {
-				width: 35rpx;
-				height: 35rpx;
-			}
-		}
-	}
-</style>
+	@import './mysigning.scss';
+</style>
\ No newline at end of file
diff --git a/pagesB/performancedetails/performancedetails.vue b/pagesB/performancedetails/performancedetails.vue
index 8685b37..bef89b2 100644
--- a/pagesB/performancedetails/performancedetails.vue
+++ b/pagesB/performancedetails/performancedetails.vue
@@ -48,10 +48,6 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F4F5F7;
-	}
-
 	.app {
 		width: 96%;
 		margin: 20rpx auto;
@@ -109,4 +105,4 @@
 			margin-bottom: 20rpx;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pagesC/Onlinesigning/Onlinesigning.scss b/pagesC/Onlinesigning/Onlinesigning.scss
index 83e26d4..18dbb1c 100644
--- a/pagesC/Onlinesigning/Onlinesigning.scss
+++ b/pagesC/Onlinesigning/Onlinesigning.scss
@@ -1,8 +1,4 @@
-page {
-		background-color: #F4F5F7;
-	}
-
-	.app {
+.app {
 		width: 96%;
 		margin: 20rpx auto;
 		background-color: #F7F5F5;
diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue
index ae058e0..1f7bd9f 100644
--- a/pagesC/Onlinesigning/Onlinesigning.vue
+++ b/pagesC/Onlinesigning/Onlinesigning.vue
@@ -105,7 +105,7 @@
 			</view>
 			<view class="name">
 				签约周期(年)
-				<u-input v-model="query.signYears" type='number' :border="true" placeholder="请输入签约周期(单位年)" />
+				<u-input v-model="query.signYears" type='number' :border="true" placeholder="请输入签约周期(单位年)"/>
 			</view>
 			<view class=" signing">
 				<view class="agency">
diff --git a/pagesC/choosedoctor/choosedoctor.scss b/pagesC/choosedoctor/choosedoctor.scss
index 9b02e45..3ceb29d 100644
--- a/pagesC/choosedoctor/choosedoctor.scss
+++ b/pagesC/choosedoctor/choosedoctor.scss
@@ -1,7 +1,3 @@
-	page {
-		background-color: #F4F5F7;
-	}
-
 	.app {
 		width: 100%;
 
diff --git a/pagesC/selectInstitution/selectInstitution.vue b/pagesC/selectInstitution/selectInstitution.vue
index 89c7b5d..9a80945 100644
--- a/pagesC/selectInstitution/selectInstitution.vue
+++ b/pagesC/selectInstitution/selectInstitution.vue
@@ -142,10 +142,6 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F4F5F7;
-	}
-
 	.app {
 		width: 94%;
 		margin: 20rpx auto;