This commit is contained in:
2024-01-22 15:10:40 +08:00
parent cb4142ab6f
commit 5ad1e3b327
8 changed files with 138 additions and 27 deletions

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

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>

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>

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

View File

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