shish 2 дней назад
Родитель
Сommit
3a051dc612
2 измененных файлов с 5 добавлено и 57 удалено
  1. 5 56
      hdApp/src/admin/home/order.vue
  2. 0 1
      hdApp/src/static/icons/order-printer-green.svg

+ 5 - 56
hdApp/src/admin/home/order.vue

@@ -167,38 +167,22 @@
                 class="outline-action"
                 class="outline-action"
                 :class="{ disabled: !item._isPaid }"
                 :class="{ disabled: !item._isPaid }"
                 @click.stop="item._isPaid ? printOrder(index) : ''"
                 @click.stop="item._isPaid ? printOrder(index) : ''"
-              >
-                <image
-                  class="action-icon"
-                  :class="{ 'action-icon-muted': !item._isPaid }"
-                  :src="iconSrc('order-printer-green')"
-                  mode="aspectFit"
-                />
-                <text>打印</text>
-              </view>
+              >打印</view>
 
 
               <view
               <view
                 v-if="item._expressText"
                 v-if="item._expressText"
                 class="outline-action"
                 class="outline-action"
                 :class="{ disabled: item._expressDisabled }"
                 :class="{ disabled: item._expressDisabled }"
                 @click.stop="item._expressDisabled ? '' : openExpressPage(item.id)"
                 @click.stop="item._expressDisabled ? '' : openExpressPage(item.id)"
-              >
-                <image
-                  class="action-icon"
-                  :class="{ 'action-icon-muted': item._expressDisabled }"
-                  :src="iconSrc('delivery-outline')"
-                  mode="aspectFit"
-                />
-                <text>{{ item._expressText }}</text>
-              </view>
+              >{{ item._expressText }}</view>
             </view>
             </view>
 
 
             <view class="action-more-wrap">
             <view class="action-more-wrap">
-              <!-- 已取消订单:「更多」与状态文案同为灰色 -->
+              <!-- 已取消订单:「更多」灰色且不可点开菜单 -->
               <view
               <view
                 class="outline-action"
                 class="outline-action"
                 :class="{ disabled: item.status == 5 }"
                 :class="{ disabled: item.status == 5 }"
-                @click.stop="toggleActionMore(index)"
+                @click.stop="item.status == 5 ? '' : toggleActionMore(index)"
               >更多</view>
               >更多</view>
             </view>
             </view>
           </view>
           </view>
@@ -1639,11 +1623,6 @@ export default {
   background: linear-gradient(135deg, #18d36f 0%, #08b856 100%);
   background: linear-gradient(135deg, #18d36f 0%, #08b856 100%);
 }
 }
 
 
-.outline-action text,
-.solid-action text {
-  margin-left: 6upx;
-}
-
 .outline-action.disabled,
 .outline-action.disabled,
 .solid-action.disabled {
 .solid-action.disabled {
   color: #b7bfc0;
   color: #b7bfc0;
@@ -1655,8 +1634,7 @@ export default {
 .filter-icon,
 .filter-icon,
 .card-icon,
 .card-icon,
 .card-icon-sm,
 .card-icon-sm,
-.merge-icon,
-.action-icon {
+.merge-icon {
   display: block;
   display: block;
   flex-shrink: 0;
   flex-shrink: 0;
 }
 }
@@ -1688,35 +1666,6 @@ export default {
   align-self: center;
   align-self: center;
 }
 }
 
 
-.action-icon {
-  width: 36upx;
-  height: 36upx;
-}
-
-.outline-action .action-icon {
-  width: 36upx;
-  height: 36upx;
-}
-
-.action-row .outline-action .action-icon,
-.action-row .solid-action .action-icon {
-  width: 32upx;
-  height: 32upx;
-}
-
-.action-icon-white {
-  filter: brightness(0) invert(1);
-}
-
-.action-icon-muted {
-  opacity: 0.45;
-  filter: none;
-}
-
-.solid-action.disabled .action-icon-white {
-  filter: none;
-}
-
 .staff-popup {
 .staff-popup {
   display: flex;
   display: flex;
   flex-wrap: wrap;
   flex-wrap: wrap;

+ 0 - 1
hdApp/src/static/icons/order-printer-green.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1783474302342" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5212" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256"><path d="M786.3 382.5m-40.9 0a40.9 40.9 0 1 0 81.8 0 40.9 40.9 0 1 0-81.8 0Z" fill="#09c567" p-id="5213"></path><path d="M125.4 689.9V649v16.2c0.8 13.8 12.2 24.7 26.2 24.7h-26.2zM266.4 888.9V848v16.2c0.8 13.8 12.2 24.7 26.2 24.7h-26.2zM886.4 689.7h-40.9 16.2c13.8-0.8 24.7-12.2 24.7-26.2v26.2zM745.8 888.4h-40.9 16.2c13.8-0.8 24.7-12.2 24.7-26.2v26.2zM745.5 139.8v40.9-16.2c-0.8-13.8-12.2-24.7-26.2-24.7h26.2zM745.5 619.9v40.9-16.2c-0.8-13.8-12.2-24.7-26.2-24.7h26.2zM265.9 139.8h40.9-16.2c-13.8 0.8-24.7 12.2-24.7 26.2v-26.2zM266 619.7h41-16.2c-13.8 0.9-24.8 12.3-24.8 26.2v-26.2zM125.4 289.1h40.9-16.2c-13.8 0.8-24.7 12.2-24.7 26.2v-26.2zM886.1 289.2v40.9-16.2c-0.8-13.8-12.2-24.7-26.2-24.7h26.2z" fill="#09c567" p-id="5214"></path><path d="M967.8 710.1V266c-4.7-33-33.1-58.5-67.4-58.5h-73.1v-89.6c-3.9-32.8-31.1-58.4-64.5-59.8H250.2c-34.8 1-63.1 28.2-65.8 62.6v86.8h-78.8c-33.2 3-59.5 29.7-61.8 63.1v438.7c2.4 31.7 26.4 57.3 57.4 62.1h83.2v133.1c1.2 34.8 28.5 62.9 62.8 65.5h519.2c32.6-3.3 58.4-29.7 60.9-62.6v-136h80.5c31.8-3.6 57-29.2 60-61.3zM266.3 140h479.1v67.5H266.3V140z m479.1 590.4V888H266.3V620h479.1v110.4z m140.5-40.9h-58.6v-92c-3.9-31.9-29.8-56.9-62.1-59.4H248.3c-34.4 2-61.9 29.6-63.9 64v87.4h-58.6V289.4H886v400.1z" fill="#09c567" p-id="5215"></path></svg>