|
|
@@ -3,12 +3,12 @@
|
|
|
<view :class="{popupShow:isShowAlert}" class="content">
|
|
|
<view class="banner">
|
|
|
<view class="head flex">
|
|
|
- <view class="text flex" @click="goCity(0)">{{startPlace.sendCity}} {{startPlace.sendArea}}
|
|
|
+ <view class="text flex" @click="goCity(0)">{{startPlace.sendCity}} {{startPlace.sendArea!='全部'?startPlace.sendArea:''}}
|
|
|
<u-icon name="arrow-down" color="##fff" size="20"></u-icon>
|
|
|
</view>
|
|
|
<image class="jt-icon item2" src="@/static/images/goodSource/jt.png" mode='widthFix'>
|
|
|
</image>
|
|
|
- <view class="text flex" @click="goCity(1)">{{endPlace.unloadCity}} {{endPlace.unloadArea}}
|
|
|
+ <view class="text flex" @click="goCity(1)">{{endPlace.unloadCity}} {{endPlace.unloadArea!='全部'?endPlace.unloadArea:''}}
|
|
|
<u-icon name="arrow-down" color="#fff" size="20"></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -182,20 +182,11 @@
|
|
|
},
|
|
|
onLoad() {
|
|
|
that = this
|
|
|
- // this.checkOpenGPSServiceByAndroidIOS()
|
|
|
},
|
|
|
onHide() {
|
|
|
this.isdblclick = 0
|
|
|
},
|
|
|
async onShow() {
|
|
|
- // if (this.scrollTop > 1200) {
|
|
|
- // uni.setTabBarItem({
|
|
|
- // index: 0,
|
|
|
- // text: '返回顶部',
|
|
|
- // iconPath: 's',
|
|
|
- // selectedIconPath: 'static/images/common/top@2x.png'
|
|
|
- // })
|
|
|
- // }
|
|
|
uni.setTabBarItem({
|
|
|
index: 2,
|
|
|
text: '订单',
|
|
|
@@ -225,12 +216,6 @@
|
|
|
unloadArea: '富拉尔基',
|
|
|
selected: '齐齐哈尔市'
|
|
|
}
|
|
|
- // uni.setStorageSync('sPlaceObj', {
|
|
|
- // schoosearea: '请选择区',
|
|
|
- // schoosecity: '请选择市',
|
|
|
- // schooseprovince: '全国',
|
|
|
- // selected: '全国'
|
|
|
- // })
|
|
|
}
|
|
|
that.upCallback({
|
|
|
size: 10,
|
|
|
@@ -262,46 +247,6 @@
|
|
|
})
|
|
|
// this.mescroll.resetUpScroll()
|
|
|
|
|
|
- },
|
|
|
- // async onLoad() {
|
|
|
- // that = this
|
|
|
- // // #ifdef APP-PLUS
|
|
|
- // let _status = await that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
|
|
|
- // driverPhone: this.userInfo.phone,
|
|
|
- // }).then(res => {
|
|
|
- // return res.data.authenticationStatus
|
|
|
- // })
|
|
|
- // // if (_status == '已禁用') {
|
|
|
- // // this.isShowAlert = true
|
|
|
- // // this.alertTitle = '账号审核中'
|
|
|
- // // this.confirmText = '退出APP'
|
|
|
- // // this.showCancelButton = false
|
|
|
- // // } else {
|
|
|
- // // console.log(1231233212332312312213)
|
|
|
- // // }
|
|
|
- // // #endif
|
|
|
-
|
|
|
- // },
|
|
|
-
|
|
|
- onPageScroll(res) {
|
|
|
- this.scrollTop = res.scrollTop
|
|
|
- // console.log("页面滚动了", res.scrollTop)
|
|
|
- if (this.scrollTop > 1200) {
|
|
|
- uni.setTabBarItem({
|
|
|
- index: 0,
|
|
|
- text: '返回顶部',
|
|
|
- iconPath: 'static/images/common/top@2x.png',
|
|
|
- selectedIconPath: 'static/images/common/top@2x.png'
|
|
|
- })
|
|
|
- } else {
|
|
|
- uni.setTabBarItem({
|
|
|
- index: 0,
|
|
|
- text: '货源',
|
|
|
- iconPath: 'static/images/common/huoyuan@2x(1).png',
|
|
|
- selectedIconPath: 'static/images/common/huoyuan@2x.png'
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
},
|
|
|
methods: {
|
|
|
stopRoll() {
|
|
|
@@ -535,13 +480,19 @@
|
|
|
upCallback(page) {
|
|
|
console.log(this.startPlace)
|
|
|
console.log(this.endPlace)
|
|
|
+ if(this.startPlace.sendArea=="全部") this.startPlace.sendArea = ''
|
|
|
+ if(this.endPlace.unloadArea=="全部") this.endPlace.unloadArea = ''
|
|
|
this.$request.baseRequest('get', '/hyReleaseGoodsInfo/selectTask', {
|
|
|
currentPage: page.num,
|
|
|
pageSize: page.size,
|
|
|
searchType: this.tabIndex + 1,
|
|
|
loadingPlaceCity: this.startPlace.sendCity,
|
|
|
unLoadingPlaceCity: this.endPlace.unloadCity,
|
|
|
- driverFlag: 1
|
|
|
+ driverFlag: 1,
|
|
|
+ loadingPlace:this.startPlace.sendArea,
|
|
|
+ unLoadingPlace:this.endPlace.unloadArea
|
|
|
+
|
|
|
+
|
|
|
}).then(res => {
|
|
|
uni.hideLoading()
|
|
|
let curPageData = res.data.records;
|
