diff --git a/package1/index/deliveryPersonList.vue b/package1/index/deliveryPersonList.vue
index 5521c71..8ded3ce 100644
--- a/package1/index/deliveryPersonList.vue
+++ b/package1/index/deliveryPersonList.vue
@@ -12,32 +12,26 @@
+ style="width: 95%;height: 150px;margin: 0 auto;border-radius: 10px;overflow: hidden;position: absolute;top: 100px;left: 1%;border: 5px solid #fff;">
-
-
- 交易保障 ▼
-
-
-
-
- 相同地址 ▼
-
-
-
-
- 4星以上 ▼
-
-
- 区域选择 ▼
+ 筛选条件 ▼
{{item.title}}
+
+ 交易保障
+
+
+ 相同地址
+
+
+
+
@@ -95,12 +89,17 @@
markers: [], // 标记点，可以包括配送员位置和用户位置
polyline: [], // 路线，如果需要显示配送员路线
menuButtonInfo: {},
+ baozhang:false,
+ xiangtong:false,
shopArea: [{
id: 0,
- title: '跑腿单'
+ title: '配送时长'
}, {
- id: 0,
- title: '外卖单'
+ id: 1,
+ title: '评分优先'
+ },{
+ id: 2,
+ title: '配送费低'
}],
}
},
@@ -114,24 +113,10 @@
searchShop(type, value) {
if (type == 'area') {
this.searchForm.shopArea = value
- } else if (type == 'score') {
- this.searchScore = !this.searchScore
- this.searchSale = false
- this.searchForm.sort = 'shopScore'
- } else if (type == 'sale') {
- this.searchSale = !this.searchSale
- this.searchScore = false
- this.searchForm.sort = 'saleCount'
- } else if (type == 'all') {
- this.searchForm.sortOrder = 'shoprank'
- this.searchForm.orderOrder = 'desc'
- this.searchForm.shopArea = ''
- this.searchForm.sort = 'shoprank'
- this.searchScore = false
- this.searchScore = false
- this.searchSale = false
- } else if (type == 'typeUp') {
- //TODO跳转新页面
+ } else if (type == 'baozhang') {
+ this.baozhang = !this.baozhang
+ } else if (type == 'xiangtong') {
+ this.xiangtong = !this.xiangtong
}
this.getShopList();
},
@@ -192,7 +177,7 @@
.title-sort {
height: 60rpx;
display: flex;
- margin-top: 30rpx;
+ margin-top: 50rpx;
}
.sort-member {
@@ -275,11 +260,12 @@
.man-type {
height: 16px;
line-height: 16px;
- background: rgba(166, 255, 234, 1);
- padding: 0 10px;
+ background: #a6ffea;
+ padding: 0 5px;
font-size: 10px;
color: #777;
margin-top: 9px;
+ border-radius: 5px;
}
.man-rate {
diff --git a/package1/order/orderList.vue b/package1/order/orderList.vue
index 24ec34c..21016ad 100644
--- a/package1/order/orderList.vue
+++ b/package1/order/orderList.vue
@@ -46,22 +46,22 @@
+ :style="{'background':tab2Checked=='quanbu'?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked=='quanbu'?'#000':'#777'}">
全部
+ :style="{'background':tab2Checked=='daifu'?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked=='daifu'?'#000':'#777'}">
待付款
+ :style="{'background':tab2Checked=='daifa'?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked=='daifa'?'#000':'#777'}">
待发货
+ :style="{'background':tab2Checked=='daishou'?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked=='daishou'?'#000':'#777'}">
待收货
+ :style="{'background':tab2Checked=='daiping'?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked=='daiping'?'#000':'#777'}">
待评价
+ :style="{'background':tab2Checked=='guanbi'?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked=='guanbi'?'#000':'#777'}">
已关闭
@@ -95,12 +95,12 @@
待评价
-->
-
+
饭团
竹仔园牛仔农庄(第六分店)
-
+
@@ -123,7 +123,7 @@
-
+
待支付 23:59:23
@@ -298,7 +298,7 @@
height: 35px;
line-height: 35px;
text-align: center;
- background: #eee;
+ background: #F5F5F5;
border-radius: 10px;
font-weight: 700;
margin-right: 10px;
@@ -310,7 +310,7 @@
position: absolute;
top: 0;
right: 0;
- background: #eee;
+ background: #F5F5F5;
border-top-right-radius: 10px;
border-bottom-left-radius: 10px;
font-weight: 700;
@@ -318,6 +318,7 @@
width: 60px;
text-align: center;
line-height: 28px;
+ color: #fff;
}
.box1 {
@@ -375,7 +376,7 @@
line-height: 30px;
text-align: center;
margin-top: 10px;
- background: #eee;
+ background: #F5F5F5;
border-radius: 30px;
color: #777;
font-weight: 700;