diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue index feb8c09..561a65d 100644 --- a/components/tab-bar/delivery.vue +++ b/components/tab-bar/delivery.vue @@ -69,7 +69,7 @@ 今日接单状态 - {{isOnLine == 1 ? '已上线' : '已离线'}} + {{isOnLine == 1 ? '已上线' : '已离线，新订单不再提醒'}} {{deliveryStatusText}} @@ -121,27 +121,25 @@ style="background: rgba(247, 248, 248, 0.6);height: 80rpx;line-height: 80rpx;font-weight: 500;padding: 0 20rpx;border-radius: 20rpx;"> 备注：{{item.remark}} - - - - {{item.allCount != null ? item.allCount : 0}}件 + + + + 件数 + {{item.allCount != null ? item.allCount : 0}}件 - - 取件码截图(分割一下) {{item.getPictures}} + + 取件码 + {{item.getCodes}} - - 取件码{{item.getCodes}} - - - 手机尾号：{{item.phoneNumber}} + + 手机尾号 + {{item.phoneNumber}} - - - + + 取件码截图 + - + @@ -601,6 +599,25 @@ } }, methods: { + getPickupPictures(item) { + const pictures = item && item.getPictures + if (!pictures) return [] + if (Array.isArray(pictures)) { + return pictures.filter(pic => pic) + } + if (typeof pictures === 'string') { + let value = pictures.trim() + if (!value) return [] + try { + const parsed = JSON.parse(value) + if (Array.isArray(parsed)) { + return parsed.filter(pic => pic) + } + } catch (e) {} + return value.split(/[,，\s]+/).map(pic => pic.trim()).filter(pic => pic) + } + return [] + }, loadDeliveryStatusCounts() { this.setDeliveryStatusCounts(uni.getStorageSync('deliveryStatusCounts') || {}) }, @@ -891,7 +908,8 @@ }, //查看大图 largeImg(img) { - this.bigImg = 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/00b1f011787c4549bbea650d95a4eb39.png' + if (!img) return + this.bigImg = img this.$refs.imgPopup.open() }, zhipaiChange(e) { @@ -1209,7 +1227,7 @@ worker.isOnLine = value; this.isOnLine = value uni.setStorageSync('worker', worker); - this.tui.toast(res.message) + this.tui.toast(value == 0 ? '下线后不再接收新订单通知' : res.message) } else { this.tui.toast(res.message) } @@ -1620,6 +1638,84 @@ white-space: normal; } + .express-info-card { + margin-top: 16rpx; + padding: 16rpx 18rpx; + border-radius: 18rpx; + background: rgba(247, 248, 248, 0.72); + color: #596560; + box-sizing: border-box; + } + + .express-info-row { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 12rpx; + } + + .express-info-item { + min-height: 48rpx; + padding: 0 16rpx; + display: flex; + align-items: center; + border-radius: 999rpx; + background: #fff; + box-sizing: border-box; + max-width: 100%; + } + + .express-info-item--code { + flex: 1; + min-width: 220rpx; + } + + .express-info-label { + flex-shrink: 0; + margin-right: 8rpx; + color: #8a9691; + font-size: 22rpx; + font-weight: 700; + line-height: 32rpx; + } + + .express-info-value { + min-width: 0; + color: #313b37; + font-size: 24rpx; + font-weight: 900; + line-height: 34rpx; + word-break: break-all; + } + + .express-picture-list { + margin-top: 14rpx; + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 12rpx; + } + + .express-picture-title { + height: 44rpx; + line-height: 44rpx; + padding: 0 14rpx; + border-radius: 999rpx; + background: rgba(166, 255, 234, 0.46); + color: #0b6b5a; + font-size: 22rpx; + font-weight: 800; + } + + .express-picture { + width: 112rpx; + height: 112rpx; + border-radius: 14rpx; + background: #eef4f1; + border: 1px solid rgba(0, 35, 28, 0.08); + box-sizing: border-box; + } + .refund-status { width: 100%; margin-top: 24rpx; diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue index ccc60fd..d20353b 100644 --- a/components/tab-bar/myCenter.vue +++ b/components/tab-bar/myCenter.vue @@ -7,6 +7,7 @@ 钱包余额 ￥{{balance}} 我的订单 切换校区放到设置中 + 优惠券 退出登录 @@ -150,6 +151,13 @@ url = '/package2/myCenter/addGoods' } else if (e == 'merchantCenter') { if (this.schoolShop) { + let shopItem = [] + for(let aa = 0;aa 1) { this.$refs.shopPopup.open() return @@ -186,6 +194,8 @@ url = '/package2/myCenter/addType' } else if (e == 'qianbao') { url = '/package2/myCenter/wallet' + } else if (e == 'youhui') { + url = '/package2/myCenter/couponList' } else if (e == 'goodsList') { url = '/package2/myCenter/goodsList' } else if (e == 'merchant') { diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue index 7afcea5..8865863 100644 --- a/components/tab-bar/tab-bar.vue +++ b/components/tab-bar/tab-bar.vue @@ -1,6 +1,6 @@