Merge branch 'main' of http://git.zihai.cn/szj1219/JiaZhiQianYan-MiniProgram
# Conflicts: # unpackage/dist/dev/.sourcemap/mp-weixin/app.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/common/assets.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/components/LCCalendar/LCCalendar.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/geGuCenter/geGuCenter.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pagesStock/stockCenterDetails/bkydmx.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map # unpackage/dist/dev/mp-weixin/common/assets.js # unpackage/dist/dev/mp-weixin/common/vendor.js # unpackage/dist/dev/mp-weixin/components/zysj-view/zysj-view.js # unpackage/dist/dev/mp-weixin/pages/geGuCenter/geGuCenter.wxml # unpackage/dist/dev/mp-weixin/pages/mine/mine.js # unpackage/dist/dev/mp-weixin/pages/ztfx/ztfx.js # unpackage/dist/dev/mp-weixin/pagesMine/vip/vip.js # unpackage/dist/dev/mp-weixin/pagesMine/vipMeal/vipMeal.js # unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/bkydmx.js # unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/bkydmx.wxml # unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/cwDetails.js # unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/stockCenterDetails.js # unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/ztfx.js
This commit is contained in:
@@ -1,81 +0,0 @@
|
||||
.logo {
|
||||
margin-left: calc((100% - 144rpx)/2);
|
||||
width: 144rpx;
|
||||
height: auto;
|
||||
}
|
||||
.loginTitle {
|
||||
margin: 40rpx 80rpx 0;
|
||||
font-size: 40rpx;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
}
|
||||
.inputC {
|
||||
background-color: #f8f8f8;
|
||||
margin: 0 75rpx;
|
||||
height: 80rpx;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
.inputC input {
|
||||
font-size: 26rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
.inputC.mobile {
|
||||
margin-top: 40rpx;
|
||||
padding-left: 29rpx;
|
||||
}
|
||||
.inputC.mobile .icon {
|
||||
margin-right: 13rpx;
|
||||
width: 26rpx;
|
||||
height: auto;
|
||||
}
|
||||
.inputC.code {
|
||||
margin-top: 36rpx;
|
||||
padding-left: 27rpx;
|
||||
}
|
||||
.inputC.code .icon {
|
||||
margin-right: 10rpx;
|
||||
width: 26rpx;
|
||||
height: auto;
|
||||
}
|
||||
.inputC.code .getCode {
|
||||
padding: 0 30rpx;
|
||||
font-size: 26rpx;
|
||||
font-weight: 500;
|
||||
color: #F97316;
|
||||
}
|
||||
.btn {
|
||||
margin: 0 75rpx;
|
||||
line-height: 80rpx;
|
||||
border-radius: 20rpx;
|
||||
font-size: 26rpx;
|
||||
font-weight: 500;
|
||||
text-align: center;
|
||||
}
|
||||
.btn.loginAtOnce {
|
||||
background-color: #F97316;
|
||||
margin-top: 60rpx;
|
||||
color: white;
|
||||
}
|
||||
.btn.oneClickLogin {
|
||||
background-color: #FFF1E8;
|
||||
margin-top: 28rpx;
|
||||
color: #F97316;
|
||||
}
|
||||
.agreeProtocolC {
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: calc(120rpx + env(safe-area-inset-bottom));
|
||||
font-size: 26rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
.agreeProtocolC .agreeC {
|
||||
padding: 14rpx;
|
||||
}
|
||||
.agreeProtocolC .agreeC .icon {
|
||||
display: block;
|
||||
width: 28rpx;
|
||||
height: auto;
|
||||
}
|
||||
.agreeProtocolC .protocol {
|
||||
color: #F97316;
|
||||
}
|
||||
Reference in New Issue
Block a user