Commit aa109b612926cf8531309ec4313304d3bd107520
1 parent
0e34d852
Exists in
master
and in
1 other branch
fix: 货源
Showing
5 changed files
with
49 additions
and
113 deletions
Show diff stats
pages/global/search-address.vue
| @@ -30,6 +30,7 @@ | @@ -30,6 +30,7 @@ | ||
| 30 | 30 | ||
| 31 | <script> | 31 | <script> |
| 32 | import { urlParam } from '@/utils/param'; | 32 | import { urlParam } from '@/utils/param'; |
| 33 | +import { formatLngLat } from '@/utils/format-value'; | ||
| 33 | 34 | ||
| 34 | export default { | 35 | export default { |
| 35 | props: { | 36 | props: { |
| @@ -124,74 +125,13 @@ export default { | @@ -124,74 +125,13 @@ export default { | ||
| 124 | wx.chooseLocation({ | 125 | wx.chooseLocation({ |
| 125 | latitude: this.lat ? Number(this.lat) : undefined, | 126 | latitude: this.lat ? Number(this.lat) : undefined, |
| 126 | longitude: this.lng ? Number(this.lng) : undefined, | 127 | longitude: this.lng ? Number(this.lng) : undefined, |
| 127 | - }).then(res => { | ||
| 128 | - uni.request({ | ||
| 129 | - url: 'https://restapi.amap.com/v3/geocode/regeo', //逆地理编码接口地址。 | ||
| 130 | - data: { | ||
| 131 | - key: '1b987a62e5685a58cda5933e1bc66044', | ||
| 132 | - location: res.longitude + ',' + res.latitude, | ||
| 133 | - }, | ||
| 134 | - success: response => { | ||
| 135 | - console.info(response); | ||
| 136 | - const regeocode = response?.data?.regeocode || {}; | ||
| 137 | - const addressComponent = regeocode?.addressComponent || {}; | ||
| 138 | - const addressInfo = this.getAddress(response?.data); | ||
| 139 | - let location = { | ||
| 140 | - lng: res.longitude || '', | ||
| 141 | - lat: res.latitude || '', | ||
| 142 | - provinceCode: addressComponent.pcode, | ||
| 143 | - provinceName: addressComponent.pname, | ||
| 144 | - areaCode: addressComponent.adcode, | ||
| 145 | - areaName: addressComponent.district, | ||
| 146 | - address: addressInfo.address, | ||
| 147 | - }; | ||
| 148 | - this.onSelect(location, true); | ||
| 149 | - }, | 128 | + }) |
| 129 | + .then(res => { | ||
| 130 | + return formatLngLat({ lat: res.latitude, lng: res.longitude }); | ||
| 131 | + }) | ||
| 132 | + .then(location => { | ||
| 133 | + this.onSelect(location, true); | ||
| 150 | }); | 134 | }); |
| 151 | - // let location = { | ||
| 152 | - // lng: res.longitude || '', | ||
| 153 | - // lat: res.latitude || '', | ||
| 154 | - // provinceCode: '', | ||
| 155 | - // provinceName: '', | ||
| 156 | - // cityCode: '', | ||
| 157 | - // cityName: '', | ||
| 158 | - // areaCode: '', | ||
| 159 | - // areaName: '', | ||
| 160 | - // address: res.address || '', | ||
| 161 | - // }; | ||
| 162 | - // this.onSelect(location); | ||
| 163 | - }); | ||
| 164 | - // uni.$once('webview-select', location => { | ||
| 165 | - // this.onSelect(location); | ||
| 166 | - // }); | ||
| 167 | - // const url = 'https://zeyi-tms-product.oss-cn-hangzhou.aliyuncs.com/webview/location-wx-freight.html'; | ||
| 168 | - // const params = { | ||
| 169 | - // lat: this.lat ? Number(this.lat) : '', | ||
| 170 | - // lng: this.lng ? Number(this.lng) : '', | ||
| 171 | - // }; | ||
| 172 | - // uni.navigateTo({ url: `/pages/common/webview?url=${url}&query=${JSON.stringify(params)}` }); | ||
| 173 | - }, | ||
| 174 | - // 格式化地址 | ||
| 175 | - getAddress(geo) { | ||
| 176 | - const { regeocode = {} } = geo || {}; | ||
| 177 | - const { addressComponent = {} } = regeocode || {}; | ||
| 178 | - const { province, city, district, township, streetNumber } = addressComponent || {}; | ||
| 179 | - const { street, number } = streetNumber || {}; | ||
| 180 | - const formattedAddress = regeocode.formatted_address || regeocode.formattedAddress || ''; | ||
| 181 | - let amapAddress = formattedAddress.replace(province, ''); | ||
| 182 | - amapAddress = amapAddress.replace(city, ''); | ||
| 183 | - amapAddress = amapAddress.replace(district, ''); | ||
| 184 | - amapAddress = amapAddress.replace(township, ''); | ||
| 185 | - amapAddress = amapAddress.replace(street, ''); | ||
| 186 | - amapAddress = amapAddress.replace(number, ''); | ||
| 187 | - return { | ||
| 188 | - formattedAddress, | ||
| 189 | - fullAddress: `${province}${city}${district}${township}${street}${number}`, | ||
| 190 | - address: `${township}${street}${number}${amapAddress}`, | ||
| 191 | - amapAddress, | ||
| 192 | - adcode: addressComponent.adcode, | ||
| 193 | - township, | ||
| 194 | - }; | ||
| 195 | }, | 135 | }, |
| 196 | }, | 136 | }, |
| 197 | }; | 137 | }; |
pages/goodSource/add.vue
| @@ -383,11 +383,12 @@ export default { | @@ -383,11 +383,12 @@ export default { | ||
| 383 | uni.$u.api.freightGoodsSourceV2[opType]({ ...this.form, ...startAddressObj, ...endAddressObj }) | 383 | uni.$u.api.freightGoodsSourceV2[opType]({ ...this.form, ...startAddressObj, ...endAddressObj }) |
| 384 | .then(res => { | 384 | .then(res => { |
| 385 | if (res.success) { | 385 | if (res.success) { |
| 386 | - uni.showToast({ title: '成功', icon: 'none' }); | 386 | + // uni.showToast({ title: '成功', icon: 'none' }); |
| 387 | this.getOpenerEventChannel().emit('refreshData'); | 387 | this.getOpenerEventChannel().emit('refreshData'); |
| 388 | - setTimeout(() => uni.navigateBack(), 1000); | 388 | + setTimeout(() => uni.navigateBack(), 500); |
| 389 | + } else { | ||
| 390 | + this.loading = false; | ||
| 389 | } | 391 | } |
| 390 | - this.loading = false; | ||
| 391 | }) | 392 | }) |
| 392 | .catch(e => { | 393 | .catch(e => { |
| 393 | this.loading = false; | 394 | this.loading = false; |
pages/goodSource/detail.vue
| @@ -4,17 +4,33 @@ | @@ -4,17 +4,33 @@ | ||
| 4 | <card :item="form" :onlyShow="true"></card> | 4 | <card :item="form" :onlyShow="true"></card> |
| 5 | <view class="card"> | 5 | <view class="card"> |
| 6 | <view class="card__item"> | 6 | <view class="card__item"> |
| 7 | - <view class="card__item_field">货物名称</view> | 7 | + <view class="card__item_field">货物类型</view> |
| 8 | <view class="card__item_content">{{ form.goodsName || '' }}</view> | 8 | <view class="card__item_content">{{ form.goodsName || '' }}</view> |
| 9 | </view> | 9 | </view> |
| 10 | - <view class="card__item" v-if="form.goodsWeight"> | ||
| 11 | - <view class="card__item_field">货物总量</view> | ||
| 12 | - <view class="card__item_content">{{ form.goodsWeight || '' }}</view> | ||
| 13 | - </view> | ||
| 14 | - <view class="card__item" v-if="form.remainGoodsWeight"> | ||
| 15 | - <view class="card__item_field">货物剩余</view> | ||
| 16 | - <view class="card__item_content">{{ form.remainGoodsWeight || '' }}</view> | ||
| 17 | - </view> | 10 | + <template v-if="form.priceType === 'TON'"> |
| 11 | + <view class="card__item"> | ||
| 12 | + <view class="card__item_field">货物总量</view> | ||
| 13 | + <view class="card__item_content">{{ form.goodsWeight || '' }}吨</view> | ||
| 14 | + </view> | ||
| 15 | + <view class="card__item"> | ||
| 16 | + <view class="card__item_field">货物剩余</view> | ||
| 17 | + <view class="card__item_content"> | ||
| 18 | + <text>{{ form.remainGoodsWeight || '' }}吨</text> | ||
| 19 | + </view> | ||
| 20 | + </view> | ||
| 21 | + </template> | ||
| 22 | + <template v-if="form.priceType === 'VEHICLE'"> | ||
| 23 | + <view class="card__item"> | ||
| 24 | + <view class="card__item_field">需求车数</view> | ||
| 25 | + <view class="card__item_content">{{ form.vehicleNumber || '' }}车</view> | ||
| 26 | + </view> | ||
| 27 | + <view class="card__item"> | ||
| 28 | + <view class="card__item_field">还需车数</view> | ||
| 29 | + <view class="card__item_content"> | ||
| 30 | + <text>{{ form.remainVehicleNumber || '' }}车</text> | ||
| 31 | + </view> | ||
| 32 | + </view> | ||
| 33 | + </template> | ||
| 18 | <view class="card__item"> | 34 | <view class="card__item"> |
| 19 | <view class="card__item_field">司机抢单</view> | 35 | <view class="card__item_field">司机抢单</view> |
| 20 | <view class="card__item_content"> | 36 | <view class="card__item_content"> |
| @@ -44,44 +60,22 @@ | @@ -44,44 +60,22 @@ | ||
| 44 | </view> | 60 | </view> |
| 45 | <view class="card"> | 61 | <view class="card"> |
| 46 | <view class="card__item"> | 62 | <view class="card__item"> |
| 47 | - <view class="card__item_field">需求车型</view> | ||
| 48 | - <view class="card__item_content">{{ formatSpecification || '' }}</view> | ||
| 49 | - </view> | ||
| 50 | - <view class="card__item"> | ||
| 51 | - <view class="card__item_field">需求箱型</view> | ||
| 52 | - <view class="card__item_content">{{ formatVanType || '' }}</view> | ||
| 53 | - </view> | ||
| 54 | - </view> | ||
| 55 | - <view class="card"> | ||
| 56 | - <view class="card__item"> | ||
| 57 | <view class="card__item_field">装货地址</view> | 63 | <view class="card__item_field">装货地址</view> |
| 58 | <view class="card__item_content"> {{ form.startProvinceName || '' }}{{ form.startCityName || '' }}{{ form.startAreaName || '' }}{{ form.startAddress || '' }} </view> | 64 | <view class="card__item_content"> {{ form.startProvinceName || '' }}{{ form.startCityName || '' }}{{ form.startAreaName || '' }}{{ form.startAddress || '' }} </view> |
| 59 | </view> | 65 | </view> |
| 60 | <view class="card__item"> | 66 | <view class="card__item"> |
| 61 | - <view class="card__item_field">司机抢单</view> | ||
| 62 | - <view class="card__item_content"> | ||
| 63 | - <text> | ||
| 64 | - 已抢单<text class="color-blue">{{ form.biddingCount }}</text> /已指派<text class="color-red">{{ form.assignedCount }}</text> /待指派<text class="color-red">{{ | ||
| 65 | - form.waitAssignCount | ||
| 66 | - }}</text> | ||
| 67 | - </text> | ||
| 68 | - </view> | ||
| 69 | - </view> | ||
| 70 | - <view class="card__item"> | ||
| 71 | - <view class="card__item_field">订单备注</view> | ||
| 72 | - <view class="card__item_content">{{ form.remark || '' }}</view> | 67 | + <view class="card__item_field">卸货地址</view> |
| 68 | + <view class="card__item_content"> {{ form.endProvinceName || '' }}{{ form.endCityName || '' }}{{ form.endAreaName || '' }}{{ form.endAddress || '' }} </view> | ||
| 73 | </view> | 69 | </view> |
| 70 | + </view> | ||
| 71 | + <view class="card"> | ||
| 74 | <view class="card__item"> | 72 | <view class="card__item"> |
| 75 | - <view class="card__item_field">货源联系人</view> | ||
| 76 | - <view class="card__item_content"> | ||
| 77 | - <text>{{ form.contactUser || '' }} {{ form.contactMobile || '' }}</text> | ||
| 78 | - </view> | 73 | + <view class="card__item_field">需求车型</view> |
| 74 | + <view class="card__item_content">{{ formatSpecification || '' }}</view> | ||
| 79 | </view> | 75 | </view> |
| 80 | <view class="card__item"> | 76 | <view class="card__item"> |
| 81 | - <view class="card__item_field">货源发布时间</view> | ||
| 82 | - <view class="card__item_content"> | ||
| 83 | - <text>{{ form.releaseTime || '' }}</text> | ||
| 84 | - </view> | 77 | + <view class="card__item_field">需求箱型</view> |
| 78 | + <view class="card__item_content">{{ formatVanType || '' }}</view> | ||
| 85 | </view> | 79 | </view> |
| 86 | </view> | 80 | </view> |
| 87 | <view class="card"> | 81 | <view class="card"> |
pages/goodSource/grab-record.vue
| @@ -93,7 +93,7 @@ | @@ -93,7 +93,7 @@ | ||
| 93 | <u-modal :show="cancelShow" title="取消原因" @cancel="cancelShow = false" @confirm="confirmCancel" show-cancel-button> | 93 | <u-modal :show="cancelShow" title="取消原因" @cancel="cancelShow = false" @confirm="confirmCancel" show-cancel-button> |
| 94 | <u-input v-model="cancelRemark" placeholder="取消原因"></u-input> | 94 | <u-input v-model="cancelRemark" placeholder="取消原因"></u-input> |
| 95 | </u-modal> | 95 | </u-modal> |
| 96 | - <popup-platenumber v-model="platenumberVisible" :plate="searchForm.vehicleCode" @cancel="platenumberVisible = false" @confirm="onPlatenumberSelect" /> | 96 | + <popup-platenumber :visible="platenumberVisible" v-model="searchForm.vehicleLicenseNum" @update:visible="e => (platenumberVisible = e)" @confirm="onPlatenumberSelect" /> |
| 97 | </template> | 97 | </template> |
| 98 | </Page> | 98 | </Page> |
| 99 | </template> | 99 | </template> |
pages/order/add.vue
| @@ -635,12 +635,13 @@ export default { | @@ -635,12 +635,13 @@ export default { | ||
| 635 | addFun({ ...this.form, totalAmount, payeeId: this.payeeModel.driverId }) | 635 | addFun({ ...this.form, totalAmount, payeeId: this.payeeModel.driverId }) |
| 636 | .then(res => { | 636 | .then(res => { |
| 637 | if (res.success) { | 637 | if (res.success) { |
| 638 | - this.form = {}; | 638 | + // this.form = {}; |
| 639 | uni.showToast({ title: '下单成功', icon: 'none' }); | 639 | uni.showToast({ title: '下单成功', icon: 'none' }); |
| 640 | this.getOpenerEventChannel().emit('refreshData'); | 640 | this.getOpenerEventChannel().emit('refreshData'); |
| 641 | - setTimeout(() => uni.navigateBack(), 500); | 641 | + setTimeout(() => uni.navigateBack(), 1500); |
| 642 | + } else { | ||
| 643 | + this.loading = false; | ||
| 642 | } | 644 | } |
| 643 | - this.loading = false; | ||
| 644 | }) | 645 | }) |
| 645 | .catch(e => { | 646 | .catch(e => { |
| 646 | this.loading = false; | 647 | this.loading = false; |