优化

ghs/src/components/order/OrderCommitDialog.vue

@@ -10,7 +10,7 @@
     <!-- 中间可滚动：表单内容多，避免挤掉底部提交按钮 -->
     <div class="panel-scroll">
     <div class="commit-body">
-      <!-- 当前门店/客户名称已移至顶栏展示，此处不再重复渲染；form.customName 仍用于提交 -->
+      <!-- 当前门店名在底部提交按钮正上方展示，避免多店开错单；form.customName 仍用于提交 -->
 
       <!-- 批发商 pfLevel：同城/德邦等 -->
       <div class="accounts-list" v-if="currentShop.pfLevel && currentShop.pfLevel == 1">
@@ -194,8 +194,8 @@
       <div class="accounts-list">
         <span class="accounts-label">合计金额</span>
         <div class="accounts-center accounts-center--row">
-          <span style="color:#3385ff;font-weight:700;">¥{{ parseFloat(finalPrice) }}</span>
-          <el-button size="small" style="margin-left:12px;" @click="discountVisible = true">打折</el-button>
+          <span style="color:#3385ff;font-weight:700;font-size:28px;">¥{{ parseFloat(finalPrice) }}</span>
+          <el-button size="small" style="margin-left:20px;" @click="discountVisible = true">打折</el-button>
           <span v-if="discountValue > 0 && discountValue < 1" class="discount-tag">
             {{ (Number(discountValue) * 10).toFixed(1) }}折
           </span>
@@ -253,12 +253,12 @@
     </div>
     </div>
 
-    <!-- 底部固定提交：始终可见，不随表单滚动 -->
+    <!-- 底部固定提交：始终可见，不随表单滚动；门店提示贴在按钮正上方，提交前再确认当前店 -->
     <div class="panel-footer">
+      <div class="shop-tip">当前在 {{ displayShopName }}</div>
       <el-button type="primary" :loading="submitting" class="submit-btn" @click="submitOrder(false)">
         确认提交（Ctrl+Enter）
       </el-button>
-      <p class="tip">按 Tab 切到下一个，按空格选中</p>
     </div>
 
     <!-- 选物流：嵌套弹窗挂到 body，避免被侧栏裁剪 -->
@@ -380,7 +380,7 @@ export default {
     }
   },
   computed: {
-    // 面板已隐藏「当前门店」行；仍保留计算，避免与 shopName/currentShop 同步逻辑脱节
+    // 提交按钮上方「当前在 xxx」：优先用父页传入的 shopName，缺省再取当前店资料
     displayShopName() {
       if (this.shopName) return this.shopName
       const shop = this.currentShop || {}
@@ -806,16 +806,21 @@ export default {
   padding: 10px 12px 14px;
   border-top: 1px solid #ebeef5;
   background: #fff;
-  .submit-btn {
-    width: 100%;
-    height: 40px;
+  .shop-tip {
+    margin-bottom: 8px;
     font-size: 15px;
-  }
-  .tip {
+    font-weight: 700;
+    color: #303133;
+    line-height: 1.3;
     text-align: center;
-    color: #999;
-    margin: 8px 0 0;
-    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .submit-btn {
+    width: 100%;
+    height: 52px;
+    font-size: 16px;
   }
 }
 .commit-body {

ghs/src/views/order/add.vue

@@ -141,19 +141,15 @@
           </div>
         </div>
         <div class="pos-cart-footer">
+          <!-- 合计只保留一行：金额放大标红，种/扎跟在后面，避免和下面再重复一个总价 -->
           <div class="sum-line">
-            合计: ¥ {{ allPrice }}，{{ allCount.kind || 0 }}种，{{ allCount.bigLength || 0 }}扎
-            <template v-if="allCount.weight">，{{ allCount.weight }}公斤</template>
-          </div>
-          <!-- 总价、当前在同一行；查看财务单独一行 -->
-          <div class="footer-main-row">
-            <div class="sum-price">¥ {{ allPrice }}</div>
-            <div class="shop-tip">当前在 {{ shopDisplayName }}</div>
+            <span class="sum-price">¥ {{ allPrice }}</span>
+            <span class="sum-meta">，{{ allCount.kind || 0 }}种，{{ allCount.bigLength || 0 }}扎<template v-if="allCount.weight">，{{ allCount.weight }}公斤</template></span>
           </div>
           <div v-if="hasFinance == 1" class="footer-finance" @click.stop>
             <template v-if="showFinance == 1">
-              <span class="footer-finance-sum">成本 ¥{{ financeAvCost }}，毛利 ¥{{ financeProfit }}</span>
               <el-button type="text" class="cart-finance-link" @click="toggleFinance">关闭财务</el-button>
+              <span class="footer-finance-sum">成本 ¥{{ financeAvCost }}，毛利 ¥{{ financeProfit }}</span>
             </template>
             <el-button v-else type="text" class="cart-finance-link" @click="toggleFinance">查看财务</el-button>
           </div>
@@ -1013,43 +1009,25 @@ export default {
   background: #fff;
 }
 
-/* 合计字号相对原先加大后的 24px 再缩小 1/3 → 16px */
+/* 合计一行：金额醒目，种/扎等次要信息跟在后面 */
 .sum-line {
-  font-size: 16px;
-  color: #606266;
-  margin-bottom: 8px;
-  line-height: 1.4;
-}
-
-/* 总价与当前在同一行 */
-.footer-main-row {
   display: flex;
   align-items: baseline;
   flex-wrap: wrap;
-  margin-bottom: 6px;
+  margin-bottom: 8px;
+  line-height: 1.3;
 }
 
 .sum-price {
   flex-shrink: 0;
-  /* 相对 44px 缩小 1/3 */
-  font-size: 29px;
+  font-size: 26px;
   font-weight: 700;
   color: #f56c6c;
-  line-height: 1.1;
-  margin-right: 10px;
 }
 
-.shop-tip {
-  flex-shrink: 0;
-  /* 相对 14px 再大 1/3 */
-  font-size: 19px;
+.sum-meta {
+  font-size: 16px;
   color: #606266;
-  line-height: 1.2;
-  /* 购物车收窄后限制门店名宽度，避免撑破 */
-  max-width: 160px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 /* 查看财务单独一行；提交已挪到右侧面板，不再预留按钮间距 */
@@ -1063,7 +1041,7 @@ export default {
   font-size: 14px;
   color: #3385ff;
   font-weight: 700;
-  margin-right: 4px;
+  margin-left: 8px;
 }
 
 .cart-finance-link {

ghs/src/views/order/confirm.vue

@@ -216,7 +216,6 @@
             <el-button type="primary" @click="createOrder">确认（Ctrl+Enter）</el-button>
           </div>
         </div>
-        <p style="text-align: center;color: #999999;">按Tab切到下一个，按空格选中</p>
       </div>
       <div style="text-align:center;margin-top:10px;font-size:16px;" v-if="!$util.isEmpty(diffList)">
         <div style="font-size:16px;margin-bottom:10px;color:red;font-weight:bold;">