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 {