Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/news1/MerchantSettlement.vue

@@ -1,9 +1,8 @@
 <template>
 	<view class="settlement">
 		<view class="topContent">
-			<view>商家入驻信息采集，请认真填写提交</view>
+			<view class="topFont">商家入驻信息采集，请认真填写提交</view>
 			<view style="margin-top:22upx">通过审核后会有专人联系</view>
-
 		</view>
 		<view class="formContent">
 			<u-form :model="form" ref="uForm">
@@ -14,8 +13,9 @@
 					<u-form-item label="*主营类目" @click="categoryShow = true"> 
 						<u-input border v-model="form.store_cat" placeholder="请选择主营类目" type="select"
 							@click="categoryShow = true" />
-						<u-action-sheet :list="categoryList" :cancel-btn="false" v-model="categoryShow"
-							@click="actionSheetCallback(1, $event)"></u-action-sheet>
+						<u-picker :range="categoryList" range-key="text" @confirm="actionSheetCallback(1, $event)" v-model="categoryShow" mode="selector"></u-picker>
+						<!-- <u-action-sheet style="height: 200rpx;" :list="categoryList" :cancel-btn="false"
+							v-model="categoryShow" @click="actionSheetCallback(1, $event)"></u-action-sheet> -->
 					</u-form-item>
 				</view>
 				<view class="formSection">
@@ -109,10 +109,13 @@
 				</view>
 			</view>
 		</view>
+		<view class="subBox">
 			<view class="submitBtn" @click="sureSubmit">
 				提交
 			</view>
-		<u-popup v-model="popShow" mode="center" border-radius="12">
+		</view>
+
+		<view class="selfMask" v-if="popShow">
 			<view class="self_popup">
 				<image :src="$picUrl + '/static/news1/pop.png'" class="popimg" mode="widthFix"></image>
 				<view class="popcontent">
@@ -127,7 +130,7 @@
 					</view>
 				</view>
 			</view>
-		</u-popup>
+		</view>
 	</view>
 </template>
 
@@ -277,7 +280,7 @@ export default {
 	},
 	methods: {
 		actionSheetCallback(type, index) {
-			console.log(type, index)
+			// console.log(type, index)
 			if (type == 1) { //类目  
 				this.form.store_cat = this.categoryList[index].text
 			}
@@ -365,11 +368,14 @@ export default {
 				tip_title = '请输入联系人姓名！'
 			}
 			if (!this.form.user_position) {
-				tip_title = '请输入联系人职位！'
+				tip_title = '请选择联系人职位！'
 			}
 			if (!this.form.user_mobile) {
 				tip_title = '请输入联系人手机号！'
 			}
+			if (this.form.user_mobile && (!/^\+?\d[\d -]{8,12}\d/.test(this.form.user_mobile))) {
+				tip_title = '手机号格式不正确！'
+			}
 			if (!this.form.user_wx) {
 				tip_title = '请输入联系人微信！'
 			}
@@ -386,10 +392,10 @@ export default {
 				tip_title = '请选择是否自有工厂！'
 			}
 			if (!this.offline_name) {
-				tip_title = '是否有线下渠道'
+				tip_title = '请选择是否有线下渠道'
 			}
 			if (!this.shop_name) {
-				tip_title = '是否有电商店铺！'
+				tip_title = '请选择是否有电商店铺！'
 			}
 			let plat_form = []
 			this.btnList.map(item => {
@@ -413,6 +419,14 @@ export default {
 				.then(res => {
 					if (res.status) {
 						this.popShow = true
+						this.form = this.$options.data().form
+						this.send_name = ''
+						this.factory_name = ''
+						this.offline_name = ''
+						this.shop_name = ''
+						this.btnList.map(item => {
+							item.active = false
+						})
 					} else {
 						uni.showToast({
 							title: '入驻失败',
@@ -430,27 +444,26 @@ export default {
 <style lang="scss" scoped>
 page {
 	min-height: 100%;
-	padding-bottom: 60upx;
 }
 
 .settlement {
 	height: 100%;
-	padding-bottom: 60upx;
+	padding-bottom: 134upx;
 
 	.topContent {
 		height: 232upx;
 		background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%);
-		border-radius: 0px 0px 0px 0px;
-		opacity: 1;
 		font-size: 32upx;
 		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
+		font-weight: bold;
 		color: #FFFFFF;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		justify-content: center;
 
+		.topFont {
+			margin: 50upx 0 22upx;
+		}
 	}
 
 	.formContent {
@@ -500,14 +513,14 @@ page {
 			.shopText {
 				width: 240upx;
 				height: 72upx;
-				line-height: 72upx;
-				text-align: center;
 				background: #FFFFFF;
 				border-radius: 3px 3px 3px 3px;
-				opacity: 1;
 				border: 1px solid #D6D6D6;
 				position: relative;
 				margin-bottom: 24upx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
 
 				text {
 					font-size: 26upx;
@@ -541,41 +554,49 @@ page {
 		}
 	}
 
+	.subBox {
+		width: 100%;
+		position: fixed;
+		z-index: 66;
+		padding-bottom: 30upx;
+		bottom: 0;
+		background: #fff;
+	}
+
 	.submitBtn {
-		margin: 60upx 24upx 0;
-		height: 100upx;
+		width: 694rpx;
+		margin-left: 28rpx;
+		height: 104upx;
 		background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%);
-		border-radius: 52px 52px 52px 52px;
+		border-radius: 52px;
 		opacity: 1;
 		font-size: 32upx;
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 500;
 		color: #FFFFFF;
-		line-height: 100upx;
-		text-align: center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 }
 
 .popcontent {
 	width: 520upx;
-	height: 460upx;
+	height: 486upx;
 	background: linear-gradient(180deg, #FFE4E4 0%, #FFFFFF 100%);
 	border-radius: 6px 6px 6px 6px;
 	opacity: 1;
 
 	display: flex;
 	flex-direction: column;
-	// justify-content: space-around;
-	padding: 100upx 40upx 0 40upx;
+	padding: 0 40upx;
 	align-items: center;
-	position: relative;
-	z-index: 1;
-	top: -80upx;
 
 	.poptitle {
 		font-size: 32upx;
 		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
+		font-weight: bold;
+		margin-top: 118upx;
 		color: #000000;
 
 	}
@@ -585,7 +606,7 @@ page {
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
 		color: #727272;
-		margin-top: 36upx;
+		margin-top: 32upx;
 		line-height: 36upx;
 
 	}
@@ -596,28 +617,41 @@ page {
 		line-height: 72upx;
 		text-align: center;
 		background: #F55349;
-		border-radius: 36px 36px 36px 36px;
-		opacity: 1;
+		border-radius: 72upx;
 		font-size: 28upx;
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
 		color: #FFFFFF;
-		margin-top: 60upx;
+		margin-top: 58upx;
 	}
 
 }
-.self_popup{
+
+.selfMask {
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	background: rgba(60, 60, 60, 0.52);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.self_popup {
 	position: relative;
-	// background: rgba(60,60,60,0.52);
+	padding-top: 56rpx;
 }
+
 .popimg {
 	position: absolute;
-	width: 120upx;
+	width: 112upx;
 	left: 50%;
-	height: auto;
-	margin-left: -60upx;
-	top:0;
-	position: relative;
+	height: 128upx;
+	margin-left: -56upx;
+	top: 0;
 	z-index: 2;
 }