Merge branch 'master' into panda-ui

env/.env

@@ -3,6 +3,6 @@
 # 商城服务器
 API_HOST = 'https://www.fuint.cn/fuint-food/'
 NODE_ENV = 'development'
-SYSTEM_NAME = '盼达点餐收银系统'
+SYSTEM_NAME = 'app.title'
 
 

src/renderer/i18n/index.js

@@ -1,25 +1,11 @@
-export default function loadLanguage() {
-    const context = require.context("./languages", false, /([a-z_]+)\.js$/i)
+import en from './languages/en.json'
+import zhCN from './languages/zh-CN.json'
 
-    const languages = context
-        .keys()
-        .map((key) => ({ key, name: key.match(/([a-z_-]+)\.js$/i)[1] }))
-        .reduce(
-            (languages, {key, name}) => {
-                let lang;
-                try {
-                    // 引入 element-ui 语言包
-                    lang = Object.assign(context(key).lang, require(`element-ui/lib/locale/lang/${name}`).default);
-                } catch(err) {
-                    lang = context(key).lang
-                }
-                return {
-                    ...languages,
-                    [name]: lang
-                }
-            },
-            {}
-        )
+export default function loadLanguage() {
+  const languages = {
+    en,
+    'zh-CN': zhCN,
+  }
 
-    return languages
-}
+  return languages
+}

src/renderer/i18n/languages/en.js

@@ -1,30 +0,0 @@
-export const lang = {
-    welcome: "Welcome use the framework",
-    buttonTips: "You can click buttons to experience",
-    waitDataLoading: "Wait data loading",
-    about: {
-        system: "About system",
-        language: "language：",
-        languageValue: "English",
-        currentPagePath: "current page path:",
-        currentPageName: "current page name:",
-        vueVersion: "Vue version:",
-        electronVersion: "Electron version:",
-        nodeVersion: "Node version:",
-        systemPlatform: "system platform:",
-        systemVersion: "system version:",
-        systemArch: "system arch:",
-        currentEnvironment:"current environment:"
-    },
-    buttons: {
-        console: "Console",
-        checkUpdate: "Check update",
-        checkUpdate2: "Check update(plan 2)",
-        startServer: "Start server",
-        stopServer: "Stop server",
-        viewMessage: "view message",
-        openNewWindow: "Open new window",
-        openDocument: "Open document",
-        changeLanguage: "Change language"
-    }
-}

src/renderer/i18n/languages/en.json

@@ -0,0 +1,33 @@
+{
+  "app": {
+    "title": "Panda Order System"
+  },
+  "welcome": "Welcome use the framework",
+  "buttonTips": "You can click buttons to experience",
+  "waitDataLoading": "Wait data loading",
+  "about": {
+    "system": "About system",
+    "language": "language：",
+    "languageValue": "English",
+    "currentPagePath": "current page path:",
+    "currentPageName": "current page name:",
+    "vueVersion": "Vue version:",
+    "electronVersion": "Electron version:",
+    "nodeVersion": "Node version:",
+    "systemPlatform": "system platform:",
+    "systemVersion": "system version:",
+    "systemArch": "system arch:",
+    "currentEnvironment": "current environment:"
+  },
+  "buttons": {
+    "console": "Console",
+    "checkUpdate": "Check update",
+    "checkUpdate2": "Check update(plan 2)",
+    "startServer": "Start server",
+    "stopServer": "Stop server",
+    "viewMessage": "view message",
+    "openNewWindow": "Open new window",
+    "openDocument": "Open document",
+    "changeLanguage": "Change language"
+  }
+}

src/renderer/i18n/languages/zh-CN.js

@@ -1,30 +0,0 @@
-export const lang = {
-    welcome: "欢迎进入本框架",
-    buttonTips: "您可以点击的按钮测试功能",
-    waitDataLoading: "等待数据读取",
-    about: {
-        system: "关于系统",
-        language: "语言：",
-        languageValue: "中文简体",
-        currentPagePath: "当前页面路径：",
-        currentPageName: "当前页面名称：",
-        vueVersion: "Vue版本：",
-        electronVersion: "Electron版本：",
-        nodeVersion: "Node版本：",
-        systemPlatform: "系统平台：",
-        systemVersion: "系统版本：",
-        systemArch: "系统位数：",
-        currentEnvironment:'当前环境：'
-    },
-    buttons: {
-        console: "控制台打印",
-        checkUpdate: "检查更新",
-        checkUpdate2: "检查更新（第二种方法）",
-        startServer: "启动内置服务端",
-        stopServer: "关闭内置服务端",
-        viewMessage: "查看消息",
-        openNewWindow: "打开新窗口",
-        openDocument: "打开文档",
-        changeLanguage: "切换语言"
-    }
-}

src/renderer/i18n/languages/zh-CN.json

@@ -0,0 +1,33 @@
+{
+  "app": {
+    "title": "盼达点餐系统"
+  },
+  "welcome": "欢迎进入本框架",
+  "buttonTips": "您可以点击的按钮测试功能",
+  "waitDataLoading": "等待数据读取",
+  "about": {
+    "system": "关于系统",
+    "language": "语言：",
+    "languageValue": "中文简体",
+    "currentPagePath": "当前页面路径：",
+    "currentPageName": "当前页面名称：",
+    "vueVersion": "Vue版本：",
+    "electronVersion": "Electron版本：",
+    "nodeVersion": "Node版本：",
+    "systemPlatform": "系统平台：",
+    "systemVersion": "系统版本：",
+    "systemArch": "系统位数：",
+    "currentEnvironment": "当前环境："
+  },
+  "buttons": {
+    "console": "控制台打印",
+    "checkUpdate": "检查更新",
+    "checkUpdate2": "检查更新（第二种方法）",
+    "startServer": "启动内置服务端",
+    "stopServer": "关闭内置服务端",
+    "viewMessage": "查看消息",
+    "openNewWindow": "打开新窗口",
+    "openDocument": "打开文档",
+    "changeLanguage": "切换语言"
+  }
+}

src/renderer/main.js

@@ -54,9 +54,10 @@ Vue.use(VueI18n) // 新版本必须要这个，不知道为什么
 usePermission() // 放在后面，确保加载顺序
 
 const i18n = new VueI18n({
-  locale: 'zh-CN', // 设置默认语言
+  locale: 'en', // 设置默认语言
   messages: languages, // 设置语言包
 })
+
 Vue.use(ElementUI, {
   i18n: (key, value) => i18n.t(key, value),
 })

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

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

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

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

src/renderer/views/cashier/index.vue

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

src/renderer/views/login/index.vue

@@ -74,9 +74,9 @@ import { getCodeImg } from '@/api/login'
 const { login } = useUserStore()
 const router = useRouter()
 export default {
-  data: () => {
+  data() {
     return {
-      systemName: process.env.userConfig.SYSTEM_NAME,
+      systemName: this.$t('app.title'),
       loading: false,
       loginForm: { uuid: '', username: '', password: '', captchaCode: '' },
       codeUrl: '',
@@ -92,6 +92,7 @@ export default {
     }
   },
   created() {
+    console.log(this.$t)
     this.getCode()
   },
   methods: {