guzijian / garbage-removal · Commits

Commit 8e19ef49c5096c7e9f030f7cea139f0e4edc8f05

Authored by 2c2c2c
1 parent 5de73be7
build: skipped

1

Inline Side-by-side
Showing 4 changed files with 14 additions and 5 deletions
garbage-removal/src/pages/order-info/order-driver/detail/index.vue
  View file @8e19ef4
@@ -405,6 +405,11 @@ const handleUploadImage = (orderId, putType) => { @@ -405,6 +405,11 @@ const handleUploadImage = (orderId, putType) => {
405 */ 405 */
406 onLoad((options) => { 406 onLoad((options) => {
407 orderId.value = options.orderId 407 orderId.value = options.orderId
  408 + uni.showModal({
  409 + title: '提示',
  410 + content: '开始运输前请先上传装车图片！',
  411 + showCancel: false
  412 + })
408 handleOrderDetail(orderId.value) 413 handleOrderDetail(orderId.value)
409 }) 414 })
410 415
garbage-removal/src/pages/order-info/order-driver/upload/index.vue
  View file @8e19ef4
@@ -133,15 +133,18 @@ @@ -133,15 +133,18 @@
133 }; 133 };
134 // 提交图片 134 // 提交图片
135 const handleSubmit = async (id, type, driver, carPlate) => { 135 const handleSubmit = async (id, type, driver, carPlate) => {
  136 +
136 if (!validateImage()) { 137 if (!validateImage()) {
137 uni.$u.toast("请等待图片上传~") 138 uni.$u.toast("请等待图片上传~")
138 return 139 return
139 } 140 }
  141 +
140 if(typeof(location.value.latitude) === 'undefined'){ 142 if(typeof(location.value.latitude) === 'undefined'){
141 console.log('定位获取失败'); 143 console.log('定位获取失败');
142 uni.$u.toast("需要位置权限才能提交"); 144 uni.$u.toast("需要位置权限才能提交");
143 return; 145 return;
144 } 146 }
  147 +
145 const userPhone = store.userPhone; 148 const userPhone = store.userPhone;
146 let params = { 149 let params = {
147 garOrderId: id, 150 garOrderId: id,
@@ -159,7 +162,8 @@ @@ -159,7 +162,8 @@
159 uni.$u.toast("请上传现场图片"); 162 uni.$u.toast("请上传现场图片");
160 return; 163 return;
161 } 164 }
162 - 165 +
  166 +
163 uploadImageUrlByType(params).then(res => { 167 uploadImageUrlByType(params).then(res => {
164 if (res.data.success) { 168 if (res.data.success) {
165 uni.$u.toast("图片上传完毕！"); 169 uni.$u.toast("图片上传完毕！");
garbage-removal/src/pages/order-info/order-other/detail/index.vue
  View file @8e19ef4
@@ -187,13 +187,13 @@ @@ -187,13 +187,13 @@
187 :previewFullImage="true" :isReadOnly="true"></u-upload> 187 :previewFullImage="true" :isReadOnly="true"></u-upload>
188 </view> 188 </view>
189 </view> 189 </view>
190 - <view class="order-detail-container-header-item"> 190 + <!-- <view class="order-detail-container-header-item">
191 <text class=" order-detail-container-header-title">卸车照片：</text> 191 <text class=" order-detail-container-header-title">卸车照片：</text>
192 <view class="order-detail-container-header-content"> 192 <view class="order-detail-container-header-content">
193 <u-upload width="180" height="130" :fileList="putDownImages" name="3" multiple 193 <u-upload width="180" height="130" :fileList="putDownImages" name="3" multiple
194 :maxCount="20" :previewFullImage="true" :isReadOnly="true"></u-upload> 194 :maxCount="20" :previewFullImage="true" :isReadOnly="true"></u-upload>
195 </view> 195 </view>
196 - </view> 196 + </view> -->
197 </view> 197 </view>
198 <view v-else class="empty-image" 198 <view v-else class="empty-image"
199 style="width: 100%; display: flex; justify-content: center; align-items: center;"> 199 style="width: 100%; display: flex; justify-content: center; align-items: center;">
garbage-removal/src/pages/order-info/order-other/guest/index.vue
  View file @8e19ef4
@@ -131,13 +131,13 @@ @@ -131,13 +131,13 @@
131 :previewFullImage="true" :isReadOnly="true"></u-upload> 131 :previewFullImage="true" :isReadOnly="true"></u-upload>
132 </view> 132 </view>
133 </view> 133 </view>
134 - <view class="order-detail-container-header-item"> 134 + <!-- <view class="order-detail-container-header-item">
135 <text class="order-detail-container-header-title">卸车照片：</text> 135 <text class="order-detail-container-header-title">卸车照片：</text>
136 <view class="order-detail-container-header-content"> 136 <view class="order-detail-container-header-content">
137 <u-upload width="180" height="130" :fileList="putDownImages" name="3" multiple :maxCount="20" 137 <u-upload width="180" height="130" :fileList="putDownImages" name="3" multiple :maxCount="20"
138 :previewFullImage="true" :isReadOnly="true"></u-upload> 138 :previewFullImage="true" :isReadOnly="true"></u-upload>
139 </view> 139 </view>
140 - </view> 140 + </view> -->
141 </view> 141 </view>
142 <view v-else class="empty-image" 142 <view v-else class="empty-image"
143 style="width: 100%; display: flex; justify-content: center; align-items: center;"> 143 style="width: 100%; display: flex; justify-content: center; align-items: center;">