From 6040e37da2f799a9775a75ca67108db62b2362ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Tue, 9 Apr 2024 09:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/0-conf.js   | 9 +++++----
 pages/login/login.vue | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/framework/0-conf.js b/framework/0-conf.js
index d257fa3..55ff58b 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -3,10 +3,11 @@ const debug = true;
 const proxyApi = "/api"
 // #endif
 // #ifdef MP-WEIXIN || MP-ALIPAY
-const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
-const baseUrlwws = 'wss://cashier.sxczgkj.cn/cashierService' // 线上
-// const baseUrl = "https://cashierapplet.sxczgkj.cn/cashierService"  //测试
-// const baseUrlwws = 'wss://cashierapplet.sxczgkj.cn/cashierService' // 测试
+// const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
+// const baseUrlwws = 'wss://cashier.sxczgkj.cn/cashierService' // 线上
+const baseUrl = "https://wxcashiertest.sxczgkj.cn/cashierService"  //测试
+const baseUrlwws = 'wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
+
 // #endif
 // #ifdef H5
 const baseUrl = debug ? proxyApi : 'http://192.168.2.161:9889/cashierService/' // 线上
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a46a1b7..ecb4f48 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -195,7 +195,7 @@
 					margin-top: 60rpx;
 
 					.containerbottomone {
-						padding: 10rpx 80rpx;
+						padding: 10rpx 60rpx;
 						font-size: 24rpx;
 					}
 
@@ -208,7 +208,7 @@
 						font-size: 24rpx;
 						background: #baf505;
 						border: none;
-						padding: 10rpx 80rpx;
+						padding: 10rpx 60rpx;
 					}
 
 					.containerbottomtow::after {