Commit c656f30b2c0787e2d1554616166043482d21a5ff
1 parent
ed332b52
快递员小程序显示调整,logo图片
Showing
19 changed files
with
32 additions
and
25 deletions
project-wl-kuaidiyuan-uniapp-vue3/App.vue
project-wl-kuaidiyuan-uniapp-vue3/manifest.json
| ... | ... | @@ -196,7 +196,7 @@ |
| 196 | 196 | }, |
| 197 | 197 | "geolocation" : { |
| 198 | 198 | "system" : { |
| 199 | - "__platform__" : [ "android" ] | |
| 199 | + "__platform__" : [ "ios", "android" ] | |
| 200 | 200 | }, |
| 201 | 201 | "amap" : { |
| 202 | 202 | "name" : "amap_18628256862CSZ5FNjB", |
| ... | ... | @@ -208,10 +208,10 @@ |
| 208 | 208 | }, |
| 209 | 209 | "icons" : { |
| 210 | 210 | "android" : { |
| 211 | - "hdpi" : "static/logo/tsm_72.png", | |
| 212 | - "xhdpi" : "static/logo/tms_96.png", | |
| 213 | - "xxhdpi" : "static/logo/tms_144.png", | |
| 214 | - "xxxhdpi" : "static/logo/tms_192.png" | |
| 211 | + "hdpi" : "static/logo/icon72.png", | |
| 212 | + "xhdpi" : "static/logo/icon96.png", | |
| 213 | + "xxhdpi" : "static/logo/icon144.png", | |
| 214 | + "xxxhdpi" : "static/logo/icon192.png" | |
| 215 | 215 | } |
| 216 | 216 | }, |
| 217 | 217 | "splashscreen" : { | ... | ... |
project-wl-kuaidiyuan-uniapp-vue3/pages/delivery/components/components/alreadyParcel.vue
| ... | ... | @@ -15,13 +15,14 @@ |
| 15 | 15 | <view class="address">派件地址:{{ item.address }}</view> |
| 16 | 16 | <view class="address">签收时间:{{ item.taskTime }}</view> |
| 17 | 17 | <view class="time" v-if="item.amount > 0 && item.status === 2">运费:{{ item.amount }}元</view> |
| 18 | - <text | |
| 18 | + <!-- 注释掉去收款按钮 2025-11-25 --> | |
| 19 | + <!-- <text | |
| 19 | 20 | @click.stop="handleDetails($event, item)" |
| 20 | 21 | class="delete" |
| 21 | 22 | v-if="item.status === 2 && item.paymentStatus === 1 && item.paymentMethod === 2 && item.signStatus !== 2" |
| 22 | - > | |
| 23 | + > | |
| 23 | 24 | <button class="uni-btn btn-default">去收款</button> |
| 24 | - </text> | |
| 25 | + </text> --> | |
| 25 | 26 | </view> |
| 26 | 27 | </view> |
| 27 | 28 | </view> |
| ... | ... | @@ -238,19 +239,23 @@ const handleDetails = (e, item) => { |
| 238 | 239 | // 用vuex保存状态,因为当从详情页返回列表页的时候要显示对应的tab列表项 |
| 239 | 240 | store.commit('user/setTaskStatus', 5); |
| 240 | 241 | store.commit('user/setNewType', null); |
| 241 | - if (item.status === 2 && item.paymentStatus === 1 && item.paymentMethod === 2 && item.signStatus !== 2) { | |
| 242 | - // 未付款进入付款二维码页面 | |
| 243 | - store.commit('user/setIsDelivery', true); | |
| 244 | - store.commit('user/setPayData', {}); | |
| 245 | - uni.redirectTo({ | |
| 246 | - url: '/pages/pay/scanPay' | |
| 247 | - }); | |
| 248 | - } else { | |
| 249 | - // 进入详情页 | |
| 250 | - uni.redirectTo({ | |
| 242 | + uni.redirectTo({ | |
| 251 | 243 | url: '/pages/details/waybill' |
| 252 | 244 | }); |
| 253 | - } | |
| 245 | + | |
| 246 | + // if (item.status === 2 && item.paymentStatus === 1 && item.paymentMethod === 2 && item.signStatus !== 2) { | |
| 247 | + // // 未付款进入付款二维码页面 | |
| 248 | + // store.commit('user/setIsDelivery', true); | |
| 249 | + // store.commit('user/setPayData', {}); | |
| 250 | + // uni.redirectTo({ | |
| 251 | + // url: '/pages/pay/scanPay' | |
| 252 | + // }); | |
| 253 | + // } else { | |
| 254 | + // // 进入详情页 | |
| 255 | + // uni.redirectTo({ | |
| 256 | + // url: '/pages/details/waybill' | |
| 257 | + // }); | |
| 258 | + // } | |
| 254 | 259 | }; |
| 255 | 260 | //把数据、方法暴漏给父组件 |
| 256 | 261 | defineExpose({ | ... | ... |
project-wl-kuaidiyuan-uniapp-vue3/pages/details/index.vue
| ... | ... | @@ -58,7 +58,10 @@ |
| 58 | 58 | </view> |
| 59 | 59 | <!-- end --> |
| 60 | 60 | <!-- 付款方式 --> |
| 61 | - <view class="boxBg"> | |
| 61 | + | |
| 62 | + <!-- 付款方式暂时隐藏 2025-11-25日修改 --> | |
| 63 | + | |
| 64 | + <!-- <view class="boxBg"> | |
| 62 | 65 | <view class="tit"> |
| 63 | 66 | <text>付款方式</text> |
| 64 | 67 | <view class="goodsSelect" @click="handlePayMethod" v-if="!isPickUp || (users.paymentMethod === 2 && !isCollect)"> |
| ... | ... | @@ -69,7 +72,7 @@ |
| 69 | 72 | <text class="textInfo">{{ detailsData.paymentMethod === 1 ? '寄付' : '到付' }}</text> |
| 70 | 73 | </view> |
| 71 | 74 | </view> |
| 72 | - </view> | |
| 75 | + </view> --> | |
| 73 | 76 | <!-- end --> |
| 74 | 77 | <!-- 备注 --> |
| 75 | 78 | <view class="boxBg"> | ... | ... |
project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon1024.png
0 → 100644
96.7 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon120-1.png
0 → 100644
12.2 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon120.png
0 → 100644
12.2 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/tms_144.png renamed to project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon144.png
8.53 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon180.png
0 → 100644
17.7 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/tms_192.png renamed to project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon192.png
10.7 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon40.png
0 → 100644
4.9 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon58.png
0 → 100644
6.24 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon60.png
0 → 100644
6.59 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/tsm_72.png renamed to project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon72.png
5.56 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon80.png
0 → 100644
8.35 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon87.png
0 → 100644
8.98 KB
project-wl-kuaidiyuan-uniapp-vue3/static/logo/tms_96.png renamed to project-wl-kuaidiyuan-uniapp-vue3/static/logo/icon96.png
6.47 KB
project-wl-kuaidiyuan-uniapp-vue3/utils/index.js
| ... | ... | @@ -230,7 +230,7 @@ export const positionsUploadInit = () => { |
| 230 | 230 | // 位置获取 item 如果存在 则直接执行上报 清空所有时间和距离条件 重新计算 |
| 231 | 231 | export const positionUploadHandle = item => { |
| 232 | 232 | uni.getLocation({ |
| 233 | - type: 'gcj02', | |
| 233 | + type: 'wgs84', | |
| 234 | 234 | isHighAccuracy: true, |
| 235 | 235 | success: function(positions) { |
| 236 | 236 | if (positions){ |
| ... | ... | @@ -274,6 +274,7 @@ export const positionUploadHandle = item => { |
| 274 | 274 | } |
| 275 | 275 | }, |
| 276 | 276 | fail: function(err){ |
| 277 | + console.log('位置获取失败,',err) | |
| 277 | 278 | uni.showToast({ |
| 278 | 279 | title: '位置获取失败,请检查定位功能是否开启,或切网络了重新上传', |
| 279 | 280 | duration: 3000, | ... | ... |
project-wl-kuaidiyuan-uniapp-vue3/utils/request.js
| ... | ... | @@ -4,7 +4,6 @@ import { baseUrl } from "./env"; |
| 4 | 4 | |
| 5 | 5 | export function request({ url = "", params = {}, method = "GET" }) { |
| 6 | 6 | // baseUrl改为可配置地址 |
| 7 | - console.log('baseUrl', baseUrl) | |
| 8 | 7 | // 获取token |
| 9 | 8 | const token = uni.getStorageSync("token"); |
| 10 | 9 | let header = { |
| ... | ... | @@ -17,7 +16,6 @@ export function request({ url = "", params = {}, method = "GET" }) { |
| 17 | 16 | header['Content-Type'] = 'application/x-www-form-urlencoded' |
| 18 | 17 | } |
| 19 | 18 | const requestRes = new Promise((resolve, reject) => { |
| 20 | - console.log('fullUrl:', baseUrl + url) | |
| 21 | 19 | uni.request({ |
| 22 | 20 | url: baseUrl + url, |
| 23 | 21 | data: params, | ... | ... |