shish 2 ay önce
ebeveyn
işleme
0cf45572e8

+ 11 - 6
hdApp/src/admin/home/order.vue

@@ -101,7 +101,6 @@
                 <image class="card-icon-sm" :src="iconSrc(item.sendType == 1 ? 'order-clock' : 'order-truck')" mode="aspectFit" />
                 <text class="field-label">{{ item.sendType == 1 ? '取花:' : '配送:' }}</text>
                 <text class="field-value">{{ item._reachText }}</text>
-                <text v-if="item.sendType == 1" class="pickup-tag">到店自取</text>
               </view>
               <view class="info-row">
                 <image class="card-icon-sm" :src="iconSrc('order-sub-account-name')" mode="aspectFit" />
@@ -142,6 +141,7 @@
                   </view>
                 </view>
                 <view v-else class="price-line reverse-price">红冲 -¥{{ item._orderPriceText }}</view>
+                <text v-if="item.sendType == 1" class="pickup-tag">到店自取</text>
               </view>
             </view>
           </view>
@@ -1076,11 +1076,12 @@ export default {
 }
 
 .pickup-tag {
-  margin-left: 12upx;
+  display: inline-block;
+  margin-top: 10upx;
   padding: 3upx 10upx;
-  border: 1upx solid #09c567;
+  border: 1upx solid #4ae299;
   border-radius: 8upx;
-  color: #09c567;
+  color: #4ae299;
   font-size: 24upx;
   font-weight: 700;
   flex-shrink: 0;
@@ -1103,6 +1104,9 @@ export default {
 
 .price-wrap {
   margin-top: 18upx;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
   text-align: right;
 }
 
@@ -1121,9 +1125,10 @@ export default {
 
 .origin-price {
   color: #8a8e96;
-  font-size: 26upx;
+  font-size: 32upx;
   font-weight: 500;
   text-decoration: line-through;
+  margin-right: 10upx;
 }
 
 .reverse-price {
@@ -1162,7 +1167,7 @@ export default {
 
 .outline-action,
 .solid-action {
-  min-height: 56upx;
+  min-height: 66upx;
   padding: 0 22upx;
   border-radius: 12upx;
   display: flex;

+ 1 - 1
hdApp/src/admin/home/workbench.vue

@@ -1441,7 +1441,7 @@ export default {
 .custom-nav-title {
   max-width: 560upx;
   color: #161819;
-  font-size: 44upx;
+  font-size: 50upx;
   font-weight: 700;
   line-height: 48upx;
   text-align: center;