From 2b0c3e534fcfb149365deba85c77b71e52fdda75 Mon Sep 17 00:00:00 2001
From: wtq <2394975549@qq.com>
Date: Mon, 3 Aug 2026 15:05:42 +0800
Subject: [PATCH] '!'

---
 src/pages/merchant/options/options.vue        | 16 ++++----
 .../childPages/component/orderListTop.vue     | 40 +++++++++++++++++++
 .../orderRealTime/orderRealTime.ts            |  6 ++-
 src/subPages/merchantChild/setUp/setUp.vue    |  4 +-
 .../orderDetail/detailChild/goodsList.vue     |  4 +-
 5 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/src/pages/merchant/options/options.vue b/src/pages/merchant/options/options.vue
index f209949..06b63f1 100644
--- a/src/pages/merchant/options/options.vue
+++ b/src/pages/merchant/options/options.vue
@@ -70,11 +70,11 @@ const grindListData = ref([
     icon: '/static/merchant-icon/2.png',
     title: '营业资质',
   },
-  {
-    id: 3,
-    icon: '/static/merchant-icon/3.png',
-    title: '平台管理',
-  },
+  // {
+  //   id: 3,
+  //   icon: '/static/merchant-icon/3.png',
+  //   title: '平台管理',
+  // },
   {
     id: 4,
     icon: '/static/merchant-icon/4.png',
@@ -179,9 +179,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(
diff --git a/src/pages/order-manager/childPages/component/orderListTop.vue b/src/pages/order-manager/childPages/component/orderListTop.vue
index 0146235..ac49b35 100644
--- a/src/pages/order-manager/childPages/component/orderListTop.vue
+++ b/src/pages/order-manager/childPages/component/orderListTop.vue
@@ -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">
@@ -177,6 +178,18 @@ 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
+})
+
+
 /**
  * 是否显示预计送达时间
  */
@@ -386,6 +399,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);
   }
@@ -429,6 +460,15 @@ const isShow = computed(() => {
     font-weight: bold;
   }
 }
+
+
+/* 定义动画 */
+@keyframes blink {
+  0% { opacity: 1; }
+  50% { opacity: 0; }
+  100% { opacity: 1; }
+}
+
 // 顶部标题
 .order-title {
   display: flex;
diff --git a/src/subPages/merchantChild/orderRealTime/orderRealTime.ts b/src/subPages/merchantChild/orderRealTime/orderRealTime.ts
index 9d3488f..1708d1a 100644
--- a/src/subPages/merchantChild/orderRealTime/orderRealTime.ts
+++ b/src/subPages/merchantChild/orderRealTime/orderRealTime.ts
@@ -348,7 +348,8 @@ export default function orderRealTime() {
                     return '实际支付'
                 } else {
                     //报价
-                    return '实际收入'
+                    // return '实际收入'
+                    return '预计收益'
                 }
             }
         } else {
@@ -357,7 +358,8 @@ export default function orderRealTime() {
                 return '平台结算'
             } else {
                 //报价
-                return '实际收入'
+                // return '实际收入'
+                return '预计收益'
             }
         }
     })
diff --git a/src/subPages/merchantChild/setUp/setUp.vue b/src/subPages/merchantChild/setUp/setUp.vue
index 583e745..89220dc 100644
--- a/src/subPages/merchantChild/setUp/setUp.vue
+++ b/src/subPages/merchantChild/setUp/setUp.vue
@@ -5,7 +5,7 @@
   </view>
 
   <!-- 订单拣货提醒 -->
-  <view class="picking-root">
+  <!-- <view class="picking-root">
     <picker
       :value="smsNotify"
       :range="smsNotifyData"
@@ -18,7 +18,7 @@
         </view>
       </view>
     </picker>
-  </view>
+  </view> -->
 
   <!-- 默认使用打印机设备 -->
   <view class="picking-root">
diff --git a/src/subPages/orderChild/orderDetail/detailChild/goodsList.vue b/src/subPages/orderChild/orderDetail/detailChild/goodsList.vue
index e6e2638..86aee5f 100644
--- a/src/subPages/orderChild/orderDetail/detailChild/goodsList.vue
+++ b/src/subPages/orderChild/orderDetail/detailChild/goodsList.vue
@@ -156,7 +156,7 @@
               <jx-price
                 v-else
                 color="#4fb433"
-                :price="sku.salePrice * sku.count * 0.7"
+                :price="sku.salePrice * sku.count * 0.6"
               />
             </view>
             <view class="price" v-else>
@@ -165,7 +165,7 @@
                 color="#f84a82"
                 :price="sku.salePrice"
               />
-              <jx-price v-else color="#f84a82" :price="sku.salePrice * 0.7" />
+              <jx-price v-else color="#f84a82" :price="sku.salePrice * 0.6" />
             </view>
           </view>
         </view>