This commit is contained in:
wtq
2026-05-27 09:29:51 +08:00
parent 140bfe388e
commit c98f292438
3 changed files with 52 additions and 11 deletions

View File

@@ -2,8 +2,8 @@
"name" : "京西到家商家版",
"appid" : "__UNI__F9A47D3",
"description" : "1、商户通过京西平台同时管理美团、淘宝闪购、京东等多个外卖平台实现一键上架、下架、修改、删除多个平台商品2、商户通过京西平台可以同时对、美团专送、达达、顺丰同城等多个专送平台召唤偶骑手",
"versionName" : "1.9.3",
"versionCode" : 193,
"versionName" : "1.9.5",
"versionCode" : 195,
"transformPx" : false,
"uni-app" : {
"debug" : true

View File

@@ -92,12 +92,12 @@ const grindListData = ref([
title: '营业资质',
isIos: false,
},
{
id: 3,
icon: '/static/merchant-icon/3.png',
title: '我的店铺',
isIos: false,
},
// {
// id: 3,
// icon: '/static/merchant-icon/3.png',
// title: '我的店铺',
// isIos: false,
// },
{
id: 4,
icon: '/static/merchant-icon/4.png',
@@ -233,9 +233,9 @@ function grindData(title: number) {
url: '/subPages/merchantChild/businessLicense/businessLicense',
}) // 营业资质
break
case 3:
uni.navigateTo({ url: '/subPages/merchantChild/platformM/platformM' }) // 我的店铺
break
// case 3:
// uni.navigateTo({ url: '/subPages/merchantChild/platformM/platformM' }) // 我的店铺
// break
case 4:
uni.navigateTo({
url: `/subPages/merchantChild/bill/bill?billList=${JSON.stringify(

View File

@@ -11,6 +11,7 @@
</view>
<view class="timer" v-if="!item.buyerComment.includes('支付方式')">预计{{ expectedDeliveredTime }}前送达</view>
</view>
<span class="rushOrder" v-if="isShowRushOrder"></span>
<view v-if="isSrestPickTime" v-html="restPickTime"></view>
<view v-if="isCancelTime">
@@ -178,6 +179,19 @@ const isCancelTime = computed(() => {
)
})
/**
* 是否显示急送 美团 饿百
*/
const isShowRushOrder = computed(() => {
return (props.item.vendorID === 1 || props.item.vendorID === 3)
&& props.item.status <=20 ?
(props.item.couponIDs && props.item.couponIDs.includes('11002') || props.item.couponIDs.includes('11003') )
: false
})
/**
* 是否显示预计送达时间
*/
@@ -387,6 +401,24 @@ const isShow = computed(() => {
}
}
.rushOrder{
height: 30px;
padding: 0 5px;
line-height: 30px;
background-color: rgba(245, 108, 108, .1);
border-color: rgba(245, 108, 108, .2);
color: #f56c6c;
font-size: 20px;
border-radius: 50%;
box-sizing: border-box;
// border: 1px solid rgba(64, 158, 255, .2);
border: 1px solid rgba(245, 108, 108, .2);
white-space: nowrap;
position: fixed;
left: 50%;
animation: blink 1.8s infinite; /* 1秒循环无限播放 */
}
.index-color {
color: rgb(0, 0, 0);
}
@@ -430,6 +462,15 @@ const isShow = computed(() => {
font-weight: bold;
}
}
/* 定义动画 */
@keyframes blink {
0% { opacity: 1; }
50% { opacity: 0; }
100% { opacity: 1; }
}
// 顶部标题
.order-title {
display: flex;