#3 feat: 界面调整;

Merged
Fox merged 1 commits from fox into master 3 weeks ago
  1. +1
    -1
      config.js
  2. +29
    -28
      pages_order/auth/wxLogin.vue

+ 1
- 1
config.js View File

@ -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',
}
}


+ 29
- 28
pages_order/auth/wxLogin.vue View File

@ -7,17 +7,21 @@
</view>
</view>
<view class="btn mt"
<button class="btn btn-login mt"
@click="wxLogin">
<view class="icon">
<uv-icon name="weixin-fill" color="#ffffff" size="36rpx"></uv-icon>
</view>
<view class="">
微信登录
授权登录
</view>
</view>
</button>
<button class="btn btn-cancel" :plain="true" :hairline="false" @click="onCancel">
暂不登录
</button>
<view class="config">
<view class="config mt">
<view style="flex: 1;">
<uv-checkbox-group
v-model="checkboxValue"
@ -41,10 +45,6 @@
</view>
<agreementModal ref="modal" @confirm="onConfirmAggrement"></agreementModal>
<button class="btn-cancel" :plain="true" :hairline="false" @click="onCancel">
暂不登录
</button>
</view>
</template>
@ -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 {


Loading…
Cancel
Save