From 8344496487f0836338c2459a8e73504b152f97ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Tue, 27 Dec 2022 09:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/order.js               |   4 +-
 apis/interfaces/user.js                |  10 ++-
 manifest.json                          |   2 +-
 pages.json                             |  29 +++++--
 pages/auth/registered.vue              |   2 +-
 pages/college/test.vue                 |  26 +++++-
 pages/user/set.vue                     |  93 ++++++++++++++++++++-
 pages/work/orderInfo.vue               |   2 +-
 pages/work/orders.vue                  |   1 +
 pages/work/perfectBasis.vue            |  52 ++++++------
 pages/work/perfectBasisInfo.vue        | 110 +++++++++++++++++++++++++
 pages/work/perfectChoose.vue           |  14 ++--
 pages/work/perfectInstitutions.vue     | 104 +++++++++++++++--------
 pages/work/perfectInstitutionsInfo.vue |  66 +++++++++++++++
 pages/work/schemes.vue                 |  20 ++++-
 pages/work/service.vue                 |  50 ++++++-----
 16 files changed, 484 insertions(+), 101 deletions(-)
 create mode 100644 pages/work/perfectBasisInfo.vue
 create mode 100644 pages/work/perfectInstitutionsInfo.vue

diff --git a/apis/interfaces/order.js b/apis/interfaces/order.js
index 3686e94..70da03d 100644
--- a/apis/interfaces/order.js
+++ b/apis/interfaces/order.js
@@ -74,9 +74,9 @@ const perfectBase = orderId => {
 }
 
 // 提交基础资料信息
-const updPerfectBase = (orderId, data) => {
+const updPerfectBase = (orderUserId, data) => {
 	return request({
-		url		: 'business/' + orderId + '/user/base',
+		url		: 'business/' + orderUserId + '/user/base',
 		method	: 'POST',
 		data
 	})
diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js
index 7aef592..b0895a5 100644
--- a/apis/interfaces/user.js
+++ b/apis/interfaces/user.js
@@ -23,13 +23,20 @@ const code = () => {
 	})
 }
 
-// 用户信息
+// 用户基础信息
 const info = () => {
 	return request({
 		url		: 'app/user/info'
 	})
 }
 
+// 获取用户信息
+const userInfo = () => {
+	return request({
+		url		: 'user'
+	})
+}
+
 // 更新用户资料
 const updInfo = (key, value) => {
 	return request({
@@ -76,6 +83,7 @@ export {
 	relations,
 	code,
 	info,
+	userInfo,
 	updInfo,
 	certified,
 	certification,
diff --git a/manifest.json b/manifest.json
index 7cf1e2d..8eaee59 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "",
-    "versionName" : "1.0.3",
+    "versionName" : "1.0.4",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages.json b/pages.json
index 39e111d..acd7804 100644
--- a/pages.json
+++ b/pages.json
@@ -178,7 +178,7 @@
 		"style": {
 			"navigationBarTitleText": "奖金账户",
 			"enablePullDownRefresh": false,
-			"navigationBarBackgroundColor": "#926fff",
+			"navigationBarBackgroundColor": "#926fff",
 			"navigationBarTextStyle": "white"
 		}
 	}, {
@@ -354,15 +354,34 @@
 			"enablePullDownRefresh": false
 		}
 	}, {
-		"path": "pages/work/schemes",
-		"auth": true,
+		"path": "pages/work/schemes",
+		"auth": true,
 		"name": "OrderSchemes",
 		"style": {
 			"navigationBarTitleText": "预估方案",
-			"enablePullDownRefresh": false,
-			"navigationBarBackgroundColor": "#446EFE",
+			"enablePullDownRefresh": false,
+			"navigationBarBackgroundColor": "#446EFE",
 			"navigationBarTextStyle": "white"
 		}
+	}, {
+		"path": "pages/work/perfectBasisInfo",
+		"auth": true,
+		"name": "OrderPerfectBasisInfo",
+		"style": {
+			"navigationBarTitleText": "基础资料信息",
+			"enablePullDownRefresh": false,
+			"navigationBarBackgroundColor": "#ffffff"
+		}
+
+	}, {
+		"path": "pages/work/perfectInstitutionsInfo",
+		"auth": true,
+		"name": "OrderPerfectInstitutionsInfo",
+		"style": {
+			"navigationBarTitleText": "机构资料信息",
+			"enablePullDownRefresh": false,
+			"navigationBarBackgroundColor": "#ffffff"
+		}
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/auth/registered.vue b/pages/auth/registered.vue
index 0813644..8268ad2 100644
--- a/pages/auth/registered.vue
+++ b/pages/auth/registered.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="registered-content">
 		<view class="title">你好，欢迎使用抖火法律</view>
-		<view class="submit-title">请填写账号信息</view>
+		<view class="submit-title">请填信息，请设置8位以上密码并包含大小写</view>
 		<view class="from">
 			<view class="from-inpus from-input-phoen">
 				<label>+86</label>
diff --git a/pages/college/test.vue b/pages/college/test.vue
index dbab121..a84ea34 100644
--- a/pages/college/test.vue
+++ b/pages/college/test.vue
@@ -15,7 +15,7 @@
 				</view>
 				<view class="btns">
 					<button @click="$Router.push({name: 'CollegeResults', params: {id: item.answer.last_answer_id}})" v-if="item.answer.is_finish">查看成绩</button>
-					<button @click="$Router.push({name: 'CollegeAnswer', params: {id: item.evaluation_id}})" v-else>开始答题</button>
+					<button @click="onAnswer(item.evaluation_id, item.canDo)" v-else>开始答题</button>
 				</view>
 			</view>
 		</block>
@@ -39,6 +39,30 @@
 					icon : 'none'
 				})
 			})
+		},
+		methods: {
+			onAnswer(id, isTo){
+				if(!isTo){
+					uni.showModal({
+						title		: '提示',
+						content		: '暂未完成实名认证，完成后才可以申请参加考试',
+						cancelText  : '稍后认证',
+						confirmText	: '立即认证',
+						success		: res => {
+							if(res.confirm){
+								this.$Router.push({ name: 'UserCertification' })
+							}
+						}
+					})
+					return
+				}
+				this.$Router.push({
+					name	: 'CollegeAnswer',
+					params	: {
+						id
+					}						
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/user/set.vue b/pages/user/set.vue
index 0aada9b..06fa6f7 100644
--- a/pages/user/set.vue
+++ b/pages/user/set.vue
@@ -1,27 +1,112 @@
 <template>
-	<view>
-		<button @click="onLogout()">退出登录</button>
+	<view class="content">
+		<view class="set-nav-block">
+			<view class="set-nav" @click="onNav('UserCertification')">
+				<label>实名认证</label>
+				<view class="value nowrap">
+					{{certification ? certification_data.id_card : '未认证'}}<uni-icons type="right" color="gray"></uni-icons>
+				</view>
+			</view>
+			<view class="border-solid-empty"></view>
+			<view class="set-nav"@click="onNav('UserInfo')">
+				<label>手机号码</label>
+				<view class="value nowrap">
+					{{username}}<uni-icons type="right" color="gray"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<view class="set-nav-block">
+			<view class="set-nav" @click="onNav('ResetPassword')">
+				<label>修改密码</label>
+				<view class="value nowrap">
+					<uni-icons type="right" color="gray"></uni-icons>
+				</view>
+			</view>
+			<view class="border-solid-empty"></view>
+			<view class="set-nav" @click="onNav()">
+				<label>账户信息</label>
+				<view class="value nowrap">
+					<uni-icons type="right" color="gray"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<view class="set-nav-block">
+			<view class="set-nav" @click="onLogout">
+				<label>退出登录</label>
+				<view class="value nowrap">
+					<uni-icons type="right" color="gray"></uni-icons>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
+	import { userInfo } from '@/apis/interfaces/user.js'
 	export default {
 		data() {
 			return {
-				
+				username			: '',
+				certification		: false,
+				certification_data	: {}
 			};
 		},
+		onShow() {
+			uni.showLoading({
+				title: '加载中...'
+			})
+			userInfo().then(res => {
+				let { username, certification, certification_data } = res
+				this.username = username
+				this.certification = certification
+				this.certification_data = certification_data
+				uni.hideLoading()
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
 		methods: {
 			onLogout(){
 				this.$store.commit('setToken', '');
 				this.$Router.replaceAll({
 				    name: 'Auth'
 				})
+			},
+			onNav(name){
+				this.$Router.push({name})
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-
+	.content{
+		padding-top: 30rpx;
+		box-sizing: border-box;
+		.set-nav-block{
+			padding-bottom: 30rpx;
+			.set-nav{
+				background: white;
+				display: flex;
+				justify-content: space-between;
+				padding: 32rpx;
+				position: relative;
+				label{
+					width: 200rpx;
+					font-size: 32rpx;
+					line-height: 40rpx;
+				}
+				.value{
+					line-height: 40rpx;
+					width: calc(100% - 200rpx);
+					text-align: right;
+					font-size: 30rpx;
+					color: gray;
+				}
+			}
+		}
+	}
 </style>
diff --git a/pages/work/orderInfo.vue b/pages/work/orderInfo.vue
index d20a5a4..096873d 100644
--- a/pages/work/orderInfo.vue
+++ b/pages/work/orderInfo.vue
@@ -12,7 +12,7 @@
 			</view>
 			<view class="order-items">
 				<view class="order-items-flex" v-for="(item, index) in items" :key="index" @click="$Router.push({ name: 'OrderSchemes', params: { id: item.business_order_item_id }})">
-					<label>{{item.institution.title}}({{item.business_type.title}})</label>
+					<label class="nowrap">{{item.institution.title}}({{item.business_type.title}})</label>
 					<view class="order-items-type nowrap">￥{{item.price}}<uni-icons type="right" color="gray" size="14px"></uni-icons></view>
 				</view>
 			</view>
diff --git a/pages/work/orders.vue b/pages/work/orders.vue
index cd399dc..62c4e64 100644
--- a/pages/work/orders.vue
+++ b/pages/work/orders.vue
@@ -63,6 +63,7 @@
 						<view class="btns-item btns-border" v-if="item.status.value == 4 && item.is_my" @click="onSign(item.business_order_id)">签约</view>
 						<view class="btns-item btns-border" v-if="item.status.value == 3" @click="$Router.push({name: 'Pay', params: {orderId: item.business_order_id, type: 'acting', paytype: 'price'}})">缴费</view>
 						<view class="btns-item btns-border" v-if="item.status.value == 5" @click="$Router.push({name: 'WorkPerfectChoose', params: {orderId: item.business_order_id, type: 'perfect'}})">完善</view>
+						<view class="btns-item btns-border" v-if="item.status.value == 6" @click="$Router.push({name: 'WorkPerfectChoose', params: {orderId: item.business_order_id, type: 'perfect'}})">查看资料</view>
 						<view class="btns-item" @click="$Router.push({name: 'OrderInfo', params: {orderId: item.business_order_id}})">查看</view>
 					</view>
 				</view>
diff --git a/pages/work/perfectBasis.vue b/pages/work/perfectBasis.vue
index bd0fd26..183d660 100644
--- a/pages/work/perfectBasis.vue
+++ b/pages/work/perfectBasis.vue
@@ -116,14 +116,12 @@
 		data() {
 			return {
 				loding			: true,
-				orderId		 	: '',
 				baseInfo	 	: {},
 				cityPicker		: [],
 				isCheck			: false
 			};
 		},
 		created() {
-			this.orderId = this.$Route.query.orderId
 			uni.showLoading({
 				title: '加载中...',
 				mask : true
@@ -141,17 +139,10 @@
 		methods: {
 			// 获取用户基础信息
 			getPerfectBase(){
-				perfectBase(this.orderId).then(res => {
+				perfectBase(this.$Route.query.orderId).then(res => {
 					let { base, province } = res;
-					console.log(res)
-					
-					console.log(base.check_params.toString() != '')
-					
 					this.baseInfo = base;
 					this.isCheck = base.check_params.toString() != ''
-					
-					console.log(base.check_params)
-					
 					this.loding   = false;
 					uni.hideLoading()
 				}).catch(err => {
@@ -181,20 +172,35 @@
 					city_id		: this.baseInfo.city_id,
 					district_id	: this.baseInfo.province_id
 				}
-				updPerfectBase(this.orderId, data).then(res => {
-					uni.showModal({
-						title		: '提示',
-						content		: '资料已保存',
-						showCancel	: false,
-						success		: ModalRes => {
-							this.$Router.back()
+				uni.showModal({
+					title		: '提示',
+					content		: '请确认资料无误，提交后在审核期间不可更改',
+					cancelText	: '稍后',
+					confirmText : '确认无误',
+					success		: ModalRes => {
+						if(ModalRes.confirm){
+							uni.showLoading({
+								title: '提交中...',
+								mask : true
+							})
+							updPerfectBase(this.baseInfo.business_order_user_id, data).then(res => {
+								uni.hideLoading()
+								uni.showModal({
+									title		: '提示',
+									content		: '资料已保存',
+									showCancel	: false,
+									success		: ModalRes => {
+										this.$Router.back()
+									}
+								})
+							}).catch(err => {
+								uni.showToast({
+									title: err.message,
+									icon : 'none'
+								})
+							})
 						}
-					})
-				}).catch(err => {
-					uni.showToast({
-						title: err.message,
-						icon : 'none'
-					})
+					}
 				})
 			},
 			// 修改提示信息
diff --git a/pages/work/perfectBasisInfo.vue b/pages/work/perfectBasisInfo.vue
new file mode 100644
index 0000000..c05fdaf
--- /dev/null
+++ b/pages/work/perfectBasisInfo.vue
@@ -0,0 +1,110 @@
+<template>
+	<view v-if="base.name">
+		<view class="item-flex">
+			<label>姓名</label>
+			<view class="value">{{base.name || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>性别</label>
+			<view class="value">{{base.sex || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>年龄</label>
+			<view class="value">{{base.age || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>属相</label>
+			<view class="value">{{base.zodiak || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>婚姻</label>
+			<view class="value">{{base.marriages[base.marriage] || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>配偶姓名</label>
+			<view class="value">{{base.mate || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>学历</label>
+			<view class="value">{{base.educations[base.education] || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>毕业院校</label>
+			<view class="value">{{base.school || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>身份证号</label>
+			<view class="value">{{base.id_card || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>身份证地址</label>
+			<view class="value">{{base.address || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>联系电话</label>
+			<view class="value">{{base.mobile || '-'}}</view>
+		</view>
+		<view class="item-flex">
+			<label>联系地址</label>
+			<view class="value">{{base.contact_address || '-'}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { perfectBase } from '@/apis/interfaces/order.js'
+	export default {
+		data() {
+			return {
+				base: {}
+			};
+		},
+		created() {
+			uni.showLoading({
+				title: '加载中...',
+				mask : true
+			})
+			perfectBase(this.$Route.query.orderId).then(res => {
+				let { base } = res;
+				this.base = base
+				uni.hideLoading()
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	.item-flex{
+		display: flex;
+		justify-content: space-between;
+		padding: 30rpx;
+		position: relative;
+		line-height: 40rpx;
+		align-items: center;
+		label{
+			width: 200rpx;
+			font-size: 30rpx;
+			color: gray;
+			@extend .nowrap;
+		}
+		.value{
+			text-align: right;
+			width: calc( 100% - 200rpx );
+			font-size: 30rpx;
+		}
+		&::after{
+			position: absolute;
+			left: 30rpx;
+			right: 0;
+			bottom: 0;
+			height: 1rpx;
+			content: " ";
+			background: #f6f6f6;
+		}
+	}
+</style>
diff --git a/pages/work/perfectChoose.vue b/pages/work/perfectChoose.vue
index b3425f2..e1de5e7 100644
--- a/pages/work/perfectChoose.vue
+++ b/pages/work/perfectChoose.vue
@@ -1,10 +1,9 @@
 <template>
 	<view class="perfect">
 		<view class="perfect-header">
-			<text v-if="isFinish == 0">完善订单资料</text>
+			<text v-if="isFinish == 0">订单资料完善中</text>
 			<text v-if="isFinish == 1">订单资料审核中</text>
 			<text v-if="isFinish == 2">修改订单资料</text>
-			
 			<image class="cover" src="@/static/background/info_back.png" mode="widthFix"></image>
 		</view>
 		<view class="perfect-list">
@@ -82,12 +81,17 @@
 				})
 			},
 			// 资料导航
-			onPerfect(name, finish, id){
-				if(finish == 1) return
+			onPerfect(name, finish, itemId){
+				if(finish == 1) {
+					if(name === 'WorkPerfectBasis') this.$Router.push({name: 'OrderPerfectBasisInfo', params: {orderId: this.orderId} })
+					if(name === 'WorkPerfectInstitutions') this.$Router.push({name: 'OrderPerfectInstitutionsInfo', params: { itemId } })
+					return
+				}
 				this.$Router.push({
 					name,
 					params: {
-						orderId: id
+						itemId : itemId,
+						orderId: this.orderId
 					}
 				})
 			}
diff --git a/pages/work/perfectInstitutions.vue b/pages/work/perfectInstitutions.vue
index ad7a9b4..682f641 100644
--- a/pages/work/perfectInstitutions.vue
+++ b/pages/work/perfectInstitutions.vue
@@ -16,7 +16,7 @@
 				v-if="item.pre_key != null ? isShowBlock(params, item): true"
 			>
 				<view class="from-item" :class="item.flex == 50 ? 'from-item-50': 'from-item-100'">
-					<block v-if="item.type == 'price' || item.type == 'number' || item.type == 'text' || item.type == 'region'">
+					<block v-if="item.type == 'text' || item.type == 'region'">
 						<label>
 							<text v-if="item.is_required === 1">*</text>{{item.title}}
 							<uni-icons v-if="item.reason.description" class="from-icon" type="info" size="18" color="red" @click="modifyToast(item.reason.description)"></uni-icons>
@@ -24,7 +24,7 @@
 						<input class="from-input" v-model="item.value" :type="item.type" :placeholder="item.placeholder || '请输入'">
 					</block>
 					<!-- mobile -->
-					<block v-if="item.type == 'mobile'">
+					<block v-if="item.type == 'price' || item.type == 'number' || item.type == 'mobile'">
 						<label>
 							<text v-if="item.is_required === 1">*</text>{{item.title}}
 							<uni-icons v-if="item.reason.description" class="from-icon" type="info" size="18" color="red" @click="modifyToast(item.reason.description)"></uni-icons>
@@ -47,7 +47,7 @@
 						</label>
 						<picker class="from-picker" mode="date" :value="item.value" @change="item.value = $event.detail.value">
 							<view class="from-picker-text">
-								<view class="text nowrap">{{item.value || '选择日期'}}</view>
+								<view class="text nowrap" :class="{'text-gray': item.value == ''}">{{item.value || '选择日期'}}</view>
 								<u-icon class="icon" name="calendar" color="#999" size="20"></u-icon>
 							</view>
 						</picker>
@@ -86,7 +86,7 @@
 						</label>
 						<picker class="from-picker" :range="item.options" :value="item.value" @change="item.value = $event.detail.value">
 							<view class="from-picker-text">
-								<view class="nowrap">{{item.options[item.value]}}</view>
+								<view class="nowrap" :class="{'text-gray': item.value == 0}">{{item.options[item.value]}}</view>
 								<u-icon class="icon" name="arrow-down-fill" color="#999" size="10"></u-icon>
 							</view>
 						</picker>
@@ -97,7 +97,10 @@
 							<text v-if="item.is_required === 1">*</text>{{item.title}}
 							<uni-icons v-if="item.reason.description" class="from-icon" type="info" size="18" color="red" @click="modifyToast(item.reason.description)"></uni-icons>
 						</label>
-						<textarea class="from-textarea" v-model="item.value" :placeholder="item.placeholder"></textarea>
+						<view class="from-textarea">
+							<textarea v-model="item.value" :maxlength="item.number" :placeholder="item.placeholder"></textarea>
+							<view class="from-number">{{item.value.length}}/{{item.number}}</view>
+						</view>
 					</block>
 				</view>
 			</block>
@@ -115,6 +118,7 @@
 	export default {
 		data() {
 			return {
+				submitId: '',
 				baseInfo: {
 					cover: '',
 					title: '',
@@ -151,10 +155,10 @@
 					title: '加载中...',
 					mask : true
 				})
-				baseBase(this.$Route.query.orderId).then(res => {
-					let { item, params } = res;
+				baseBase(this.$Route.query.itemId).then(res => {
+					let { item, params, business_order_user_bank_id } = res;
 					uni.getStorage({
-						key		: 'institutions' + this.$Route.query.orderId,
+						key		: 'institutions' + this.$Route.query.itemId,
 						success	: StorageRes => {
 							let { data } 	  = StorageRes
 							let storageParams = []
@@ -177,6 +181,7 @@
 								title: item.institution.title,
 								type : item.business_type.title
 							}
+							this.submitId = business_order_user_bank_id
 							uni.hideLoading()
 						}
 					})
@@ -202,7 +207,7 @@
 				}
 				if(type === 'local'){
 					uni.setStorage({
-						key		: 'institutions' + this.$Route.query.orderId,
+						key		: 'institutions' + this.$Route.query.itemId,
 						data	: subData,
 						success	: res => {
 							uni.showToast({
@@ -213,32 +218,46 @@
 					})
 					return
 				}
-				// 组织提交数据
-				for(let key in subData){
-					dataArr.push({
-						key,
-						value: subData[key]
-					})
-				}
-				updBaseBase(this.$Route.query.orderId, {
-					data: dataArr
-				}).then(res => {
-					uni.showModal({
-						title		: '提示',
-						content		: '机构资料已保存',
-						showCancel	: false,
-						success		: ModalRes => {
-							uni.removeStorageSync('institutions' + this.$Route.query.orderId)
-							this.$Router.back()
+				// 提交数据提示
+				uni.showModal({
+					title		: '提示',
+					content		: '请确认资料无误，提交后在审核期间不可更改',
+					cancelText	: '稍后',
+					confirmText : '确认无误',
+					success		: ModalRes => {
+						if(ModalRes.confirm){
+							uni.showLoading({
+								title: '提交中...',
+								mask : true
+							})
+							// 组织提交数据
+							for(let key in subData){
+								dataArr.push({
+									key,
+									value: subData[key]
+								})
+							}
+							updBaseBase(this.submitId, {
+								data: dataArr
+							}).then(res => {
+								uni.showModal({
+									title		: '提示',
+									content		: '机构资料已保存',
+									showCancel	: false,
+									success		: ModalRes => {
+										uni.removeStorageSync('institutions' + this.$Route.query.itemId)
+										this.$Router.back()
+									}
+								})
+								uni.hideLoading()
+							}).catch(err => {
+								uni.showToast({
+									title: err.message,
+									icon : 'none'
+								})
+							})
 						}
-					})
-					uni.hideLoading()
-				}).catch(err => {
-					console.log(err)
-					uni.showToast({
-						title: err.message,
-						icon : 'none'
-					})
+					}
 				})
 			},
 			// 修改提示信息
@@ -335,9 +354,19 @@
 				background: #F6F6F6;
 				width: 100%;
 				box-sizing: border-box;
-				font-size: 30rpx;
-				line-height: 50rpx;
 				border-radius: 10rpx;
+				textarea{
+					font-size: 30rpx;
+					line-height: 50rpx;
+					height: 150rpx;
+					width: 100%;
+				}
+				.from-number{
+					padding-top: 20rpx;
+					text-align: right;
+					font-size: 30rpx;
+					color: gray;
+				}
 			}
 			// radio
 			.from-radio{
@@ -378,6 +407,9 @@
 					& > .text{
 						width: calc(100% - 80rpx);
 					}
+					& > .text-gray{
+						color: gray;
+					}
 				}
 			}
 			// checkbox
diff --git a/pages/work/perfectInstitutionsInfo.vue b/pages/work/perfectInstitutionsInfo.vue
new file mode 100644
index 0000000..e8e2206
--- /dev/null
+++ b/pages/work/perfectInstitutionsInfo.vue
@@ -0,0 +1,66 @@
+<template>
+	<view>
+		<view class="item-flex" v-for="(item, index) in params" :key="index">
+			<label>{{item.title}}</label>
+			<view class="value">{{item.value_text || '-'}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { baseBase } from '@/apis/interfaces/order.js'
+	export default {
+		data() {
+			return {
+				params: []
+			};
+		},
+		created() {
+			uni.showLoading({
+				title: '加载中...',
+				mask : true
+			})
+			baseBase(this.$Route.query.itemId).then(res => {
+				let { params } = res;
+				this.params = params
+				uni.hideLoading()
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	.item-flex{
+		display: flex;
+		justify-content: space-between;
+		padding: 30rpx;
+		position: relative;
+		line-height: 40rpx;
+		align-items: center;
+		label{
+			width: 300rpx;
+			font-size: 30rpx;
+			color: gray;
+			@extend .nowrap;
+		}
+		.value{
+			text-align: right;
+			width: calc( 100% - 300rpx );
+			font-size: 30rpx;
+		}
+		&::after{
+			position: absolute;
+			left: 30rpx;
+			right: 0;
+			bottom: 0;
+			height: 1rpx;
+			content: " ";
+			background: #f6f6f6;
+		}
+	}
+</style>
diff --git a/pages/work/schemes.vue b/pages/work/schemes.vue
index 7dfe15c..1bc5aca 100644
--- a/pages/work/schemes.vue
+++ b/pages/work/schemes.vue
@@ -39,7 +39,17 @@
 				</block>
 				<view class="schemes-tips">
 					<view class="schemes-tips-title">须知：</view>
-					<text>{{scheme.business_type.notic}}</text>
+					<u-read-more
+						:toggle="true"
+						showHeight="200rpx"
+						:shadowStyle="shadowStyle"
+						closeText="阅读全文"
+						color="#446EFE"
+						textIndent="0em"
+					>
+						<text>{{scheme.business_type.notic}}</text>
+					</u-read-more>
+					<!-- <rich-text :nodes="content"></rich-text> -->
 				</view>
 			</view>
 		</view>
@@ -57,6 +67,11 @@
 			return {
 				user  : { name : '', sex: '' },
 				scheme: '',
+				shadowStyle: {
+					backgroundImage: "linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #F6F6F6 80%)",
+					paddingTop: "50px",
+					marginTop: "-50px",
+				}
 			};
 		},
 		created() {
@@ -186,6 +201,9 @@
 					color: #111;
 					padding-bottom: 20rpx;
 				}
+				text{
+					line-height: 40rpx;
+				}
 			}
 		}
 	}
diff --git a/pages/work/service.vue b/pages/work/service.vue
index 77c3c30..9d635de 100644
--- a/pages/work/service.vue
+++ b/pages/work/service.vue
@@ -193,27 +193,37 @@
 			},
 			// 提交保存服务
 			onSubmitService(){
-				wx.showLoading({
-					title: '保存中...',
-					mask : true
-				})
-				serviceOver(this.orderId).then(res => {
-					uni.showModal({
-						content		: res.message,
-						showCancel	: false,
-						confirmColor: '#446EFE',
-						success		: res => {
-							if(res.confirm){
-								this.$store.commit('setOrderId', this.orderId)
-								uni.navigateBack()
-							}
+				uni.showModal({
+					title		: '提示',
+					content		: '是否确认提交服务包配置给客户，提交后不可修改',
+					cancelText	: '稍后',
+					confirmText	: '提交',
+					success		: ModalRes => {
+						if(ModalRes.confirm){
+							wx.showLoading({
+								title: '保存中...',
+								mask : true
+							})
+							serviceOver(this.orderId).then(res => {
+								uni.showModal({
+									content		: res.message,
+									showCancel	: false,
+									confirmColor: '#446EFE',
+									success		: res => {
+										if(res.confirm){
+											this.$store.commit('setOrderId', this.orderId)
+											uni.navigateBack()
+										}
+									}
+								})
+							}).catch(err => {
+								uni.showToast({
+									title: err.message,
+									icon : 'none'
+								})
+							})
 						}
-					})
-				}).catch(err => {
-					uni.showToast({
-						title: err.message,
-						icon : 'none'
-					})
+					}
 				})
 			}
 		},