|
|
@@ -22,10 +22,10 @@
|
|
|
|
|
|
<view class="content">
|
|
|
<!-- 待取货和配送中搜索框 -->
|
|
|
- <view class="search-bar" v-if="current == 1 || current == 2">
|
|
|
+ <view class="search-bar" v-show="current == 1 || current == 2">
|
|
|
<view class="search-bar-box">
|
|
|
<image class="search-span" src="../../static/image/sousuo.png"/>
|
|
|
- <input type="text" v-model="keyword" placeholder="请输入收货地址或收货人手机号码" @input="searchKeyword" class="search-text" maxlength="10" focus/>
|
|
|
+ <input type="text" v-model="keyword" placeholder="请输入收货地址或收货人手机号码" @input="searchKeyword" @confirm="shouhuiche" class="search-text" focus/>
|
|
|
</view>
|
|
|
<!-- <input type="text" v-model="shoudanma" class="impute padding-lr" placeholder="请输入收货地址或收货人手机号码" @input="onInput" @confirm="shouhuiche" /> -->
|
|
|
</view>
|
|
|
@@ -667,7 +667,7 @@
|
|
|
<view class="zhuan-mode">
|
|
|
<view class="zhuan-title">待转订单</view>
|
|
|
<view class="zhuan-que">
|
|
|
- <scroll-view
|
|
|
+ <scroll-view style="height: 670rpx;"
|
|
|
:scroll-y="true"
|
|
|
class="block-main block-two-level block-pad"
|
|
|
@scrolltolower="scrolltolowerDai">
|
|
|
@@ -709,10 +709,10 @@
|
|
|
<view class="zhuan-mode">
|
|
|
<view class="search-bar-box">
|
|
|
<image class="search-span" src="../../static/image/sousuo.png"/>
|
|
|
- <input type="text" v-model="keywordRider" placeholder="请输入手机号码或骑手姓名" class="search-text" @input="searchKeywordRider" maxlength="10" focus/>
|
|
|
+ <input type="text" v-model="keywordRider" placeholder="请输入手机号码或骑手姓名" class="search-text" @input="searchKeywordRider" focus/>
|
|
|
</view>
|
|
|
<view class="zhuan-que">
|
|
|
- <scroll-view
|
|
|
+ <scroll-view style="height: 670rpx;"
|
|
|
:scroll-y="true"
|
|
|
class="block-main block-two-level block-pad"
|
|
|
@scrolltolower="scrolltolower">
|
|
|
@@ -2297,6 +2297,7 @@ export default {
|
|
|
title: '加载中',
|
|
|
mask: true // 是否显示透明蒙层，防止触摸穿透
|
|
|
})
|
|
|
+ console.log('this.keyword',this.keyword)
|
|
|
this.$Request
|
|
|
.getT('/app/tbindent/findRiderIndent', {
|
|
|
page: this.page3,
|
|
|
@@ -2903,6 +2904,7 @@ export default {
|
|
|
// 在toast显示2000毫秒（2秒）后执行操作
|
|
|
setTimeout(function () {
|
|
|
that.alertduan = false
|
|
|
+ that.taskDataJ()
|
|
|
}, 1200)
|
|
|
} else {
|
|
|
uni.showToast({
|
|
|
@@ -2940,6 +2942,7 @@ export default {
|
|
|
that.alertduan = false
|
|
|
// this.alertduan = false
|
|
|
that.shows = false
|
|
|
+ that.taskDataJ()
|
|
|
}, 1200)
|
|
|
// this.lists = []
|
|
|
// that.taskDataJ()
|
|
|
@@ -3055,11 +3058,16 @@ export default {
|
|
|
//收货地址或收货人手机号搜索
|
|
|
searchKeyword(e){
|
|
|
this.keyword=e.detail.value
|
|
|
+ // this.taskDataJ()
|
|
|
+ },
|
|
|
+ //搜索框回车
|
|
|
+ shouhuiche() {
|
|
|
this.taskDataJ()
|
|
|
},
|
|
|
|
|
|
//一键批量转单弹框
|
|
|
allZhuan(){
|
|
|
+ this.pageDai=1
|
|
|
this.showsZhuan=true
|
|
|
this.getDaizhuan()
|
|
|
},
|
|
|
@@ -3119,10 +3127,10 @@ export default {
|
|
|
.then((res) => {
|
|
|
console.log('listDai', res)
|
|
|
this.pageCountDai = res.data.totalCount
|
|
|
- if (this.pageRider == 1) {
|
|
|
+ if (this.pageDai == 1) {
|
|
|
this.listDai = res.data.list
|
|
|
} else {
|
|
|
- this.listDai = this.lists.concat(res.data.list)
|
|
|
+ this.listDai = this.listDai.concat(res.data.list)
|
|
|
}
|
|
|
// console.log('listDai', this.listDai)
|
|
|
// res.page -- 后端返回的当前页，
|
|
|
@@ -3264,7 +3272,7 @@ export default {
|
|
|
if (this.pageRider == 1) {
|
|
|
this.listRider = res.data.list
|
|
|
} else {
|
|
|
- this.listRider = this.lists.concat(res.data.list)
|
|
|
+ this.listRider = this.listRider.concat(res.data.list)
|
|
|
}
|
|
|
// console.log('listRider', this.listRider)
|
|
|
// res.page -- 后端返回的当前页，
|
|
|
@@ -3316,6 +3324,7 @@ export default {
|
|
|
if (this.list_box.length < this.totalCount2) {
|
|
|
this.page2 = this.page2 + 1
|
|
|
this.taskData()
|
|
|
+ this.checkedz=false
|
|
|
} else {
|
|
|
uni.showToast({
|
|
|
title: '已经最后一页啦',
|
|
|
@@ -3329,6 +3338,7 @@ export default {
|
|
|
this.page3 = this.page3 + 1
|
|
|
this.indentState = 3
|
|
|
this.taskDataJ()
|
|
|
+ this.checkedz=false
|
|
|
} else {
|
|
|
uni.showToast({
|
|
|
title: '已经最后一页啦',
|
|
|
@@ -3455,6 +3465,7 @@ button::after {
|
|
|
/* 待取货和配送中搜索框 */
|
|
|
// 搜索框
|
|
|
.search-bar{
|
|
|
+ position: relative;
|
|
|
width: 100%;
|
|
|
height: 100rpx;
|
|
|
margin-top: 20rpx;
|
