From 1dc9449e47bf6076a73b2b0f0a6e58c9e7427df6 Mon Sep 17 00:00:00 2001
From: wpf <2187978347@qq.com>
Date: Tue, 5 Mar 2024 17:26:20 +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

---
 manifest.json                    | 11 +++--------
 pages/users/login/login_copy.vue | 22 ++++++++++++++++------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/manifest.json b/manifest.json
index d159cc0..4d697d7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.9.6",
-    "versionCode" : 196,
+    "versionName" : "1.9.7",
+    "versionCode" : 197,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -132,12 +132,7 @@
                         "name" : "amapIvoVHpJR"
                     }
                 },
-                "oauth" : {
-                    "weixin" : {
-                        "appid" : "wx9d68c92b550ddd1e",
-                        "UniversalLinks" : "https://shop.lihaink.cn/"
-                    }
-                },
+                "oauth" : {},
                 "ad" : {},
                 "push" : {},
                 "speech" : {}
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index c736d04..4077a4d 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -142,6 +142,8 @@
 						</checkbox-group>
 					</div>
 				</div>
+        
+        <!-- <button @click="wxLogin">微信登录</button> -->
 			</div>
 			<div class="bottom"></div>
 			<view class="settlementAgreement" v-if="showAgreement">
@@ -523,10 +525,12 @@ import { Toast } from "../../../libs/uniApi";
 					provider: 'weixin',
 					// onlyAuthorize: true,
 					success: function(loginRes) {
-						self.appUserInfo = loginRes
+            console.log(loginRes);
+						self.appUserInfo = loginRes;
 						self.wxLoginApi()
 					},
 					fail(error) {
+            console.log(error);
 						uni.showToast({
 							title: '登录失败',
 							icon: 'none',
@@ -547,11 +551,16 @@ import { Toast } from "../../../libs/uniApi";
 				commonAuth({
 					auth: {
 						type: 'app_wechat',
-						auth: {
-							code: that.appUserInfo.authResult.access_token,
-							openid: that.appUserInfo.authResult.openid,
-							phone: this.account,
-						}
+						// auth: {
+						// 	code: that.appUserInfo.authResult.access_token,
+						// 	openid: that.appUserInfo.authResult.openid,
+						// 	phone: this.account,
+						// }
+            auth: {
+            	code: that.appUserInfo.authResult.access_token,
+            	openid: that.appUserInfo.authResult.openid,
+            	phone: this.account,
+            }
 					}
 				}).then(res => {
 					const data = res.data;
@@ -590,6 +599,7 @@ import { Toast } from "../../../libs/uniApi";
 					}
 					uni.hideLoading();
 				}).catch(res => {
+          console.log(res);
 					uni.hideLoading();
 					uni.showToast({
 						title: res.message || res,