Merge branch 'panda-ui'

src/renderer/styles/element-ui.css

@@ -0,0 +1,115 @@
+.el-upload input[type='file'] {
+  display: none !important;
+}
+
+.el-upload__input {
+  display: none;
+}
+
+.el-dialog {
+  transform: none;
+  left: 0;
+  position: relative;
+  margin: 0 auto;
+}
+
+.upload-container .el-upload {
+  width: 100%;
+}
+
+.upload-container .el-upload .el-upload-dragger {
+  width: 100%;
+  height: 200px;
+}
+
+.fixed-width .el-button--mini {
+  padding: 7px 10px;
+  width: 60px;
+}
+
+.status-col .cell {
+  padding: 0 10px;
+  text-align: center;
+}
+
+.status-col .cell .el-tag {
+  margin-right: 0px;
+}
+
+.common-dialog .el-dialog__header {
+  padding: 10px;
+}
+
+.common-dialog .el-dialog__headerbtn {
+  top: 15px;
+}
+
+.common-dialog .el-dialog__body {
+  padding: 30px;
+}
+
+.common-dialog .el-dialog__title,
+.common-dialog .el-dialog__close {
+  color: #000;
+  font-size: 14px;
+}
+
+.common-dialog .el-dialog__title,
+.common-dialog .el-dialog__close:hover {
+  color: #000;
+  font-weight: bold;
+}
+
+.main-button {
+  background: #f67f20;
+  line-height: 40px;
+  padding: 0px 20px 0px 20px;
+  height: 40px;
+}
+
+.main-button-mini {
+  background: #f67f20;
+  padding: 5px 8px 5px 8px;
+}
+
+.main-button-middle {
+  background: #f67f20;
+  padding: 8px 12px 8px 12px;
+}
+
+.main-button:hover {
+  background: #fcb47b;
+  border-color: #fcb47b;
+}
+
+.main-button-mini:hover {
+  background: #fcb47b;
+  border-color: #fcb47b;
+}
+
+.main-button-middle:hover {
+  background: #fcb47b;
+  border-color: #fcb47b;
+}
+
+.main-button-reset {
+  background: #ffffff;
+}
+
+.main-button-reset:hover {
+  background: #f5f5f5;
+  color: #333333;
+}
+
+.do-button {
+  background: #ff5b57;
+  line-height: 40px;
+  padding: 0px 20px 0px 20px;
+  height: 40px;
+  border: solid 1px #cccccc;
+}
+
+.do-button:hover {
+  background: #ff5b33;
+  border: solid 1px #ff5b57;
+}

src/renderer/styles/element-ui.min.css

@@ -0,0 +1 @@
+.el-upload input[type='file']{display:none !important}.el-upload__input{display:none}.el-dialog{transform:none;left:0;position:relative;margin:0 auto}.upload-container .el-upload{width:100%}.upload-container .el-upload .el-upload-dragger{width:100%;height:200px}.fixed-width .el-button--mini{padding:7px 10px;width:60px}.status-col .cell{padding:0 10px;text-align:center}.status-col .cell .el-tag{margin-right:0px}.common-dialog .el-dialog__header{padding:10px}.common-dialog .el-dialog__headerbtn{top:15px}.common-dialog .el-dialog__body{padding:30px}.common-dialog .el-dialog__title,.common-dialog .el-dialog__close{color:#000;font-size:14px}.common-dialog .el-dialog__title,.common-dialog .el-dialog__close:hover{color:#000;font-weight:bold}.main-button{background:#f67f20;line-height:40px;padding:0px 20px 0px 20px;height:40px}.main-button-mini{background:#f67f20;padding:5px 8px 5px 8px}.main-button-middle{background:#f67f20;padding:8px 12px 8px 12px}.main-button:hover{background:#fcb47b;border-color:#fcb47b}.main-button-mini:hover{background:#fcb47b;border-color:#fcb47b}.main-button-middle:hover{background:#fcb47b;border-color:#fcb47b}.main-button-reset{background:#ffffff}.main-button-reset:hover{background:#f5f5f5;color:#333333}.do-button{background:#ff5b57;line-height:40px;padding:0px 20px 0px 20px;height:40px;border:solid 1px #cccccc}.do-button:hover{background:#ff5b33;border:solid 1px #ff5b57}

src/renderer/styles/element-ui.scss

@@ -1,33 +1,33 @@
 //to reset element-ui default css
- .el-upload {
-   input[type="file"] {
-     display: none !important;
-   }
- }
+.el-upload {
+  input[type='file'] {
+    display: none !important;
+  }
+}
 
- .el-upload__input {
-   display: none;
- }
+.el-upload__input {
+  display: none;
+}
 
- //暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
- .el-dialog {
-   transform: none;
-   left: 0;
-   position: relative;
-   margin: 0 auto;
- }
+//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
+.el-dialog {
+  transform: none;
+  left: 0;
+  position: relative;
+  margin: 0 auto;
+}
 
- //element ui upload
- .upload-container {
-   .el-upload {
-     width: 100%;
+//element ui upload
+.upload-container {
+  .el-upload {
+    width: 100%;
 
-     .el-upload-dragger {
-       width: 100%;
-       height: 200px;
-     }
-   }
- }
+    .el-upload-dragger {
+      width: 100%;
+      height: 200px;
+    }
+  }
+}
 
 .fixed-width {
   .el-button--mini {
@@ -46,12 +46,12 @@
   }
 }
 
- // common dialog
+// common dialog
 .common-dialog {
   .el-dialog {
     // border: solid 0px #113a28;
   }
-  .el-dialog__header{
+  .el-dialog__header {
     // background: #113a28;
     padding: 10px;
   }
@@ -61,39 +61,44 @@
   .el-dialog__body {
     padding: 30px;
   }
-  .el-dialog__title,.el-dialog__close{
-    color: #fff;
+  .el-dialog__title,
+  .el-dialog__close {
+    color: #000;
     font-size: 14px;
   }
-  .el-dialog__title,.el-dialog__close:hover{
-    color: #fff;
+  .el-dialog__title,
+  .el-dialog__close:hover {
+    color: #000;
     font-weight: bold;
   }
 }
 // main button
 .main-button {
-   background: #f67f20;
-   line-height: 40px;
-   padding: 0px 20px 0px 20px;
-   height: 40px;
+  background: #f67f20;
+  line-height: 40px;
+  padding: 0px 20px 0px 20px;
+  height: 40px;
 }
 .main-button-mini {
-  background: #113a28;
+  background: #f67f20;
   padding: 5px 8px 5px 8px;
 }
 .main-button-middle {
-  // background: #113a28;
+  background: #f67f20;
   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: #fcb47b;
+  border-color: #fcb47b;
+}
+.main-button-mini:hover {
+  background: #fcb47b;
+  border-color: #fcb47b;
+}
+.main-button-middle:hover {
+  background: #fcb47b;
+  border-color: #fcb47b;
+}
 .main-button-reset {
   background: #ffffff;
 }
@@ -112,5 +117,3 @@
   background: #ff5b33;
   border: solid 1px #ff5b57;
 }
-
-

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

@@ -187,12 +187,11 @@ export default {
     cursor: pointer;
     padding: 5px;
     .info {
-      border: solid 1px #cccccc;
       padding: 5px;
       height: 100%;
       border-radius: 4px;
-      background: #e6f7f7;
-      //  border: #113a28 solid 1px;
+      background: #ffc03833;
+      border: #f67f20 solid 1px;
       .sn {
         font-weight: bold;
         font-size: 20px;

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

@@ -1,22 +1,30 @@
 <template>
   <div class="member-container">
-    <el-form :model="queryParams" class="search-form" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      class="search-form"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="会员ID" prop="id">
         <el-input
           v-model="queryParams.id"
           placeholder="请输入会员ID"
           clearable
-          style="width: 240px;"
+          style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="会员号" prop="userNo">
         <el-input
-            v-model="queryParams.userNo"
-            placeholder="请输入会员号"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
+          v-model="queryParams.userNo"
+          placeholder="请输入会员号"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="手机号" prop="mobile">
@@ -24,7 +32,7 @@
           v-model="queryParams.mobile"
           placeholder="请输入会员手机号"
           clearable
-          style="width: 240px;"
+          style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -33,52 +41,74 @@
           v-model="queryParams.name"
           placeholder="请输入会员名称"
           clearable
-          style="width: 240px;"
+          style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="会员等级" prop="gradeId">
-        <el-select
-          v-model="queryParams.gradeId"
-          clearable
-          placeholder="会员等级"
-        >
-          <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
+        <el-select v-model="queryParams.gradeId" clearable placeholder="会员等级">
+          <el-option
+            v-for="grade in userGradeList"
+            :key="grade.id + ''"
+            :label="grade.name"
+            :value="grade.id + ''"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
+        <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 240px">
+          <el-option key="A" label="启用" value="A" />
+          <el-option key="N" label="禁用" value="N" />
         </el-select>
       </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>
+        <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>
         <el-button
           plain
           icon="el-icon-plus"
           class="main-button-middle main-button-reset"
           @click="handleAdd"
           v-hasPermi="['member:add']"
-        >新增</el-button>
+        >
+          新增
+        </el-button>
       </el-form-item>
     </el-form>
 
-    <el-table ref="tables" v-loading="loading" :data="list" border style="width: 100%;" fit height="100%" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="会员ID" prop="id" width="80"/>
+    <el-table
+      ref="tables"
+      v-loading="loading"
+      :data="list"
+      border
+      style="width: 100%"
+      fit
+      height="100%"
+      @selection-change="handleSelectionChange"
+      :default-sort="defaultSort"
+      @sort-change="handleSortChange"
+    >
+      <el-table-column label="会员ID" prop="id" width="80" />
       <el-table-column label="头像" align="center" width="80">
         <template slot-scope="scope">
-            <img v-if="scope.row.avatar" class="list-avatar" :src="scope.row.avatar">
-            <img v-else class="list-avatar" src="@/assets/images/avatar.png">
+          <img v-if="scope.row.avatar" class="list-avatar" :src="scope.row.avatar" />
+          <img v-else class="list-avatar" src="@/assets/images/avatar.png" />
         </template>
       </el-table-column>
-      <el-table-column label="会员号" prop="userNo" width="150"/>
+      <el-table-column label="会员号" prop="userNo" width="150" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="手机号" align="center" prop="mobile">
         <template slot-scope="scope">
@@ -92,26 +122,36 @@
       </el-table-column>
       <el-table-column label="余额" align="center" prop="balance">
         <template slot-scope="scope">
-          <div><span style="color:red;">￥{{ scope.row.balance ? scope.row.balance.toFixed(2) : '0.00' }}</span></div>
+          <div>
+            <span style="color: red">
+              ￥{{ scope.row.balance ? scope.row.balance.toFixed(2) : '0.00' }}
+            </span>
+          </div>
           <el-button
             class="main-button-mini"
             type="primary"
             size="mini"
             @click="handleBalance(scope.row.id)"
             v-hasPermi="['balance:modify']"
-          >充值</el-button>
+          >
+            充值
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column label="积分" align="center" prop="point">
         <template slot-scope="scope">
-          <div><span>{{ scope.row.point ? scope.row.point : '0.00' }}</span></div>
+          <div>
+            <span>{{ scope.row.point ? scope.row.point : '0.00' }}</span>
+          </div>
           <el-button
             class="main-button-mini"
             type="primary"
             size="mini"
             @click="handlePoint(scope.row.id)"
             v-hasPermi="['point:modify']"
-          >变更</el-button>
+          >
+            变更
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column label="注册时间" align="center" width="160" prop="createTime">
@@ -135,7 +175,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="138" fixed='right'>
+      <el-table-column label="操作" align="center" width="138" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -144,7 +184,9 @@
             class="main-text"
             v-hasPermi="['member:add']"
             @click="handleUpdate(scope.row)"
-          >修改</el-button>
+          >
+            修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -152,13 +194,15 @@
             class="main-text"
             v-hasPermi="['member:add']"
             @click="handleDelete(scope.row)"
-          >删除</el-button>
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       class="pagination"
       :page.sync="queryParams.page"
@@ -167,7 +211,13 @@
     />
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      class="common-dialog"
+      width="800px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -179,13 +229,14 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="会员等级" prop="gradeId">
-                <el-select
-                  v-model="form.gradeId"
-                  placeholder="会员等级"
-                  style="width: 300px"
-                >
-                  <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
-                </el-select>
+              <el-select v-model="form.gradeId" placeholder="会员等级" style="width: 300px">
+                <el-option
+                  v-for="grade in userGradeList"
+                  :key="grade.id + ''"
+                  :label="grade.name"
+                  :value="grade.id + ''"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -198,7 +249,7 @@
                 type="datetime"
                 placeholder="开始时间"
               ></el-date-picker>
-              <span class="sp"> 至 </span>
+              <span class="sp">至</span>
               <el-date-picker
                 v-model="form.endTime"
                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -211,14 +262,18 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="会员号" prop="userNo">
-              <el-input v-model="form.userNo" placeholder="请输入会员号，为空系统将自动分配" maxlength="30" />
+              <el-input
+                v-model="form.userNo"
+                placeholder="请输入会员号，为空系统将自动分配"
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="手机号" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="30"/>
+              <el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="30" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -235,21 +290,25 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="身份证号" prop="idcard">
-              <el-input v-model="form.idcard" placeholder="请输入身份证号" maxlength="30"/>
+              <el-input v-model="form.idcard" placeholder="请输入身份证号" maxlength="30" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="生日" prop="birthday">
-              <el-input v-model="form.birthday" placeholder="请输入生日，格式如：1990-01-01" maxlength="30"/>
+              <el-input
+                v-model="form.birthday"
+                placeholder="请输入生日，格式如：1990-01-01"
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="通讯地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入通讯地址" maxlength="100"/>
+              <el-input v-model="form.address" placeholder="请输入通讯地址" maxlength="100" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -269,11 +328,19 @@
             <el-form-item label="注册来源">
               <el-radio-group v-model="form.source">
                 <el-radio label="" v-if="!form.source">未知</el-radio>
-                <el-radio label="wechat_login" v-if="form.source == 'wechat_login'">微信小程序</el-radio>
+                <el-radio label="wechat_login" v-if="form.source == 'wechat_login'">
+                  微信小程序
+                </el-radio>
                 <el-radio label="wechat_mp" v-if="form.source == 'wechat_mp'">微信公众号</el-radio>
-                <el-radio label="backend_add" v-if="form.source == 'backend_add'">后台添加</el-radio>
-                <el-radio label="register_by_account" v-if="form.source == 'register_by_account'">H5注册</el-radio>
-                <el-radio label="mobile_login" v-if="form.source == 'mobile_login'">手机号登录注册</el-radio>
+                <el-radio label="backend_add" v-if="form.source == 'backend_add'">
+                  后台添加
+                </el-radio>
+                <el-radio label="register_by_account" v-if="form.source == 'register_by_account'">
+                  H5注册
+                </el-radio>
+                <el-radio label="mobile_login" v-if="form.source == 'mobile_login'">
+                  手机号登录注册
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -282,7 +349,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注信息">
-              <el-input v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input
+                v-model="form.description"
+                type="textarea"
+                placeholder="请输入内容"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -294,27 +365,45 @@
     </el-dialog>
 
     <!-- 余额充值对话框 -->
-    <balanceRecharge :showDialog="openBalance" :userId="userId" @closeDialog="closeDialog" @close="closeDialog" append-to-body/>
+    <balanceRecharge
+      :showDialog="openBalance"
+      :userId="userId"
+      @closeDialog="closeDialog"
+      @close="closeDialog"
+      append-to-body
+    />
 
     <!-- 积分充值对话框 -->
-    <pointRecharge :showDialog="openPoint" :userId="userId" @closeDialog="closeDialog" @close="closeDialog" append-to-body/>
+    <pointRecharge
+      :showDialog="openPoint"
+      :userId="userId"
+      @closeDialog="closeDialog"
+      @close="closeDialog"
+      append-to-body
+    />
   </div>
 </template>
 
 <script>
-import { getMemberList, updateMemberStatus, getMemberInfo, saveMember, deleteMember } from "@/api/member";
-import balanceRecharge from "./balanceRecharge";
-import pointRecharge from "./pointRecharge";
-import { Message } from "element-ui";
+import {
+  getMemberList,
+  updateMemberStatus,
+  getMemberInfo,
+  saveMember,
+  deleteMember,
+} from '@/api/member'
+import balanceRecharge from './balanceRecharge'
+import pointRecharge from './pointRecharge'
+import { Message } from 'element-ui'
 export default {
-  name: "MemberIndex",
+  name: 'MemberIndex',
   components: { balanceRecharge, pointRecharge },
   data() {
     return {
       // 遮罩层
       loading: true,
       // 标题
-      title: "",
+      title: '',
       // 选中数组
       ids: [],
       // 非多个禁用
@@ -338,185 +427,212 @@ export default {
       // 日期范围
       dateRange: [],
       // 默认排序
-      defaultSort: {prop: 'updateTime', order: 'descending'},
+      defaultSort: { prop: 'updateTime', order: 'descending' },
       // 表单参数
-      form: { id: '', name: '', gradeId: '', mobile: '', userNo: '', startTime: '', endTime: '', sex: 1, idcard: '', birthday: '', address: '', status: "A", description: '' },
+      form: {
+        id: '',
+        name: '',
+        gradeId: '',
+        mobile: '',
+        userNo: '',
+        startTime: '',
+        endTime: '',
+        sex: 1,
+        idcard: '',
+        birthday: '',
+        address: '',
+        status: 'A',
+        description: '',
+      },
       // 查询参数
       queryParams: {
         page: 1,
         pageSize: 10,
-        mobile: "",
-        name: "",
-        gradeId: "",
-        userId: "",
-        userNo: "",
-        status: ""
+        mobile: '',
+        name: '',
+        gradeId: '',
+        userId: '',
+        userNo: '',
+        status: '',
       },
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "会员名称不能为空", trigger: "blur" },
-          { min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' }
+          { required: true, message: '会员名称不能为空', trigger: 'blur' },
+          { min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' },
         ],
-        gradeId: [{ required: true, message: "请选择会员等级", trigger: "blur" }]
-      }
-    };
+        gradeId: [{ required: true, message: '请选择会员等级', trigger: 'blur' }],
+      },
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     // 查询列表
     getList() {
-      this.loading = true;
-      getMemberList(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
+      this.loading = true
+      getMemberList(this.addDateRange(this.queryParams, this.dateRange))
+        .then((response) => {
+          this.list = response.data.paginationResponse.content
+          this.total = response.data.paginationResponse.totalElements
           this.userGradeList = response.data.userGradeList
-          this.loading = false;
-        }
-      ).catch(() => {
-        // empty
-      });
+          this.loading = false
+        })
+        .catch(() => {
+          // empty
+        })
     },
     // 搜索按钮操作
     handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
+      this.queryParams.page = 1
+      this.getList()
     },
     // 重置按钮操作
     resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order);
-      this.handleQuery();
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery()
     },
     // 状态修改
     handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$confirm('确认要' + text + '"' + row.name + '"吗？').then(function() {
-        return updateMemberStatus(row.id, row.status);
-      }).then(() => {
-        Message({
-          message: "提示：" + text + "成功",
-          type: "success"
-        });
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
+      let text = row.status == 'A' ? '启用' : '禁用'
+      this.$confirm('确认要' + text + '"' + row.name + '"吗？')
+        .then(function () {
+          return updateMemberStatus(row.id, row.status)
+        })
+        .then(() => {
+          Message({
+            message: '提示：' + text + '成功',
+            type: 'success',
+          })
+        })
+        .catch(function () {
+          row.status = row.status === 'N' ? 'A' : 'N'
+        })
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map((item) => item.id)
       this.multiple = !selection.length
     },
     // 排序触发事件
     handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
+      this.queryParams.orderByColumn = column.prop
+      this.queryParams.isAsc = column.order
+      this.getList()
     },
     // 余额充值操作
     handleBalance(userId) {
-       this.openBalance = true;
-       this.userId = userId.toString();
+      this.openBalance = true
+      this.userId = userId.toString()
     },
     // 积分变更操作
     handlePoint(userId) {
-       this.openPoint = true
-       this.userId = userId.toString();
+      this.openPoint = true
+      this.userId = userId.toString()
     },
     // 关闭对话框
     closeDialog(dialog) {
       if (dialog == 'balance') {
-          this.openBalance = false;
+        this.openBalance = false
       }
       if (dialog == 'point') {
-          this.openPoint = false;
+        this.openPoint = false
       }
-      this.userId = "";
-      this.getList();
+      this.userId = ''
+      this.getList()
     },
     // 新增按钮操作
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增会员";
+      this.reset()
+      this.open = true
+      this.title = '新增会员'
     },
     // 表单重置
     reset() {
-      this.resetForm("form");
-      this.form.id = '';
-      this.form.description = '';
-      this.form.name = '';
-      this.form.startTime = '';
-      this.form.endTime = '';
-      this.form.gradeId = '';
-      this.form.userNo = '';
-      this.form.mobile = '';
+      this.resetForm('form')
+      this.form.id = ''
+      this.form.description = ''
+      this.form.name = ''
+      this.form.startTime = ''
+      this.form.endTime = ''
+      this.form.gradeId = ''
+      this.form.userNo = ''
+      this.form.mobile = ''
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.id) {
-              saveMember(this.form).then(response => {
+            saveMember(this.form)
+              .then((response) => {
                 Message({
-                  message: "提示：修改会员成功",
-                  type: "success"
-                });
-                this.open = false;
-                this.getList();
-              }).catch(() => {
-                 // empty
-              });
+                  message: '提示：修改会员成功',
+                  type: 'success',
+                })
+                this.open = false
+                this.getList()
+              })
+              .catch(() => {
+                // empty
+              })
           } else {
-              saveMember(this.form).then(response => {
+            saveMember(this.form)
+              .then((response) => {
                 Message({
-                  message: "提示：新增会员成功",
-                  type: "success"
-                });
-                this.open = false;
-                this.getList();
-              }).catch(() => {
-                 // empty
-              });
+                  message: '提示：新增会员成功',
+                  type: 'success',
+                })
+                this.open = false
+                this.getList()
+              })
+              .catch(() => {
+                // empty
+              })
           }
         }
-      });
+      })
     },
     // 修改按钮操作
     handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getMemberInfo(id).then(response => {
-        this.form = response.data.memberInfo;
-        this.open = true;
-        this.title = "编辑会员";
-      }).catch(() => {
-         // empty
-      });
+      this.reset()
+      const id = row.id || this.ids
+      getMemberInfo(id)
+        .then((response) => {
+          this.form = response.data.memberInfo
+          this.open = true
+          this.title = '编辑会员'
+        })
+        .catch(() => {
+          // empty
+        })
     },
     // 删除按钮操作
     handleDelete(row) {
       const name = row.name
-      this.$confirm('确定删除"' + name + '"的会员信息？').then(function() {
-        return deleteMember(row.id);
-      }).then(() => {
-        this.getList();
-        Message({
-          message: "提示：删除成功",
-          type: "success"
-        });
-      }).catch(() => {});
-    }
-  }
-};
+      this.$confirm('确定删除"' + name + '"的会员信息？')
+        .then(function () {
+          return deleteMember(row.id)
+        })
+        .then(() => {
+          this.getList()
+          Message({
+            message: '提示：删除成功',
+            type: 'success',
+          })
+        })
+        .catch(() => {})
+    },
+  },
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-table__body-wrapper::-webkit-scrollbar {

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

@@ -1,135 +1,154 @@
 <template>
-    <el-dialog class="common-dialog" title="关联会员" :visible="showDialog" @close="close" width="750px" destroy-on-close>
-        <el-form ref="form" v-if="!memberInfo.id" class="form" :model="form" label-width="100px">
-            <el-form-item label="会员关键字" class="form-item" prop="keyword">
-              <el-input class="input-item" v-model="form.keyword" v-focus placeholder="请输入会员手机号码、会员名称或扫码会员二维码" clearable maxlength="200" />
-            </el-form-item>
-        </el-form>
-        <div class="member-info" v-if="memberInfo.id">
-            <div class="item">
-              <img class="avatar" v-if="memberInfo.avatar" :src="memberInfo.avatar"/>
-              <img class="avatar" v-if="!memberInfo.avatar" src="@/assets/images/avatar.png"/>
-              <div class="value">会员名称：{{ memberInfo.name }}</div>
-              <div class="value">会员性别：{{ memberInfo.sex == '1' ? '男' : '女' }}</div>
-            </div>
-            <div class="item">
-              <div class="value">手机号码：{{ memberInfo.mobile ? memberInfo.mobile : '暂无' }}</div>
-              <div class="value">会员号码：{{ memberInfo.userNo ? memberInfo.userNo : '暂无' }}</div>
-            </div>
-            <div class="item">
-              <div class="value">可用余额：{{ memberInfo.balance ? memberInfo.balance.toFixed(2) : '0.00' }}（元）</div>
-              <div class="value">可用积分：{{ memberInfo.point ? memberInfo.point : '0' }}</div>
-            </div>
+  <el-dialog
+    class="common-dialog"
+    title="关联会员"
+    :visible="showDialog"
+    @close="close"
+    width="750px"
+    destroy-on-close
+  >
+    <el-form ref="form" v-if="!memberInfo.id" class="form" :model="form" label-width="100px">
+      <el-form-item label="会员关键字" class="form-item" prop="keyword">
+        <el-input
+          class="input-item"
+          v-model="form.keyword"
+          v-focus
+          placeholder="请输入会员手机号码、会员名称或扫码会员二维码"
+          clearable
+          maxlength="200"
+        />
+      </el-form-item>
+    </el-form>
+    <div class="member-info" v-if="memberInfo.id">
+      <div class="item">
+        <img class="avatar" v-if="memberInfo.avatar" :src="memberInfo.avatar" />
+        <img class="avatar" v-if="!memberInfo.avatar" src="@/assets/images/avatar.png" />
+        <div class="value">会员名称：{{ memberInfo.name }}</div>
+        <div class="value">会员性别：{{ memberInfo.sex == '1' ? '男' : '女' }}</div>
+      </div>
+      <div class="item">
+        <div class="value">手机号码：{{ memberInfo.mobile ? memberInfo.mobile : '暂无' }}</div>
+        <div class="value">会员号码：{{ memberInfo.userNo ? memberInfo.userNo : '暂无' }}</div>
+      </div>
+      <div class="item">
+        <div class="value">
+          可用余额：{{ memberInfo.balance ? memberInfo.balance.toFixed(2) : '0.00' }}（元）
         </div>
-        <div slot="footer" class="dialog-footer">
-            <el-button v-if="!memberInfo.id" @click="doSubmit()">切换游客</el-button>
-            <el-button type="primary" class="main-button" v-if="!memberInfo.id" @click="doQuery()">查询会员</el-button>
-            <el-button v-if="memberInfo.id" @click="cancel()">重新查询</el-button>
-            <el-button type="danger" v-if="memberInfo.id" @click="doSubmit()">确认会员</el-button>
-        </div>
-    </el-dialog>
+        <div class="value">可用积分：{{ memberInfo.point ? memberInfo.point : '0' }}</div>
+      </div>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="!memberInfo.id" @click="doSubmit()">切换游客</el-button>
+      <el-button type="primary" class="main-button" v-if="!memberInfo.id" @click="doQuery()">
+        查询会员
+      </el-button>
+      <el-button v-if="memberInfo.id" @click="cancel()">重新查询</el-button>
+      <el-button type="danger" v-if="memberInfo.id" @click="doSubmit()">确认会员</el-button>
+    </div>
+  </el-dialog>
 </template>
 <script>
-import { getMemberInfo } from "@/api/cashier";
+import { getMemberInfo } from '@/api/cashier'
 export default {
-    props: {
-      showDialog: {
-        type:[Boolean],
-        default:()=>false
+  props: {
+    showDialog: {
+      type: [Boolean],
+      default: () => false,
+    },
+  },
+  // 自动获取焦点
+  directives: {
+    focus: {
+      inserted: function (el) {
+        el.querySelector('input').focus()
+      },
+    },
+  },
+  watch: {
+    showDialog(value) {
+      if (value) {
+        this.memberInfo = {}
+        this.form.keyword = ''
       }
     },
-    // 自动获取焦点
-    directives: {
-      focus: {
-        inserted: function (el) {
-           el.querySelector('input').focus();
-        }
+  },
+  data() {
+    return {
+      loading: false,
+      form: { keyword: '' },
+      memberInfo: {},
+    }
+  },
+  methods: {
+    doQuery() {
+      const app = this
+      const keyword = this.form.keyword.trim()
+      if (keyword.length > 0) {
+        getMemberInfo({ keyword: this.form.keyword.trim() })
+          .then((response) => {
+            if (response.data.memberInfo) {
+              app.memberInfo = response.data.memberInfo
+            } else {
+              app.$alert('未查询到该会员信息，请确认！')
+              return false
+            }
+          })
+          .catch(() => {
+            // empty
+          })
+      } else {
+        app.$alert('请先输入会员关键字！')
       }
     },
-    watch: {
-      showDialog(value) {
-        if (value) {
-            this.memberInfo = {};
-            this.form.keyword = '';
-        }
-      },
+    doSubmit() {
+      const app = this
+      if (app.memberInfo.id) {
+        app.$emit('doSwitchMember', app.memberInfo)
+      } else {
+        app.$emit('doSwitchMember', null)
+      }
     },
-    data(){
-        return {
-          loading: false,
-          form: { keyword: '' },
-          memberInfo: {}
-        }
+    cancel() {
+      this.memberInfo = {}
     },
-    methods: {
-        doQuery() {
-          const app = this;
-          const keyword = this.form.keyword.trim();
-          if (keyword.length > 0) {
-              getMemberInfo( { keyword: this.form.keyword.trim() }).then(response => {
-                if (response.data.memberInfo) {
-                    app.memberInfo = response.data.memberInfo;
-                } else {
-                    app.$alert("未查询到该会员信息，请确认！");
-                    return false;
-                }
-              }).catch(() => {
-                 // empty
-              });
-          } else {
-             app.$alert("请先输入会员关键字！");
-          }
-        },
-        doSubmit() {
-           const app = this;
-           if (app.memberInfo.id) {
-               app.$emit('doSwitchMember', app.memberInfo);
-           } else {
-               app.$emit('doSwitchMember', null);
-           }
-        },
-        cancel() {
-           this.memberInfo = {};
-        },
-        close() {
-           this.$emit('doSwitchMember', 0);
-        }
-    }
+    close() {
+      this.$emit('doSwitchMember', 0)
+    },
+  },
 }
 </script>
 <style scoped>
-  .form {
-     margin-top: 30px;
-  }
-  .input-item >>> .el-input__inner {
-    /* border: #113a28 solid 2px; */
-    line-height: 50px;
-    height: 50px;
-  }
-  .form-item >>> .el-form-item__label {
-    line-height: 50px;
-    height: 50px;
-  }
-  .member-info {
-     border: solid 1px #cccccc;
-     padding: 20px;
-     border-radius: 4px;
-     cursor: pointer;
-  }
-  .member-info .item {
-      height: 20px;
-  }
-  .member-info .item .avatar {
-     height: 60px;
-     width: 60px;
-     border-radius: 30px;
-     border: solid 1px #cccccc;
-     float: left;
-  }
-  .member-info .item .value {
-     float: left;
-     margin-left: 10px;
-     width: 200px;
-  }
-
+.form {
+  margin-top: 30px;
+}
+.input-item >>> .el-input__inner {
+  /* border: #113a28 solid 2px; */
+  line-height: 50px;
+  height: 50px;
+}
+.form-item >>> .el-form-item__label {
+  line-height: 50px;
+  height: 50px;
+}
+.member-info {
+  border: solid 1px #cccccc;
+  padding: 20px;
+  border-radius: 4px;
+  cursor: pointer;
+}
+.member-info .item {
+  height: 20px;
+}
+.member-info .item .avatar {
+  height: 60px;
+  width: 60px;
+  border-radius: 30px;
+  border: solid 1px #cccccc;
+  float: left;
+}
+.member-info .item .value {
+  float: left;
+  margin-left: 10px;
+  width: 200px;
+}
 </style>

src/renderer/views/cashier/index.vue

@@ -12,7 +12,7 @@
         <div class="top-nav">欢迎使用{{ systemName }}</div>
         <div class="left-side">
           <div class="logo">
-            <i class="logout el-icon-d-arrow-left" @click="logout"></i>
+            <!-- <i class="logout el-icon-d-arrow-left" @click="logout"></i> -->
             <div class="title">收银台</div>
             <div class="store" v-if="storeInfo">({{ storeInfo.name }})</div>
             <div class="account">您好，{{ accountInfo.realName }}！</div>
@@ -25,7 +25,10 @@
                   href="javascript:;"
                   @click="switchMenu(menu.key)"
                 >
-                  <img class="cate-logo" :src="menu.logo" />
+                  <div class="cate-logo-div">
+                    <img class="cate-logo" :src="menu.logo" />
+                  </div>
+
                   <span>{{ menu.name }}</span>
                 </a>
               </li>
@@ -34,28 +37,28 @@
         </div>
         <div class="cart-container" v-if="activeMenu == 'cashier'">
           <div class="title">
-            <div class="logo">
+            <div class="avatar">
               <img
-                class="avatar"
+                class="w-full h-full object-cover"
                 v-if="!memberInfo || !memberInfo.avatar"
                 src="@/assets/images/avatar.png"
               />
-              <img class="avatar" v-else :src="memberInfo.avatar" />
+              <img class="w-full h-full object-cover" v-else :src="memberInfo.avatar" />
             </div>
             <div class="member-info">
               <span class="name" v-if="memberInfo">
                 {{ memberInfo.mobile ? memberInfo.mobile : memberInfo.name }}
               </span>
               <span class="none" v-if="!memberInfo">当前为游客</span>
-              <el-button
-                size="mini"
-                class="switch"
-                type="danger"
-                icon="el-icon-refresh"
-                @click="switchMember()"
-              >
-                关联会员
-              </el-button>
+              <!-- <el-button
+                  size="mini"
+                  class="switch"
+                  type="danger"
+                  icon="el-icon-refresh"
+                  @click="switchMember()"
+                >
+                  关联会员
+                </el-button> -->
             </div>
           </div>
           <div class="carts">
@@ -118,10 +121,13 @@
           </div>
         </div>
         <div class="main-list" v-if="activeMenu == 'cashier'">
-
-          <div class="title ">
-            
-            <el-form class="search-form flex justify-between" 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"
@@ -133,7 +139,12 @@
                   maxlength="100"
                 />
               </el-form-item>
-              <el-button class="search-goods mr-5" size="small" @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>
@@ -162,17 +173,19 @@
             </div>
           </div> -->
           <div class="goods-list">
-
             <div class="goods-item" v-for="goodsInfo in goodsList">
-              <div class="bg-white rounded-lg shadow-sm overflow-hidden cursor-pointer hover:shadow-md transition" @click="clickGoods(goodsInfo)">
+              <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> -->
                 <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 class="p-3">
+                  <h3 class="font-medium mb-2">{{ goodsInfo.name }}</h3>
+                  <div class="text-[#e74c3c]">¥{{ goodsInfo.price }}</div>
+                </div>
               </div>
             </div>
 
@@ -194,7 +207,7 @@
         <!-- 订单列表组件 end-->
 
         <!-- 会员列表组件 start-->
-        <memberList v-if="activeMenu == 'member'"></memberList> 
+        <memberList v-if="activeMenu == 'member'"></memberList>
         <!-- 会员列表组件 end-->
 
         <!-- 卡券核销组件 start-->
@@ -382,9 +395,9 @@ export default {
       goodsForm: {},
       // 左侧菜单
       menuList: [
-        { name: '收银主页', key: 'cashier', logo: require('../../assets/images/cashier.png') },
-        { name: '订单管理', key: 'order', logo: require('../../assets/images/order.png') },
-        { name: '退出', key: 'exit', logo: require('../../assets/images/order.png') },
+        { name: '收银主页', key: 'cashier', logo: require('../../assets/images/menu-cooker1.png') },
+        { name: '订单管理', key: 'order', logo: require('../../assets/images/menu-cooker2.png') },
+        { name: '退出', key: 'exit', logo: require('../../assets/images/menu-cooker3.png') },
         //  { name: '会员管理', key: 'member', logo: require('../../assets/images/hot.png') },
         //  { name: '卡券核销', key: 'coupon', logo: require('../../assets/images/life.png') }
       ],
@@ -1092,8 +1105,8 @@ export default {
       }
       .account {
         font-size: 12px;
-        border: solid 2px #ffffff;
-        background: #6c757d;
+        // border: solid 2px #ffffff;
+        // background: #6c757d;
         cursor: pointer;
         margin-top: 6px;
         padding: 2px;
@@ -1120,25 +1133,35 @@ export default {
             padding: 0.5356875rem 0.9375rem;
             white-space: nowrap;
             text-align: center;
-            font-weight: 600;
-            color: #666666;
+            font-weight: 400;
+            color: #333;
             display: flex;
             align-items: center;
             flex-direction: column;
             justify-content: center;
             border-radius: 5px;
             transition: color 0.2s linear;
-            background: #f5f5f5;
             border: 2px solid #ffffff;
-            .cate-logo {
-              display: block;
-              width: 50px;
-              height: 50px;
+            .cate-logo-div {
+              width: 60px;
+              height: 60px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              border-radius: 10px;
+              .cate-logo {
+                display: block;
+                width: 50px;
+                height: 50px;
+              }
             }
           }
           .active {
             font-weight: bold;
-            border: 4px #ff5b57 solid;
+
+            .cate-logo-div {
+              background-color: #f67f20;
+            }
           }
         }
       }
@@ -1158,29 +1181,28 @@ export default {
     .title {
       height: 70px;
       width: 310px;
-      // background: #6c757d;
       border-bottom: #cccccc 1px solid;
-      // color: #ffffff;
       padding-top: 16px;
       padding-left: 1px;
-      display: block;
+      display: flex;
+      align-items: center;
       position: fixed;
       top: 45px;
       z-index: 999;
       clear: both;
-      .logo {
-        float: left;
-        font-size: 24px;
-        .avatar {
-          width: 30px;
-          height: 30px;
-          border-radius: 40px;
-          margin: 5px 0px 5px 5px;
-        }
+
+      .avatar {
+        display: inline-block;
+        width: 30px;
+        height: 30px;
+        border-radius: 50%;
+        margin: 5px 0px 5px 5px;
+        overflow: hidden;
       }
+
       .member-info {
-        float: left;
-        margin-top: 5px;
+        display: inline-block;
+        margin-left: 5px;
         .name {
           margin-left: 2px;
           margin-right: 3px;
@@ -1289,11 +1311,11 @@ export default {
       z-index: 999;
       bottom: 0;
       height: 120px;
-      width: 100%;
       padding-top: 5px;
       padding-right: 15px;
       display: block;
       width: 310px;
+      margin-bottom: 10px;
       .number {
         float: right;
         margin: 5px;
@@ -1310,14 +1332,17 @@ export default {
         text-align: center;
         cursor: pointer;
         float: right;
-        color: #ffffff;
+        color: white;
+        // box-sizing: border-box;
+        // padding-bottom: 20px;
         .cash {
           float: left;
           height: 50px;
-          // border: solid 1px #113a28;
+          border: solid 1px #f67f20;
           padding-top: 15px;
           width: 135px;
           border-radius: 5px;
+          color: #f67f20;
           // background: #113a28;
           font-weight: bold;
         }