优化权限

src/views/device/add.vue

@@ -66,7 +66,10 @@
         <div class="print_view">
           <div class="title t1">{{ printData.shop_name }}</div>
           <div class="title t2">
-            预结算单【{{ printData.orderInfo.masterId }}】
+            预结算单 <span style="margin-left: 6px;">#{{ printData.orderInfo.orderNum }}</span>
+          </div>
+          <div class="title t2" style="margin-bottom: 20px;">
+            桌号：无
           </div>
           <div class="row">订单号：{{ printData.orderInfo.orderNo }}</div>
           <div class="row">交易时间：{{ printData.createdAt }}</div>
@@ -91,16 +94,21 @@
           </table>
           <div class="line"></div>
           <div class="row between">
-            <span>合计：</span>
-            <span>{{ printData.amount }}</span>
+            <span>原价：</span>
+            <span>{{ printData.originAmount }}</span>
           </div>
           <div class="row between">
-            <span>余额：</span>
-            <span>0.00</span>
+            <span>折扣：</span>
+            <span>-0.00</span>
           </div>
           <div class="line"></div>
-          <div class="row">备注：{{ printData.remark }}</div>
-          <div class="row">打印时间：{{ printData.printTime }}</div>
+          <div class="row between" style="font-size: 24px;">
+            <span>实付：</span>
+            <span>￥{{ printData.amount }}</span>
+          </div>
+          <div class="line"></div>
+          <div class="row" style="font-weight: bold;">备注：{{ printData.remark }}</div>
+          <div class="row" style="font-size: 14px;">打印时间：{{ printData.printTime }}</div>
         </div>
         <div class="btn_wrap">
           <div class="btn">
@@ -167,28 +175,22 @@ const printData = reactive({
   carts: [
     {
       id: 1,
-      name: "【测试】娃哈哈矿泉水",
+      name: "【测试勿管】娃哈哈矿泉水",
       skuName: "500ml",
       salePrice: "1.0",
       number: "10",
       totalAmount: "10",
     },
-    {
-      id: 2,
-      name: "【测试】柠檬奶茶",
-      skuName: "加冰、加珍珠",
-      salePrice: "10",
-      number: "2",
-      totalAmount: "20",
-    },
   ],
   amount: "30.00",
-  discountAmount: "30.00",
+  originAmount: '30.00',
+  discountAmount: "0.00",
   discount: 0,
   remark: "给我多放点辣椒，谢谢老板",
   orderInfo: {
-    masterId: "#002",
+    masterId: "",
     orderNo: "202404021023542223445",
+    orderNum: '12'
   },
   deviceName: "",
   createdAt: "2024-04-02 10:15",
@@ -325,10 +327,6 @@ onMounted(() => {
         &.t1 {
           font-size: 24px;
         }
-
-        &.t2 {
-          margin-bottom: 15px;
-        }
       }
 
       .row {

src/views/home/components/goods.vue

@@ -101,6 +101,11 @@
                     </div>
                 </div>
             </swiper-slide>
+            <swiper-slide v-if="!goodsStore.goodsList.length">
+                <div class="goods_empty" style="padding-top: 15vh;">
+                    <el-empty description="暂无商品~" v-if="!goodsStore.goodsList.length" />
+                </div>
+            </swiper-slide>
         </swiper>
     </div>
     <div class="empty">

src/views/home/index.vue

@@ -164,6 +164,10 @@
       <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>
   <!-- 备注 -->
   <remarkModal ref="remarkRef" @success="(e) => (remark = e)" />
@@ -382,6 +386,26 @@ function clearVipUserHandle() {
 </script>
 
 <style scoped lang="scss">
+.content {
+  position: relative;
+}
+
+.no_permission {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 999;
+  border-radius: 10px;
+  background-color: rgba(255, 255, 255, 0.8);
+  backdrop-filter: blur(5px);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 16px;
+}
+
 .order_list_wrap {
   .order_list_item {
     &:not(:last-child) {

src/views/login.vue

@@ -198,13 +198,13 @@ async function captchaAjax() {
 
 
 onMounted(() => {
+  store.initRoute()
   global.updateData(false)
-
   captchaAjax()
-
   let merchantLoginAccount = useStorage.get('merchantLoginAccount')
   if (merchantLoginAccount) {
     form.username = merchantLoginAccount
+    form.loginType = useStorage.get('loginType')
   }
 })
 </script>

src/views/work/index.vue

@@ -226,14 +226,15 @@ const infoshopInfoqueryDutys = async () => {
 
 }
 
+defineExpose({
+    show
+})
+
 function show() {
     dialogVisible.value = true
     infoshopInfoqueryDutys()
 }
 
-defineExpose({
-    show
-})
 </script>
 
 <style scoped lang="scss">