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

src/components/settle/services.vue

+<template>
+	<view class="content-view">
+		<view class="headimage-view">
+			<image class="headimage-view-image" src="../../static/settle/kefu@3x.png"></image>
+			<text class="name-text">朱曼婷</text>
+		</view>
+
+		<view class="content-info">
+			<view>
+				<view class="content-info-title">深圳唯修汇科技有限公司</view>
+				<view class="content-info-tip">长按二维码添加官方客服微信及时了解审核进度</view>
+			</view>
+			<view class="QRcode-view">
+				<image class="content-info-QRcode" src="../../static/settle/erweima@3x.png"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+
+		},
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-view {
+		background-color: #FFFFFF;
+		width: 440rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+
+		.headimage-view {
+			position: relative;
+
+			.headimage-view-image {
+				width: 440rpx;
+				height: 400rpx;
+			}
+
+			.name-text {
+				position: absolute;
+				bottom: 20rpx;
+				left: 20rpx;
+				color: #FFFFFF;
+				font-size: 28rpx;
+			}
+		}
+
+		.content-info {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			width: 100%;
+			padding: 0rpx 12rpx 20rpx 12rpx;
+
+			.content-info-title {
+				font-size: 24rpx;
+				color: #333333;
+				margin-bottom: 10rpx;
+			}
+
+			.content-info-tip {
+				font-size: 20rpx;
+				color: #666666;
+			}
+
+			.QRcode-view {
+				margin-left: 30rpx;
+			}
+
+			.content-info-QRcode {
+				padding-top: 12rpx;
+				width: 104rpx;
+				height: 104rpx;
+			}
+		}
+	}
+</style>

src/pages/index/index.vue

@@ -156,7 +156,7 @@ export default {
         // 后台自动判断入驻流程是否完成，前台通过status确定状态
         if (result && result.record) {
           vm.loaded = true;
-          vm.status = result.record.status;
+          vm.status = Number(result.record.status);
           // vm.status = 1
         }
       };

src/pages/settle/index.vue

@@ -166,7 +166,7 @@
 
 				this.jumpJudge()
 			},
-			jumpJudge() {
+			jumpJudge() {
 				if (Number(this.status) > 0) {
 					uni.navigateTo({
 						url: '/pages/settle/prompt'

src/pages/settle/prompt.vue

@@ -8,12 +8,16 @@
 					</image>
 				</view>
 				<view class="txt-box">
-					<text :class="['title',index ? 'active' : '']" v-for="(txt,index) in info.txtArr">{{txt}}</text>
+					<text :class="['title', {failed: status == 4} ,index ? 'active' : '']" v-for="(txt,index) in info.txtArr">{{txt}}</text>
 				</view>
 				<view class="tips-box" v-if="info.tipsArr">
 					<text :class="['tips',info.tipsArr.length>1 && index===0 ? 'red' : '']"
 						v-for="(txt,index) in info.tipsArr">{{txt}}</text>
-				</view>
+				</view>
+				<view class="services-view">
+					<Services/>
+				</view>
+				
 			</view>
 			<template v-slot:bottom>
 				<button class="btn-submit" @click="$u.debounce(goPage, 500)">{{info.btnTxt}}</button>
@@ -24,10 +28,12 @@
 
 <script>
 	import Settle from '@/components/settle/index.vue'
+	import Services from '@/components/settle/services.vue'
 
 	export default {
 		components: {
-			Settle
+			Settle,
+			Services
 		},
 
 		data() {
@@ -38,21 +44,21 @@
 					status: 1,
 					statusName: '待审核',
 					txtArr: ['已提交，等待审核', '正在审核中'],
-					btnTxt: '去接单广场逛逛',
-					url: '/pages/take/index'
+					btnTxt: '去首页',
+					url: '/pages/index/index'
 				}, {
 					status: 2,
 					statusName: '已通过',
 					txtArr: ['恭喜，审核通过', '“充电桩安装入驻审核”'],
 					btnTxt: '去考试',
-					url: '/pages/exam/start'
+					url: '/pages/learn/exam'
 				}, {
 					status: 3,
 					statusName: '备选',
 					txtArr: ['您已成为', "“充电桩安装备选服务商”"],
 					tipsArr: ['后续如有业务，请留意通知！'],
-					btnTxt: '去接单广场逛逛',
-					url: '/pages/take/index'
+					btnTxt: '去首页',
+					url: '/pages/index/index'
 				}, {
 					status: 4,
 					statusName: '已驳回',
@@ -78,8 +84,8 @@
 					status: 7,
 					statusName: '已支付保证金',
 					txtArr: ['您已成为', "充电桩安装的正式服务商"],
-					btnTxt: '去接单广场逛逛',
-					url: '/pages/take/index'
+					btnTxt: '去首页',
+					url: '/pages/index/index'
 				}],
 				// 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
 				status: '',
@@ -120,9 +126,9 @@
 					vm.settledInfo = result
 					vm.status = result.record.status
 				}
-				let settledInfo = await app.getBaseInfo(this, callBack)
-				this.settledInfo = settledInfo
-				this.status = settledInfo.record.status
+				let settledInfo = await app.getBaseInfo(this, callBack)
+				this.settledInfo = settledInfo
+				this.status = settledInfo.record.status
 				uni.hideLoading()
 				this.initInfo(settledInfo.record)
 			},
@@ -155,10 +161,17 @@
 				this.info = info
 			},
 			goPage() {
-				const url = this.info.url
-				uni.navigateTo({
-					url,
-				});
+				const url = this.info.url
+				if (this.status == 1 || this.status == 3 || this.status == 3) {
+					uni.reLaunch({
+						url,
+					});
+					
+				} else {
+					uni.navigateTo({
+						url,
+					});
+				}
 			},
 		},
 	}
@@ -194,7 +207,7 @@
 		}
 
 		.txt-box {
-			padding-bottom: 50rpx;
+			
 		}
 
 		.title {
@@ -205,29 +218,25 @@
 			font-weight: bold;
 			font-size: 44rpx;
 			color: #2272FF;
-
+			&.failed {
+				color: #FA5A49;
+			}
 			&.active {
 				color: #666666;
 				font-size: 24rpx;
-				font-weight: 300rpx;
-				margin-top: 26rpx;
+				font-weight: 400;
+				margin-top: 20rpx;
 			}
 		}
 
 		.tips-box {
-			margin-top: 32rpx;
+			// margin-top: 32rpx;
 			text-align: center;
 		}
 
 		.tips {
-			text-align: center;
-			line-height: 44rpx;
-			font-size: 32rpx;
-			color: #666;
-
-			&.red {
-				color: red;
-			}
+			color: #666666;
+			font-size: 24rpx;
 		}
 
 		.btn-submit {
@@ -245,6 +254,11 @@
 				background-color: #f3f3f3;
 				color: #999;
 			}
+		}
+		.services-view {
+			display: flex;
+			justify-content: center;
+			padding-top: 50rpx;
 		}
 	}
 </style>