优化报警提示

src/views/home/index.vue

@@ -1,42 +1,43 @@
 <template>
-  <div class="content">
+  <div>
-    <div class="cart_wrap card" v-loading="cartLoading">
+    <div class="content">
-      <div class="menu_top">
+      <div class="cart_wrap card" v-loading="cartLoading">
-        <div class="menu" @click="pendingCartModalRef.show()">
+        <div class="menu_top">
-          <el-icon class="icon">
+          <div class="menu" @click="pendingCartModalRef.show()">
-            <TakeawayBox />
-          </el-icon>
-          <el-text class="t">({{ goodsStore.pendingList.length }})</el-text>
-        </div>
-        <div class="number" @click="SelectVipUserRef.show()">
-          <div class="left">
             <el-icon class="icon">
-              <CirclePlus />
+              <TakeawayBox />
             </el-icon>
-            <template v-if="!goodsStore.vipUserInfo.id">
+            <el-text class="t">({{ goodsStore.pendingList.length }})</el-text>
-              <span class="t">选择用户</span>
+          </div>
-            </template>
+          <div class="number" @click="SelectVipUserRef.show()">
-            <template v-else>
+            <div class="left">
-              <div class="user_info">
+              <el-icon class="icon">
-                <!-- <el-text class="n">{{ goodsStore.vipUserInfo.nickName }}</el-text> -->
+                <CirclePlus />
-                <el-text class="p">{{ formatPhoneNumber(goodsStore.vipUserInfo.phone) }}</el-text>
+              </el-icon>
+              <template v-if="!goodsStore.vipUserInfo.id">
+                <span class="t">选择用户</span>
+              </template>
+              <template v-else>
+                <div class="user_info">
+                  <!-- <el-text class="n">{{ goodsStore.vipUserInfo.nickName }}</el-text> -->
+                  <el-text class="p">{{ formatPhoneNumber(goodsStore.vipUserInfo.phone) }}</el-text>
+                </div>
+              </template>
+            </div>
+            <div class="icon_wrap">
+              <div class="u_icon" v-if="!goodsStore.vipUserInfo.id">
+                <el-icon class="i">
+                  <ArrowRight />
+                </el-icon>
+              </div>
+              <div class="u_icon" v-else @click.stop="goodsStore.clearVipUserInfo()">
+                <el-icon class="i">
+                  <Close />
+                </el-icon>
               </div>
-            </template>
-          </div>
-          <div class="icon_wrap">
-            <div class="u_icon" v-if="!goodsStore.vipUserInfo.id">
-              <el-icon class="i">
-                <ArrowRight />
-              </el-icon>
-            </div>
-            <div class="u_icon" v-else @click.stop="goodsStore.clearVipUserInfo()">
-              <el-icon class="i">
-                <Close />
-              </el-icon>
             </div>
           </div>
-        </div>
+          <!-- <div class="select_user" @click="quickCashHandle">
-        <!-- <div class="select_user" @click="quickCashHandle">
           <div class="left">
             <el-icon class="icon" style="color: var(--el-color-warning);">
               <WalletFilled />
@@ -44,7 +45,7 @@
             <el-text class="t">快捷收银</el-text>
           </div>
         </div> -->
-        <!-- <div class="select_user">
+          <!-- <div class="select_user">
           <div class="left">
             <el-icon class="icon">
               <UserFilled />
@@ -63,152 +64,152 @@
             <Close />
           </el-icon>
         </div> -->
-      </div>
-      <div class="shop_operation">
-        <div class="shop_list">
-          <div class="table_info" v-if="goodsStore.tableInfo.name">
-            <div class="left">
-              <span>台桌：{{ goodsStore.tableInfo.name }}</span>
-              <div class="n" @click="takeFoodCodeRef.show()">
-                {{ goodsStore.tableInfo.num || 0 }}人
-                <el-icon>
-                  <EditPen />
-                </el-icon>
-              </div>
-            </div>
-            <div class="close" @click="goodsStore.selectTable()">
-              <el-icon class="icon">
-                <Close />
-              </el-icon>
-            </div>
-          </div>
-          <div>
-            <CartItem :item="item" :index="index" v-for="(item, index) in goodsStore.cartList" :key="item.id" />
-          </div>
-          <div class="empty" v-if="!goodsStore.cartList.length">
-            <el-empty description="请选择商品" />
-          </div>
-          <div class="order_list_wrap">
-            <div class="order_title" :class="{ border: !goodsStore.cartList.length }"
-              v-if="goodsStore.orderList.length">
-              <span class="l">历史下单</span>
-              <div class="del" @click="goodsStore.clearHistoryOrder()">
-                <el-icon class="icon">
-                  <Delete />
-                </el-icon>
-                <span>清空历史订单</span>
-              </div>
-            </div>
-            <CartItem
-              :item="{ product_name: '客座费', number: goodsStore.tableInfo.num, salePrice: store.shopInfo.tableFee, memberPrice: store.shopInfo.tableFee }"
-              v-if="!store.shopInfo.isTableFee && goodsStore.tableInfo.name && !goodsStore.allSelected" />
-            <div class="order_list_item" v-for="(arr, index) in goodsStore.orderList" :key="index">
-              <div class="order_num">
-                <span class="l">{{ `第${arr.orderNum}次下单` }}</span>
-                <div class="del" @click="goodsStore.deleteHistoryOrder(arr.orderNum)">
-                  <span>删除</span>
-                </div>
-              </div>
-              <CartItem type="order" :border="false" :item="item" :index="index" :i="i" :key="item.id"
-                v-for="(item, i) in arr.goods" />
-            </div>
-          </div>
         </div>
-        <!-- 购物车操作栏 -->
+        <div class="shop_operation">
-        <cartOperation :item="cartListActiveItem" @confirm="" @delete="delCartHandle" @pending="pendingCart"
+          <div class="shop_list">
-          @merging="showTableMerging" @showPackage="e => goodsRef.showPackage(e)" />
+            <div class="table_info" v-if="goodsStore.tableInfo.name">
-      </div>
+              <div class="left">
-      <div class="footer">
+                <span>台桌：{{ goodsStore.tableInfo.name }}</span>
-        <div class="top">
+                <div class="n" @click="takeFoodCodeRef.show()">
-          <div class="num-wrap">
+                  {{ goodsStore.tableInfo.num || 0 }}人
-            <div class="num_wrap_top">
+                  <el-icon>
-              <div class="left" @click="allSelectedHandle"
+                    <EditPen />
-                v-if="store.shopInfo && store.shopInfo.eatModel.includes('take-out')">
-                <div class="selected">
-                  <div class="selected_round" v-if="!goodsStore.allSelected"></div>
-                  <el-icon class="icon" v-else>
-                    <CircleCheckFilled />
                   </el-icon>
                 </div>
-                <el-text class="t">外带</el-text>
               </div>
-              <div class="left" v-else></div>
+              <div class="close" @click="goodsStore.selectTable()">
-              <div class="right" v-if="goodsStore.cartInfo.costSummary">
+                <el-icon class="icon">
-                共<el-text>
+                  <Close />
-                  {{ formatDecimal(goodsStore.cartInfo.costSummary.goodsTotal || 0, 2, true) }}件
+                </el-icon>
-                </el-text>，￥{{ formatDecimal(goodsStore.cartInfo.costSummary.finalPayAmount || 0) }}
               </div>
             </div>
-            <div class="num_wrap_btm">
+            <div>
-              {{ goodsStore.cartInfo.discountInfo }}
+              <CartItem :item="item" :index="index" v-for="(item, index) in goodsStore.cartList" :key="item.id" />
+            </div>
+            <div class="empty" v-if="!goodsStore.cartList.length">
+              <el-empty description="请选择商品" />
+            </div>
+            <div class="order_list_wrap">
+              <div class="order_title" :class="{ border: !goodsStore.cartList.length }"
+                v-if="goodsStore.orderList.length">
+                <span class="l">历史下单</span>
+                <div class="del" @click="goodsStore.clearHistoryOrder()">
+                  <el-icon class="icon">
+                    <Delete />
+                  </el-icon>
+                  <span>清空历史订单</span>
+                </div>
+              </div>
+              <CartItem
+                :item="{ product_name: '客座费', number: goodsStore.tableInfo.num, salePrice: store.shopInfo.tableFee, memberPrice: store.shopInfo.tableFee }"
+                v-if="!store.shopInfo.isTableFee && goodsStore.tableInfo.name && !goodsStore.allSelected" />
+              <div class="order_list_item" v-for="(arr, index) in goodsStore.orderList" :key="index">
+                <div class="order_num">
+                  <span class="l">{{ `第${arr.orderNum}次下单` }}</span>
+                  <div class="del" @click="goodsStore.deleteHistoryOrder(arr.orderNum)">
+                    <span>删除</span>
+                  </div>
+                </div>
+                <CartItem type="order" :border="false" :item="item" :index="index" :i="i" :key="item.id"
+                  v-for="(item, i) in arr.goods" />
+              </div>
             </div>
           </div>
+          <!-- 购物车操作栏 -->
+          <cartOperation :item="cartListActiveItem" @confirm="" @delete="delCartHandle" @pending="pendingCart"
+            @merging="showTableMerging" @showPackage="e => goodsRef.showPackage(e)" />
         </div>
-        <div class="btm">
+        <div class="footer">
-          <el-button icon="Edit" @click="remarkRef.show()"></el-button>
+          <div class="top">
-          <div class="button">
+            <div class="num-wrap">
-            <div class="btn" v-if="store.shopInfo.registerType == 'after'">
+              <div class="num_wrap_top">
-              <el-button type="primary" style="width: 100%;" :disabled="!goodsStore.cartList.length"
+                <div class="left" @click="allSelectedHandle"
-                v-loading="createOrderLoading" @click="createOrderHandle(0)">
+                  v-if="store.shopInfo && store.shopInfo.eatModel.includes('take-out')">
-                仅下单
+                  <div class="selected">
-              </el-button>
+                    <div class="selected_round" v-if="!goodsStore.allSelected"></div>
+                    <el-icon class="icon" v-else>
+                      <CircleCheckFilled />
+                    </el-icon>
+                  </div>
+                  <el-text class="t">外带</el-text>
+                </div>
+                <div class="left" v-else></div>
+                <div class="right" v-if="goodsStore.cartInfo.costSummary">
+                  共<el-text>
+                    {{ formatDecimal(goodsStore.cartInfo.costSummary.goodsTotal || 0, 2, true) }}件
+                  </el-text>，￥{{ formatDecimal(goodsStore.cartInfo.costSummary.finalPayAmount || 0) }}
+                </div>
+              </div>
+              <div class="num_wrap_btm">
+                {{ goodsStore.cartInfo.discountInfo }}
+              </div>
             </div>
-            <div class="btn">
+          </div>
-              <el-button type="primary" style="width: 100%;"
+          <div class="btm">
-                :disabled="!goodsStore.cartList.length && !goodsStore.orderList.length" v-loading="createOrderLoading"
+            <el-button icon="Edit" @click="remarkRef.show()"></el-button>
-                @click="createOrderHandle(1)">
+            <div class="button">
-                去结算
+              <div class="btn" v-if="store.shopInfo.registerType == 'after'">
-              </el-button>
+                <el-button type="primary" style="width: 100%;" :disabled="!goodsStore.cartList.length"
+                  v-loading="createOrderLoading" @click="createOrderHandle(0)">
+                  仅下单
+                </el-button>
+              </div>
+              <div class="btn">
+                <el-button type="primary" style="width: 100%;"
+                  :disabled="!goodsStore.cartList.length && !goodsStore.orderList.length" v-loading="createOrderLoading"
+                  @click="createOrderHandle(1)">
+                  去结算
+                </el-button>
+              </div>
             </div>
           </div>
         </div>
       </div>
+      <div class="shop_manage card">
+        <!-- 分类/商品列表 -->
+        <goods ref="goodsRef" @loading="cartLoading = true" />
+        <!-- ©银收客 v{{ packageData.version }} -->
+      </div>
+      <!-- 无权限遮罩 -->
+      <div class="no_permission" v-if="!store.menus.length || (store.menus.length && !store.menus[0].state)">
+        无操作权限，请联系管理员(；´д｀)ゞ
+      </div>
+      <!-- 打印插件是否加载好的提示 -->
+      <div class="print_tip" v-if="!printStore.isPrintService"
+        v-loading="!printStore.isPrintService && !printStore.showPrintNotService" element-loading-text="打印服务加载中...">
+        <el-dialog title="注意" v-model="printStore.showPrintNotService" :modal="false" :close-on-click-modal="false"
+          :close-on-press-escape="false" :show-close="false" top="30vh">
+          <span class="print_tip_title">打印服务未启动，请重新加载程序或者退出后重新打开！</span>
+          <template #footer>
+            <div class="dialog-footer">
+              <el-button @click="printReloadHandle">重新加载</el-button>
+              <el-button type="primary" @click="quitAPPhandle">退出程序</el-button>
+            </div>
+          </template>
+        </el-dialog>
+      </div>
     </div>
-    <div class="shop_manage card">
+    <!-- 备注 -->
-      <!-- 分类/商品列表 -->
+    <remarkModal ref="remarkRef" @success="(e) => (goodsStore.remark = e)" />
-      <goods ref="goodsRef" @loading="cartLoading = true" />
+    <!-- 修改取餐号 -->
-      <!-- ©银收客 v{{ packageData.version }} -->
+    <takeFoodCode />
-    </div>
+    <el-drawer v-model="membershow" :with-header="true" size="90%" title="选择会员">
-    <!-- 无权限遮罩 -->
+      <member :membershow="'1'"></member>
-    <div class="no_permission" v-if="!store.menus.length || (store.menus.length && !store.menus[0].state)">
+    </el-drawer>
-      无操作权限，请联系管理员(；´д｀)ゞ
+    <!-- <takeFoodCode ref="takeFoodCodeRef" title="修改取餐号" placeholder="请输入取餐号" @success="takeFoodCodeSuccess" /> -->
-    </div>
+    <!-- 结算订单 -->
-    <!-- 打印插件是否加载好的提示 -->
+    <settleAccount ref="settleAccountRef" :amount="cartInfo.totalAmount" :remark="goodsStore.remark" @success="" />
-    <div class="print_tip" v-if="!printStore.isPrintService"
+    <!-- 快捷收银 -->
-      v-loading="!printStore.isPrintService && !printStore.showPrintNotService" element-loading-text="打印服务加载中...">
+    <fastCashier ref="fastCashierRef" type="0" />
-      <el-dialog title="注意" v-model="printStore.showPrintNotService" :modal="false" :close-on-click-modal="false"
+    <!-- 挂起订单 -->
-        :close-on-press-escape="false" :show-close="false" top="30vh">
+    <pendingCartModal ref="pendingCartModalRef" />
-        <span class="print_tip_title">打印服务未启动，请重新加载程序或者退出后重新打开！</span>
+    <!-- 检查版本升级 -->
-        <template #footer>
+    <updateDialog />
-          <div class="dialog-footer">
+    <!-- 选择会员 -->
-            <el-button @click="printReloadHandle">重新加载</el-button>
+    <SelectVipUser ref="SelectVipUserRef" @success="selectUser" />
-            <el-button type="primary" @click="quitAPPhandle">退出程序</el-button>
+    <!-- 修改就餐人数 -->
-          </div>
+    <takeFoodCode ref="takeFoodCodeRef" title="修改就餐人数" placeholder="请输入就餐人数" @success="updateSeatNum" />
-        </template>
-      </el-dialog>
-    </div>
   </div>
-  <!-- 备注 -->
-  <remarkModal ref="remarkRef" @success="(e) => (goodsStore.remark = e)" />
-  <!-- 修改取餐号 -->
-  <takeFoodCode />
-  <el-drawer v-model="membershow" :with-header="true" size="90%" title="选择会员">
-    <member :membershow="'1'"></member>
-  </el-drawer>
-  <!-- <takeFoodCode ref="takeFoodCodeRef" title="修改取餐号" placeholder="请输入取餐号" @success="takeFoodCodeSuccess" /> -->
-  <!-- 结算订单 -->
-  <settleAccount ref="settleAccountRef" :cart="cartList" :amount="cartInfo.totalAmount" :remark="goodsStore.remark"
-    :orderInfo="orderInfo" @success="" />
-  <!-- 快捷收银 -->
-  <fastCashier ref="fastCashierRef" type="0" />
-  <!-- 挂起订单 -->
-  <pendingCartModal ref="pendingCartModalRef" />
-  <!-- 检查版本升级 -->
-  <updateDialog />
-  <!-- 选择会员 -->
-  <SelectVipUser ref="SelectVipUserRef" @success="selectUser" />
-  <!-- 修改就餐人数 -->
-  <takeFoodCode ref="takeFoodCodeRef" title="修改就餐人数" placeholder="请输入就餐人数" @success="updateSeatNum" />
 </template>
 
 <script setup>

src/views/queue/components/resultModal.vue

@@ -29,7 +29,7 @@ const statusList = {
         text: '用户未订阅'
     },
     0: {
-        type: 'danger',
+        type: 'error',
         text: '失败'
     },
     1: {