From 7a68f7e13913f8d4f86962979fd1e79c18f57fb6 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 03 八月 2024 10:44:25 +0800
Subject: [PATCH] update 登录和其他部分信息

---
 sub_pages/supplier/supplier-info/supplier-info.vue |  121 +++++++++++++++++++++++-----------------
 1 files changed, 69 insertions(+), 52 deletions(-)

diff --git a/sub_pages/supplier/supplier-info/supplier-info.vue b/sub_pages/supplier/supplier-info/supplier-info.vue
index e7a2c08..2baac13 100644
--- a/sub_pages/supplier/supplier-info/supplier-info.vue
+++ b/sub_pages/supplier/supplier-info/supplier-info.vue
@@ -27,7 +27,7 @@
 				</view>
 			</view>
 			<view class="form-item bottom-border-no">
-				<view class="label required" style="width: 360rpx;">店铺头像(推荐80*80px)</view>
+				<view class="label required" style="width: 360rpx;min-width: 360rpx;font-size: 28rpx;">店铺头像(推荐80*80px)</view>
 				<view class="m-l-a m-r-0 flex m-t-20 m-b-20">
 					<view class="component-button-upload" @click="uploadIcon('cover')">
 
@@ -119,23 +119,27 @@
 							v-for="(item, index) in shTypeList" :key="index" :label="item.name" :name="item.name">
 						</u-radio>
 					</u-radio-group> -->
-					<view>
-						<radio :checked="dto.idcardType==='身份证'" @click="()=>{
-							dto.idcardType='身份证';
-							$forceUpdate()
-						}">
-						</radio>身份证
-					</view>
-					<view class="m-l-10">
-						<radio :checked="dto.idcardType==='营业执照'" @click="()=>{
-							dto.idcardType='营业执照';
-							$forceUpdate()
-						}">
-						</radio>营业执照
-					</view>
+					<!--					<view>-->
+					<!--						<radio :checked="dto.idcardType==='身份证'" @click="()=>{-->
+					<!--							dto.idcardType='身份证';-->
+					<!--							$forceUpdate()-->
+					<!--						}">-->
+					<!--						</radio>身份证-->
+					<!--					</view>-->
+					<!--					<view class="m-l-10">-->
+					<!--						<radio :checked="dto.idcardType==='营业执照'" @click="()=>{-->
+					<!--							dto.idcardType='营业执照';-->
+					<!--							$forceUpdate()-->
+					<!--						}">-->
+					<!--						</radio>营业执照-->
+					<!--					</view>-->
+					<evan-radio-group v-model="dto.idcardType">
+						<evan-radio v-for="item in shTypeList" :key="item.value"
+							:label="item.value">{{item.label}}</evan-radio>
+					</evan-radio-group>
 				</view>
 			</view>
-			<view class="form-item bottom-border-no before-line m-t-20 p-b-20" v-if="dto.idcardType=='身份证'">
+			<view class="form-item bottom-border-no before-line m-t-20 p-b-20" v-if="dto.idcardType=='1'">
 				<view class="label required">身份证正反面</view>
 				<view class="m-l-a m-r-0 flex">
 					<view class="component-button-upload" @click="uploadIcon('idCards')">
@@ -144,7 +148,7 @@
 				</view>
 			</view>
 			<view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
-				v-if="dto.idcardType==='身份证'&&dto.idCards&&dto.idCards.length>0">
+				v-if="dto.idcardType==='1'&&dto.idCards&&dto.idCards.length>0">
 				<view class="m-t-12 m-r-10 " v-for="(tBanner,index) of dto.idCards" :key="index">
 					<image class="banner-img" :src="tBanner.url" @click.stop="previewImg(tBanner.url)">
 
@@ -152,7 +156,7 @@
 					<view class="t-red text-center" @click.stop="deleteImg('idCards',index)">删除</view>
 				</view>
 			</view>
-			<view class="form-item bottom-border-no before-line m-t-20 p-b-20" v-if="dto.idcardType=='营业执照'">
+			<view class="form-item bottom-border-no before-line m-t-20 p-b-20" v-if="dto.idcardType=='2'">
 				<view class="label required">营业执照</view>
 				<view class="m-l-a m-r-0 flex">
 					<view class="component-button-upload m-r-15" @click="uploadIcon('pictures')">
@@ -162,7 +166,7 @@
 				</view>
 			</view>
 			<view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
-				v-if="dto.idcardType==='营业执照'&&dto.pictures&&dto.pictures.length>0">
+				v-if="dto.idcardType==='2'&&dto.pictures&&dto.pictures.length>0">
 				<view class="m-t-12 m-r-10 " v-for="(tBanner,index) of dto.pictures" :key="index">
 					<image class="banner-img" :src="tBanner.url" @click.stop="previewImg(tBanner.url)">
 
@@ -175,7 +179,7 @@
 
 			<view class="button-green-1 m-t-20 button-fixed-bottom before-line " style="font-size: 22rpx;"
 				v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status==='P'">
-				审核已通过,若修改信息请联系客服
+				审核已通过,部分信息请前往个人资料修改
 			</view>
 
 			<view class="button-green-1 m-t-20 button-fixed-bottom before-line " v-else @click="submit">
@@ -205,8 +209,15 @@
 	import {
 		mapState
 	} from 'vuex'
+	import EvanRadio from "../components/evan-radio/evan-radio.vue";
+	import EvanRadioGroup from "../components/evan-radio-group/evan-radio-group.vue";
 
 	export default {
+
+		components: {
+			EvanRadioGroup,
+			EvanRadio
+		},
 
 		data() {
 			return {
@@ -218,7 +229,7 @@
 					pictures: [],
 					idCards: [],
 					cover: '',
-					idcardType: '身份证',
+					idcardType: '1',
 					description: '',
 					address: '',
 					stationId: '',
@@ -278,12 +289,12 @@
 
 				//审核方式
 				shTypeList: [{
-						name: '身份证',
-						disabled: false
+						label: '身份证',
+						value: '1'
 					},
 					{
-						name: '营业执照',
-						disabled: false
+						label: '营业执照',
+						value: '2'
 					}
 				],
 				regionDataPlus: [],
@@ -371,13 +382,17 @@
 				}
 			},
 			async init_area() {
-				const res = await this.$http.request('get', '/api/pub/china/area/json')
-				// console.log('area', JSON.parse(res.data))
-				this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll('name',
-					'text')) || []
-
-				// console.log('area', this.regionDataPlus)
-
+				var a = this.$storage.getItem('cache_area')
+				if (a) {
+					this.regionDataPlus = JSON.parse(a) || []
+				} else {
+					const res = await this.$http.request('get', '/api/pub/china/area/json')
+					// console.log('area', JSON.parse(res.data))
+					this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll(
+						'name',
+						'text')) || []
+					this.$storage.setItem('cache_area', JSON.stringify(this.regionDataPlus))
+				}
 
 			},
 
@@ -412,11 +427,8 @@
 					} else if (typeof this.dto.idCards == 'string') {
 						this.dto.idCards = JSON.parse(this.dto.idCards)
 					}
-
-					if (this.dto.idcardType == '1') {
-						this.dto.idcardType = '身份证'
-					} else {
-						this.dto.idcardType = '营业执照'
+					if (!this.dto.idcardType) {
+						this.dto.idcardType = '1'
 					}
 					this.dto.userId = this.currentInfo.id
 
@@ -445,11 +457,6 @@
 					} else if (typeof this.dto.idCards == 'string') {
 						this.dto.idCards = JSON.parse(this.dto.idCards)
 					}
-					if (this.dto.idcardType == '1') {
-						this.dto.idcardType = '身份证'
-					} else {
-						this.dto.idcardType = '营业执照'
-					}
 				}
 
 				this.$message.hideLoading()
@@ -470,24 +477,25 @@
 					this.$message.showToast(`联系方式需要为11位手机号,格式错误`)
 					return
 				}
-				if (this.dto.idcardType == '身份证' && this.dto.idCards.length == 0) {
-					this.$message.showToast(`${this.dto.idcardType}信息未填写`)
+				if (this.dto.idcardType == '1' && this.dto.idCards.length == 0) {
+					this.$message.showToast(`身份证信息未填写`)
 					return
 				}
-				if (this.dto.idcardType == '身份证' && this.dto.idCards.length < 2) {
-					this.$message.showToast(`${this.dto.idcardType}信息未填写完整,至少上传两张图片(正反面)`)
+				if (this.dto.idcardType == '1' && this.dto.idCards.length < 2) {
+					this.$message.showToast(`身份证信息未填写完整,至少上传两张图片(正反面)`)
 					return
 				}
-				if (this.dto.idcardType !== '身份证' && this.dto.pictures.length == 0) {
-					this.$message.showToast(`${this.dto.idcardType}信息未填写`)
-					return
-				}
+				if (this.dto.idcardType == '2' && this.dto.pictures.length == 0) {
+					this.$message.showToast(`营业执照信息未填写`)
+					return
+					
+				}
+				
 				await this.$message.confirm(`是否确定提交/修改店铺信息`)
 
 
 				var dto = {
 					...this.dto,
-					idcardType: this.dto.idcardType === '身份证' ? "1" : '2'
 				}
 				this.$message.showLoading()
 				const re = await this.$http.request('post', '/api/supplier/addOrUpdate', {
@@ -562,7 +570,6 @@
 		computed: {
 			...mapState(['currentInfo'])
 		},
-		components: {}
 	}
 </script>
 
@@ -650,4 +657,14 @@
 		color: #F56c6c;
 		background-color: rgb(254, 243, 243);
 	}
+
+	/deep/ {
+		.evan-radio-group {
+			display: flex;
+		}
+
+		.evan-radio {
+			margin-right: 12rpx;
+		}
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3