From 72ff135b0523247414e992ad8ebc559a55da6c50 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 27 Feb 2024 18:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Authorize.vue      |  6 +++---
 libs/login.js                 |  8 ++++----
 pages/index/index.vue         |  2 +-
 pages/store/settled/index.vue | 14 +++++++-------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/components/Authorize.vue b/components/Authorize.vue
index dd9b10f..7674fcd 100644
--- a/components/Authorize.vue
+++ b/components/Authorize.vue
@@ -101,8 +101,8 @@
 				title: '用户登录',
 				info: '请登录，将为您提供更好的服务！',
 				//#ifdef H5
-				// isWeixin: this.$wechat.isWeixin(),
-        isWeixin: false, // 关闭微信公众号授权登录
+				isWeixin: this.$wechat.isWeixin(),
+        // isWeixin: false, // 关闭微信公众号授权登录
 				//#endif
 				//#ifdef MP
 				title: '授权提醒',
@@ -193,7 +193,7 @@
 					url: '/pages/users/login/login_copy'
 				})
 				// console.log(22);
-				return
+				return;
 				let self = this;
 				Routine.getUserProfile()
 					.then(res => {
diff --git a/libs/login.js b/libs/login.js
index 542ab40..153c507 100644
--- a/libs/login.js
+++ b/libs/login.js
@@ -51,10 +51,10 @@ export function toLogin(push, pathLogin) {
 	Cache.set('login_back_url', path);
 	// #ifdef H5
 	if (isWeixin()) {
-		// auth.oAuth();
-    uni.navigateTo({
-    	url: '/pages/users/login/login_copy',
-    })
+		auth.oAuth();
+    // uni.navigateTo({
+    // 	url: '/pages/users/login/login_copy',
+    // })
 	} else {
 		if (path !== pathLogin) {
 			push ? uni.navigateTo({
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8bddd87..08c3ffb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -613,7 +613,7 @@ import activityCard from "@/components/activityCard.vue"
         // 	url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}&source=103&location=${this.latitude},${this.longitude}`
         // })
         uni.navigateTo({
-          url: `/pages/nongKe/cloud_entrepot/indexh?street_id=${this.street_id}&townName=${this.town}&source=103&location=${this.latitude},${this.longitude}`
+          url: `pages/cloud_warehouse/big_classification/index`
         })
 
       },
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 53f76a6..39a5b27 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -136,7 +136,7 @@
 								<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="请输入详细地址"
+										<input type="text" maxlength="30" placeholder="自动识别"
 											v-model="merchantData.address" @input="validateBtn"
 											placeholder-class='placeholder' />
 
@@ -149,7 +149,7 @@
 								<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="请输入公司名称"
+										<input type="text" maxlength="30" placeholder="自动识别"
 											v-model="merchantData.company_name" @input="validateBtn"
 											placeholder-class='placeholder' />
 
@@ -160,7 +160,7 @@
 						<view class="item">
 							<view class="acea-row row-middle">
 								<text class="item-name">法人名称</text>
-								<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name"
+								<input type="text" placeholder="自动识别" v-model="merchantData.user_name"
 									@input="validateBtn" placeholder-class='placeholder' />
 							</view>
 						</view>
@@ -169,7 +169,7 @@
 								<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="请输入社会信用代码"
+										<input type="text" maxlength="30" placeholder="自动识别"
 											v-model="merchantData.social_credit_code" @input="validateBtn"
 											placeholder-class='placeholder' />
 
@@ -715,9 +715,9 @@ import { Toast } from '../../../libs/uniApi';
 					if (res.code == 0) {
 						this.company = ''
 						this.organization_code = ''
-						this.$util.Tips({
-							title: res.msg
-						});
+						// this.$util.Tips({
+						// 	title: res.msg
+						// });
 						return false;
 					} else {
 						this.company = res.data.title