czg_team
/
cashier_desktop
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新优化问题

This commit is contained in:
gyq 2024-12-18 09:05:10 +08:00
parent ddd67d0c0a
commit 608c41de4f
9 changed files with 15858 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -29,7 +29,7 @@ VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api'
# VITE_API_URL = 'http://192.168.1.34:10589/cashier-client' # VITE_API_URL = 'http://192.168.1.34:10589/cashier-client'
# 测试 # 测试
VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' # VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
# 预发布 # 预发布
# VITE_API_URL = 'https://pre-cashierclient.sxczgkj.cn/cashier-client' # VITE_API_URL = 'https://pre-cashierclient.sxczgkj.cn/cashier-client'
@ -38,4 +38,4 @@ VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
# VITE_API_URL = 'https://36z1017t45.goho.co/cashier-client' # VITE_API_URL = 'https://36z1017t45.goho.co/cashier-client'
# 正式 # 正式
# VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client' VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client'

8
.env.test
View File

@ -2,10 +2,10 @@
ENV = test ENV = test
#测试ws #测试ws
VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client' # VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client'
# 正式ws # 正式ws
# VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client' VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client'
# 正式 php # 正式 php
VITE_API_PHP_URL = 'https://czgdoumei.sxczgkj.com/index.php/api' VITE_API_PHP_URL = 'https://czgdoumei.sxczgkj.com/index.php/api'
@ -17,7 +17,7 @@ VITE_API_PHP_URL = 'https://czgdoumei.sxczgkj.com/index.php/api'
VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api' VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api'
# 测试 # 测试
VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' # VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
# 预发布 # 预发布
# VITE_API_URL = 'https://pre-cashierclient.sxczgkj.cn/cashier-client' # VITE_API_URL = 'https://pre-cashierclient.sxczgkj.cn/cashier-client'
@ -26,4 +26,4 @@ VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
# VITE_API_URL = 'https://36z1017t45.goho.co/cashier-client' # VITE_API_URL = 'https://36z1017t45.goho.co/cashier-client'
# 正式 # 正式
# VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client' VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client'

15849
dist-electron/main.js
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "vite-electron", "name": "vite-electron",
"private": true, "private": true,
"version": "1.4.26", "version": "1.4.27",
"main": "dist-electron/main.js", "main": "dist-electron/main.js",
"scripts": { "scripts": {
"dev": "chcp 65001 && vite", "dev": "chcp 65001 && vite",

10
src/components/leftMenu.vue
View File

@ -87,11 +87,11 @@ const menus = ref([
path: '/member', path: '/member',
icon: 'User' icon: 'User'
}, },
{ // {
label: '排队', // label: '排队',
path: '/queue', // path: '/queue',
icon: 'Timer' // icon: 'Timer'
}, // },
// { // {
// label: '交班', // label: '交班',
// path: '/work', // path: '/work',

5
src/components/lodop/receiptPrint.js
View File

@ -25,6 +25,9 @@ export default (data) => {
data.orderInfo.masterId ? data.orderInfo.masterId : "" data.orderInfo.masterId ? data.orderInfo.masterId : ""
}】 }】
</div> </div>
<div style="font-size: 16px;display: flex; justify-content:center;margin-top:6px;">
桌号：${data.orderInfo && data.orderInfo.tableName || ''}
</div>
<div style="font-size: 16px;display: flex; justify-content:center;margin-top:20px;"> <div style="font-size: 16px;display: flex; justify-content:center;margin-top:20px;">
${data.orderInfo.outNumber ? data.orderInfo.outNumber : ""} ${data.orderInfo.outNumber ? data.orderInfo.outNumber : ""}
</div> </div>
@ -61,7 +64,7 @@ export default (data) => {
</tr> </tr>
`; `;
let proGroupInfo = JSON.parse(item.proGroupInfo); let proGroupInfo = JSON.parse(item.proGroupInfo);
for (let item of proGroupInfo) { for (let item of proGroupInfo) {
table += ` table += `
<tr> <tr>

3
src/components/lodop/refundPrint.js
View File

@ -19,6 +19,9 @@ export default (data) => {
<div style="font-size: 16px;display: flex; justify-content:center;margin-top:6px;"> <div style="font-size: 16px;display: flex; justify-content:center;margin-top:6px;">
退款单【${data.orderInfo.masterId ? data.orderInfo.masterId : ""}】 退款单【${data.orderInfo.masterId ? data.orderInfo.masterId : ""}】
</div> </div>
<div style="font-size: 16px;display: flex; justify-content:center;margin-top:6px;">
桌号：${data.orderInfo && data.orderInfo.tableName || ''}
</div>
<div style="margin-top: 30px;font-size: 12px;"> <div style="margin-top: 30px;font-size: 12px;">
订单号：${data.orderInfo && data.orderInfo.orderNo} 订单号：${data.orderInfo && data.orderInfo.orderNo}
</div> </div>

4
src/components/more.vue
View File

@ -7,8 +7,8 @@
<div class="drawerbox_bo_top_left_one" style="font-size: 24px;"> <div class="drawerbox_bo_top_left_one" style="font-size: 24px;">
{{ store.userInfo.shopName }} {{ store.userInfo.shopName }}
</div> </div>
<div class="tips" style="margin-top: 4px; color: var(--el-color-warning);" v-if="!showTips">注意：您的账号将于{{ <!-- <div class="tips" style="margin-top: 4px; color: var(--el-color-warning);" v-if="!showTips">注意：您的账号将于{{
store.userInfo.expireDate }}后过期，请尽快续期！</div> store.userInfo.expireDate }}后过期，请尽快续期！</div> -->
<div class="drawerbox_bo_top_left_tow" style="margin-top: 10px"> <div class="drawerbox_bo_top_left_tow" style="margin-top: 10px">
收银员：{{ store.userInfo.loginAccount }} 收银员：{{ store.userInfo.loginAccount }}
</div> </div>

4
src/views/home/components/cartOperation.vue
View File

@ -56,13 +56,13 @@
</el-icon> </el-icon>
<el-text class="t">挂单</el-text> <el-text class="t">挂单</el-text>
</div> </div>
<div class="item" @click="tableMergingHandle" :class="{ disabled: !props.item.id }" <!-- <div class="item" @click="tableMergingHandle" :class="{ disabled: !props.item.id }"
v-if="shopStore.info.registerType == 'restaurant' && props.item.tableId"> v-if="shopStore.info.registerType == 'restaurant' && props.item.tableId">
<el-icon class="icon"> <el-icon class="icon">
<EditPen /> <EditPen />
</el-icon> </el-icon>
<el-text class="t">转桌</el-text> <el-text class="t">转桌</el-text>
</div> </div> -->
<div class="item" @click="props.item.id && emit('clearCart')"> <div class="item" @click="props.item.id && emit('clearCart')">
<el-icon class="icon"> <el-icon class="icon">
<RefreshRight /> <RefreshRight />