From 1b78e33e0d0340f3d45f87160abcb0f13f013774 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 02 八月 2024 00:10:56 +0800
Subject: [PATCH] fix bug

---
 sub_pages/partner/partner-info/partner-info.vue |   80 +++++++++++++++++++++++++---------------
 1 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/sub_pages/partner/partner-info/partner-info.vue b/sub_pages/partner/partner-info/partner-info.vue
index 4d99b20..698993b 100644
--- a/sub_pages/partner/partner-info/partner-info.vue
+++ b/sub_pages/partner/partner-info/partner-info.vue
@@ -1,16 +1,16 @@
 <template>
-	<view class="container-page">
-		<view v-if="source==='step'" style="padding: 20rpx 0rpx;color: red;">
-			<view style="padding: 20rpx;text-align: center;background-color: #fff;">先阶段仅限云南产地的供应商入住</view>
+	<view class="container-page" style="padding: 0rpx;">
+		<view v-if="source==='step'" style="padding: 20rpx 0rpx;color: red;;background-color: #e6e6e6;">
+			<view style="padding: 20rpx;text-align: center;background-color: #fff;">仅限花满芫合伙人入驻</view>
 		</view>
-		<view v-if="source==='step'" >
-			<u-steps current="1">
-				<u-steps-item title="信息填写">
+		<view v-if="source==='step'" class="m-t-20">
+			<u-steps current="0">
+				<u-steps-item title="信息填写" class="u-steps-item" style="font-size: 28rpx;">
 				</u-steps-item>
-				<u-steps-item title="提交申请"  ></u-steps-item>
+				<u-steps-item title="提交申请" class="u-steps-item"></u-steps-item>
 			</u-steps>
 		</view>
-		<view>
+		<view class="p20">
 			<view class="form-item before-line">
 				<view class="label required">联系人姓名</view>
 				<view class="m-l-a m-r-0 flex">
@@ -27,17 +27,17 @@
 
 				</view>
 			</view>
+
 			<view class="form-item before-line">
-				<view class="label required">集货站</view>
-				<view class="m-l-a m-r-0 flex " :class="[!dto.stationId?'desc-gray':'']" @click="()=>{
-					if(!id){
-						show_select_station=true
-					}
-				}">
-					<view>{{dto.stationName || '请选择'}}</view>
-					<u-icon class="m-l-a" name="arrow-right"></u-icon>
+				<view class="label required">城市仓名称</view>
+				<view class="m-l-a m-r-0 flex">
+					<input v-model="dto.cityWarehouse" placeholder="请输入城市仓名称"
+						style="margin-top: 16px;text-align: right;"></input>
+
 				</view>
 			</view>
+
+
 			<view class="form-item before-line">
 				<view class="label required">地区</view>
 
@@ -65,7 +65,7 @@
 			<view class="form-item before-line m-t-20" @click="uploadIcon('idCards')">
 				<view class="label required">上传身份证正反面</view>
 				<view class="m-l-a m-r-0 flex">
-					<view class="component-button-upload" @click="uploadIcon('idCards')">
+					<view class="component-button-upload">
 
 					</view>
 
@@ -119,8 +119,8 @@
 					idCards: [],
 					address: '',
 					id: '',
-					stationId: '',
-					stationName: '',
+					// stationId: '',
+					// stationName: '',
 					userId: '',
 					name: '',
 					contactTel: '',
@@ -139,8 +139,8 @@
 						key: 'contactTel'
 					},
 					{
-						name: '集货站',
-						key: 'stationId'
+						name: '城市仓名称',
+						key: 'cityWarehouse'
 					},
 					{
 						name: '地区',
@@ -158,18 +158,18 @@
 		},
 		onLoad(options) {
 			this.source = options.source || ''
-			this.$http.request('get', '/api/station/list', {
-				params: {}
-			}).then(res => {
-				var data = res.data
-				this.columns_station = [data || []]
-			})
+			// this.$http.request('get', '/api/station/list', {
+			// 	params: {}
+			// }).then(res => {
+			// 	var data = res.data
+			// 	this.columns_station = [data || []]
+			// })
 			if (options.id) {
 				this.id = options.id
 				this.getDetail()
 			} else {
 				//判断是不是来自登录步骤,是等话需要从缓存里面拿信息
-				if (this.source == 'step') {
+				if (this.source === 'step') {
 					var tjson = this.$storage.getItem('cache_partner_info')
 					if (tjson) {
 						this.dto = {
@@ -199,7 +199,14 @@
 					this.dto.province = ''
 					this.dto.city = ''
 					this.dto.region = ''
-					if (e.detail.value.length <= 3) {
+					if (e.detail.value.length == 2) {
+						if (!!e.detail.value[0])
+							this.dto.province = e.detail.value[0].value
+						if (!!e.detail.value[0])
+							this.dto.city = e.detail.value[0].value
+						if (!!e.detail.value[1])
+							this.dto.region = e.detail.value[1].value
+					} else if (e.detail.value.length <= 3) {
 						if (!!e.detail.value[0])
 							this.dto.province = e.detail.value[0].value
 						if (!!e.detail.value[1])
@@ -297,8 +304,21 @@
 						return
 					}
 				}
+			
+				if (this.dto.contactTel.length !== 11 && !this.dto.contactTel.startsWith('1')) {
+					this.$message.showToast(`联系方式需要为11位,且开头为1`)
+					return
+				}
+				if(isNaN(parseInt(this.dto.contactTel))){
+					this.$message.showToast(`联系方式需要为11位手机号,格式错误`)
+					return
+				}
 				if (this.dto.idCards.length == 0) {
 					this.$message.showToast(`身份证信息未填写`)
+					return
+				}
+				if (this.dto.idCards.length < 2) {
+					this.$message.showToast(`身份证信息需要上传至少2张图片(正反面)`)
 					return
 				}
 				await this.$message.confirm(`是否确定提交/修改信息`)
@@ -309,7 +329,7 @@
 						...this.dto
 					}))
 
-					uni.redirectTo({
+					uni.navigateTo({
 						url: '/pages/login/supplier-reg?source=step'
 					})
 

--
Gitblit v1.9.3