diff --git a/package1/address/addressList.vue b/package1/address/addressList.vue index b3446b7..3868d0b 100644 --- a/package1/address/addressList.vue +++ b/package1/address/addressList.vue @@ -6,7 +6,7 @@ + style="margin-bottom: 20rpx;display: flex;padding: 20rpx 40rpx 40rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;"> 默认 @@ -41,31 +41,31 @@ {{addressForm.id ? '编辑地址' : '填写地址'}} - + - + {{addressForm.floor}} 请填写所在楼层(仅限整数) - + {{addressForm.roomNum}} 请填写门牌号或所在机构科室 - + {{addressForm.receiverName}} 收货人名字 - + {{addressForm.receiverPhone}} @@ -263,6 +263,6 @@ .uni-combox{ border: 0 !important; padding: 20rpx 20rpx !important; - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); } \ No newline at end of file diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue index d1e092c..dc62700 100644 --- a/package1/buyFood/buyFood.vue +++ b/package1/buyFood/buyFood.vue @@ -58,7 +58,7 @@ + :style="{'background':formData.isImmediately?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'rgba(247, 248, 248, 0.6)'}"> 立即送出 @@ -67,7 +67,7 @@ + :style="{'background':formData.isImmediately==false?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'rgba(247, 248, 248, 0.6)'}"> 预约配送 @@ -139,7 +139,7 @@ - @@ -165,7 +165,7 @@ - @@ -193,7 +193,7 @@ - @@ -1290,7 +1290,7 @@ } .ziqu-box { - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); width: 90%; margin: 0 auto; border-radius: 20rpx; diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue index a77463d..bbf11e2 100644 --- a/package1/group/groupBuySingle.vue +++ b/package1/group/groupBuySingle.vue @@ -2119,7 +2119,7 @@ .spec222 { display: inline-block; padding: 0 20rpx; - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); color: #777; height: 72rpx; line-height: 72rpx; @@ -2141,7 +2141,7 @@ .team1 { width: 154rpx; - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); border-radius: 20rpx; font-size: 26rpx; text-align: center; @@ -2154,7 +2154,7 @@ .team2{ width: 190rpx; height: 270rpx; - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); border-radius: 10px; float: left; text-align: center; diff --git a/package1/group/searchGroup.vue b/package1/group/searchGroup.vue index df2098f..b5a1884 100644 --- a/package1/group/searchGroup.vue +++ b/package1/group/searchGroup.vue @@ -20,7 +20,7 @@ - + {{item}} diff --git a/package1/group/shopEvaluate.vue b/package1/group/shopEvaluate.vue index c46679c..820b076 100644 --- a/package1/group/shopEvaluate.vue +++ b/package1/group/shopEvaluate.vue @@ -82,13 +82,13 @@ 回复 - + + style="background: rgba(247, 248, 248, 0.6);text-align: center;line-height: 160rpx;"> @@ -537,7 +537,7 @@ /* 卡片整体样式(可根据需要调整外间距) */ .reply-card { border-radius: 12rpx; - background-color: #f5f5f5; + background-color: rgba(247, 248, 248, 0.6); width: 100%; box-sizing: border-box; margin-top:20rpx; diff --git a/package1/index/deliveryPersonList.vue b/package1/index/deliveryPersonList.vue index bd42d23..7d5e383 100644 --- a/package1/index/deliveryPersonList.vue +++ b/package1/index/deliveryPersonList.vue @@ -11,7 +11,7 @@ - @@ -23,21 +23,24 @@ @tap="searchShop('area',item.id)">{{item.title}} - + 交易保障 - + 相同地址 - + - + @@ -45,7 +48,8 @@ + alt="" style="width: 140rpx;height: 32rpx;margin-top: 18rpx;" + v-if="worker.rebateAmount > 0" /> ¥{{worker.orderBkge}} @@ -55,11 +59,13 @@ {{worker.score || 5}} - + - 平均配送时长 {{worker.avgTime || 30}}分钟 + 平均配送时长 {{worker.avgTime || 30}}分钟 @@ -72,7 +78,8 @@ 当前待送 {{worker.orderPutCount || 0}} - 待接单数 {{worker.orderWaitCount || 0}} + 待接单数 {{worker.orderWaitCount || 0}} @@ -94,28 +101,28 @@ markers: [], // 标记点,可以包括配送员位置和用户位置 polyline: [], // 路线,如果需要显示配送员路线 menuButtonInfo: {}, - baozhang:false, - xiangtong:false, + baozhang: false, + xiangtong: false, shopArea: [{ id: 0, title: '配送时长' }, { id: 1, title: '评分优先' - },{ + }, { id: 2, title: '配送费低' - },{ + }, { id: 3, title: '清空' }], shopAreaId: '', - regionId:JSON.parse(uni.getStorageSync('area')).id, - sortField:"score", + regionId: JSON.parse(uni.getStorageSync('area')).id, + sortField: "score", putAreaId: '', workerList: [], - orderType:null, - pageNum: 1, // ← 新增 + orderType: null, + pageNum: 1, // ← 新增 pageSize: 10, totalPages: 1, keyword: '' @@ -147,8 +154,8 @@ putAreaId: this.putAreaId, baozhang: this.baozhang, xiangtong: this.xiangtong, - sortField:this.sortField, - regionId:this.regionId, + sortField: this.sortField, + regionId: this.regionId, keyword: this.keyword, pageNum: this.pageNum, pageSize: this.pageSize @@ -156,13 +163,40 @@ let that = this this.tui.request("/worker/getMatchingWorkerList", "POST", payload, false, false).then(res => { that.loadStatus = 'nomore'; - if(res.code == 200) { - if(res.result != null){ + if (res.code == 200) { + + if (res.result != null) { if (that.pageNum == 1) { that.workerList = res.result.records || []; } else { that.workerList = [...that.workerList, ...res.result.records]; } + that.markers = [] + for (let i = 0; i < that.workerList.length; i++) { + that.workerList[i].geolocation = that.workerList[i].geolocation.split(","); + // // 将用户位置添加到标记点 + that.markers.push({ + id: i, + latitude: that.workerList[i].geolocation[0], + longitude: that.workerList[i].geolocation[1], + title: that.workerList[i].workerName, + iconPath: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png', // 用户位置图标 + width: 30, + height: 30, + callout: { + content: "状态不对", + color: '#333333', + fontSize: 14, + borderRadius: 10, + bgColor: '#ffffff', + padding: 8, + display: 'ALWAYS' // 可选 'BYCLICK'(点击) 或 'ALWAYS'(常显) + } + }); + + } + that.latitude = that.markers[0].latitude + that.longitude = that.markers[0].longitude that.totalPages = res.result.pages; // pages = 总页数 that.$forceUpdate(); } @@ -176,13 +210,13 @@ }, searchShop(type, value) { if (type == 'area') { - if(value == 0){ + if (value == 0) { this.sortField = 'avgTime' - }else if(value == 1){ + } else if (value == 1) { this.sortField = 'score' - }else if(value == 2){ + } else if (value == 2) { this.sortField = 'orderBkge' - }else{ + } else { this.sortField = 'score' } } else if (type == 'baozhang') { @@ -308,7 +342,7 @@ width: 95%; margin: 20rpx auto; background: #fff; - padding: 20rpx; + padding: 20rpx; } .man-title1 { @@ -321,7 +355,7 @@ display: flex; height: 70rpx; line-height: 70rpx; - padding-right: 20rpx; + padding-right: 20rpx; } .man-name { @@ -343,19 +377,20 @@ .man-rate { display: flex; - padding-right: 20rpx; + padding-right: 20rpx; } .man-num { color: #777; - flex: 1; - text-align: right; + flex: 1; + text-align: right; } .man-title { display: flex; } - .man-dingdan{ + + .man-dingdan { width: 100%; height: 100rpx; display: flex; @@ -365,17 +400,20 @@ margin: 20rpx auto; border: 1px solid rgba(166, 255, 234, 1); } - .man-dingdan1{ + + .man-dingdan1 { flex: 1; text-align: center; - color:#777; + color: #777; } - .man-mank{ - line-height: 40rpx; - color: #777; - font-weight: 700; + + .man-mank { + line-height: 40rpx; + color: #777; + font-weight: 700; } - .shop-menu-purchase{ + + .shop-menu-purchase { display: flex; background: rgba(255, 57, 57, 0.1); height: 36rpx; diff --git a/package1/myCenter/addGoods.vue b/package1/myCenter/addGoods.vue index 119e302..0252bdb 100644 --- a/package1/myCenter/addGoods.vue +++ b/package1/myCenter/addGoods.vue @@ -18,7 +18,7 @@ + style="background: rgba(247, 248, 248, 0.6);text-align: center;line-height: 160rpx;"> @@ -897,7 +897,7 @@ } .content-left { width: 160rpx; - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); height: 900rpx; overflow: scroll; scrollbar-width: none; diff --git a/package1/myCenter/dataStatistics.vue b/package1/myCenter/dataStatistics.vue index ba4f9dc..aa7d1b7 100644 --- a/package1/myCenter/dataStatistics.vue +++ b/package1/myCenter/dataStatistics.vue @@ -39,7 +39,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/package1/myCenter/goodsList.vue b/package1/myCenter/goodsList.vue index d218aa6..9e5c6ce 100644 --- a/package1/myCenter/goodsList.vue +++ b/package1/myCenter/goodsList.vue @@ -471,7 +471,7 @@ } .content-left { width: 170rpx; - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); overflow: scroll; } .left-box { @@ -603,7 +603,7 @@ .show-box{ display: flex; height: 100rpx; - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); } .show-text{ display: flex; diff --git a/package1/myCenter/partTimeJobRegister.vue b/package1/myCenter/partTimeJobRegister.vue index 818fe6e..3eb6dd7 100644 --- a/package1/myCenter/partTimeJobRegister.vue +++ b/package1/myCenter/partTimeJobRegister.vue @@ -15,7 +15,7 @@ + style="background: rgba(247, 248, 248, 0.6);height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;"> @@ -37,7 +37,7 @@ + style="background: rgba(247, 248, 248, 0.6);height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;"> @@ -46,7 +46,7 @@ + style="background: rgba(247, 248, 248, 0.6);height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;"> @@ -55,11 +55,11 @@ + :style="{background:formData.waima?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:formData.waima?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> 外卖 + :style="{background:formData.paotui?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:formData.paotui?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> 快递 @@ -180,7 +180,7 @@ + :style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> {{item.title}} 暂无可选取货区域 @@ -192,7 +192,7 @@ + :style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> {{item.title}} 暂无可送货区域 @@ -570,7 +570,7 @@ } .value1 { - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); border-radius: 20rpx; padding: 20rpx; margin-bottom: 20rpx; diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue index 66b69fe..9e0eddb 100644 --- a/package1/order/orderDetail.vue +++ b/package1/order/orderDetail.vue @@ -16,7 +16,7 @@ {{orderDetail.shopName}} - + @@ -204,7 +204,7 @@ 退款/售后 - @@ -226,9 +226,9 @@ + style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;"> - + @@ -307,7 +307,7 @@ + style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;"> @@ -1486,14 +1486,14 @@ position: absolute; top: 20rpx; right: 0; - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); width: 130rpx; height: 50rpx; text-align: center; line-height: 50rpx; border-radius: 16rpx; color: #777; - border: 1px solid #777; + border: 1px solid rgba(0, 35, 28, 0.16); font-size: 20rpx; } diff --git a/package1/order/orderEvaluate.vue b/package1/order/orderEvaluate.vue index 0d5bce4..013ea2f 100644 --- a/package1/order/orderEvaluate.vue +++ b/package1/order/orderEvaluate.vue @@ -16,7 +16,7 @@ {{shopData.shopName}} - + @@ -65,7 +65,7 @@ + style="background: rgba(247, 248, 248, 0.6);text-align: center;line-height: 160rpx;"> @@ -96,7 +96,7 @@ + style="background: rgba(247, 248, 248, 0.6);text-align: center;line-height: 160rpx;"> diff --git a/package1/order/orderList.vue b/package1/order/orderList.vue index 2052414..9d64a0c 100644 --- a/package1/order/orderList.vue +++ b/package1/order/orderList.vue @@ -46,43 +46,43 @@ + :style="{'background':tab2Checked==10?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==10?'#000':'#777'}"> 全部 + :style="{'background':tab2Checked==0?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==0?'#000':'#777'}"> 待支付 + :style="{'background':tab2Checked==1?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==1?'#000':'#777'}"> 待成团 + :style="{'background':tab2Checked==2?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==2?'#000':'#777'}"> 待消费 + :style="{'background':tab2Checked==3?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==3?'#000':'#777'}"> 待接单 + :style="{'background':tab2Checked==4?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==4?'#000':'#777'}"> 待取货 + :style="{'background':tab2Checked==5?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==5?'#000':'#777'}"> 待送达 + :style="{'background':tab2Checked==6?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==6?'#000':'#777'}"> 已完成 + :style="{'background':tab2Checked==7?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==7?'#000':'#777'}"> 待退款 + :style="{'background':tab2Checked==8?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==8?'#000':'#777'}"> 已退款 + :style="{'background':tab2Checked==9?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==9?'#000':'#777'}"> 已取消 + :style="{'background':tab2Checked==11?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==8?'#000':'#777'}"> 售后中 + :style="{'background':tab2Checked==12?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==9?'#000':'#777'}"> 已售后 @@ -130,7 +130,7 @@ {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '二手物品': item.shopName}} - + + :style="{'background':formData.isImmediately?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'rgba(247, 248, 248, 0.6)'}"> 立即送出 预计{{immediateTimeStr}}送达 + :style="{'background':formData.isImmediately==false?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'rgba(247, 248, 248, 0.6)'}"> 预约配送 @@ -146,7 +146,7 @@ 取件数量* - + - + @@ -177,7 +177,7 @@ 截图凭证 - + @@ -194,7 +194,7 @@ 特殊情况 - + 超重/超大 @@ -207,7 +207,7 @@ 订单备注 - + @@ -267,7 +267,7 @@ + style="padding: 30rpx 20rpx; border-bottom: 1px solid rgba(247, 248, 248, 0.6); display: flex; align-items: center; justify-content: space-between;"> {{item.title}} @@ -1072,7 +1072,7 @@ display: inline-block; text-align: center; height: 72rpx; - background: #f5f5f5; + background: rgba(247, 248, 248, 0.6); line-height: 72rpx; border-radius: 10rpx; padding: 0 20rpx;