Compare commits
No commits in common. "812abdfea31c2d4e85350f4360fc7d2f4cba651c" and "bd2d9b50766ed3dcaa129b24c2b46c9b43797b97" have entirely different histories.
812abdfea3
...
bd2d9b5076
@ -71,7 +71,7 @@
|
|||||||
<view
|
<view
|
||||||
class="schedule-block"
|
class="schedule-block"
|
||||||
v-if="
|
v-if="
|
||||||
![2010, 2050,2060, 2070].includes(OrderInfo.order_state_id) &&
|
![2010, 2060, 2070].includes(OrderInfo.order_state_id) &&
|
||||||
![5, 10].includes(OrderInfo.delivery_type_id)
|
![5, 10].includes(OrderInfo.delivery_type_id)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
@ -92,7 +92,7 @@
|
|||||||
'iconfontAili icon-money-cny-circle-fill icon-2',
|
'iconfontAili icon-money-cny-circle-fill icon-2',
|
||||||
orderProcessCalss(OrderInfo.order_state_id),
|
orderProcessCalss(OrderInfo.order_state_id),
|
||||||
]"
|
]"
|
||||||
></view>
|
></view>
|
||||||
<view
|
<view
|
||||||
:class="[
|
:class="[
|
||||||
'iconfontAili icon-yundianxiaochengxu2_tongchengpeisong icon-3',
|
'iconfontAili icon-yundianxiaochengxu2_tongchengpeisong icon-3',
|
||||||
@ -106,12 +106,10 @@
|
|||||||
class="map-block"
|
class="map-block"
|
||||||
ref="mapBlock"
|
ref="mapBlock"
|
||||||
v-if="
|
v-if="
|
||||||
![2010, 2060, 2050,2070].includes(OrderInfo.order_state_id) &&
|
![2010, 2060, 2070].includes(OrderInfo.order_state_id) &&
|
||||||
![5, 10].includes(OrderInfo.delivery_type_id)
|
![5, 10].includes(OrderInfo.delivery_type_id)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<!--5-自提;10-快递;16-同城配送;"-->
|
|
||||||
<!--2010待付款 2050已签收 2060已完成 2070已取消-->
|
|
||||||
<map
|
<map
|
||||||
:latitude="mapLat"
|
:latitude="mapLat"
|
||||||
:longitude="mapLng"
|
:longitude="mapLng"
|
||||||
@ -1426,11 +1424,6 @@ export default {
|
|||||||
return "satisfy";
|
return "satisfy";
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
orderSignCalss(id) {
|
|
||||||
if ([2050].includes(id)) {
|
|
||||||
return "satisfy";
|
|
||||||
}
|
|
||||||
},
|
|
||||||
orderTips() {
|
orderTips() {
|
||||||
switch (this.OrderInfo.order_state_id) {
|
switch (this.OrderInfo.order_state_id) {
|
||||||
case 2010:
|
case 2010:
|
||||||
@ -1444,9 +1437,6 @@ export default {
|
|||||||
case 2040:
|
case 2040:
|
||||||
return "骑手正在配送中,亲耐心等待";
|
return "骑手正在配送中,亲耐心等待";
|
||||||
break;
|
break;
|
||||||
case 2050:
|
|
||||||
return "用户已签收";
|
|
||||||
break;
|
|
||||||
case 2060:
|
case 2060:
|
||||||
return "感谢您对小发同城的信任,期待再次光临。";
|
return "感谢您对小发同城的信任,期待再次光临。";
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -151,7 +151,6 @@
|
|||||||
v-if="category_deep == 1"
|
v-if="category_deep == 1"
|
||||||
ref="productList"
|
ref="productList"
|
||||||
:uniId="ptConfig.uniId"
|
:uniId="ptConfig.uniId"
|
||||||
:storeId="shopInfo.store_id"
|
|
||||||
:isFilterFixed="ptConfig.isFilterFixed"
|
:isFilterFixed="ptConfig.isFilterFixed"
|
||||||
:isShowFilter="ptConfig.isShowFilter"
|
:isShowFilter="ptConfig.isShowFilter"
|
||||||
:isShowLoading="ptConfig.isShowLoading"
|
:isShowLoading="ptConfig.isShowLoading"
|
||||||
@ -465,6 +464,7 @@ export default {
|
|||||||
that.categoryId = options.category_id;
|
that.categoryId = options.category_id;
|
||||||
that.storeId = options.store_id;
|
that.storeId = options.store_id;
|
||||||
that.w = w;
|
that.w = w;
|
||||||
|
|
||||||
that.$.getSystemInfo({
|
that.$.getSystemInfo({
|
||||||
success: function (t) {
|
success: function (t) {
|
||||||
that.setData({ screenHeight: t.screenHeight });
|
that.setData({ screenHeight: t.screenHeight });
|
||||||
|
|||||||
@ -1884,9 +1884,6 @@ export default {
|
|||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
::v-deep .uni-nav-bar-text {
|
|
||||||
font-size: 20px !important;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user