root/hht-tongbo-yinni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

样式

Browse Source
This commit is contained in:
caill
2024-01-22 15:10:40 +08:00
parent cb4142ab6f
commit 5ad1e3b327
8 changed files with 138 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
common/style/layout.css
View File

@@ -1,5 +1,5 @@
page {
background-color: #f6f6f6!important;
background-color: #f2f5fa !important;
min-height: 100% !important;
height: 100% !important;
}
@@ -106,17 +106,21 @@ uni-button:after {
height: 100%;
}
.zd_content {
position: relative;
top: calc(var(--status-bar-height) + 72rpx);
width: 100%;
height: auto;
padding: calc(var(--status-bar-height) + 92rpx) 14rpx 82rpx 14rpx;
padding: 20rpx 14rpx 128rpx 14rpx;
background: linear-gradient(to bottom, #ff6400 0%, #fee4d7 30%, #f6f6f6 100%)
}
.zd_wrapper {
width: 100%;
height: auto;
background-color: #fff;
border-radius: 24rpx;
padding: 14rpx;
padding: 22rpx 14rpx;
margin-bottom: 20rpx;
box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
}
.filter_item {
display: flex;
@@ -263,26 +267,98 @@ uni-button:after {
width: 100%;
z-index: 200;
background-color: #fff;
padding-top: 10rpx;
padding-top: 20rpx;
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
}
.submit-bar_new {
display: flex;
justify-content: space-between;
align-items: center;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
z-index: 200;
background-color: #fff;
padding: 20rpx;
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
}
.submit-button {
font-size: 30rpx;
line-height: 62rpx;
font-size: 34rpx;
line-height: 88rpx;
color: #ff6a00;
text-align: center;
letter-spacing: 1rpx;
padding: 0 22rpx;
background-color: #fff;
border: 1px solid #ff6a00;
margin: 0 40rpx 10rpx 0;
border-radius: 30rpx;
margin: 0 40rpx 20rpx 0;
border-radius: 10rpx;
}
.submit-button_new {
width: 35%;
font-size: 34rpx;
line-height: 88rpx;
color: #fff;
text-align: center;
letter-spacing: 1rpx;
padding: 0 22rpx;
background-color: #ff6a00;
border-radius: 10rpx;
}
.submit-more {
width: 20%;
font-size: 34rpx;
line-height: 34rpx;
padding: 27rpx 10rpx;
color: #000;
text-align: center;
background-color: #fff
}
.btn-disabled, .submit-button[disabled] {
background-color: #c9c9c9;
border: 1px solid #c9c9c9;
color: #fff;
}
.more_btns_wraper {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
z-index: 201;
padding: 0 20rpx 20rpx;
transition: all .3s;
}
.more-button {
font-size: 34rpx;
line-height: 88rpx;
color: #ff6a00;
text-align: center;
border-radius: 0;
background-color: transparent;
}
.more_btns_items .btn-disabled, .more_btns_items .submit-button_new[disabled] {
color: #c9c9c9;
border: none;
}
.more-button:last-child {
border-bottom: none;
}
.more_btns_cancle {
margin-top: 20rpx;
width: 100%;
font-size: 34rpx;
line-height: 88rpx;
color: #000;
text-align: center;
background-color: #fff;
border-radius: 20rpx;
}
.more_btns_items{
width: 100%;
border-radius: 20rpx;
background-color: #fff;
}
/** 下拉框 */
.uni-select__selector {
@@ -332,11 +408,25 @@ uni-button:after {
max-width: 300px;
margin: 40rpx auto 0;
display: flex;
justify-content: space-between;
justify-content: center;
align-items: center;
}
.msg_btn {
width: 45%;
border-radius: 10rpx;
margin: 0;
font-size: 34rpx;
line-height: 78rpx;
color: #fff;
text-align: center;
background-color: #ff6a00;
border-radius: 44rpx;
box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
}
.msg_btn_cancle {
background-color: #fff;
color: #000;
margin-right: 20rpx;
}
.msg_btn:disabled {
background-color: #c9c9c9;

6
common/style/reset.css
View File

@@ -41,3 +41,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
text-overflow: ellipsis;
white-space: nowrap;
}
.popshow {
transform: translateY(0);
}
.pophide {
transform: translateY(100%);
}

2
components/NavBar.vue
View File

@@ -54,7 +54,7 @@
_fj()
position fixed
_wh(100%, calc(var(--status-bar-height) + 72rpx))
background-color $red
background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
z-index 200
padding 0 20rpx
.page_name

26
pages/ProductManage/SlittingFeeding.vue
View File

@@ -76,12 +76,25 @@
</view>
<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
</view>
<view class="submit-bar">
<!-- <view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn">{{$t('button.empty-shaft-return')}}</button>
<button class="submit-button" @tap="handleSure">{{$t('button.manual-call')}}</button>
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">{{$t('button.call')}}</button>
<button class="submit-button" @tap="searchList">{{$t('button.search')}}</button>
</view> -->
<view class="submit-bar_new">
<button class="submit-more" @tap="btn_active = true">···<br>more</button>
<button class="submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">{{$t('button.call')}}</button>
<button class="submit-button_new" @tap="searchList">{{$t('button.search')}}</button>
</view>
<view class="more_btns_wraper" :class="btn_active ? 'popshow' : 'pophide'">
<view class="more_btns_items">
<button class="more-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn">{{$t('button.empty-shaft-return')}}</button>
<button class="more-button" @tap="handleSure">{{$t('button.manual-call')}}</button>
</view>
<view class="more_btns_cancle" @tap="btn_active = false">取消</view>
</view>
<view v-if="btn_active" class="msg_mask"></view>
<view v-if="active" class="msg_wrapper msg_wrapper_1">
<view class="msg_box">
<view class="filter_item">
@@ -110,8 +123,8 @@
</view>
</view>
<view class="msg_btns">
<button class="submit-button msg_btn" @tap="cancleModal">{{$t('button.cancel')}}</button>
<button class="submit-button msg_btn" @tap="modalToSure">{{$t('button.confirm')}}</button>
<button class="msg_btn msg_btn_cancle" @tap="cancleModal">{{$t('button.cancel')}}</button>
<button class="msg_btn" @tap="modalToSure">{{$t('button.confirm')}}</button>
</view>
</view>
</view>
@@ -153,7 +166,8 @@
val4: '',
val5: '',
disabled1: false,
disabled2: false
disabled2: false,
btn_active: false
};
},
created () {
@@ -227,6 +241,7 @@
},
handleSure () {
this.active = true
this.btn_active = false
},
cancleModal () {
this.active = false
@@ -295,6 +310,7 @@
title: '点位不能为空',
icon: 'none'
})
this.btn_active = false
return
}
try {
@@ -303,6 +319,7 @@
this.active = false
this.val1 = ''
this.pkId = ''
this.btn_active = false
this.searchList()
uni.showToast({
title: res.message,
@@ -310,6 +327,7 @@
})
} catch (e) {
this.disabled2 = false
this.btn_active = false
}
},
}

4
pages/ProductManage/ZjOutStore.vue
View File

@@ -102,8 +102,8 @@
<view class="filter_search" @tap="_conveyPointQuery">{{$t('button.search')}}</view>
</view>
<view class="msg_btns">
<button class="submit-button msg_btn" @tap="cancleModal">{{$t('button.cancel')}}</button>
<button class="submit-button msg_btn" :class="{'btn-disabled': !index4}" :disabled="disabled2" @tap="_conveyConfirm">{{$t('button.confirm')}}</button>
<button class="msg_btn msg_btn_cancle" @tap="cancleModal">{{$t('button.cancel')}}</button>
<button class="msg_btn" :class="{'btn-disabled': !index4}" :disabled="disabled2" @tap="_conveyConfirm">{{$t('button.confirm')}}</button>
</view>
</view>
</view>

2
pages/WarehouseManage/CheckDtl.vue
View File

@@ -106,7 +106,7 @@
</view>
</view>
<view class="msg_btns">
<button class="submit-button" @tap="toSurerk">确定</button>
<button class="msg_btn" @tap="toSurerk">确定</button>
</view>
</view>
</view>

16
pages/home/home.vue
View File

@@ -21,7 +21,7 @@
</view>
</view>
</view>
<view class="sec_menu_wraper" :class="show ? 'show' : 'hidden'">
<view class="sec_menu_wraper" :class="show ? 'popshow' : 'pophide'">
<!-- <view class="cancel">
<view class="iconfont cancel_icon" @tap="show = false"></view>
</view> -->
@@ -84,10 +84,10 @@
@import '../../common/style/mixin.styl';
.home_wraper
_wh(100%, 100%)
overflow: hidden
.zd_content
padding 0 24rpx
height 100%
padding-top calc(var(--status-bar-height) + 86rpx)
padding 0 20rpx
height calc(100% - var(--status-bar-height) - 72rpx)
background linear-gradient(to bottom, #f8e6db 0%, #f6f6f6 30%, #f6f6f6 100%)
.header
position fixed
@@ -95,9 +95,9 @@
top 0
padding-top var(--status-bar-height)
z-index 100
_wh(100%, calc(var(--status-bar-height) + 86rpx))
_wh(100%, calc(var(--status-bar-height) + 72rpx))
background-color #f8e6db
_font(36rpx,86rpx,#333,,center)
_font(36rpx,72rpx,#333,,center)
.userInfo-wrap
_fj()
_wh(100%,160rpx)
@@ -211,10 +211,6 @@
padding 20rpx 0
overflow hidden
border-bottom 1px solid #c5c6c7
.show
transform: translateY(0)
.hidden
transform: translateY(100%)
.bgc_1
background linear-gradient(to right, rgba(73,102,255,0.8) 0%, rgba(117,142,255,0.8) 100%)
.bgc_2

1
pages/login/login.vue
View File

@@ -181,6 +181,7 @@
background-color $red
.zd_content
position: relative
top 0
height: 100%
padding-left 40rpx
padding-right 40rpx