fix:修改首页右边展示菜品页面，隐藏订单管理部分字段，和修改样式

src/renderer/styles/element-ui.scss

@@ -49,10 +49,10 @@
  // common dialog
 .common-dialog {
   .el-dialog {
-    border: solid 0px #113a28;
+    // border: solid 0px #113a28;
   }
   .el-dialog__header{
-    background: #113a28;
+    // background: #113a28;
     padding: 10px;
   }
   .el-dialog__headerbtn {
@@ -72,7 +72,7 @@
 }
 // main button
 .main-button {
-   background: #113a28;
+   background: #f67f20;
    line-height: 40px;
    padding: 0px 20px 0px 20px;
    height: 40px;
@@ -82,18 +82,18 @@
   padding: 5px 8px 5px 8px;
 }
 .main-button-middle {
-  background: #113a28;
+  // background: #113a28;
   padding: 8px 12px 8px 12px;
 }
-.main-button:hover {
-   background: #077171;
-}
-.main-button-mini:hover {
-  background: #077171;
-}
-.main-button-middle:hover {
-  background: #077171;
-}
+// .main-button:hover {
+//    background: #077171;
+// }
+// .main-button-mini:hover {
+//   background: #077171;
+// }
+// .main-button-middle:hover {
+//   background: #077171;
+// }
 .main-button-reset {
   background: #ffffff;
 }

src/renderer/styles/fuint.scss

@@ -386,7 +386,7 @@
 }
 
 .el-pagination.is-background .el-pager li:not(.disabled).active {
-  background-color: #113a28;
+  background-color: #f67f20;
 }
 
 .el-tabs__item.is-active {

src/renderer/views/cashier/components/couponConfirm.vue

@@ -215,7 +215,7 @@ export default {
 }
 
 .input-item >>> .el-input__inner {
-  border: #113a28 solid 2px;
+  /* border: #113a28 solid 2px; */
   line-height: 50px;
   height: 50px;
 }
@@ -234,7 +234,7 @@ export default {
   margin-left: 5px;
 }
 .confirm-button {
-  background: #113a28;
+  /* background: #113a28; */
   line-height: 50px;
   padding: 0px 25px 0px 25px;
   height: 50px;

src/renderer/views/cashier/components/hangUpDialog.vue

@@ -137,7 +137,7 @@ export default {
            height: 100%;
            border-radius: 4px;
            background: #e6f7f7;
-           border: #113a28 solid 1px;
+          //  border: #113a28 solid 1px;
            .sn {
              font-weight: bold;
              font-size: 20px;

src/renderer/views/cashier/components/memberList.vue

@@ -130,7 +130,7 @@
             v-model="scope.row.status"
             active-value="A"
             inactive-value="N"
-            active-color="#113a28"
+            active-color="#f67f20"
             @change="handleStatusChange(scope.row)"
           ></el-switch>
         </template>

src/renderer/views/cashier/components/orderList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="order-container">
     <el-form class="search-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="name">
+      <!-- <el-form-item label="会员ID" prop="name">
         <el-input
             v-model="queryParams.userId"
             placeholder="请输入会员ID"
@@ -16,7 +16,7 @@
             clearable
             @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="订单号" prop="orderSn">
         <el-input
             v-model="queryParams.orderSn"
@@ -70,7 +70,7 @@
           <el-option v-for="statusItem in payStatusList" :key="statusItem.key+''" :label="statusItem.name" :value="statusItem.key+''"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="配送方式">
+      <!-- <el-form-item label="配送方式">
         <el-select
             v-model="queryParams.orderMode"
             placeholder="配送方式"
@@ -78,7 +78,7 @@
         >
           <el-option v-for="item in orderModeList" :key="item.key+''" :label="item.name" :value="item.key+''"/>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" class="main-button-middle" icon="el-icon-search" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" class="main-button-middle main-button-reset" @click="resetQuery">重置</el-button>
@@ -97,14 +97,14 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="会员名称" align="center" prop="orderInfo.name">
+      <!-- <el-table-column label="会员名称" align="center" prop="orderInfo.name">
         <template slot-scope="scope">
           <span v-if="scope.row.userInfo && scope.row.isVisitor == 'N'">
               <span>{{ scope.row.userInfo.name }}</span>
           </span>
           <span v-else>游客</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="订单类型" align="center" prop="typeName">
         <template slot-scope="scope">
           <span>{{ scope.row.typeName }}</span>
@@ -133,11 +133,11 @@
           <span class="status-normal">{{ getName(statusList, scope.row.status) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="配送方式" align="center" prop="orderMode">
+      <!-- <el-table-column label="配送方式" align="center" prop="orderMode">
         <template slot-scope="scope">
           <span>{{ getName(orderModeList, scope.row.orderMode) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="生成时间" align="center" width="130" prop="createTime">
         <template slot-scope="scope">
           <span>{{ scope.row.createTime }}</span>
@@ -155,12 +155,12 @@
           <span v-else>0.00</span>
         </template>
       </el-table-column>
-      <el-table-column label="积分金额" align="center" prop="pointAmount">
+      <!-- <el-table-column label="积分金额" align="center" prop="pointAmount">
         <template slot-scope="scope">
           <span v-if="true">{{ scope.row.pointAmount.toFixed(2) }}</span>
           <span v-else>0.00</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="更新时间" align="center" width="130" prop="updateTime">
         <template slot-scope="scope">
           <span>{{ scope.row.updateTime }}</span>
@@ -854,13 +854,14 @@ export default {
     .pagination {
       position: fixed;
       bottom: 10px;
+      right: 150px;
       height: 50px;
       min-width: 730px;
       line-height: 50px;
-      right: 150px;
       margin-top: 10px;
       display: block;
-      background: #6c757d;
+      background: #fff;
+      border: 1px solid #eee;
       color: #ffffff;
       border-radius: 5px;
       z-index: 99999;

src/renderer/views/cashier/components/settlementDialog.vue

@@ -306,14 +306,14 @@ export default {
             width: 45%;
             margin-left: 10px;
             height: 83px;
-            border: solid 2px #113a28;
+            // border: solid 2px #113a28;
             cursor: pointer;
             border-radius: 2px;
             .left {
                 width: 30%;
                 height: 80px;
                 float: left;
-                background: #113a28;
+                // background: #113a28;
                 color: #FFFFFF;
                 .amount {
                    font-size: 24px;
@@ -377,7 +377,7 @@ export default {
            }
         }
         .active {
-           border: 3px solid #113a28;
+          //  border: 3px solid #113a28;
            background: #FDF5E6;
            color: #FFFFFF;
         }

src/renderer/views/cashier/components/switchMemberDialog.vue

@@ -102,7 +102,7 @@ export default {
      margin-top: 30px;
   }
   .input-item >>> .el-input__inner {
-    border: #113a28 solid 2px;
+    /* border: #113a28 solid 2px; */
     line-height: 50px;
     height: 50px;
   }

src/renderer/views/cashier/index.vue

@@ -115,8 +115,10 @@
           </div>
         </div>
         <div class="main-list" v-if="activeMenu == 'cashier'">
-          <div class="title">
-            <el-form class="search-form" ref="searchForm" :inline="true" :model="searchForm">
+
+          <div class="title ">
+            
+            <el-form class="search-form flex justify-between" ref="searchForm" :inline="true" :model="searchForm">
               <el-form-item class="form-item" label="" prop="keyword">
                 <el-input
                   v-model="searchForm.keyword"
@@ -128,11 +130,11 @@
                   maxlength="100"
                 />
               </el-form-item>
-              <el-button class="search-goods" @click="doQueryGoods()" icon="el-icon-search">
+              <el-button class="search-goods mr-5" size="small" @click="doQueryGoods()" icon="el-icon-search">
                 查询商品
               </el-button>
             </el-form>
-            <el-tabs class="tab-box" type="card" v-model="navTab" @tab-click="switchTab">
+            <el-tabs class="tab-box" v-model="navTab" @tab-click="switchTab">
               <el-tab-pane label="全部" name="0"></el-tab-pane>
               <el-tab-pane
                 v-for="tab in tabList"
@@ -142,12 +144,32 @@
               ></el-tab-pane>
             </el-tabs>
           </div>
+          <!-- <div class="grid grid-cols-3 gap-4">
+            <div
+              v-for="goodsInfo in goodsList"
+              :key="product"
+              class="bg-white rounded-lg shadow-sm overflow-hidden cursor-pointer hover:shadow-md transition"
+              @click="clickGoods(goodsInfo)"
+            >
+              <img lazy :src="imagePath + goodsInfo.logo" class="w-full h-48 object-cover" />
+              <div class="p-3">
+                <h3 class="font-medium mb-2">{{ goodsInfo.name }}</h3>
+                <div class="text-[#e74c3c]">¥{{ product.price }}</div>
+              </div>
+            </div>
+          </div> -->
           <div class="goods-list">
+
             <div class="goods-item" v-for="goodsInfo in goodsList">
-              <div class="item" @click="clickGoods(goodsInfo)">
-                <img class="image" lazy :src="imagePath + goodsInfo.logo" />
+              <div class="bg-white rounded-lg shadow-sm overflow-hidden cursor-pointer hover:shadow-md transition" @click="clickGoods(goodsInfo)">
+                <!-- <img class="image" lazy :src="imagePath + goodsInfo.logo" />
                 <div class="goods-name">{{ goodsInfo.name }}</div>
-                <div class="goods-price">￥{{ goodsInfo.price }}</div>
+                <div class="goods-price">￥{{ goodsInfo.price }}</div> -->
+                <img lazy :src="imagePath + goodsInfo.logo" class="w-full h-48 object-cover" />
+              <div class="p-3">
+                <h3 class="font-medium mb-2">{{ goodsInfo.name }}</h3>
+                <div class="text-[#e74c3c]">¥{{ goodsInfo.price }}</div>
+              </div>
               </div>
             </div>
 
@@ -169,7 +191,7 @@
         <!-- 订单列表组件 end-->
 
         <!-- 会员列表组件 start-->
-        <memberList v-if="activeMenu == 'member'"></memberList>
+        <memberList v-if="activeMenu == 'member'"></memberList> 
         <!-- 会员列表组件 end-->
 
         <!-- 卡券核销组件 start-->
@@ -1001,7 +1023,9 @@ export default {
     right: 10px;
     margin-top: 10px;
     display: block;
-    background: #6c757d;
+    // background: #6c757d;
+    border: 1px solid #eee;
+
     color: #ffffff;
     border-radius: 5px;
     z-index: 99999;
@@ -1270,11 +1294,11 @@ export default {
         .cash {
           float: left;
           height: 50px;
-          border: solid 1px #113a28;
+          // border: solid 1px #113a28;
           padding-top: 15px;
           width: 135px;
           border-radius: 5px;
-          background: #113a28;
+          // background: #113a28;
           font-weight: bold;
         }
         .submit {
@@ -1319,7 +1343,7 @@ export default {
           min-width: 456px;
         }
         .search-goods {
-          height: 50px;
+          // height: 50px;
           background: #f67f20;
           color: #fff;
         }

src/renderer/views/home/index.vue

@@ -57,7 +57,7 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
    .main {
-      background: #113a28;
+      // background: #113a28;
       height: 100%;
       width: 100%;
       display: block;
@@ -102,7 +102,7 @@ export default {
           border-radius: 6px;
        }
        .item:hover {
-         border: #113a28 3px solid;
+        //  border: #113a28 3px solid;
        }
        .logout {
           border: none;

src/renderer/views/setting/index.vue

@@ -42,7 +42,7 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
    .main {
-      background: #113a28;
+      // background: #113a28;
       height: 100%;
       width: 100%;
       display: block;

yarn.lock

@@ -8109,9 +8109,9 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@*:
+rxjs@^7.5.2:
   version "7.8.2"
-  resolved "https://registry.npmmirror.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
   integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
   dependencies:
     tslib "^2.1.0"