From 768f94d2bb62914e6469d2790d79a6a40d77648c Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 14 Sep 2023 19:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=20=E4=BB=A5=E5=8F=8A=E6=B3=A8?=
 =?UTF-8?q?=E9=94=80=E5=8A=9F=E8=83=BD=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/store/settled/index.vue   | 69 ++++++++++++++++++++++++++-------
 pages/users/user_info/index.vue |  4 +-
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 4a62a93..7a183d9 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -106,15 +106,42 @@
 						<view class="uni-list">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name businessBox">社会信用代码</text>
-									<input type="text" maxlength="30" placeholder="请输入社会信用代码"
-										v-model="merchantData.social_credit_code" @input="validateBtn"
+									<text class="item-name businessBox">详细地址</text>
+									<input type="text" maxlength="30" placeholder="请输入详细地址"
+										v-model="merchantData.address" @input="validateBtn"
 										placeholder-class='placeholder' />
-									
+
 								</view>
 							</view>
 						</view>
 					</view>
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name businessBox">公司名称</text>
+									<input type="text" maxlength="30" placeholder="请输入公司名称"
+										v-model="merchantData.company_name" @input="validateBtn"
+										placeholder-class='placeholder' />
+					
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name businessBox">社会信用代码</text>
+									<input type="text" maxlength="30" placeholder="请输入社会信用代码"
+										v-model="merchantData.social_credit_code" @input="validateBtn"
+										placeholder-class='placeholder' />
+
+								</view>
+							</view>
+						</view>
+					</view>
+					
 					<!-- <view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name">是否农贸市场</text>
@@ -245,6 +272,8 @@
 					phone: "",
 					classification: '',
 					social_credit_code: '',
+					company_name: '',
+					address: ''
 				},
 				validate: false,
 				successful: false,
@@ -388,13 +417,16 @@
 						this.merchantData.enterprise_name = resData.mer_name
 						this.merchantData.user_name = resData.name
 						this.merchantData.phone = resData.phone
-						this.merchantData.social_credit_code=resData.social_credit_code
+						this.merchantData.social_credit_code = resData.social_credit_code
+						this.merchantData.company_name = resData.company_name
+						this.merchantData.address = resData.address
 						this.merchantData.classification = resData.merchant_category_id
 						this.merchantData.mer_type = resData.mer_type_id
-						this.area_id=resData.area_id
-						this.street_id=resData.street_id
-						this.mer_storeType=resData.mer_storeType
-						this.village_id=resData.village_id
+						this.area_id = resData.area_id
+						this.street_id = resData.street_id
+						this.mer_storeType = resData.mer_storeType
+						this.village_id = resData.village_id
+						
 					})
 					this.pics = resData.images
 					this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
@@ -609,10 +641,12 @@
 						mer_name: that.merchantData.enterprise_name,
 						name: that.merchantData.user_name,
 						code: that.merchantData.yanzhengma,
+						company_name:that.merchantData.company_name,
+						address:that.merchantData.address,
 						social_credit_code: that.merchantData.social_credit_code,
 						merchant_category_id: that.merchantData.classification,
 						mer_type_id: that.merchantData.mer_type,
-						mer_storeType:this.mer_storeType,
+						mer_storeType: this.mer_storeType,
 						area_id: this.area_id,
 						street_id: this.street_id,
 						village_id: this.village_id,
@@ -685,6 +719,12 @@
 				if (!value.social_credit_code) return that.$util.Tips({
 					title: '请输入统一社会信用代码'
 				});
+				if (!value.company_name) return that.$util.Tips({
+					title: '请输入公司名称'
+				});
+				if (!value.address) return that.$util.Tips({
+					title: '请输入详细地址'
+				});
 				if (!value.user_name) return that.$util.Tips({
 					title: '请输入姓名'
 				});
@@ -700,11 +740,11 @@
 				if (!value.classification) return that.$util.Tips({
 					title: '请选择商户分类'
 				});
-				if(!this.mer_storeType) return that.$util.Tips({
-					title:'请选择商户类型'
+				if (!this.mer_storeType) return that.$util.Tips({
+					title: '请选择商户类型'
 				})
-				if(!this.business_name) return that.$util.Tips({
-					title:'请选择店铺所在地'
+				if (!this.business_name) return that.$util.Tips({
+					title: '请选择店铺所在地'
 				})
 				if (!that.isAgree) return that.$util.Tips({
 					title: '请勾选并同意入驻协议'
@@ -728,6 +768,7 @@
 				if (!this.merchantData.phone) return this.$util.Tips({
 					title: '请输入手机号'
 				});
+				
 				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({
 					title: '请输入正确的手机号码'
 				});
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 3ccbd7e..961ba2f 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -103,13 +103,13 @@
               <text class='iconfont icon-you'></text>
             </navigator>
           </view>
-          <view class='item acea-row row-between-wrapper'>
+          <!-- <view class='item acea-row row-between-wrapper'>
             <view>注销账号</view>
             <view class='input acea-row row-between-wrapper' @click="changeCancel">
               <input type='text' placeholder="账号注销后不能恢复" disabled='true' class='id'></input>
               <text class='iconfont icon-you'></text>
             </view>
-          </view>
+          </view> -->
           <!--#ifdef APP-PLUS-->
           <view class='item acea-row row-between-wrapper'>
             <view>当前版本</view>