theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'gdpaoup3' (#106) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/106
This commit is contained in:
gyh 2020-08-03 21:42:24 +08:00
commit 1e9f442b7b
3 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -18,10 +18,10 @@
<style lang="scss"> <style lang="scss">
/* #ifndef APP-PLUS-NVUE */ /* #ifndef APP-PLUS-NVUE */
@import "/static/css/normalize"; @import "/static/css/normalize";
/* #endif */
/* 顶部自定义导航留白 */ /* 顶部自定义导航留白 */
.status_bar { .status_bar {
width: 100%; width: 100%;
height: var(--status-bar-height); height: var(--status-bar-height);
} }
/* #endif */
</style> </style>

9
components/index/video-item/index.vue
View File

@ -105,12 +105,12 @@
.action { .action {
z-index: 19; z-index: 19;
position: absolute; position: absolute;
right: 0rpx; right: -10rpx;
bottom: 55rpx; bottom: 60rpx;
// width: 234rpx; // width: 234rpx;
border-radius: 6rpx;
background: rgba(255,255,255,1); background: rgba(255,255,255,1);
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12); box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
border-radius: 6rpx;
.bubble { .bubble {
position: relative; position: relative;
background-color: #fff; background-color: #fff;
@ -128,9 +128,10 @@
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12); box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
} }
> view { > view {
padding: 9rpx 12rpx;
display: flex; display: flex;
align-items: center; align-items: center;
height: 52rpx;
padding: 10rpx 20rpx;
&:not(:last-child) { &:not(:last-child) {
border-bottom: 2rpx #ECECEC solid; border-bottom: 2rpx #ECECEC solid;
} }

18
pageA/login/login.vue
View File

@ -38,7 +38,8 @@
</view> </view>
<!-- denglu QQ weixin --> <!-- denglu QQ weixin -->
<view class="buttones"> <view class="buttones">
<view @click="loginOn">{{login}}</view> <view @click="loginOn" class="btn">{{login}}</view>
<view class="a-go" @click="goIndex">暂不登录</view>
</view> </view>
<u-mask :show="show" @click="show = false"> <u-mask :show="show" @click="show = false">
<view class="warp"> <view class="warp">
@ -302,6 +303,11 @@
}, },
tochange() { tochange() {
},
goIndex() {
uni.switchTab({
url: "/pages/index/index"
})
} }
}, },
components: { components: {
@ -446,7 +452,8 @@
height: 22rpx; height: 22rpx;
} }
.buttones>view { .buttones {
.btn {
width: 628rpx; width: 628rpx;
height: 98rpx; height: 98rpx;
background: rgba(255, 120, 15, 1) !important; background: rgba(255, 120, 15, 1) !important;
@ -460,6 +467,13 @@
border-color: rgba(255, 120, 15, 1) !important; border-color: rgba(255, 120, 15, 1) !important;
text-align: center; text-align: center;
} }
.a-go {
margin-top: 24rpx;
text-align: center;
font-size: 26rpx;
color: #f2f2f2;
}
}
.warp { .warp {
display: flex; display: flex;