From fc740a71e8a8da79511a878b990d7d445bc754ac Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 13 Sep 2023 18:52:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                       |  2 +-
 pages/index/index.vue         |  4 +---
 pages/store/settled/index.vue | 21 ++++++++++++++++++++-
 store/modules/app.js          |  2 +-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/App.vue b/App.vue
index 387107c..3fe566e 100644
--- a/App.vue
+++ b/App.vue
@@ -254,7 +254,7 @@
 				uni.onNetworkStatusChange(function(res) {
 
 					if (res.isConnected) {
-
+           
 						uni.reLaunch({
 							url: '/pages/index/index'
 						})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1218e55..90aa999 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -253,9 +253,7 @@
 		mounted() {
 			this.getUserInfo()
 
-			uni.onNetworkStatusChange((res) => {
-				console.log(res, res.networkType)
-			});
+		
 			this.selfLocation()
 			// #ifdef  H5
 			// 监听页面滚动事件
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index bf98155..4a62a93 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -102,6 +102,19 @@
 							</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>
@@ -230,7 +243,8 @@
 					enterprise_name: "",
 					user_name: "",
 					phone: "",
-					classification: ''
+					classification: '',
+					social_credit_code: '',
 				},
 				validate: false,
 				successful: false,
@@ -374,6 +388,7 @@
 						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.classification = resData.merchant_category_id
 						this.merchantData.mer_type = resData.mer_type_id
 						this.area_id=resData.area_id
@@ -594,6 +609,7 @@
 						mer_name: that.merchantData.enterprise_name,
 						name: that.merchantData.user_name,
 						code: that.merchantData.yanzhengma,
+						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,
@@ -666,6 +682,9 @@
 				if (!value.enterprise_name) return that.$util.Tips({
 					title: '请输入企业名称'
 				});
+				if (!value.social_credit_code) return that.$util.Tips({
+					title: '请输入统一社会信用代码'
+				});
 				if (!value.user_name) return that.$util.Tips({
 					title: '请输入姓名'
 				});
diff --git a/store/modules/app.js b/store/modules/app.js
index 75d1220..9d86afa 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -117,7 +117,7 @@ const actions = {
 		} else {
 			apptype = 1
 		}
-
+console.log(os)
 		Appversion({
 			version: os.appWgtVersion,
 			type: apptype