feat: 1.点餐流程修改样式

build/builder-debug.yml

@@ -8,7 +8,7 @@ x64:
     - '!**/*.{iml,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,suo,xproj,cc,d.ts,mk,a,o,forge-meta,pdb}'
     - '!**/._*'
     - '!**/electron-builder.{yaml,yml,json,json5,toml,ts}'
-    - '!**/{.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,.DS_Store,thumbs.db,.gitignore,.gitkeep,.gitattributes,.npmignore,.idea,.vs,.flowconfig,.jshintrc,.eslintrc,.circleci,.yarn-integrity,.yarn-metadata.json,yarn-error.log,yarn.lock,package-lock.json,npm-debug.log,appveyor.yml,.travis.yml,circle.yml,.nyc_output,.husky,.github,electron-builder.env}'
+    - '!**/{.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,.DS_Store,thumbs.db,.gitignore,.gitkeep,.gitattributes,.npmignore,.idea,.vs,.flowconfig,.jshintrc,.eslintrc,.circleci,.yarn-integrity,.yarn-metadata.json,yarn-error.log,yarn.lock,package-lock.json,npm-debug.log,appveyor.yml,.travis.yml,circle.yml,.nyc_output,.husky,.github}'
     - '!.yarn{,/**/*}'
     - '!.editorconfig'
     - '!.yarnrc.yml'
@@ -17,8 +17,8 @@ x64:
     - dist/electron/**/*
 nsis:
   script: |-
-    !include "C:\Code\fuint\fuint-cashier\node_modules\app-builder-lib\templates\nsis\include\StdUtils.nsh"
-    !addincludedir "C:\Code\fuint\fuint-cashier\node_modules\app-builder-lib\templates\nsis\include"
+    !include "C:\A beijing\formal\pc\store-v1\node_modules\app-builder-lib\templates\nsis\include\StdUtils.nsh"
+    !addincludedir "C:\A beijing\formal\pc\store-v1\node_modules\app-builder-lib\templates\nsis\include"
     !macro _isUpdated _a _b _t _f
       ${StdUtils.TestParameter} $R9 "updated"
       StrCmp "$R9" "true" `${_t}` `${_f}`
@@ -90,8 +90,8 @@ nsis:
       !insertmacro MUI_LANGUAGE "Vietnamese"
     !macroend
 
-    !addplugindir /x86-unicode "C:\Users\zach\AppData\Local\electron-builder\Cache\nsis\nsis-resources-3.4.1\plugins\x86-unicode"
-    !include "C:\Users\zach\AppData\Local\Temp\t-idwXjr\0-messages.nsh"
+    !include "C:\Users\28162\AppData\Local\Temp\t-KFFj2U\0-messages.nsh"
+    !addplugindir /x86-unicode "C:\Users\28162\AppData\Local\electron-builder\Cache\nsis\nsis-resources-3.4.1\plugins\x86-unicode"
 
     Var newStartMenuLink
     Var oldStartMenuLink

build/latest.yml

@@ -1,8 +1,8 @@
 version: 1.0.0
 files:
   - url: fuint收银系统 Setup 1.0.0.exe
-    sha512: /5Jf84ozx4NWmYJ0ifp4QCXTCXoDCuxT4ECBKBlyysiJgqbb8KZ1z4ShFeQ8W6zYCKzz+IPtj7MzK7fn/bnOAw==
-    size: 75309070
+    sha512: ME1irSAhybIuIELDr9OXEB1DYxrkLA8Az7LZ2KdVw96P7XAOPpXslgEmgfw4+2397ZgAmkXycU+5OwDtloQ1pg==
+    size: 75178399
 path: fuint收银系统 Setup 1.0.0.exe
-sha512: /5Jf84ozx4NWmYJ0ifp4QCXTCXoDCuxT4ECBKBlyysiJgqbb8KZ1z4ShFeQ8W6zYCKzz+IPtj7MzK7fn/bnOAw==
-releaseDate: '2024-08-09T11:04:57.235Z'
+sha512: ME1irSAhybIuIELDr9OXEB1DYxrkLA8Az7LZ2KdVw96P7XAOPpXslgEmgfw4+2397ZgAmkXycU+5OwDtloQ1pg==
+releaseDate: '2025-02-27T08:50:47.465Z'

env/.env

@@ -1,3 +1,7 @@
-API_HOST = 'https://www.fuint.cn/fuint-food/'
+# 黄雯本地
+API_HOST = 'http://192.168.1.44:8080/'
+# API_HOST = 'https://www.fuint.cn/fuint-food/'
 NODE_ENV = 'development'
-SYSTEM_NAME = 'fuint餐饮收银系统'
+SYSTEM_NAME = '盼达点餐收银系统'
+
+

src/renderer/views/cashier/index.vue

@@ -1,203 +1,325 @@
 <template>
-   <div id="app" class="app-container">
-     <el-drawer
-       :withHeader="false"
-       :visible.sync="isOpen"
-       direction="ttb"
-       size="100%"
-       :before-close="handleClose"
-       :show-close="false">
-       <div class="main">
-         <div class="top-nav">欢迎使用{{ systemName }}</div>
-         <div class="left-side">
-           <div class="logo">
-             <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>
-           </div>
-           <div class="cate">
-             <ul class="nav">
-               <li class="nav-item" v-for="menu in menuList">
-                 <a :class="'nav-link' + (activeMenu == menu.key ? ' active' : '')" href="javascript:;" @click="switchMenu(menu.key)">
-                    <img class="cate-logo" :src="menu.logo">
-                    <span>{{ menu.name }}</span>
-                 </a>
-               </li>
-             </ul>
-           </div>
-         </div>
-         <div class="cart-container" v-if="activeMenu == 'cashier'">
-           <div class="title">
-             <div class="logo">
-               <img class="avatar" v-if="!memberInfo || !memberInfo.avatar" src="@/assets/images/avatar.png" />
-               <img class="avatar" 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>
-             </div>
-           </div>
-           <div class="carts">
-             <div>
-               <div class="tab">
-                 <div class="cart-list" v-if="cartList.length > 0">
-                   <div class="cart-item" v-for="cartInfo in cartList">
-                     <img class="image" :src="cartInfo.logo"/>
-                     <div class="info">
-                       <div class="name">{{ cartInfo.name }}</div>
-                       <div class="spec" v-if="cartInfo.specList && cartInfo.specList.length > 0">
-                         <span class="item" v-for="spec in cartInfo.specList" :title="spec.value">{{ spec.value }}</span>
-                       </div>
-                       <div class="num"><el-input-number class="input" @change="changeBuyNum(cartInfo)" v-model="cartInfo.buyNum" :min="1" :max="1000"/></div>
-                     </div>
-                     <div class="option">
-                       <div class="remove el-icon-delete" @click="removeFromCart(cartInfo.cartId)"></div>
-                       <div class="total">￥{{ (cartInfo.price * cartInfo.buyNum).toFixed(2) }}</div>
-                     </div>
-                   </div>
-                 </div>
-                 <div class="empty" v-if="cartList.length < 1">
-                     <el-empty description="暂无结算商品" :image-size="40"></el-empty>
-                 </div>
-               </div>
-             </div>
-           </div>
-           <div class="footer">
-             <div class="number">
-               <div class="total-num">总件数：<b class="num">{{ cartTotalNum }}</b></div>
-               <div class="total-price">总金额：<b class="num">￥{{ cartTotalPrice ? cartTotalPrice.toFixed(2) : '0.00' }}</b></div>
-             </div>
-             <div class="options">
-               <div class="cash" @click="hangUp()">挂单 / 取单</div>
-               <div class="submit" v-if="cartTotalNum > 0" @click="doSettlement()">提交结算</div>
-               <div class="submit" v-if="cartTotalNum == 0" @click="doCashier()">无商品收款</div>
-             </div>
-           </div>
-         </div>
-         <div class="main-list" v-if="activeMenu == 'cashier'">
-            <div class="title">
-              <el-form class="search-form" ref="searchForm" :inline="true" :model="searchForm">
-                <el-form-item class="form-item" label="" prop="keyword">
-                  <el-input v-model="searchForm.keyword" prefix-icon="el-icon-full-screen" @keyup.enter.native="doQueryGoods" class="input-item" placeholder="请输入商品关键字：商品名称、条码、商品ID..." clearable maxlength="100" />
-                </el-form-item>
-                <el-button class="search-goods" @click="doQueryGoods()" icon="el-icon-search">查询商品</el-button>
-              </el-form>
-              <el-tabs class="tab-box" type="card" v-model="navTab" @tab-click="switchTab">
-                <el-tab-pane label="全部" name="0"></el-tab-pane>
-                <el-tab-pane v-for="tab in tabList" :label="tab.name" :key="tab.id+''" :name="tab.id+''"></el-tab-pane>
-              </el-tabs>
+  <div id="app" class="app-container">
+    <el-drawer
+      :withHeader="false"
+      :visible.sync="isOpen"
+      direction="ttb"
+      size="100%"
+      :before-close="handleClose"
+      :show-close="false"
+    >
+      <div class="main">
+        <div class="top-nav">欢迎使用{{ systemName }}</div>
+        <div class="left-side">
+          <div class="logo">
+            <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>
+          </div>
+          <div class="cate">
+            <ul class="nav">
+              <li class="nav-item" v-for="menu in menuList">
+                <a
+                  :class="'nav-link' + (activeMenu == menu.key ? ' active' : '')"
+                  href="javascript:;"
+                  @click="switchMenu(menu.key)"
+                >
+                  <img class="cate-logo" :src="menu.logo" />
+                  <span>{{ menu.name }}</span>
+                </a>
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div class="cart-container" v-if="activeMenu == 'cashier'">
+          <div class="title">
+            <div class="logo">
+              <img
+                class="avatar"
+                v-if="!memberInfo || !memberInfo.avatar"
+                src="@/assets/images/avatar.png"
+              />
+              <img class="avatar" 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>
             </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="goods-name">{{ goodsInfo.name }}</div>
-                    <div class="goods-price">￥{{ goodsInfo.price }}</div>
+          </div>
+          <div class="carts">
+            <div>
+              <div class="tab">
+                <div class="cart-list" v-if="cartList.length > 0">
+                  <div class="cart-item" v-for="cartInfo in cartList">
+                    <img class="image" :src="cartInfo.logo" />
+                    <div class="info">
+                      <div class="name">{{ cartInfo.name }}</div>
+                      <div class="spec" v-if="cartInfo.specList && cartInfo.specList.length > 0">
+                        <span class="item" v-for="spec in cartInfo.specList" :title="spec.value">
+                          {{ spec.value }}
+                        </span>
+                      </div>
+                      <div class="num">
+                        <el-input-number
+                          class="input"
+                          @change="changeBuyNum(cartInfo)"
+                          v-model="cartInfo.buyNum"
+                          :min="1"
+                          :max="1000"
+                        />
+                      </div>
+                    </div>
+                    <div class="option">
+                      <div
+                        class="remove el-icon-delete"
+                        @click="removeFromCart(cartInfo.cartId)"
+                      ></div>
+                      <div class="total">￥{{ (cartInfo.price * cartInfo.buyNum).toFixed(2) }}</div>
+                    </div>
                   </div>
+                </div>
+                <div class="empty" v-if="cartList.length < 1">
+                  <el-empty description="暂无结算商品" :image-size="40"></el-empty>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="footer">
+            <div class="number">
+              <div class="total-num">
+                总件数：
+                <b class="num">{{ cartTotalNum }}</b>
               </div>
+              <div class="total-price">
+                总金额：
+                <b class="num">￥{{ cartTotalPrice ? cartTotalPrice.toFixed(2) : '0.00' }}</b>
+              </div>
+            </div>
+            <div class="options">
+              <div class="cash" @click="hangUp()">挂单 / 取单</div>
+              <div class="submit" v-if="cartTotalNum > 0" @click="doSettlement()">提交结算</div>
+              <div class="submit" v-if="cartTotalNum == 0" @click="doCashier()">无商品收款</div>
+            </div>
+          </div>
+        </div>
+        <div class="main-list" v-if="activeMenu == 'cashier'">
+          <div class="title">
+            <el-form class="search-form" ref="searchForm" :inline="true" :model="searchForm">
+              <el-form-item class="form-item" label="" prop="keyword">
+                <el-input
+                  v-model="searchForm.keyword"
+                  prefix-icon="el-icon-full-screen"
+                  @keyup.enter.native="doQueryGoods"
+                  class="input-item"
+                  placeholder="请输入商品关键字：商品名称、条码、商品ID..."
+                  clearable
+                  maxlength="100"
+                />
+              </el-form-item>
+              <el-button class="search-goods" @click="doQueryGoods()" icon="el-icon-search">
+                查询商品
+              </el-button>
+            </el-form>
+            <el-tabs class="tab-box" type="card" v-model="navTab" @tab-click="switchTab">
+              <el-tab-pane label="全部" name="0"></el-tab-pane>
+              <el-tab-pane
+                v-for="tab in tabList"
+                :label="tab.name"
+                :key="tab.id + ''"
+                :name="tab.id + ''"
+              ></el-tab-pane>
+            </el-tabs>
+          </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="goods-name">{{ goodsInfo.name }}</div>
+                <div class="goods-price">￥{{ goodsInfo.price }}</div>
+              </div>
+            </div>
 
-              <pagination
-                  v-show="totalGoods > 0"
-                  :total="totalGoods"
-                  class="pagination"
-                  :page.sync="page"
-                  :limit.sync="pageSize"
-                  @pagination="initCashier"
-              />
+            <pagination
+              v-show="totalGoods > 0"
+              :total="totalGoods"
+              class="pagination"
+              :page.sync="page"
+              :limit.sync="pageSize"
+              @pagination="initCashier"
+            />
 
-              <el-empty v-if="goodsList.length == 0" description="暂无商品..."></el-empty>
-            </div>
-         </div>
+            <el-empty v-if="goodsList.length == 0" description="暂无商品..."></el-empty>
+          </div>
+        </div>
 
-         <!-- 订单列表组件 start-->
-         <orderList v-if="activeMenu == 'order'" @doPayOrder="doPayOrder"></orderList>
-         <!-- 订单列表组件 end-->
+        <!-- 订单列表组件 start-->
+        <orderList v-if="activeMenu == 'order'" @doPayOrder="doPayOrder"></orderList>
+        <!-- 订单列表组件 end-->
 
-         <!-- 会员列表组件 start-->
-         <memberList v-if="activeMenu == 'member'"></memberList>
-         <!-- 会员列表组件 end-->
+        <!-- 会员列表组件 start-->
+        <memberList v-if="activeMenu == 'member'"></memberList>
+        <!-- 会员列表组件 end-->
 
-         <!-- 卡券核销组件 start-->
-         <couponConfirm v-if="activeMenu == 'coupon'"></couponConfirm>
-         <!-- 卡券核销组件 end-->
-       </div>
-     </el-drawer>
+        <!-- 卡券核销组件 start-->
+        <couponConfirm v-if="activeMenu == 'coupon'"></couponConfirm>
+        <!-- 卡券核销组件 end-->
+      </div>
+    </el-drawer>
 
-     <!-- 规格详情 start-->
-     <el-dialog title="选择商品规格" :visible.sync="openGoodsDialog" class="common-dialog" append-to-body>
-       <div class="goods-info">
-         <div class="name">{{ goodsInfo.name }}</div>
-         <div class="price">￥{{ goodsInfo.price }}</div>
-         <div class="num"><el-input-number class="input" v-model="goodsNum" :min="1" :max="1000"/></div>
-         <div class="spec-list" v-if="goodsInfo.isSingleSpec == 'N'">
-             <div class="spec-item" v-for="specInfo in goodsInfo.specList">
-                <div class="spec-name">{{ specInfo.name }}</div>
-                <div class="values">
-                  <span v-for="value in specInfo.child" :class="goodsSpecIds.includes(value.id) ? 'value active' : 'value'" @click="selectGoodsSpec(value.id)">{{ value.name }}</span>
-                </div>
-             </div>
-         </div>
-       </div>
-       <div slot="footer" class="dialog-footer">
-         <el-button type="primary" class="main-button" @click="addToCart()">加入结算</el-button>
-         <el-button @click="closeGoodsDialog()">取 消</el-button>
-       </div>
-     </el-dialog>
-     <!-- 规格详情 end-->
+    <!-- 规格详情 start-->
+    <el-dialog
+      title="选择商品规格"
+      :visible.sync="openGoodsDialog"
+      class="common-dialog"
+      append-to-body
+    >
+      <div class="goods-info">
+        <div class="name">{{ goodsInfo.name }}</div>
+        <div class="price">￥{{ goodsInfo.price }}</div>
+        <div class="num">
+          <el-input-number class="input" v-model="goodsNum" :min="1" :max="1000" />
+        </div>
+        <div class="spec-list" v-if="goodsInfo.isSingleSpec == 'N'">
+          <div class="spec-item" v-for="specInfo in goodsInfo.specList">
+            <div class="spec-name">{{ specInfo.name }}</div>
+            <div class="values">
+              <span
+                v-for="value in specInfo.child"
+                :class="goodsSpecIds.includes(value.id) ? 'value active' : 'value'"
+                @click="selectGoodsSpec(value.id)"
+              >
+                {{ value.name }}
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" class="main-button" @click="addToCart()">加入结算</el-button>
+        <el-button @click="closeGoodsDialog()">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 规格详情 end-->
 
-     <!--关联会员对话框 start-->
-     <switchMemberDialog :show-dialog="openSwitchMemberDialog" @doSwitchMember="doSwitchMember"/>
-     <!--关联会员对话框 end-->
+    <!--关联会员对话框 start-->
+    <switchMemberDialog :show-dialog="openSwitchMemberDialog" @doSwitchMember="doSwitchMember" />
+    <!--关联会员对话框 end-->
 
-     <!--关联员工对话框 start-->
-     <bindStaffDialog :show-dialog="openBindStaffDialog" @doBindStaff="doBindStaff" @closeDialog="closeDialog"/>
-     <!--关联员工对话框 end-->
+    <!--关联员工对话框 start-->
+    <bindStaffDialog
+      :show-dialog="openBindStaffDialog"
+      @doBindStaff="doBindStaff"
+      @closeDialog="closeDialog"
+    />
+    <!--关联员工对话框 end-->
 
-     <!--结算对话框 start-->
-     <settlementDialog :show-dialog="openSettlementDialog" :memberInfo="memberInfo" :staffInfo="staffInfo" :totalPrice="cartTotalPrice" :remarks="cartRemark" :orderInfo="orderInfo" :couponList="couponList" @submit="submitSettlement" @switchMember="switchMember" @bindStaff="bindStaff" @closeDialog="closeDialog"/>
-     <!--结算对话框 end-->
+    <!--结算对话框 start-->
+    <settlementDialog
+      :show-dialog="openSettlementDialog"
+      :memberInfo="memberInfo"
+      :staffInfo="staffInfo"
+      :totalPrice="cartTotalPrice"
+      :remarks="cartRemark"
+      :orderInfo="orderInfo"
+      :couponList="couponList"
+      @submit="submitSettlement"
+      @switchMember="switchMember"
+      @bindStaff="bindStaff"
+      @closeDialog="closeDialog"
+    />
+    <!--结算对话框 end-->
 
-     <!--扫码付款对话框 start-->
-     <scanPayCodeDialog ref="scanPayCodeDialog" :show-dialog="openScanPayCodeDialog" :memberInfo="memberInfo" :orderId="orderId" :payType="payType" :payAmount="payAmount" @closeDialog="closeDialog" @showPayResult="showPayResult"/>
-     <!--扫码付款对话框 end-->
+    <!--扫码付款对话框 start-->
+    <scanPayCodeDialog
+      ref="scanPayCodeDialog"
+      :show-dialog="openScanPayCodeDialog"
+      :memberInfo="memberInfo"
+      :orderId="orderId"
+      :payType="payType"
+      :payAmount="payAmount"
+      @closeDialog="closeDialog"
+      @showPayResult="showPayResult"
+    />
+    <!--扫码付款对话框 end-->
 
-     <!--支付结果对话框 start-->
-     <payResultDialog :show-dialog="openPayResultDialog" :payResult="payResult" @showOrderPrint="showOrderPrint" @closeDialog="closeDialog"/>
-     <!--支付结果对话框 end-->
+    <!--支付结果对话框 start-->
+    <payResultDialog
+      :show-dialog="openPayResultDialog"
+      :payResult="payResult"
+      @showOrderPrint="showOrderPrint"
+      @closeDialog="closeDialog"
+    />
+    <!--支付结果对话框 end-->
 
-     <!--打印订单对话框 start-->
-     <orderPrintDialog :show-dialog="openOrderPrintDialog" :storeInfo="storeInfo" :orderInfo="orderInfo" @closeDialog="closeDialog"/>
-     <!--打印订单对话框 end-->
+    <!--打印订单对话框 start-->
+    <orderPrintDialog
+      :show-dialog="openOrderPrintDialog"
+      :storeInfo="storeInfo"
+      :orderInfo="orderInfo"
+      @closeDialog="closeDialog"
+    />
+    <!--打印订单对话框 end-->
 
-     <!--挂单对话框 start-->
-     <hangUpDialog :show-dialog="openHangUpDialog" :memberInfo="memberInfo" :cartList="cartList" @getHangNo="getHangNo" @doHangUp="doHangUp" @closeDialog="closeDialog"/>
-     <!--挂单对话框 end-->
+    <!--挂单对话框 start-->
+    <hangUpDialog
+      :show-dialog="openHangUpDialog"
+      :memberInfo="memberInfo"
+      :cartList="cartList"
+      @getHangNo="getHangNo"
+      @doHangUp="doHangUp"
+      @closeDialog="closeDialog"
+    />
+    <!--挂单对话框 end-->
 
-     <!-- 无商品收款组件 start-->
-     <noGoodsCashier :show-dialog="openNoGoodsCashierDialog" @submit="submitCashier" @closeDialog="closeDialog"></noGoodsCashier>
-     <!-- 无商品收款组件 end-->
-   </div>
+    <!-- 无商品收款组件 start-->
+    <noGoodsCashier
+      :show-dialog="openNoGoodsCashierDialog"
+      @submit="submitCashier"
+      @closeDialog="closeDialog"
+    ></noGoodsCashier>
+    <!-- 无商品收款组件 end-->
+  </div>
 </template>
 
 <script>
-import { init, getGoodsInfo, searchGoods, getCartList, saveCart, removeFromCart, submitSettlement, doPay, getMemberInfoById } from "@/api/cashier";
-import { getOrderInfo } from "@/api/order";
-import { getUserId, setUserId, removeUserId } from '@/utils/auth';
-import switchMemberDialog from "./components/switchMemberDialog";
-import settlementDialog from "./components/settlementDialog";
-import scanPayCodeDialog from "./components/scanPayCodeDialog";
-import payResultDialog from "./components/payResultDialog";
-import orderPrintDialog from "./components/orderPrintDialog";
-import hangUpDialog from "./components/hangUpDialog";
-import orderList from "./components/orderList";
-import memberList from "./components/memberList";
-import couponConfirm from "./components/couponConfirm";
-import noGoodsCashier from "./components/noGoodsCashier";
-import bindStaffDialog from "./components/bindStaffDialog";
+import {
+  init,
+  getGoodsInfo,
+  searchGoods,
+  getCartList,
+  saveCart,
+  removeFromCart,
+  submitSettlement,
+  doPay,
+  getMemberInfoById
+} from '@/api/cashier'
+import { getOrderInfo } from '@/api/order'
+import { getUserId, setUserId, removeUserId } from '@/utils/auth'
+import switchMemberDialog from './components/switchMemberDialog'
+import settlementDialog from './components/settlementDialog'
+import scanPayCodeDialog from './components/scanPayCodeDialog'
+import payResultDialog from './components/payResultDialog'
+import orderPrintDialog from './components/orderPrintDialog'
+import hangUpDialog from './components/hangUpDialog'
+import orderList from './components/orderList'
+import memberList from './components/memberList'
+import couponConfirm from './components/couponConfirm'
+import noGoodsCashier from './components/noGoodsCashier'
+import bindStaffDialog from './components/bindStaffDialog'
 export default {
-  name: "Cashier",
+  name: 'Cashier',
   components: {
     switchMemberDialog,
     settlementDialog,
@@ -234,10 +356,13 @@ export default {
       payResult: { isSuccess: false, payAmount: 0, orderId: 0 },
       goodsForm: {},
       // 左侧菜单
-      menuList: [{ name: '收银主页', key: 'cashier', logo: require('../../assets/images/cashier.png') },
-                 { name: '订单管理', key: 'order', logo: require('../../assets/images/order.png') },
-                 { name: '会员管理', key: 'member', logo: require('../../assets/images/hot.png') },
-                 { name: '卡券核销', key: 'coupon', logo: require('../../assets/images/life.png') }],
+      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: 'member', logo: require('../../assets/images/hot.png') },
+        //  { name: '卡券核销', key: 'coupon', logo: require('../../assets/images/life.png') }
+      ],
       // 激活菜单
       activeMenu: 'cashier',
       // 导航栏tab
@@ -251,7 +376,7 @@ export default {
       // 当前门店信息
       storeInfo: {},
       // 当前操作商品
-      goodsInfo: { num : 1, specList : [], skuList: [] },
+      goodsInfo: { num: 1, specList: [], skuList: [] },
       // 当前选择属性
       goodsSpecIds: [],
       // 商品数量
@@ -287,983 +412,1036 @@ export default {
       // 挂单序号
       hangNo: '',
       isSearch: false
-    };
+    }
   },
   mounted() {
-    const app = this;
+    const app = this
     // 监听扫码枪按键
-    let code = '';
-    let lastTime, nextTime; // 上次时间、最新时间
-    let lastCode, nextCode; // 上次按键、最新按键
+    let code = ''
+    let lastTime, nextTime // 上次时间、最新时间
+    let lastCode, nextCode // 上次按键、最新按键
     document.onkeypress = (e) => {
       // 获取按键
-      if (window.event) { // IE
-          nextCode = e.keyCode;
-      } else if (e.which) { // Netscape/Firefox/Opera
-          nextCode = e.which;
+      if (window.event) {
+        // IE
+        nextCode = e.keyCode
+      } else if (e.which) {
+        // Netscape/Firefox/Opera
+        nextCode = e.which
       }
       // 如果触发了回车事件(扫码结束时间)
       if (nextCode === 13) {
-          if (code.length < 3) {
-              return;
-          }
-          if (app.openScanPayCodeDialog == true) {
-              app.$refs.scanPayCodeDialog.submit(code);
-              return false;
-          }
-          if (app.openSwitchMemberDialog == true) {
-              return false;
-          }
-          if (app.openSettlementDialog == true) {
-              app.$alert("请点击确定收款！");
-              return false;
-          }
-          if (app.activeMenu == 'cashier') {
-              app.addToCart(code);
-          }
-          code = '';
-          lastCode = '';
-          lastTime = '';
-          return true;
+        if (code.length < 3) {
+          return
+        }
+        if (app.openScanPayCodeDialog == true) {
+          app.$refs.scanPayCodeDialog.submit(code)
+          return false
+        }
+        if (app.openSwitchMemberDialog == true) {
+          return false
+        }
+        if (app.openSettlementDialog == true) {
+          app.$alert('请点击确定收款！')
+          return false
+        }
+        if (app.activeMenu == 'cashier') {
+          app.addToCart(code)
+        }
+        code = ''
+        lastCode = ''
+        lastTime = ''
+        return true
       }
-      nextTime = new Date().getTime(); // 记录最新时间
-      if (!lastTime && !lastCode) { // 如果上次时间和上次按键为空
-          code += e.key; // 执行叠加操作
+      nextTime = new Date().getTime() // 记录最新时间
+      if (!lastTime && !lastCode) {
+        // 如果上次时间和上次按键为空
+        code += e.key // 执行叠加操作
       }
       // 如果有上次时间及上次按键
       if (lastCode && lastTime && nextTime - lastTime > 30) {
-          code = e.key;
+        code = e.key
       } else if (lastCode && lastTime) {
-          code += e.key;
+        code += e.key
       }
-      lastCode = nextCode;
-      lastTime = nextTime;
-      return true;
+      lastCode = nextCode
+      lastTime = nextTime
+      return true
     }
   },
   created() {
-    this.initCashier();
-    this.getCartList();
+    this.initCashier()
+    this.getCartList()
   },
   methods: {
     // 初始化数据
     initCashier() {
-      const app = this;
-      const userId = getUserId() > 0 ? getUserId() : 0;
-      init(userId, app.cateId, app.page, app.pageSize).then( response => {
-          app.cateList = response.data.cateList;
-          app.tabList = response.data.cateList;
-          app.goodsList = response.data.goodsList;
-          app.imagePath = response.data.imagePath;
-          app.storeInfo = response.data.storeInfo;
-          app.accountInfo = response.data.accountInfo;
-          app.memberInfo = response.data.memberInfo;
-          app.totalGoods = response.data.totalGoods;
-          app.loading = false;
-          app.hangNo = '';
-          app.staffInfo = null;
-        }
-      ).catch((err) => {
-          app.loading = false;
-          console.log(err.toString());
-      });
+      const app = this
+      const userId = getUserId() > 0 ? getUserId() : 0
+      init(userId, app.cateId, app.page, app.pageSize)
+        .then((response) => {
+          app.cateList = response.data.cateList
+          app.tabList = response.data.cateList
+          app.goodsList = response.data.goodsList
+          app.imagePath = response.data.imagePath
+          app.storeInfo = response.data.storeInfo
+          app.accountInfo = response.data.accountInfo
+          app.memberInfo = response.data.memberInfo
+          app.totalGoods = response.data.totalGoods
+          app.loading = false
+          app.hangNo = ''
+          app.staffInfo = null
+        })
+        .catch((err) => {
+          app.loading = false
+          console.log(err.toString())
+        })
     },
     // 菜单切换
     switchMenu(menuKey) {
-      this.activeMenu = menuKey;
-      return menuKey;
+      this.activeMenu = menuKey
+      return menuKey
     },
     // tab切换
     switchTab(el) {
-      this.navTab = el.name;
-      this.filterCate(this.navTab);
+      this.navTab = el.name
+      this.filterCate(this.navTab)
     },
     // 过滤分类商品
     filterCate(cateId) {
-       this.cateId = cateId;
-       this.initCashier();
+      this.cateId = cateId
+      this.initCashier()
     },
     // 购物车列表
     getCartList(cartIds) {
-      const app = this;
+      const app = this
       if (app.loading) {
-          return false;
+        return false
       }
-      app.loading = true;
-      app.cartList = [];
-      const switchCartIds = cartIds ? cartIds.join(",") : "";
-      getCartList({ userId: getUserId(), hangNo: app.hangNo, cartIds: switchCartIds }).then( response => {
-           const cartList = response.data.list;
-           if (cartList && cartList.length > 0) {
-               cartList.forEach(function(item) {
-                  const specList = [];
-                  if (item.specList && item.specList.length > 0) {
-                      item.specList.forEach(function (spec) {
-                        specList.push({name: spec.specName, value: spec.specValue});
-                      })
-                  }
-                  const cartInfo = { cartId: item.id, skuId: item.skuId, goodsId: item.goodsInfo.id, name: item.goodsInfo.name, logo: item.goodsInfo.logo, price: item.goodsInfo.price, buyNum: item.num, specList: specList };
-                  app.cartList.push(cartInfo);
-               })
-           }
-           app.cartTotalPrice = response.data.payPrice;
-           app.cartTotalNum = response.data.totalNum;
-           app.couponList = response.data.couponList;
-           app.loading = false;
-      }).catch((err) => {
-           app.loading = false;
-           console.log(err.toString());
-      });
+      app.loading = true
+      app.cartList = []
+      const switchCartIds = cartIds ? cartIds.join(',') : ''
+      getCartList({ userId: getUserId(), hangNo: app.hangNo, cartIds: switchCartIds })
+        .then((response) => {
+          const cartList = response.data.list
+          if (cartList && cartList.length > 0) {
+            cartList.forEach(function (item) {
+              const specList = []
+              if (item.specList && item.specList.length > 0) {
+                item.specList.forEach(function (spec) {
+                  specList.push({ name: spec.specName, value: spec.specValue })
+                })
+              }
+              const cartInfo = {
+                cartId: item.id,
+                skuId: item.skuId,
+                goodsId: item.goodsInfo.id,
+                name: item.goodsInfo.name,
+                logo: item.goodsInfo.logo,
+                price: item.goodsInfo.price,
+                buyNum: item.num,
+                specList: specList
+              }
+              app.cartList.push(cartInfo)
+            })
+          }
+          app.cartTotalPrice = response.data.payPrice
+          app.cartTotalNum = response.data.totalNum
+          app.couponList = response.data.couponList
+          app.loading = false
+        })
+        .catch((err) => {
+          app.loading = false
+          console.log(err.toString())
+        })
     },
     // 查询商品
     doQueryGoods() {
-      const app = this;
+      const app = this
       if (!app.searchForm.keyword) {
-          app.initCashier();
-          return false;
+        app.initCashier()
+        return false
       }
-      app.loading = true;
-      searchGoods({ keyword: app.searchForm.keyword }).then( response => {
-         app.loading = false;
-         if (response.data && response.data.length > 0) {
-             app.goodsList = response.data;
-         } else {
-             app.$alert("抱歉，未查询到商品信息！");
-             return false;
-         }
-      }).catch((err) => {
-          app.loading = false;
-          console.log(err.toString());
-      });
+      app.loading = true
+      searchGoods({ keyword: app.searchForm.keyword })
+        .then((response) => {
+          app.loading = false
+          if (response.data && response.data.length > 0) {
+            app.goodsList = response.data
+          } else {
+            app.$alert('抱歉，未查询到商品信息！')
+            return false
+          }
+        })
+        .catch((err) => {
+          app.loading = false
+          console.log(err.toString())
+        })
     },
     // 点击商品规格弹框
     clickGoods(goodsInfo) {
-      const app = this;
+      const app = this
       if (app.loading) {
-          return false;
+        return false
       }
-      app.loading = true;
-      getGoodsInfo(goodsInfo.id).then( response => {
-          app.goodsInfo = response.data.goodsInfo;
-          app.goodsInfo.specList = response.data.specList;
-          app.goodsInfo.skuList = response.data.skuList;
-          app.goodsNum = 1;
-          app.loading = false;
+      app.loading = true
+      getGoodsInfo(goodsInfo.id)
+        .then((response) => {
+          app.goodsInfo = response.data.goodsInfo
+          app.goodsInfo.specList = response.data.specList
+          app.goodsInfo.skuList = response.data.skuList
+          app.goodsNum = 1
+          app.loading = false
           if (app.goodsInfo.isSingleSpec == 'N') {
-              app.openGoodsDialog = true;
+            app.openGoodsDialog = true
           } else {
-              app.addToCart(false);
+            app.addToCart(false)
           }
-      }).catch((err) => {
-          app.loading = false;
-          console.log(err.toString());
-      });
+        })
+        .catch((err) => {
+          app.loading = false
+          console.log(err.toString())
+        })
     },
     // 关闭规格弹框
     closeGoodsDialog() {
-       this.openGoodsDialog = false;
+      this.openGoodsDialog = false
     },
     // 选择商品属性
     selectGoodsSpec(specId) {
-       const app = this;
-       let specIds = [];
-       app.goodsInfo.specList.forEach(function() {
-          specIds.push(0);
-       })
-       app.goodsInfo.specList.forEach(function(specItem, index) {
-          const children = [];
-          specItem.child.forEach(function(child) {
-              children.push(child.id)
-          })
-          if (children.includes(specId)) {
-              specIds[index] = specId
-          } else {
-              specIds[index] = app.goodsSpecIds[index] == undefined ? 0 : app.goodsSpecIds[index];
-          }
-       })
-       app.goodsSpecIds = specIds;
+      const app = this
+      let specIds = []
+      app.goodsInfo.specList.forEach(function () {
+        specIds.push(0)
+      })
+      app.goodsInfo.specList.forEach(function (specItem, index) {
+        const children = []
+        specItem.child.forEach(function (child) {
+          children.push(child.id)
+        })
+        if (children.includes(specId)) {
+          specIds[index] = specId
+        } else {
+          specIds[index] = app.goodsSpecIds[index] == undefined ? 0 : app.goodsSpecIds[index]
+        }
+      })
+      app.goodsSpecIds = specIds
     },
     // 加入购物车
     addToCart(skuNo) {
-      const app = this;
-      app.isSearch = false;
+      const app = this
+      app.isSearch = false
       // 扫码枪扫描商品条码，直接加入购物车
       if (skuNo) {
-          searchGoods({ keyword: skuNo }).then( response => {
-            app.loading = false;
+        searchGoods({ keyword: skuNo })
+          .then((response) => {
+            app.loading = false
             if (response.data && response.data.length > 0) {
-                app.clickGoods(response.data[0]);
-                app.isSearch = true;
-                return false;
+              app.clickGoods(response.data[0])
+              app.isSearch = true
+              return false
             } else {
-                app.$alert("抱歉，未查询到商品信息！");
-                return false;
+              app.$alert('抱歉，未查询到商品信息！')
+              return false
             }
-          }).catch((err) => {
-              app.loading = false;
-              console.log(err.toString());
-          });
+          })
+          .catch((err) => {
+            app.loading = false
+            console.log(err.toString())
+          })
       }
       if (app.loading || app.isSearch || !app.goodsInfo.id || app.goodsNum <= 0) {
-          return false;
+        return false
       }
-      const specIds = app.goodsSpecIds.join('-');
-      let skuId = 0;
-      app.goodsInfo.skuList.forEach(function(skuInfo) {
-         if (skuInfo.specIds == specIds) {
-             skuId = skuInfo.id;
-         }
+      const specIds = app.goodsSpecIds.join('-')
+      let skuId = 0
+      app.goodsInfo.skuList.forEach(function (skuInfo) {
+        if (skuInfo.specIds == specIds) {
+          skuId = skuInfo.id
+        }
       })
       if (app.goodsInfo.isSingleSpec == 'N' && skuId <= 0) {
-          app.$alert("请先确认商品规格！");
-          return false;
+        app.$alert('请先确认商品规格！')
+        return false
       }
       // 添加到购物车
-      const cartInfo = { goodsId: app.goodsInfo.id,
-                         name: app.goodsInfo.name,
-                         logo: app.goodsInfo.logo,
-                         price: app.goodsInfo.price,
-                         skuId: skuId,
-                         userId: getUserId(),
-                         hangNo: app.hangNo,
-                         buyNum: app.goodsNum };
-      app.loading = true;
-      saveCart(cartInfo).then(response => {
-          app.loading = false;
+      const cartInfo = {
+        goodsId: app.goodsInfo.id,
+        name: app.goodsInfo.name,
+        logo: app.goodsInfo.logo,
+        price: app.goodsInfo.price,
+        skuId: skuId,
+        userId: getUserId(),
+        hangNo: app.hangNo,
+        buyNum: app.goodsNum
+      }
+      app.loading = true
+      saveCart(cartInfo)
+        .then((response) => {
+          app.loading = false
           if (response.data.cartId) {
-              app.getCartList();
-              app.openGoodsDialog = false;
-              app.goodsSpecIds = [];
-              app.goodsNum = 0;
+            app.getCartList()
+            app.openGoodsDialog = false
+            app.goodsSpecIds = []
+            app.goodsNum = 0
           }
-      }).catch((err) => {
-          app.loading = false;
-          console.log(err.toString());
-      });
+        })
+        .catch((err) => {
+          app.loading = false
+          console.log(err.toString())
+        })
     },
     // 删除购物车
     removeFromCart(cartId) {
-      const app = this;
-      removeFromCart({ cartId: [cartId], userId: getUserId() }).then(response => {
-        if (response.data) {
-            app.getCartList();
-        }
-      }).catch((err) => {
-          app.loading = false;
-          console.log(err.toString());
-      });
+      const app = this
+      removeFromCart({ cartId: [cartId], userId: getUserId() })
+        .then((response) => {
+          if (response.data) {
+            app.getCartList()
+          }
+        })
+        .catch((err) => {
+          app.loading = false
+          console.log(err.toString())
+        })
     },
     // 购物车数量变化
     changeBuyNum(cartInfo) {
-      const app = this;
-      const param = { goodsId: cartInfo.goodsId,
-                      skuId: cartInfo.skuId,
-                      cartId: cartInfo.cartId,
-                      action: '=',
-                      userId: app.memberInfo ? app.memberInfo.id : null,
-                      hangNo: app.hangNo,
-                      buyNum: cartInfo.buyNum };
-      app.loading = true;
-      saveCart(param).then(response => {
-        app.loading = false;
-        if (response.data.cartId) {
-            app.getCartList();
-            app.openGoodsDialog = false;
-            app.goodsSpecIds = [];
-        }
-      }).catch(() => {
-          app.loading = false;
-          app.getCartList();
-      });
+      const app = this
+      const param = {
+        goodsId: cartInfo.goodsId,
+        skuId: cartInfo.skuId,
+        cartId: cartInfo.cartId,
+        action: '=',
+        userId: app.memberInfo ? app.memberInfo.id : null,
+        hangNo: app.hangNo,
+        buyNum: cartInfo.buyNum
+      }
+      app.loading = true
+      saveCart(param)
+        .then((response) => {
+          app.loading = false
+          if (response.data.cartId) {
+            app.getCartList()
+            app.openGoodsDialog = false
+            app.goodsSpecIds = []
+          }
+        })
+        .catch(() => {
+          app.loading = false
+          app.getCartList()
+        })
     },
     // 弹出关联会员
     switchMember() {
-       this.openSwitchMemberDialog = true;
+      this.openSwitchMemberDialog = true
     },
     // 弹出关联员工
     bindStaff() {
-      this.openBindStaffDialog = true;
+      this.openBindStaffDialog = true
     },
     // 确认关联会员
     doSwitchMember(memberInfo) {
-       this.openSwitchMemberDialog = false;
-       if (memberInfo != 0) {
-           this.memberInfo = memberInfo;
-           if (memberInfo) {
-               let cartIds = [];
-               if (this.cartList && this.cartList.length > 0) {
-                   this.cartList.forEach(function(cart){
-                      cartIds.push(cart.cartId);
-                   })
-               }
-               setUserId(memberInfo.id);
-               this.getCartList(cartIds);
-           } else {
-               removeUserId();
-               this.getCartList();
-           }
-       }
+      this.openSwitchMemberDialog = false
+      if (memberInfo != 0) {
+        this.memberInfo = memberInfo
+        if (memberInfo) {
+          let cartIds = []
+          if (this.cartList && this.cartList.length > 0) {
+            this.cartList.forEach(function (cart) {
+              cartIds.push(cart.cartId)
+            })
+          }
+          setUserId(memberInfo.id)
+          this.getCartList(cartIds)
+        } else {
+          removeUserId()
+          this.getCartList()
+        }
+      }
     },
     // 确认绑定员工
     doBindStaff(staff) {
-      this.openBindStaffDialog = false;
-      this.staffInfo = staff;
+      this.openBindStaffDialog = false
+      this.staffInfo = staff
     },
     // 退出登录
     logout() {
-      this.$router.push( '/' );
+      this.$router.push('/')
     },
     // 发起结算
     doSettlement() {
-       if (this.cartList.length < 1) {
-           this.$alert("请先添加结算商品！");
-           return false;
-       }
-       this.getCartList();
-       this.orderInfo = {};
-       this.openSettlementDialog = true;
+      if (this.cartList.length < 1) {
+        this.$alert('请先添加结算商品！')
+        return false
+      }
+      this.getCartList()
+      this.orderInfo = {}
+      this.openSettlementDialog = true
     },
     // 无商品结算
     doCashier() {
-      this.orderInfo = {};
-      this.openNoGoodsCashierDialog = true;
+      this.orderInfo = {}
+      this.openNoGoodsCashierDialog = true
     },
     // 提交结算
     submitCashier(param) {
-      this.orderInfo = {};
-      this.openSettlementDialog = true;
-      this.cartTotalPrice = parseFloat(param.amount);
-      this.cartRemark = param.remark;
-      this.openNoGoodsCashierDialog = false;
+      this.orderInfo = {}
+      this.openSettlementDialog = true
+      this.cartTotalPrice = parseFloat(param.amount)
+      this.cartRemark = param.remark
+      this.openNoGoodsCashierDialog = false
     },
     // 确认结算
     submitSettlement(param) {
-      const app = this;
+      const app = this
       // 已生成的订单支付
       if (app.orderInfo.id) {
-          // 微信、支付宝支付
-          if (param.payType == 'MICROPAY' || param.payType == 'ALISCAN') {
-              app.payAmount = app.orderInfo.payAmount;
-              app.orderId = app.orderInfo.id;
-              app.openScanPayCodeDialog = true;
-              app.openSettlementDialog = false;
-              app.payType = param.payType;
-          }
-          // 现金、余额支付
-          if (param.payType == 'CASH' || param.payType == 'BALANCE') {
-              doPay({ orderId: app.orderId, payType: param.payType, cashierPayAmount: param.totalPrice, cashierDiscountAmount: param.discountPrice, userId: getUserId() }).then( response => {
-                  app.openSettlementDialog = false;
-                  if (response.data.orderInfo.payStatus == 'B') {
-                      app.showPayResult({ isSuccess: true, payAmount: response.data.orderInfo.payAmount, orderId: response.data.orderInfo.id });
-                  } else {
-                      app.$alert(response.data.message ? response.data.message : "抱歉，订单操作异常！");
-                  }
+        // 微信、支付宝支付
+        if (param.payType == 'MICROPAY' || param.payType == 'ALISCAN') {
+          app.payAmount = app.orderInfo.payAmount
+          app.orderId = app.orderInfo.id
+          app.openScanPayCodeDialog = true
+          app.openSettlementDialog = false
+          app.payType = param.payType
+        }
+        // 现金、余额支付
+        if (param.payType == 'CASH' || param.payType == 'BALANCE') {
+          doPay({
+            orderId: app.orderId,
+            payType: param.payType,
+            cashierPayAmount: param.totalPrice,
+            cashierDiscountAmount: param.discountPrice,
+            userId: getUserId()
+          }).then((response) => {
+            app.openSettlementDialog = false
+            if (response.data.orderInfo.payStatus == 'B') {
+              app.showPayResult({
+                isSuccess: true,
+                payAmount: response.data.orderInfo.payAmount,
+                orderId: response.data.orderInfo.id
               })
-          }
-          return false;
+            } else {
+              app.$alert(response.data.message ? response.data.message : '抱歉，订单操作异常！')
+            }
+          })
+        }
+        return false
       }
       // 购物车提交结算
-      let cartIds = [];
-      app.cartList.forEach(function(cart){
-          cartIds.push(cart.cartId);
+      let cartIds = []
+      app.cartList.forEach(function (cart) {
+        cartIds.push(cart.cartId)
       })
-      const data = { cashierPayAmount: param.totalPrice,
-                     cashierDiscountAmount: param.discountPrice,
-                     cartIds: cartIds.join(','),
-                     orderMode: 'oneself',
-                     payType: param.payType,
-                     remark: param.remark,
-                     type: app.cartList.length > 0 ? 'goods' : 'payment',
-                     couponId: param.userCouponId ? param.userCouponId : 0,
-                     userId: getUserId(),
-                     staffId: app.staffInfo ? app.staffInfo.id : 0 };
+      const data = {
+        cashierPayAmount: param.totalPrice,
+        cashierDiscountAmount: param.discountPrice,
+        cartIds: cartIds.join(','),
+        orderMode: 'oneself',
+        payType: param.payType,
+        remark: param.remark,
+        type: app.cartList.length > 0 ? 'goods' : 'payment',
+        couponId: param.userCouponId ? param.userCouponId : 0,
+        userId: getUserId(),
+        staffId: app.staffInfo ? app.staffInfo.id : 0
+      }
       if (app.loading) {
-          return false;
+        return false
       }
-      app.loading = true;
-      submitSettlement(data).then( response => {
-          app.loading = false;
-          app.doSwitchMember(null);
-          app.initCashier();
-          app.getCartList();
+      app.loading = true
+      submitSettlement(data)
+        .then((response) => {
+          app.loading = false
+          app.doSwitchMember(null)
+          app.initCashier()
+          app.getCartList()
           // 微信支付，弹出扫码框
           if (response.data.orderInfo.payType == 'MICROPAY' || param.payType == 'ALISCAN') {
-              app.payAmount = response.data.orderInfo.payAmount;
-              app.orderId = response.data.orderInfo.id;
-              app.openScanPayCodeDialog = true;
-              app.openSettlementDialog = false;
-              app.payType = param.payType;
-              return false;
+            app.payAmount = response.data.orderInfo.payAmount
+            app.orderId = response.data.orderInfo.id
+            app.openScanPayCodeDialog = true
+            app.openSettlementDialog = false
+            app.payType = param.payType
+            return false
           }
           // 现金、余额支付
-          if (response.data.orderInfo.payType == 'CASH' || response.data.orderInfo.payType == 'BALANCE') {
-              app.openSettlementDialog = false;
-              if (response.data.orderInfo.payStatus == 'B') {
-                  app.showPayResult({ isSuccess: true, payAmount: response.data.orderInfo.payAmount, orderId: response.data.orderInfo.id });
-              } else {
-                  app.$alert(response.data.message);
-              }
-              return false;
+          if (
+            response.data.orderInfo.payType == 'CASH' ||
+            response.data.orderInfo.payType == 'BALANCE'
+          ) {
+            app.openSettlementDialog = false
+            if (response.data.orderInfo.payStatus == 'B') {
+              app.showPayResult({
+                isSuccess: true,
+                payAmount: response.data.orderInfo.payAmount,
+                orderId: response.data.orderInfo.id
+              })
+            } else {
+              app.$alert(response.data.message)
+            }
+            return false
           }
           if (response.code == '201') {
-              app.$alert(response.data.message);
+            app.$alert(response.data.message)
           }
-          return false;
-      }).catch((err) => {
-          app.loading = false;
-          console.log(err.toString());
-      });
+          return false
+        })
+        .catch((err) => {
+          app.loading = false
+          console.log(err.toString())
+        })
     },
     // 点击挂单/取单
     hangUp() {
-       this.openHangUpDialog = true;
+      this.openHangUpDialog = true
     },
     // 取单
     getHangNo(data) {
-       this.openHangUpDialog = false;
-       this.hangNo = data.hangNo;
-       this.getCartList();
-       // 关联会员信息
-       if (data.hangNo && data.hangNo.length > 0 ) {
-           this.doSwitchMember(data.memberInfo);
-       }
+      this.openHangUpDialog = false
+      this.hangNo = data.hangNo
+      this.getCartList()
+      // 关联会员信息
+      if (data.hangNo && data.hangNo.length > 0) {
+        this.doSwitchMember(data.memberInfo)
+      }
     },
     // 执行挂单
     doHangUp() {
-      this.hangNo = '';
-      this.getCartList();
-      removeUserId();
-      this.memberInfo = null;
+      this.hangNo = ''
+      this.getCartList()
+      removeUserId()
+      this.memberInfo = null
     },
     // 关闭对话框
     closeDialog(dialog) {
-       if (dialog == 'settlementDialog') {
-           this.openSettlementDialog = false;
-       } else if (dialog == 'switchMemberDialog') {
-           this.openSwitchMemberDialog = false;
-       } else if (dialog == 'scanPayCodeDialog') {
-           this.openScanPayCodeDialog = false;
-       } else if (dialog == 'payResultDialog') {
-           this.openPayResultDialog = false;
-       } else if (dialog == 'printOrder') {
-           this.openOrderPrintDialog = false;
-       } else if (dialog == 'hangUpDialog') {
-           this.openHangUpDialog = false;
-       } else if (dialog == 'openNoGoodsCashierDialog') {
-           this.openNoGoodsCashierDialog = false;
-       } else if (dialog == 'openBindStaffDialog') {
-           this.openBindStaffDialog = false;
-       }
+      if (dialog == 'settlementDialog') {
+        this.openSettlementDialog = false
+      } else if (dialog == 'switchMemberDialog') {
+        this.openSwitchMemberDialog = false
+      } else if (dialog == 'scanPayCodeDialog') {
+        this.openScanPayCodeDialog = false
+      } else if (dialog == 'payResultDialog') {
+        this.openPayResultDialog = false
+      } else if (dialog == 'printOrder') {
+        this.openOrderPrintDialog = false
+      } else if (dialog == 'hangUpDialog') {
+        this.openHangUpDialog = false
+      } else if (dialog == 'openNoGoodsCashierDialog') {
+        this.openNoGoodsCashierDialog = false
+      } else if (dialog == 'openBindStaffDialog') {
+        this.openBindStaffDialog = false
+      }
     },
     // 展示支付结果
     showPayResult(payResult) {
-       this.payResult = payResult;
-       this.openPayResultDialog = true;
+      this.payResult = payResult
+      this.openPayResultDialog = true
     },
     // 订单支付
     doPayOrder(orderInfo) {
-       const app = this;
-       app.navTab = 0;
-       app.payAmount = orderInfo.amount;
-       app.orderId = orderInfo.id;
-       app.orderInfo = orderInfo;
-       let userId = 0
-       if (orderInfo.isVisitor !== "Y") {
-           userId = app.orderInfo.userInfo.id;
-       }
-       getMemberInfoById(userId).then(response => {
+      const app = this
+      app.navTab = 0
+      app.payAmount = orderInfo.amount
+      app.orderId = orderInfo.id
+      app.orderInfo = orderInfo
+      let userId = 0
+      if (orderInfo.isVisitor !== 'Y') {
+        userId = app.orderInfo.userInfo.id
+      }
+      getMemberInfoById(userId)
+        .then((response) => {
           if (response.data.memberInfo) {
-              app.memberInfo = response.data.memberInfo;
+            app.memberInfo = response.data.memberInfo
           } else {
-              app.memberInfo = null;
+            app.memberInfo = null
           }
-       }).catch((err) => {
-           app.loading = false;
-           console.log(err.toString());
-       });
-       app.doSwitchMember(app.memberInfo);
-       app.openSettlementDialog = true;
+        })
+        .catch((err) => {
+          app.loading = false
+          console.log(err.toString())
+        })
+      app.doSwitchMember(app.memberInfo)
+      app.openSettlementDialog = true
     },
     // 打印小票
     showOrderPrint(orderId) {
-      const app = this;
-      getOrderInfo(orderId).then(response => {
-        if (response.data.orderInfo) {
-            app.orderInfo = response.data.orderInfo;
-            app.openOrderPrintDialog = true;
-        }
-      }).catch((err) => {
-           app.loading = false;
-           console.log(err.toString());
-      });
+      const app = this
+      getOrderInfo(orderId)
+        .then((response) => {
+          if (response.data.orderInfo) {
+            app.orderInfo = response.data.orderInfo
+            app.openOrderPrintDialog = true
+          }
+        })
+        .catch((err) => {
+          app.loading = false
+          console.log(err.toString())
+        })
     },
     // 确认关闭
     handleClose() {
-      return false;
+      return false
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>
-   .main {
-     height: 100%;
-     width: 100%;
-     display: flex;
-     flex-direction: row;
-     .pagination {
-       position: fixed;
-       bottom: 10px;
-       height: 50px;
-       min-width: 750px;
-       line-height: 50px;
-       right: 10px;
-       margin-top: 10px;
-       display: block;
-       background: #6c757d;
-       color: #ffffff;
-       border-radius: 5px;
-       z-index: 99999;
-     }
-     .top-nav {
-        display: block;
-        clear: both;
-        height: 45px;
+.main {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  .pagination {
+    position: fixed;
+    bottom: 10px;
+    height: 50px;
+    min-width: 750px;
+    line-height: 50px;
+    right: 10px;
+    margin-top: 10px;
+    display: block;
+    background: #6c757d;
+    color: #ffffff;
+    border-radius: 5px;
+    z-index: 99999;
+  }
+  .top-nav {
+    display: block;
+    clear: both;
+    height: 45px;
+    width: 100%;
+    background: #f5f5f5;
+    border-bottom: #cccccc solid 1px;
+    position: absolute;
+    padding: 10px 0px 0px 40px;
+    top: 0;
+  }
+  .left-side {
+    width: 160px;
+    height: 100%;
+    // background: #113a28;
+    border-right: #888888 solid 2px;
+    position: absolute;
+    left: 0;
+    top: 45px;
+    padding: 0px;
+    // color: #ffffff;
+    overflow-x: hidden;
+    overflow-y: auto;
+    display: block;
+    text-align: center;
+    .logo {
+      height: 90px;
+      padding: 20px 12px 10px 12px;
+      font-weight: bold;
+      .logout {
+        float: left;
+        height: 20px;
+        line-height: 20px;
+        text-align: left;
         width: 100%;
-        background: #f5f5f5;
-        border-bottom: #cccccc solid 1px;
-        position: absolute;
-        padding: 10px 0px 0px 40px;
-        top: 0;
-     }
-     .left-side {
-        width: 160px;
-        height: 100%;
-        background: #113a28;
-        border-right: #888888 solid 2px;
-        position: absolute;
-        left: 0;
-        top: 45px;
-        padding: 0px;
-        color: #FFFFFF;
-        overflow-x: hidden;
-        overflow-y: auto;
+        cursor: pointer;
+      }
+      .store {
+        font-size: 12px;
+      }
+      .account {
+        font-size: 12px;
+        border: solid 2px #ffffff;
+        background: #6c757d;
+        cursor: pointer;
+        margin-top: 6px;
+        padding: 2px;
+        border-radius: 2px;
+      }
+    }
+    .cate {
+      text-align: center;
+      margin-left: 14px;
+      margin-top: 10px;
+      .nav {
+        list-style: none;
         display: block;
+        margin: 0px;
+        padding: 5px;
         text-align: center;
-       .logo {
-         height: 90px;
-         padding: 20px 12px 10px 12px;
-         font-weight: bold;
-         .logout {
-           float: left;
-           height: 20px;
-           line-height: 20px;
-           text-align: left;
-           width: 100%;
-           cursor: pointer;
-         }
-         .store {
-           font-size: 12px;
-         }
-         .account {
-           font-size: 12px;
-           border: solid 2px #FFFFFF;
-           background: #6c757d;
-           cursor: pointer;
-           margin-top: 6px;
-           padding: 2px;
-           border-radius: 2px;
-         }
-       }
-       .cate {
-         text-align: center;
-         margin-left: 14px;
-         margin-top: 10px;
-         .nav {
-            list-style: none;
-            display: block;
-            margin: 0px;
-            padding: 5px;
+        .nav-item {
+          margin-top: 20px;
+          font-size: 14px;
+          width: 120px;
+          text-align: center;
+          .nav-link {
+            position: relative;
+            padding: 0.5356875rem 0.9375rem;
+            white-space: nowrap;
             text-align: center;
-            .nav-item {
-                margin-top: 20px;
-                font-size: 14px;
-                width: 120px;
-                text-align: center;
-               .nav-link {
-                 position: relative;
-                 padding: .5356875rem .9375rem;
-                 white-space: nowrap;
-                 text-align: center;
-                 font-weight: 600;
-                 color: #666666;
-                 display: flex;
-                 align-items: center;
-                 flex-direction: column;
-                 justify-content: center;
-                 border-radius: 5px;
-                 transition: color .2s linear;
-                 background: #f5f5f5;
-                 border: 2px solid #FFFFFF;
-                 .cate-logo {
-                   display: block;
-                   width: 50px;
-                   height: 50px;
-                 }
-               }
-               .active {
-                 font-weight: bold;
-                 border: 4px #ff5b57 solid;
-               }
-            }
-         }
-       }
-     }
-     .cart-container {
-        width: 310px;
-        height: 100%;
-        background: #FFFFFF;
-        display: block;
-        position: absolute;
-        left: 165px;
-        top: 45px;
-        overflow-x: hidden;
-        overflow-y: auto;
-        border: #cccccc solid 1px;
-        .title {
-          height: 70px;
-          width: 310px;
-          background: #6c757d;
-          border-bottom: #CCCCCC 2px solid;
-          color: #FFFFFF;
-          padding-top: 16px;
-          padding-left: 1px;
-          display: block;
-          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;
+            font-weight: 600;
+            color: #666666;
+            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;
             }
           }
-          .member-info {
-            float: left;
-            margin-top: 5px;
-            .name {
-              margin-left: 2px;
-              margin-right: 3px;
-            }
-            .none {
-               margin-left: 2px;
-               margin-right: 5px;
-               font-size: 13px;
-            }
-            .switch {
-              padding: 8px 8px 8px 4px;
-            }
+          .active {
+            font-weight: bold;
+            border: 4px #ff5b57 solid;
           }
         }
-       .carts {
-          display: block;
-          width: 100%;
-          color: #666666;
-          margin-bottom: 120px;
-          margin-top: 70px;
-          padding: 0px;
-          .tab {
-            width: 50%;
-            .cart-list {
-               margin-bottom: 60px;
-              .cart-item {
-                border-bottom: dashed 1px #cccccc;
-                height: 110px;
-                width: 310px;
-                padding-top: 5px;
-                .image {
-                   width: 50px;
-                   height: 50px;
-                   margin-left: 5px;
-                   border-radius: 5px;
-                   border: solid 1px #ccc;
-                   float: left;
-                   margin-top: 20px;
-                }
-                .info {
-                   float: left;
-                   padding-left: 5px;
-                   margin-top: 5px;
-                   .name {
-                     font-weight: bold;
-                     font-size: 12px;
-                     width: 160px;
-                     max-height: 30px;
-                     overflow: hidden;
-                     display: -webkit-box;
-                     -webkit-box-orient: vertical;
-                     -webkit-line-clamp: 2;
-                   }
-                   .spec {
-                     font-size: 12px;
-                     width: 160px;
-                     height: 20px;
-                     margin-top: 2px;
-                     .item {
-                        margin-right: 2px;
-                        border-radius: 5px;
-                        text-align: center;
-                        max-width: 50px;
-                        height: 20px;
-                        line-height: 20px;
-                        float: left;
-                        display: block;
-                        overflow: hidden;
-                        color: #606266;
-                        cursor: pointer;
-                        background: #cceeee;
-                        padding: 0px 3px 0px 3px;
-                        white-space: nowrap;
-                        text-overflow: ellipsis;
-                     }
-                   }
-                   .input {
-                     width: 120px;
-                     margin-top: 2px;
-                   }
-                }
-                .option {
-                   float: right;
-                   text-align: right;
-                   margin-right: 10px;
-                   .remove {
-                      font-size: 12px;
-                      cursor: pointer;
-                   }
-                   .total {
-                     margin-top: 10px;
-                     font-size: 16px;
-                     color: #ff5b57;
-                   }
+      }
+    }
+  }
+  .cart-container {
+    width: 310px;
+    height: 100%;
+    background: #ffffff;
+    display: block;
+    position: absolute;
+    left: 165px;
+    top: 45px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    border: #cccccc solid 1px;
+    .title {
+      height: 70px;
+      width: 310px;
+      // background: #6c757d;
+      border-bottom: #cccccc 1px solid;
+      // color: #ffffff;
+      padding-top: 16px;
+      padding-left: 1px;
+      display: block;
+      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;
+        }
+      }
+      .member-info {
+        float: left;
+        margin-top: 5px;
+        .name {
+          margin-left: 2px;
+          margin-right: 3px;
+        }
+        .none {
+          margin-left: 2px;
+          margin-right: 5px;
+          font-size: 13px;
+        }
+        .switch {
+          padding: 8px 8px 8px 4px;
+        }
+      }
+    }
+    .carts {
+      display: block;
+      width: 100%;
+      color: #666666;
+      margin-bottom: 120px;
+      margin-top: 70px;
+      padding: 0px;
+      .tab {
+        width: 50%;
+        .cart-list {
+          margin-bottom: 60px;
+          .cart-item {
+            border-bottom: dashed 1px #cccccc;
+            height: 110px;
+            width: 310px;
+            padding-top: 5px;
+            .image {
+              width: 50px;
+              height: 50px;
+              margin-left: 5px;
+              border-radius: 5px;
+              border: solid 1px #ccc;
+              float: left;
+              margin-top: 20px;
+            }
+            .info {
+              float: left;
+              padding-left: 5px;
+              margin-top: 5px;
+              .name {
+                font-weight: bold;
+                font-size: 12px;
+                width: 160px;
+                max-height: 30px;
+                overflow: hidden;
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 2;
+              }
+              .spec {
+                font-size: 12px;
+                width: 160px;
+                height: 20px;
+                margin-top: 2px;
+                .item {
+                  margin-right: 2px;
+                  border-radius: 5px;
+                  text-align: center;
+                  max-width: 50px;
+                  height: 20px;
+                  line-height: 20px;
+                  float: left;
+                  display: block;
+                  overflow: hidden;
+                  color: #606266;
+                  cursor: pointer;
+                  background: #cceeee;
+                  padding: 0px 3px 0px 3px;
+                  white-space: nowrap;
+                  text-overflow: ellipsis;
                 }
               }
+              .input {
+                width: 120px;
+                margin-top: 2px;
+              }
             }
-            .empty {
-              margin-top: 200px;
-              width: 310px;
+            .option {
+              float: right;
+              text-align: right;
+              margin-right: 10px;
+              .remove {
+                font-size: 12px;
+                cursor: pointer;
+              }
+              .total {
+                margin-top: 10px;
+                font-size: 16px;
+                color: #ff5b57;
+              }
             }
           }
-       }
-       .footer {
-          position: fixed;
-          z-index: 999;
-          background: #6c757d;
-          bottom: 0;
-          height: 120px;
-          width: 100%;
-          padding-top: 5px;
-          padding-right: 15px;
-          color: #FFFFFF;
-          display: block;
+        }
+        .empty {
+          margin-top: 200px;
           width: 310px;
-          border: solid 3px #cccccc;
-          .number {
-            float: right;
-            margin: 5px;
-            font-size: 13px;
-            .total-price {
-               margin-top: 3px;
-               .num {
-                 color: #ff5b57;
-                 font-size: 20px;
-               }
-            }
+        }
+      }
+    }
+    .footer {
+      position: fixed;
+      z-index: 999;
+      bottom: 0;
+      height: 120px;
+      width: 100%;
+      padding-top: 5px;
+      padding-right: 15px;
+      display: block;
+      width: 310px;
+      .number {
+        float: right;
+        margin: 5px;
+        font-size: 13px;
+        .total-price {
+          margin-top: 3px;
+          .num {
+            color: #ff5b57;
+            font-size: 20px;
           }
-          .options {
-             text-align: center;
-             cursor: pointer;
-             float: right;
-             color: #FFFFFF;
-            .cash {
-              float: left;
-              height: 50px;
-              border: solid 1px #113a28;
-              padding-top: 15px;
-              width: 135px;
-              border-radius: 5px;
-              background: #113a28;
-              font-weight: bold;
-            }
-            .submit {
-               float: left;
-               height: 50px;
-               border: solid 1px #ff5b57;
-               margin-left: 10px;
-               padding-top: 15px;
-               width: 135px;
-               border-radius: 5px;
-               background: #ff5b57;
-               font-weight: bold;
-            }
+        }
+      }
+      .options {
+        text-align: center;
+        cursor: pointer;
+        float: right;
+        color: #ffffff;
+        .cash {
+          float: left;
+          height: 50px;
+          border: solid 1px #113a28;
+          padding-top: 15px;
+          width: 135px;
+          border-radius: 5px;
+          background: #113a28;
+          font-weight: bold;
+        }
+        .submit {
+          float: left;
+          height: 50px;
+          border: solid 1px #ff5b57;
+          margin-left: 10px;
+          padding-top: 15px;
+          width: 135px;
+          border-radius: 5px;
+          background: #ff5b57;
+          font-weight: bold;
+        }
+      }
+    }
+  }
+  .main-list {
+    height: 100%;
+    width: 100%;
+    min-width: 760px;
+    margin-left: 475px;
+    margin-right: 2px;
+    overflow: auto;
+    display: block;
+    background: #ffffff;
+    margin-bottom: 10px;
+    .title {
+      position: fixed;
+      height: 106px;
+      width: calc(100% - 465px);
+      min-width: 700px;
+      background: #ffffff;
+      padding: 5px;
+      color: red;
+      top: 45px;
+      .search-form {
+        height: 50px;
+        .form-item {
+          margin-right: -2px;
+        }
+        .input-item {
+          min-width: 456px;
+        }
+        .search-goods {
+          height: 50px;
+          background: #f67f20;
+          color: #fff;
+        }
+      }
+      .tab-box {
+        margin-top: 3px;
+        width: 100%;
+      }
+    }
+    .goods-list {
+      height: 100%;
+      width: 100%;
+      margin-top: 148px;
+      margin-left: 2px;
+      margin-bottom: 200px;
+      .goods-item {
+        width: 33.3%;
+        min-height: 300px;
+        min-width: 220px;
+        padding: 3px;
+        float: left;
+        background: #ffffff;
+        text-align: left;
+        cursor: pointer;
+        .item {
+          background: #ffffff;
+          padding: 5px;
+          border-radius: 5px;
+          border: solid 1px #cccccc;
+          margin: 0px;
+          .goods-name {
+            margin-top: 10px;
+            font-size: 18px;
+            color: #666666;
+            height: 30px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
           }
-       }
-     }
-     .main-list {
-       height: 100%;
-       width: 100%;
-       min-width: 760px;
-       margin-left: 475px;
-       margin-right: 2px;
-       overflow: auto;
-       display: block;
-       background: #FFFFFF;
-       margin-bottom: 10px;
-       .title {
-         position: fixed;
-         height: 106px;
-         width: calc(100% - 465px);
-         min-width: 700px;
-         background: #ffffff;
-         padding: 5px;
-         color: red;
-         top: 45px;
-         .search-form {
-            height: 50px;
-            .form-item {
-              margin-right: -2px;
-            }
-            .input-item {
-              min-width: 456px;
-            }
-            .search-goods {
-              height: 50px;
-              background: #113a28;
-              color: #fff;
-            }
-         }
-         .tab-box {
-            margin-top: 3px;
-            width: 100%;
-         }
-       }
-       .goods-list {
-         height: 100%;
-         width: 100%;
-         margin-top: 148px;
-         margin-left: 2px;
-         margin-bottom: 200px;
-         .goods-item {
-           width: 33.3%;
-           min-height: 300px;
-           min-width: 220px;
-           padding: 3px;
-           float: left;
-           background: #ffffff;
-           text-align: left;
-           cursor: pointer;
-           .item {
-              background: #ffffff;
-              padding: 5px;
-              border-radius: 5px;
-              border: solid 1px #cccccc;
-              margin: 0px;
-             .goods-name {
-               margin-top: 10px;
-               font-size: 18px;
-               color: #666666;
-               height: 30px;
-               overflow: hidden;
-               white-space: nowrap;
-               text-overflow: ellipsis;
-             }
-             .goods-price {
-               color: #ff5b57;
-               font-size: 18px;
-               font-weight: bold;
-             }
-             .image {
-               width: 100%;
-               height: 220px;
-               border-radius: 3px;
-             }
-           }
-         }
-       }
-     }
-   }
-   .goods-info {
-     border: solid 1px #ccc;
-     padding: 30px;
-     border-radius: 5px;
-     .name {
-        height: 40px;
-        font-weight: bold;
-        font-size: 20px;
-     }
-     .price {
-       height: 40px;
-       color: #ff5b57;
-       font-size: 16px;
-     }
-     .spec-list {
-        border: solid 1px #ccc;
-        padding: 20px;
-        margin-top: 10px;
-        border-radius: 6px;
-        .spec-item {
-           margin-bottom: 20px;
-          .spec-name {
-             font-weight: bold;
-             font-size: 16px;
+          .goods-price {
+            color: #ff5b57;
+            font-size: 18px;
+            font-weight: bold;
           }
-          .values {
-             display: block;
-             padding-top: 10px;
-             margin-left: 0px;
-             padding-left: 0px;
-             font-size: 12px;
-             .value {
-               border: solid 1px #cceeee;
-               margin-right: 10px;
-               padding: 8px 15px 5px 15px;
-               cursor: pointer;
-               border-radius: 4px;
-               background: rgba(0, 172, 172, 0.1);
-               color: #666666;
-             }
-             .active {
-               border: solid 1px #ff5891;
-               background: #ff5b57;
-               color: #FFFFFF;
-             }
+          .image {
+            width: 100%;
+            height: 220px;
+            border-radius: 3px;
           }
         }
-     }
-   }
-</style>
-<style scoped>
-  .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;
+      }
+    }
   }
-  .el-tabs--border-card {
-    box-shadow: none;
-    border: none;
+}
+.goods-info {
+  border: solid 1px #ccc;
+  padding: 30px;
+  border-radius: 5px;
+  .name {
+    height: 40px;
+    font-weight: bold;
+    font-size: 20px;
   }
-  ::v-deep .el-tabs--border-card > .el-tabs__content {
-     padding: 0px;
+  .price {
+    height: 40px;
+    color: #ff5b57;
+    font-size: 16px;
   }
-  ::v-deep .el-pagination.is-background span {
-     color: #fff;
+  .spec-list {
+    border: solid 1px #ccc;
+    padding: 20px;
+    margin-top: 10px;
+    border-radius: 6px;
+    .spec-item {
+      margin-bottom: 20px;
+      .spec-name {
+        font-weight: bold;
+        font-size: 16px;
+      }
+      .values {
+        display: block;
+        padding-top: 10px;
+        margin-left: 0px;
+        padding-left: 0px;
+        font-size: 12px;
+        .value {
+          border: solid 1px #cceeee;
+          margin-right: 10px;
+          padding: 8px 15px 5px 15px;
+          cursor: pointer;
+          border-radius: 4px;
+          background: rgba(0, 172, 172, 0.1);
+          color: #666666;
+        }
+        .active {
+          border: solid 1px #ff5891;
+          background: #ff5b57;
+          color: #ffffff;
+        }
+      }
+    }
   }
+}
+</style>
+<style scoped>
+.input-item >>> .el-input__inner {
+  border: #e6e6e6 solid 1px;
+  line-height: 50px;
+  height: 50px;
+}
+.form-item >>> .el-form-item__label {
+  line-height: 50px;
+  height: 50px;
+}
+.el-tabs--border-card {
+  box-shadow: none;
+  border: none;
+}
+::v-deep .el-tabs--border-card > .el-tabs__content {
+  padding: 0px;
+}
+::v-deep .el-pagination.is-background span {
+  color: #fff;
+}
 </style>

src/renderer/views/login/index.vue

@@ -1,20 +1,41 @@
 <template>
   <div class="login-container">
     <div class="login-from-box">
-      <el-form class="login-form" ref="loginForm" autocomplete="on" :model="loginForm" :rules="loginRules" label-position="left">
+      <el-form
+        class="login-form"
+        ref="loginForm"
+        autocomplete="on"
+        :model="loginForm"
+        :rules="loginRules"
+        label-position="left"
+      >
         <h3 class="title">{{ systemName }}</h3>
         <el-form-item prop="username">
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="user" />
           </span>
-          <el-input name="username" type="text" clearable v-model="loginForm.username" autocomplete="on" placeholder="用户名" />
+          <el-input
+            name="username"
+            type="text"
+            clearable
+            v-model="loginForm.username"
+            autocomplete="on"
+            placeholder="用户名"
+          />
         </el-form-item>
         <el-form-item prop="password">
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="password"></svg-icon>
           </span>
-          <el-input name="password" :type="pwdType" clearable @keyup.enter.native="handleLogin()" v-model="loginForm.password"
-            autocomplete="on" placeholder="密码"></el-input>
+          <el-input
+            name="password"
+            :type="pwdType"
+            clearable
+            @keyup.enter.native="handleLogin()"
+            v-model="loginForm.password"
+            autocomplete="on"
+            placeholder="密码"
+          ></el-input>
           <span class="show-pwd" @click="showPwd()">
             <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
           </span>
@@ -24,23 +45,26 @@
             <svg-icon icon-class="eye"></svg-icon>
           </span>
           <el-input
-              v-model="loginForm.captchaCode"
-              auto-complete="off"
-              placeholder="请输入验证码"
-              style="width: 63%"
-              clearable
-              @keyup.enter.native="handleLogin"
-          >
-          </el-input>
+            v-model="loginForm.captchaCode"
+            auto-complete="off"
+            placeholder="请输入验证码"
+            style="width: 63%"
+            clearable
+            @keyup.enter.native="handleLogin"
+          ></el-input>
           <div class="login-code">
-            <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+            <img :src="codeUrl" @click="getCode" class="login-code-img" />
           </div>
         </el-form-item>
         <div class="login-btn">
           <button type="button" class="btn" @click="handleLogin()">立即登录</button>
         </div>
         <div class="tips">
-          <span>Copyright © 2020-2024 <a target="_blank" href="https://www.fuint.cn">fuint.cn</a> 延禾技术 All Rights Reserved.</span>
+          <span>
+            Copyright © 2020-2024
+            <a target="_blank" href="https://www.fuint.cn">fuint.cn</a>
+            延禾技术 All Rights Reserved.
+          </span>
         </div>
       </el-form>
     </div>
@@ -48,69 +72,70 @@
 </template>
 
 <script>
-import { useUserStore } from "@/store/user";
-import { useRouter } from "@/hooks/use-router";
-import { getCodeImg } from "@/api/login";
-const { login } = useUserStore();
-const router = useRouter();
+import { useUserStore } from '@/store/user'
+import { useRouter } from '@/hooks/use-router'
+import { getCodeImg } from '@/api/login'
+const { login } = useUserStore()
+const router = useRouter()
 export default {
   data: () => {
     return {
-       systemName: process.env.userConfig.SYSTEM_NAME,
-       loading: false,
-       loginForm: { uuid : '', username: "", password: "", captchaCode: '' },
-       codeUrl: '',
-       pwdType: 'password',
-       loginRules: {
-          username: [
-            { required: true, trigger: "blur", message: "请输入您的账号" }
-          ],
-          password: [
-            { required: true, trigger: "blur", message: "请输入您的密码" }
-          ],
-          captchaCode: [{ required: true, trigger: "change", message: "请输入验证码" }, { min: 4, max: 6, message: '请输入正确验证码', trigger: 'blur' }]
-       }
+      systemName: process.env.userConfig.SYSTEM_NAME,
+      loading: false,
+      loginForm: { uuid: '', username: '', password: '', captchaCode: '' },
+      codeUrl: '',
+      pwdType: 'password',
+      loginRules: {
+        username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
+        password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
+        captchaCode: [
+          { required: true, trigger: 'change', message: '请输入验证码' },
+          { min: 4, max: 6, message: '请输入正确验证码', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
-    this.getCode();
+    this.getCode()
   },
   methods: {
     getCode() {
-      const app = this;
-      getCodeImg().then(res => {
-          app.codeUrl = res.data.captcha;
-          app.loginForm.uuid = res.data.uuid;
+      const app = this
+      getCodeImg().then((res) => {
+        app.codeUrl = res.data.captcha
+        app.loginForm.uuid = res.data.uuid
       })
     },
     showPwd() {
-      if (this.pwdType === "password") {
-          this.pwdType = "";
+      if (this.pwdType === 'password') {
+        this.pwdType = ''
       } else {
-          this.pwdType = "password";
+        this.pwdType = 'password'
       }
     },
     handleLogin() {
-      const app = this;
-      app.$refs.loginForm.validate(valid => {
+      const app = this
+      app.$refs.loginForm.validate((valid) => {
         if (valid) {
-           app.loading = true;
-           login(app.loginForm).then(() => {
-               app.loading = false;
-               console.log('登录成功了!');
-               app.$router.push({ path: "/" }).catch(()=>{});
-               router.push({ path: "/" }).catch((err) => {
-                   console.log('跳转失败...', err);
-               });
-               console.log('登录成功了...');
-           }).catch(() => {
-               app.loading = false;
-           })
+          app.loading = true
+          login(app.loginForm)
+            .then(() => {
+              app.loading = false
+              console.log('登录成功了!')
+              app.$router.push({ path: '/' }).catch(() => {})
+              router.push({ path: '/' }).catch((err) => {
+                console.log('跳转失败...', err)
+              })
+              console.log('登录成功了...')
+            })
+            .catch(() => {
+              app.loading = false
+            })
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
     }
   }
 }
@@ -129,7 +154,7 @@ $light_gray: #eee;
   width: 100%;
   top: 0;
   left: 0;
-  background-image: url("../../assets/images/bg.png");
+  background-image: url('../../assets/images/bg.png');
   background-position: center;
   color: #ffffff;
 
@@ -173,12 +198,11 @@ $light_gray: #eee;
       align-items: center;
       color: white;
       backdrop-filter: saturate(180%) blur(20px);
-      background: rgba(0, 0, 0, .65);
+      background: rgba(0, 0, 0, 0.65);
       border-radius: 10px;
-      box-shadow: 0 0.4px 0.6px rgba(0, 0, 0, 0.141),
-        0 1px 1.3px rgba(0, 0, 0, 0.202), 0 1.9px 2.5px rgba(0, 0, 0, 0.25),
-        0 3.4px 4.5px rgba(0, 0, 0, 0.298), 0 6.3px 8.4px rgba(0, 0, 0, 0.359),
-        0 15px 20px rgba(0, 0, 0, .26);
+      box-shadow: 0 0.4px 0.6px rgba(0, 0, 0, 0.141), 0 1px 1.3px rgba(0, 0, 0, 0.202),
+        0 1.9px 2.5px rgba(0, 0, 0, 0.25), 0 3.4px 4.5px rgba(0, 0, 0, 0.298),
+        0 6.3px 8.4px rgba(0, 0, 0, 0.359), 0 15px 20px rgba(0, 0, 0, 0.26);
       .login-btn {
         .btn {
           position: relative;
@@ -196,15 +220,12 @@ $light_gray: #eee;
 
           &::before {
             position: absolute;
-            content: "";
+            content: '';
             top: 0;
             left: 0;
             width: 100%;
             height: 100%;
-            background: linear-gradient(120deg,
-                transparent,
-                hsla(204, 70%, 53%, 0.5),
-                transparent);
+            background: linear-gradient(120deg, transparent, hsla(204, 70%, 53%, 0.5), transparent);
             transform: translateX(-100%);
             transition: 0.5s;
           }
@@ -219,15 +240,15 @@ $light_gray: #eee;
         }
       }
       .login-code {
-          width: 100px;
+        width: 100px;
+        height: 48px;
+        float: right;
+        img {
+          cursor: pointer;
+          vertical-align: middle;
           height: 48px;
-          float: right;
-          img {
-            cursor: pointer;
-            vertical-align: middle;
-            height: 48px;
-            border-radius: 1px;
-          }
+          border-radius: 1px;
+        }
       }
     }