Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/components/settle/agreement.vue

+<template>
+	<view class="content-view">
+		<view class="content-list" v-for="(item, index) in info" :key="index">
+			<view class="content-title">{{item.title}}</view>
+			<view class="content-item" v-for="(i, key) in item.content" :key="key">{{i}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {}
+		},
+		computed: {
+			info() {
+				return [{
+					title: '一、入驻条件',
+					content: [
+						'1.年龄在18-60周岁之间；',
+						'2.初中及以上学历；',
+						'3.能熟练使用智能手机；',
+						'4.与人交流时态度良好，沟通顺畅；'
+					]
+				}, {
+					title: '二、注意事项',
+					content: [
+						'1.平台会对每笔订单收取一定比例的服务费抽成；',
+						'2.若审核通过，平台工作人员将会电话联系您，并邀约参加师傅培训会，请您耐心等待；',
+						'3.开关插座、线路维修、空开漏保等品类的师傅需持有电工证;',
+						'4.家电清洗品类的师傅需持有专业高温清洗设备，并在每一笔清洗订单中上传设备照片（单独水枪类清洗设备不符合规定）；',
+						'5.请如实填写自己擅长品类，如有核实师傅申请的维修品类和开通账号的维修品类不一致，将不给予接单资格;'
+					]
+				}]
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-view {
+		padding: 16rpx 30rpx 30rpx 30rpx;
+		background-color: #F4F5F7;
+		height: 360rpx;
+		overflow: scroll;
+		.content-list {
+			.content-title {
+				font-size: 28rpx;
+				color: #333333;
+				margin-top: 14rpx;
+			}
+			.content-item {
+				font-size: 24rpx;
+				color: #666666;
+				padding-top: 14rpx;
+			}
+		}
+	}
+</style>

src/pages.json

@@ -101,7 +101,9 @@
 		{
 			"path": "pages/settle/pay-ensure",
 			"style": {
-				"navigationBarTitleText": "缴纳设备押金"
+				"navigationBarTitleText": "缴纳设备押金",
+				"navigationStyle": "custom",
+				"disableScroll": true
 			}
 		},
 		{
@@ -121,7 +123,9 @@
 		{
 			"path": "pages/settle/sign-contract",
 			"style": {
-				"navigationBarTitleText": "签约页面"
+				"navigationBarTitleText": "签约页面",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"disableScroll": true
 			}
 		},
 		{
@@ -237,6 +241,16 @@
 				"path": "pages/settle/file", //启动页面，必选
 				"query": "" //启动参数，在页面的onLoad函数里面得到
 			},
+			{
+				"name": "缴纳保证金", //模式名称
+				"path": "pages/settle/pay-ensure", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			},
+			{
+				"name": "签约页面", //模式名称
+				"path": "pages/settle/sign-contract", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			},
 			{
 				"name": "缴纳保证金", //模式名称
 				"path": "pages/settle/pay-ensure", //启动页面，必选

src/pages/settle/prompt.vue

 <template>
 	<view class="container u-row-between" v-if="info">
-		<Settle :index="2">
+		<Settle :index="pageIndex">
 			<view class="content-view">
 				<view class="u-flex u-row-center">
 					<image :class="['icon', {active: status != 1}]"
@@ -31,7 +31,8 @@
 		},
 
 		data() {
-			return {
+			return {
+				pageIndex: 2,
 				settledInfo: null,
 				promptList: [{
 					status: 1,
@@ -92,10 +93,16 @@
 					'@/static/settle/icon-prompt@3x.png')
 			}
 		},
-		onLoad(e) {
+		onLoad(e) {
+			if (e) {
+				if (e.pageIndex) {
+					this.pageIndex = e.pageIndex;
+				}
+			}
 			// if(!this.settledInfo){
 			// 	this.getBaseInfo()
-			// }
+			// }
+			
 		},
 		onShow() {
 			if (!this.settledInfo) {