From cf6755b3c8ae3cb3b623dc248ef91550eaf13769 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 1 Nov 2024 10:37:08 +0800
Subject: [PATCH] 11.1

---
 fuintAdmin/src/layout/components/AppMain.vue                | 2 +-
 fuintAdmin/src/views/convenienceStore/goodsSale.vue         | 2 +-
 fuintAdmin/src/views/convenienceStore/purchase/purchase.vue | 3 +--
 fuintAdmin/src/views/order/order_Vip.vue                    | 2 +-
 fuintAdmin_zt/src/layout/components/AppMain.vue             | 2 +-
 fuintAdmin_zt/src/views/Site/index.vue                      | 6 ++----
 fuintAdmin_zt/src/views/system/notify/page/mode.vue         | 4 ++--
 fuintAdmin_zt/src/views/system/notify/page/record.vue       | 3 +--
 fuintCashierWeb/src/layout/components/AppMain.vue           | 2 +-
 pos-uni/uni_modules/uview-ui/libs/config/zIndex.js          | 2 +-
 10 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/fuintAdmin/src/layout/components/AppMain.vue b/fuintAdmin/src/layout/components/AppMain.vue
index 063980266..438437ed4 100644
--- a/fuintAdmin/src/layout/components/AppMain.vue
+++ b/fuintAdmin/src/layout/components/AppMain.vue
@@ -53,7 +53,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {
-    padding-right: 17px;
+    //padding-right: 17px;
   }
 }
 </style>
diff --git a/fuintAdmin/src/views/convenienceStore/goodsSale.vue b/fuintAdmin/src/views/convenienceStore/goodsSale.vue
index 3d3d6d99c..1a3aeb754 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsSale.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsSale.vue
@@ -91,7 +91,7 @@
       direction="rtl"
       size="60%">
       <div style="width: 96%;margin: 0 auto">
-        <div style="display: flex;margin-bottom: 20px">
+        <div style="display: flex;margin-bottom: 20px;color: #606266;font-size: 14px">
           <div>商品名称：{{goodsInfo.name || 0}}</div>
           <div style="margin: 0 50px">品类名称：{{goodsInfo.pinLeiName || 0}}</div>
           <div>销售总额：{{goodsInfo.saleTotal || 0}}</div>
diff --git a/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue b/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
index ab18daa3c..9d4993a17 100644
--- a/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
+++ b/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
@@ -52,7 +52,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 71vh;overflow: auto">
+      <div style="height: 71vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables" border
                   v-loading="loading"
                   :data="purchaseList"
@@ -62,7 +62,6 @@
           <el-table-column label="供应商" align="center" prop="supplierName"/>
           <el-table-column label="商品数量" align="center" prop="productQuantity"/>
           <el-table-column label="单据金额" align="center" prop="totalAmount"/>
-
           <el-table-column label="状态" align="center" prop="status">
             <template slot-scope="scope">
               <div slot="reference" class="name-wrapper">
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue
index b77a417e6..61d56d7be 100644
--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@@ -490,7 +490,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 82vh;
+  height: 78vh;
   overflow: auto;
 }
 
diff --git a/fuintAdmin_zt/src/layout/components/AppMain.vue b/fuintAdmin_zt/src/layout/components/AppMain.vue
index e4eba1834..1acaf1ade 100644
--- a/fuintAdmin_zt/src/layout/components/AppMain.vue
+++ b/fuintAdmin_zt/src/layout/components/AppMain.vue
@@ -52,7 +52,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {
-    padding-right: 17px;
+    //padding-right: 17px;
   }
 }
 </style>
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 538c48751..73cc0a225 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -1,11 +1,9 @@
 <template>
-  <div class="app-container" style="padding: 0px">
-
+  <div class="app-container" style="padding: 10px">
     <div class="tab-box">
       <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="handleClick1(index)" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
     </div>
-
-    <el-row style="padding: 20px">
+    <el-row style="padding: 10px">
       <el-col :span="6">
         <el-card  style="margin-right: 5px; border: none;box-shadow: none;" shadow="never">
           <div class="left-box">
diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
index 358a07308..b95490b2c 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="padding: 10px">
     <div class="card-change" style="min-height: 80vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="notificationName">
@@ -113,7 +113,7 @@
 
         <!-- 通知模板 -->
         <el-form-item label="通知模板" prop="templateContent" style="margin-left: -30px;">
-          <el-input type="textarea" v-model="form.templateContent"  :rows="3" placeholder="请输入通知内容" :maxlength="200" show-word-limit 
+          <el-input type="textarea" v-model="form.templateContent"  :rows="3" placeholder="请输入通知内容" :maxlength="200" show-word-limit
                           style="width: 100%"></el-input>
           <div>
             <span @click = "insertText('{系统到期日期}')">{系统到期日期}</span>
diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue
index ce9bf1006..a3936f7ab 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/record.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="padding: 10px">
     <div class="card-change" style="min-height: 80vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="deptName">
@@ -107,7 +107,6 @@
       />
 
     </div>
-
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="27%" append-to-body>
       <el-form ref="form" :model="form" label-width="120px" :rules="rules" >
         <!-- 通知名称 -->
diff --git a/fuintCashierWeb/src/layout/components/AppMain.vue b/fuintCashierWeb/src/layout/components/AppMain.vue
index e83e4cbdf..5ae4c91d9 100644
--- a/fuintCashierWeb/src/layout/components/AppMain.vue
+++ b/fuintCashierWeb/src/layout/components/AppMain.vue
@@ -51,7 +51,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {
-    padding-right: 17px;
+    //padding-right: 17px;
   }
 }
 </style>
diff --git a/pos-uni/uni_modules/uview-ui/libs/config/zIndex.js b/pos-uni/uni_modules/uview-ui/libs/config/zIndex.js
index 5fc36822b..9a7f6df45 100644
--- a/pos-uni/uni_modules/uview-ui/libs/config/zIndex.js
+++ b/pos-uni/uni_modules/uview-ui/libs/config/zIndex.js
@@ -13,7 +13,7 @@ export default {
     // popup包含popup，actionsheet，keyboard，picker的值
     popup: 10075,
     mask: 10070,
-    navbar: 980,
+    : 980,
     topTips: 975,
     sticky: 970,
     indexListSticky: 965