zhaoyun 2 недель назад
Родитель
Сommit
2e306ce503

+ 10 - 1
mer_uniapp/pages/user/index.vue

@@ -161,7 +161,16 @@
 								</view>
 							</view>
 						</view>
-					</view>
+						<!-- 骑手管理 -->
+						<view class="user-menus mt20" v-if="userInfo.isRider">
+							<view class="menu-title">骑手管理</view>
+							<view class="list-box">
+								<view class="item" @click="menusTap('/pages/rider_index/index')">
+									<image :src="urlDomain+'crmebimage/presets/adminImg/ic-rider.png'"></image>
+									<text>骑手管理</text>
+								</view>
+							</view>
+						</view>
 					<image :src="copyImage" alt="" class='support'></image>
 				</scroll-view>
 			</view>

+ 1 - 1
mer_uniapp/pages/users/settled/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :data-theme="theme">
-		<view v-if="!successful">
+	<view v-if="!successful">
       <form report-submit='true'>
         <view class='merchantsSettled'>
           <view class="merchantBg">

+ 111 - 15
mer_uniapp/pages/users/user_rider/index.vue

@@ -6,6 +6,7 @@
 			</nav-bar>
 		</view>
 		<!-- #endif -->
+	<view v-if="!successful">
 		<form @submit="formSubmit">
 			<view class="merchantsSettled">
 				<view class="merchantBg">
@@ -87,7 +88,7 @@
 						<button class="settleAgree" @click="showProtocol = true">《入驻协议》</button>
 					</view>
 					<view style="padding: 0 96rpx;">
-						<button class="sub" @tap="formSubmit">提交</button>
+						<button class="sub" @tap="formSubmit">提交申请</button>
 					</view>
 
 				</view>
@@ -103,7 +104,20 @@
 				</view>
 			</view>
 		</view>
-
+	  <view class='loadingicon acea-row row-center-wrapper' v-if="loading">
+        <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
+      </view>
+	  </view>
+	  <view class="settledSuccessMain" v-else>
+	  	<view class="settledSuccessful">
+	  		<image class="image" src="../static/images/settledSuccessful.svg" alt="" />
+	  		<view class="title">恭喜,您的资料提交成功!</view>
+	  		<view class="info">预计15个工作日内审核完毕,平台客服会及时与您联系!</view>
+	  		<view class="goHome" hover-class="none" @click="goHome">
+	  			返回首页
+	  		</view>
+	  	</view>
+	  </view>
 		<Verify @success="handlerOnVerSuccess" :captchaType="'clickWord'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
 	</view>
 </template>
@@ -133,7 +147,9 @@
 		},
 		data() {
 			return {
+				successful: false,
 				showProtocol: false,
+				loading: false,
 				protocol: '',
 				tagStyle: {
 					img: 'width:100%;display:block;'
@@ -154,6 +170,7 @@
 				checkbox1: true,
 				checkbox2: false,
 				statusBarHeight: app.globalData.statusBarHeight,
+				theme: app.globalData.theme,
 				navigationBarHeight: 112,
 				isAgree: false,
 				isSwitch: false,
@@ -212,6 +229,12 @@
 					 }
 				});
 			},
+			// 首页
+			goHome() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
+			},
 			handBack() {
 				uni.navigateBack({
 					delta: 1
@@ -284,16 +307,28 @@
 						qualificationPicture: this.picsStr
 					}
 					console.log(params)
-					riderSettledApply(params).then(res => {
+					riderSettledApply(params).then(data => {
+						this.loading = true;
+						this.timer = setTimeout(() => {
+							this.successful = true;
+						}, 1000)
+					
+					}).catch(res => {
 						this.$util.Tips({
-							title: '提交成功,等待审核'
-						});
-						this.handBack()
-					}).catch(err => {
-						return this.$util.Tips({
-							title: err
+							title: res
 						});
-					});
+					})
+					
+					// riderSettledApply(params).then(res => {
+					// 	this.$util.Tips({
+					// 		title: '提交成功,等待审核'
+					// 	});
+					// 	this.handBack()
+					// }).catch(err => {
+					// 	return this.$util.Tips({
+					// 		title: err
+					// 	});
+					// });
 				}
 			},
 			/**
@@ -425,13 +460,23 @@
 	}
 
 	.sub {
-		width: 100%;
+		// width: 100%;
+		// margin: 25px auto 25px auto;
+		// background-color: $bg-color-primary;
+		// font-weight: 600;
+		// font-size: 35rpx;
+		// color: #FFFFFF;
+		// padding: 25rpx 0;
+		width: 588rpx;
 		margin: 25px auto 25px auto;
-		background-color: $bg-color-primary;
-		font-weight: 600;
-		font-size: 35rpx;
+		height: 86rpx;
+		border-radius: 25px;
+		text-align: center;
+		line-height: 86rpx;
+		font-size: 15px;
 		color: #FFFFFF;
-		padding: 25rpx 0;
+		background-color: $bg-color-primary;
+		//@include main_bg_color(theme);
 	}
 
 	.order-nav {
@@ -651,4 +696,55 @@
 		top: 18%;
 		width: calc(100% - 24px);
 	}
+	
+	.loadingicon {
+		height: 100vh;
+		overflow: hidden;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+	.settledSuccessMain {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #fff;
+	}
+	.settledSuccessful {
+		flex: 1;
+		width: 100%;
+		padding: 0 56px;
+		height: auto;
+		background: #fff;
+		text-align: center;
+	}
+	
+	.settledSuccessful .image {
+		width: 189px;
+		height: 157px;
+		margin-top: 66px;
+	}
+	
+	.settledSuccessful .title {
+		color: #333333;
+		font-size: 16px;
+		font-weight: bold;
+		margin-top: 35px;
+	}
+	
+	.settledSuccessful .info {
+		color: #A0A0A0;
+		font-size: 13px;
+		margin-top: 12px;
+	}
+	
+	.settledSuccessful .goHome {
+		margin: 60px auto 0;
+		line-height: 43px;
+		color: #282828;
+		font-size: 15px;
+		border: 1px solid #B4B4B4;
+		border-radius: 60px;
+	}
+	
 </style>