fix:修改样式,和表单

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

@@ -20,9 +20,9 @@
             v-if="!orderInfo.isEmpty"
             @click="getHangUp(orderInfo.hangNo, orderInfo.memberInfo)"
           >
-            <div class="item">
+            <!-- <div class="item">
               会员：{{ orderInfo.memberInfo ? orderInfo.memberInfo.name : '游客' }}
-            </div>
+            </div> -->
             <div class="item">件数：{{ orderInfo.num }}</div>
             <div class="item">金额：￥{{ orderInfo.amount }}</div>
             <div class="item time">{{ orderInfo.dateTime }}</div>

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

@@ -33,7 +33,7 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单类型" prop="type">
+      <!-- <el-form-item label="订单类型" prop="type">
         <el-select
             v-model="queryParams.type"
             clearable
@@ -41,8 +41,8 @@
         >
           <el-option v-for="orderType in typeList" :key="orderType.key" :label="orderType.name" :value="orderType.value"/>
         </el-select>
-      </el-form-item>
-      <el-form-item label="所属店铺" prop="storeIds">
+      </el-form-item> -->
+      <!-- <el-form-item label="所属店铺" prop="storeIds">
         <el-select v-model="storeIds" multiple filterable clearable placeholder="请选择店铺" style="width: 100%;">
           <el-option
               v-for="item in storeList"
@@ -51,7 +51,7 @@
               :value="item.id"
           ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="订单状态" prop="status">
         <el-select
             v-model="queryParams.status"
@@ -110,24 +110,24 @@
           <span>{{ scope.row.typeName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="所属店铺" align="center" width="140" prop="storeInfo.name">
+      <!-- <el-table-column label="所属店铺" align="center" width="140" prop="storeInfo.name">
         <template slot-scope="scope">
           <span v-if="scope.row.storeInfo">{{ scope.row.storeInfo.name }}</span>
           <span v-else>-</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="总金额" align="center" prop="amount">
         <template slot-scope="scope">
           <span v-if="true">{{ scope.row.amount.toFixed(2) }}</span>
           <span v-else>0.00</span>
         </template>
       </el-table-column>
-      <el-table-column label="支付状态" align="center" width="80" prop="payStatus">
+      <!-- <el-table-column label="支付状态" align="center" width="80" prop="payStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.payStatus == 'B'" class="status-active">{{ getName(payStatusList, scope.row.payStatus) }}</span>
           <span v-else class="status-disabled">{{ getName(payStatusList, scope.row.payStatus) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="订单状态" align="center" width="80" prop="status">
         <template slot-scope="scope">
           <span class="status-normal">{{ getName(statusList, scope.row.status) }}</span>
@@ -183,7 +183,7 @@
               v-hasPermi="['cashier:index']"
               @click="handleExpress(scope.row)"
           >发货</el-button>
-          <el-button
+          <!-- <el-button
               v-if="scope.row.orderMode == 'oneself'"
               type="text"
               size="mini"
@@ -191,7 +191,7 @@
               v-hasPermi="['cashier:index']"
               :disabled="scope.row.isVerify == true"
               @click="handleVerify(scope.row)"
-          >核销</el-button>
+          >核销</el-button> -->
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['order:edit', 'order:delete']">
                 <span class="el-dropdown-link">
                   <i class="el-icon-d-arrow-right el-icon--right"></i>更多
@@ -199,9 +199,9 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleView" icon="el-icon-view" v-hasPermi="['cashier:index']">查看详情</el-dropdown-item>
               <el-dropdown-item command="handlePrint" icon="el-icon-printer" v-hasPermi="['cashier:index']">打印小票</el-dropdown-item>
-              <el-dropdown-item command="handlePay" v-if="scope.row.payStatus != 'B'" icon="el-icon-wallet" v-hasPermi="['cashier:index']">发起支付</el-dropdown-item>
-              <el-dropdown-item v-if="scope.row.payStatus == 'B'" command="handleRefund" icon="el-icon-s-order" v-hasPermi="['cashier:index']">立即退款</el-dropdown-item>
-              <el-dropdown-item v-if="scope.row.payStatus != 'B'" command="handleDelete" icon="el-icon-remove" v-hasPermi="['cashier:index']">删除订单</el-dropdown-item>
+              <!-- <el-dropdown-item command="handlePay" v-if="scope.row.payStatus != 'B'" icon="el-icon-wallet" v-hasPermi="['cashier:index']">发起支付</el-dropdown-item> -->
+              <!-- <el-dropdown-item v-if="scope.row.payStatus == 'B'" command="handleRefund" icon="el-icon-s-order" v-hasPermi="['cashier:index']">立即退款</el-dropdown-item> -->
+              <!-- <el-dropdown-item v-if="scope.row.payStatus != 'B'" command="handleDelete" icon="el-icon-remove" v-hasPermi="['cashier:index']">删除订单</el-dropdown-item> -->
             </el-dropdown-menu>
           </el-dropdown>
         </template>

src/renderer/views/cashier/index.vue

@@ -18,7 +18,7 @@
             <div class="account">您好，{{ accountInfo.realName }}！</div>
           </div>
           <div class="cate">
-            <ul class="nav">
+            <ul class="nav" >
               <li class="nav-item" v-for="menu in menuList">
                 <a
                   :class="'nav-link' + (activeMenu == menu.key ? ' active' : '')"
@@ -36,7 +36,7 @@
           </div>
         </div>
         <div class="cart-container" v-if="activeMenu == 'cashier'">
-          <div class="title">
+          <!-- <div class="title">
             <div class="avatar">
               <img
                 class="w-full h-full object-cover"
@@ -50,7 +50,7 @@
                 {{ memberInfo.mobile ? memberInfo.mobile : memberInfo.name }}
               </span>
               <span class="none" v-if="!memberInfo">当前为游客</span>
-              <!-- <el-button
+              <el-button
                   size="mini"
                   class="switch"
                   type="danger"
@@ -58,9 +58,9 @@
                   @click="switchMember()"
                 >
                   关联会员
-                </el-button> -->
+                </el-button>
             </div>
-          </div>
+          </div> -->
           <div class="carts">
             <div>
               <div class="tab">
@@ -1064,8 +1064,8 @@ export default {
     right: 10px;
     margin-top: 10px;
     display: block;
-    // background: #6c757d;
-    border: 1px solid #eee;
+    background-color: transparent !important;
+    border-color: transparent !important;
 
     color: #000;
     border-radius: 5px;
@@ -1084,9 +1084,9 @@ export default {
   }
   .left-side {
     width: 160px;
-    height: 100%;
+    height: 100vh;
     // background: #113a28;
-    border-right: #888888 solid 2px;
+    // border-right: #888888 solid 2px;
     position: absolute;
     left: 0;
     top: 45px;
@@ -1125,12 +1125,18 @@ export default {
       text-align: center;
       margin-left: 14px;
       margin-top: 10px;
+      height: calc(100vh - 190px);
       .nav {
         list-style: none;
-        display: block;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content:space-around;
         margin: 0px;
         padding: 5px;
         text-align: center;
+        height: 100%;
+
         .nav-item {
           margin-top: 20px;
           font-size: 14px;
@@ -1186,11 +1192,12 @@ export default {
     overflow-x: hidden;
     overflow-y: auto;
     border: #cccccc solid 1px;
+    border-top-color: transparent !important;
     .title {
       height: 70px;
       width: 310px;
       border-bottom: #cccccc 1px solid;
-      padding-top: 16px;
+      // padding-top: 16px;
       padding-left: 1px;
       display: flex;
       align-items: center;
@@ -1211,6 +1218,7 @@ export default {
       .member-info {
         display: inline-block;
         margin-left: 5px;
+        border-top:none;
         .name {
           margin-left: 2px;
           margin-right: 3px;
@@ -1230,7 +1238,7 @@ export default {
       width: 100%;
       color: #666666;
       margin-bottom: 120px;
-      margin-top: 70px;
+      // margin-top: 70px;
       padding: 0px;
       .tab {
         width: 50%;