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

src/components/settle/index.vue

@@ -45,6 +45,9 @@
 	.settle-bottom {
 		position: fixed;
 		bottom: 44rpx;
-		width: 100%;
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 </style>

src/pages/settle/base.vue

@@ -66,9 +66,10 @@
 			<view class="seat"></view>
 			<template v-slot:bottom>
 				<view class="btn-wrap flex-xc">
-					<button class="btn-submit" :disabled="!submitStatus" @click="$u.debounce(submitBaseInfo, 500)">
-						确定
-					</button>
+					<u-button class="btn-submit" @click="$u.debounce(submitBaseInfo, 500)" :custom-style="buttonStyle"
+						type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'">
+						{{submitStatus ? '已确认信息，下一步' : '下一步'}}
+					</u-button>
 				</view>
 			</template>
 		</Settle>
@@ -123,15 +124,32 @@
 			},
 			cityText() {
 				return this.areaTxts.join('、')
-			},
-			anquanImage() {
-				return qn_base_url + 'anquan.png'
-			},
-			mixingImage() {
-				return qn_base_url + 'mixing.png'
-			},
-			dizhiImage() {
-				return qn_base_url + 'dizhi.png'
+			},
+			anquanImage() {
+				return qn_base_url + 'anquan.png'
+			},
+			mixingImage() {
+				return qn_base_url + 'mixing.png'
+			},
+			dizhiImage() {
+				return qn_base_url + 'dizhi.png'
+			},
+			buttonStyle() {
+				return this.submitStatus ? {
+					'color': '#FFFFFF',
+					'background-color': '#2272FF;',
+					'width': '600rpx',
+					'height': '104rpx',
+					'font-size': '32rpx',
+					'font-weight': 'bold'
+				} : {
+					'color': '#FFFFFF',
+					'background-color': '#D1D4D4;',
+					'width': '600rpx',
+					'height': '104rpx',
+					'font-size': '32rpx',
+					'font-weight': 'bold'
+				}
 			}
 		},
 		components: {
@@ -572,20 +590,7 @@
 	.btn-wrap {
 		width: 100%;
 
-		.btn-submit {
-			width: 600rpx;
-			height: 104rpx;
-			line-height: 104rpx;
-			border-radius: 52rpx;
-			background: #2272FF;
-			font-size: 32rpx;
-			color: #fff;
-
-			&[disabled] {
-				background-color: #D1D4D4;
-				color: #FFFFFF;
-			}
-		}
+		.btn-submit {}
 	}
 
 	.itemView {
@@ -696,8 +701,10 @@
 	}
 
 	.tip-image {
-		width: 34rpx;
+		width: 30rpx;
+		height: 32rpx;
+		flex-shrink: 0;
 		margin-right: 8rpx;
 		margin-top: 2rpx;
 	}
-</style>
+</style>

src/pages/settle/file.vue

@@ -44,9 +44,10 @@
 
 			<template v-slot:bottom>
 				<view class="btn-wrap flex-xc">
-					<button class="btn-submit" :disabled="!submitBtnStatus" @click="$u.debounce(submitFileInfo, 500)">
-						{{ !submitBtnStatus ? '完成必填项，可提交资料' : '提交' }}
-					</button>
+					<u-button class="btn-submit" @click="$u.debounce(submitFileInfo, 500)" :custom-style="buttonStyle"
+						type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'">
+						{{ !submitBtnStatus ? '下一步' : '我已确认信息，下一步' }}
+					</u-button>
 				</view>
 			</template>
 
@@ -232,6 +233,23 @@ export default {
 		},
 		tishiImage() {
 			return qn_base_url + 'tishi.png'
+		},
+		buttonStyle() {
+			return this.submitBtnStatus ? {
+				'color': '#FFFFFF',
+				'background-color': '#2272FF;',
+				'width': '600rpx',
+				'height': '104rpx',
+				'font-size': '32rpx',
+				'font-weight': 'bold'
+			} : {
+				'color': '#FFFFFF',
+				'background-color': '#D1D4D4;',
+				'width': '600rpx',
+				'height': '104rpx',
+				'font-size': '32rpx',
+				'font-weight': 'bold'
+			}
 		}
 	},
 	components: {
@@ -448,7 +466,6 @@ export default {
 				return;
 			}
 			let fileInfo = this.fileInfo;
-			debugger
 			fileInfo.other_photos = JSON.stringify(fileInfo.other_photos)
 			let submitInfoData = {
 				...fileInfo,
@@ -656,9 +673,11 @@ export default {
 	}
 
 	.tip-image {
-		width: 34rpx;
+		width: 30rpx;
+		height: 32rpx;
 		margin-right: 8rpx;
-		margin-top: 2rpx;
+		margin-top: 2rpx;
+		flex-shrink: 0;
 	}
 
 	.bottom-tip-view {
@@ -686,18 +705,7 @@ export default {
 		width: 100%;
 
 		.btn-submit {
-			width: 600rpx;
-			height: 104rpx;
-			line-height: 104rpx;
-			border-radius: 52rpx;
-			background: #2272FF;
-			font-size: 32rpx;
-			color: #fff;
 
-			&[disabled] {
-				background-color: #D1D4D4;
-				color: #FFFFFF;
-			}
 		}
 	}
 	.card-info-view {

src/pages/settle/index.vue

@@ -2,65 +2,25 @@
 	<view class="back_view">
 		<Settle :index="1">
 			<view class="content-view">
-				<view style="padding: 30rpx;">
+				<view v-for="(item, index) in contentTexts" :key="index"
+					:class="['item-list', {last: contentTexts.length <= index + 1}]">
 					<view class="item">
 						<view class="item-label">
-							<text>招募要求</text>
+							<text>{{item.title}}</text>
 						</view>
 						<view class="item-content">
-							<text>
-								1.必须具备相关的从业证书——电工证；
-								2.有汽车：皮卡、小面包、小轿车等；
-								3.需具备一定的作业工具：如液压压线钳、冲击钻、电锤、登高安全带、电锤、绝缘电阻仪（摇表）、交流充电模拟器等；
-								4.有充电桩安装经验优先；
-							</text>
-						</view>
-					</view>
-					<view class="line-view"></view>
-					<view class="item">
-						<view class="item-label">
-							<text>结算价格</text>
-						</view>
-						<view class="item-content">
-							<text>
-								1.不同车企品牌结算价格不一，675元-1890元不等；
-								2.结算价格为包工包料价，安装材料根据车企品牌规格自行采购（电缆、空开、漏保）；
-								3.结算账期：周结50%，剩余50%次月20号结算；
-							</text>
-						</view>
-					</view>
-					<view class="line-view"></view>
-					<view class="item">
-						<view class="item-label">
-							<text>入驻资料</text>
-						</view>
-						<view class="item-content">
-							<text>
-								1.身份证正反面照片
-								2.高/低压电工证正反面照片
-								3.车辆照片
-							</text>
-						</view>
-					</view>
-					<view class="line-view"></view>
-					<view class="item">
-						<view class="item-label">
-							<text>注意事项：</text>
-						</view>
-						<view class="item-content">
-							<text>
-								1.身份证，银行卡，签约人共有同一人，否则无法入驻。
-								2.充电桩材料按要求自行准备。
-							</text>
+							<text>{{item.content}}</text>
 						</view>
 					</view>
+					<view class="line-view" v-if="contentTexts.length > index + 1"></view>
 				</view>
 			</view>
 			<template v-slot:bottom>
-				<button :class="['bottom_btn', {'active': isStop}]" @click="$u.debounce(applyClick, 500)">
+				<u-button class="bottom_btn" @click="$u.debounce(applyClick, 500)" :custom-style="buttonStyle"
+					type="primary" shape="circle" :hover-class="isStop ? '' : 'none'">
 					<text class="bottom_title" v-if="!isStop">浏览 {{count}} 秒后可申请入驻</text>
 					<text class="bottom_title" v-if="isStop">申请入驻</text>
-				</button>
+				</u-button>
 			</template>
 		</Settle>
 	</view>
@@ -82,6 +42,44 @@
 				saving: true
 			}
 		},
+		computed: {
+			contentTexts() {
+				return [{
+					title: '招募要求',
+					content: '1.必须具备相关的从业证书——电工证；\n\
+							2.有汽车：皮卡、小面包、小轿车等\n\
+							3.需具备一定的作业工具：如液压压线钳、冲击钻、电锤、登高安全带、电锤、绝缘电阻仪（摇表）、交流充电模拟器等；\n\
+							4.有充电桩安装经验优先；'
+				}, {
+					title: '结算价格',
+					content: '1.不同车企品牌结算价格不一，675元-1890元不等；\n\
+							2.结算价格为包工包料价，安装材料根据车企品牌规格自行采购（电缆、空开、漏保）；\n\
+							3.结算账期：周结50%，剩余50%次月20号结算；'
+				}, {
+					title: '入驻资料',
+					content: '1.身份证正反面照片\n\
+							2.高/低压电工证正反面照片\n\
+							3.车辆照片'
+				}, {
+					title: '注意事项',
+					content: '1.身份证，银行卡，签约人共有同一人，否则无法入驻。\n\
+								2.充电桩材料按要求自行准备。'
+				}]
+			},
+			buttonStyle() {
+				return this.isStop ? {
+					'color': '#FFFFFF',
+					'background-color': '#2272FF;',
+					'width': '600rpx',
+					'height': '104rpx',
+				} : {
+					'color': '#FFFFFF',
+					'background-color': '#D1D4D4;',
+					'width': '600rpx',
+					'height': '104rpx'
+				}
+			}
+		},
 		onLoad(e) {
 			this.initpageData(e)
 			this.startCounting()
@@ -166,7 +164,7 @@
 
 				this.jumpJudge()
 			},
-			jumpJudge() {
+			jumpJudge() {
 				if (Number(this.status) > 0) {
 					uni.navigateTo({
 						url: '/pages/settle/prompt'
@@ -184,11 +182,11 @@
 
 <style lang="scss" scoped>
 	.back_view {
-		background-color: #F4F5F7;
+		background-color: #F4F5F7;
 		position: absolute;
 		top: 0;
 		left: 0;
-		width: 100%;
+		width: 100%;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
@@ -204,9 +202,15 @@
 		background-color: #F4F5F7;
 		height: 2rpx;
 		width: 100%;
-		margin-bottom: 30rpx;
 		margin-top: 30rpx;
+	}
+
+	.item-list {
+		padding: 30rpx 30rpx 0rpx 30rpx;
 
+		&.last {
+			padding-bottom: 30rpx;
+		}
 	}
 
 	.item-label {
@@ -220,24 +224,16 @@
 		color: #333333;
 		font-size: 26rpx;
 		line-height: 50rpx;
-		margin-top: 30rpx;
+		margin-top: 20rpx;
 	}
 
 	.bottom_btn {
 		width: 600rpx;
 		height: 104rpx;
 		line-height: 96rpx;
-		border-radius: 54rpx;
-		// border: 4rpx solid #FFFFFF;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		background-color: #D1D4D4;
-
-		&.active {
-			background-color: #2272FF;
-
-		}
 
 		.bottom_title {
 			color: #fff;

src/pages/settle/prompt.vue

@@ -126,7 +126,8 @@
 					vm.status = result.record.status
 				}
 				let settledInfo = await app.getBaseInfo(this, callBack)
-				this.settledInfo = settledInfo
+				this.settledInfo = settledInfo
+				this.settledInfo.record.status = 8
 				this.status = settledInfo.record.status
 				uni.hideLoading()
 				this.initInfo(settledInfo.record)
@@ -188,13 +189,14 @@
 		position: absolute;
 
 		.icon {
-			margin-top: 68rpx;
-			width: 334rpx;
-			height: 320rpx;
+			margin-top: 20rpx;
+			width: 224rpx;
+			height: 224rpx;
 
-			&.active {
-				width: 224rpx;
-				height: 224rpx;
+			&.active {
+				margin-top: 38rpx;
+				width: 234rpx;
+				height: 222rpx;
 			}
 		}