diff --git a/config.js b/config.js
index 233fb9c..62737ae 100644
--- a/config.js
+++ b/config.js
@@ -16,7 +16,7 @@ const config = {
baseUrl: 'http://augcl.natapp1.cc/massage-admin/massage',
},
prod: {
- baseUrl: 'https://adminmassage.augcl.com/massage-admin/massage',
+ baseUrl: 'https://www.yurangongfang.com/massage-admin/massage',
}
}
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 042aa46..830d2c2 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -7,17 +7,21 @@
-
- 微信登录
+ 授权登录
-
+
+
+
-
+
-
-
@@ -84,6 +84,7 @@ export default {
}
},
onCancel() {
+ console.log('--onCancel')
uni.reLaunch({
url: '/pages/index/index'
})
@@ -119,11 +120,8 @@ export default {
}
}
.btn{
- all: unset;
width: 80%;
height: 100rpx;
- background-image: linear-gradient(to right, #84A73F, #D8FF8F);
- color: #fff;
font-size: 15px;
font-family: PingFang SC, PingFang SC-Regular;
@@ -133,14 +131,27 @@ export default {
justify-content: center;
align-items: center;
border-radius: 50rpx;
- border: none;
- .icon{
- margin-right: 10rpx;
- image{
- width: 40rpx;
- height: 35rpx;
+
+ &-login {
+ background-image: linear-gradient(to right, #84A73F, #D8FF8F);
+ color: #fff;
+ border: none;
+ .icon{
+ margin-right: 10rpx;
+ image{
+ width: 40rpx;
+ height: 35rpx;
+ }
}
}
+
+ &-cancel {
+ height: calc(100rpx - 1rpx * 2);
+ color: #c7c7c7;
+ background-color: transparent;
+ border: 1rpx solid #c7c7c7;
+ margin-top: 60rpx;
+ }
}
.mt{
margin-top: 200rpx;
@@ -149,7 +160,7 @@ export default {
.config{
width: 80%;
line-height: 40rpx;
- margin-top: 27rpx;
+ // margin-top: 27rpx;
color: #C7C7C7;
text-align: left;
display: flex;
@@ -162,16 +173,6 @@ export default {
color: #07C261;
}
}
-
- .btn-cancel {
- border: none;
- font-size: 30rpx;
- font-family: PingFang SC, PingFang SC-Regular;
- font-weight: 400;
- text-align: left;
- color: #c7c7c7;
- margin-top: 432rpx;
- }
}
.flex {