+ {{
item.productName }}
+
+
+
{{
item.productName }}
@@ -861,6 +861,13 @@ export default {
\ No newline at end of file
From 7876ed1c11839d680b2fc387390b9f7a804ba786 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 27 Aug 2024 16:38:11 +0800
Subject: [PATCH 13/51] =?UTF-8?q?=E4=BB=BB=E5=8A=A1id1000083=20=E5=AE=8C?=
=?UTF-8?q?=E6=88=90=E7=8E=8780%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/order_manage/order_list.vue | 3 ++-
src/views/shop/components/securitySetting.vue | 11 ++++++++++-
src/views/user_manage/user_list.vue | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue
index ced920f..239c203 100644
--- a/src/views/order_manage/order_list.vue
+++ b/src/views/order_manage/order_list.vue
@@ -313,7 +313,8 @@ export default {
pageSize: this.tableData.size,
orderType: this.orderType,
...this.query,
- productName
+ productName,
+ userId:this.$route.query.userId
});
this.tableData.loading = false;
this.tableData.data = res.content;
diff --git a/src/views/shop/components/securitySetting.vue b/src/views/shop/components/securitySetting.vue
index 5602d91..d75fac6 100644
--- a/src/views/shop/components/securitySetting.vue
+++ b/src/views/shop/components/securitySetting.vue
@@ -1,6 +1,13 @@
+
+
+
+
-
-
+ 退款
+ 会员充值
+ 会员退款
import md5 from 'js-md5';
import { tbShopInfo } from "@/api/user";
-import { sendMsg, modfiyUserInfo } from "@/api/securitySetting"
+import { sendMsg, modfiyUserInfo, tbShopInfoPUT } from "@/api/securitySetting"
export default {
data() {
return {
disabled: true,
form: {
},
- checkList: ['退款','会员退款']
}
},
mounted() {
@@ -51,20 +48,35 @@ export default {
const shopId = localStorage.getItem("shopId");
const res = await tbShopInfo(shopId);
this.form = res
- // this.form.password = '******'
+ this.form.isReturn = this.form.isReturn == 1 ? true : false
+ this.form.isMemberIn = this.form.isMemberIn == 1 ? true : false
+ this.form.isMemberReturn = this.form.isMemberReturn == 1 ? true : false
},
async submitHandle() {
- let data = {
- code: this.form.prepareAmount,
- pwd: md5(this.form.password),
+
+ // if (!this.form.prepareAmount) {
+ // this.$message({
+ // message: "请输入验证码或密码"
+ // })
+ // return
+ // }
+ console.log(this.form, 'tiaoshi1')
+ if (this.form.password) {
+ const res = await modfiyUserInfo({
+ code: this.form.prepareAmount,
+ pwd: md5(this.form.password),
+ });
+ } else {
+ const res = await tbShopInfoPUT({
+ // code: this.form.prepareAmount,
+ // id: this.form.id,
+ // status:this.form.status,
+ ...this.form,
+ isReturn: this.form.isReturn == true ? 1 : 0,
+ isMemberIn: this.form.isMemberIn == true ? 1 : 0,
+ isMemberReturn: this.form.isMemberReturn == true ? 1 : 0,
+ });
}
- if (!this.form.prepareAmount) {
- this.$message({
- message: "请输入验证码或密码"
- })
- return
- }
- const res = await modfiyUserInfo(data);
this.form.prepareAmount = ''
this.form.password = "******"
this.disabled = true
diff --git a/src/views/user_manage/user_list.vue b/src/views/user_manage/user_list.vue
index 340acf3..879814f 100644
--- a/src/views/user_manage/user_list.vue
+++ b/src/views/user_manage/user_list.vue
@@ -171,8 +171,10 @@
- {{ userinfo.operationType == 'in' ? '充值' : '消费' }}
- {{ userinfo.operationType == 'in' ? '消费退款' : '充值退款' }}
+ 充值
+ 消费退款
+ 消费
+ 充值退款
@@ -183,7 +185,7 @@
-
+
From 18b6509b261034ec15c34ab2393fdc01c9cfdbcd Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 28 Aug 2024 18:30:02 +0800
Subject: [PATCH 15/51] =?UTF-8?q?=E8=BF=87=E6=BB=A4null=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/table/components/table-diancan.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index 516517d..321d51b 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -2387,6 +2387,9 @@ export default {
async getGoods() {
const res = await getGoodsLists(this.goods.query);
const goods= res.records.filter((v) => {
+ if(!v){
+ return false
+ }
let isShow = true;
if (v.typeEnum !== "sku") {
isShow = v.specList.length >= 1;
From 7d3251f1d6f94247cd2cae8d04b332c245655ec3 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 28 Aug 2024 18:30:33 +0800
Subject: [PATCH 16/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=91=98=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/class-api.js | 32 +++
src/api/version.js | 38 +++
src/store/getters.js | 1 +
src/store/modules/api.js | 2 +
.../version/components/add-version-file.vue | 157 +++++++++++
.../system/version/components/add-version.vue | 211 +++++++++++++++
.../system/version/components/upload-file.vue | 125 +++++++++
src/views/system/version/index.vue | 245 ++++++++++++++++++
8 files changed, 811 insertions(+)
create mode 100644 src/api/class-api.js
create mode 100644 src/api/version.js
create mode 100644 src/views/system/version/components/add-version-file.vue
create mode 100644 src/views/system/version/components/add-version.vue
create mode 100644 src/views/system/version/components/upload-file.vue
create mode 100644 src/views/system/version/index.vue
diff --git a/src/api/class-api.js b/src/api/class-api.js
new file mode 100644
index 0000000..0b73bd9
--- /dev/null
+++ b/src/api/class-api.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+class API {
+ constructor(url, req) {
+ const map = {
+ add: 'POST',
+ del: 'DELETE',
+ update: 'PUT',
+ get: 'GET'
+ }
+ this.url = url
+ for (let key in map) {
+ this[key] = function (data) {
+ data = Array.isArray(data) ? data : {
+ ...data, shopId: localStorage.getItem("shopId"),
+ }
+ if (key === 'del') {
+ delete data.shopId
+ }
+ const par={ url, method: map[key] }
+ if(key==='get'){
+ par.params=data
+ }else{
+ par.data=data
+ }
+ return request(par)
+ }
+ }
+ }
+}
+
+export default API
\ No newline at end of file
diff --git a/src/api/version.js b/src/api/version.js
new file mode 100644
index 0000000..057f352
--- /dev/null
+++ b/src/api/version.js
@@ -0,0 +1,38 @@
+import $api from './class-api'
+import request from '@/utils/request'
+
+export const $version = new $api('/api/tbVersion')
+/**
+ * 修改当前选中 版本
+ * @returns
+ */
+export function $upSel(data) {
+ return request({
+ url: 'upSel',
+ method: "put",
+ data: {
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+
+/**
+ * 上传版本文件
+ * @returns
+ */
+export function $uploadVersionFile(file, par) {
+ var data = new FormData()
+ data.append('file', file)
+ for(let i in par){
+ if(i!=='file'){
+ data.append(i, par[i])
+ }
+ }
+ return request({
+ url: 'api/qiNiuContent/uploadVersionFile',
+ method: "post",
+ data
+ });
+}
+
diff --git a/src/store/getters.js b/src/store/getters.js
index 4b32b51..dc649d1 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,6 +17,7 @@ const getters = {
fileUploadApi: state => state.api.fileUploadApi,
updateAvatarApi: state => state.api.updateAvatarApi,
qiNiuUploadApi: state => state.api.qiNiuUploadApi,
+ versionUploadApi: state => state.api.versonUploadApi,
sqlApi: state => state.api.sqlApi,
swaggerApi: state => state.api.swaggerApi,
sidebarRouters: state => state.permission.sidebarRouters
diff --git a/src/store/modules/api.js b/src/store/modules/api.js
index 563c578..2d2d640 100644
--- a/src/store/modules/api.js
+++ b/src/store/modules/api.js
@@ -18,6 +18,8 @@ const api = {
swaggerApi: baseUrl + '/doc.html',
// 文件上传
fileUploadApi: baseUrl + '/api/localStorage',
+ // 上传版本文件
+ versonUploadApi: baseUrl + '/api/uploadVersionFile',
// baseUrl，
baseApi: baseUrl
}
diff --git a/src/views/system/version/components/add-version-file.vue b/src/views/system/version/components/add-version-file.vue
new file mode 100644
index 0000000..16101a9
--- /dev/null
+++ b/src/views/system/version/components/add-version-file.vue
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/system/version/components/add-version.vue b/src/views/system/version/components/add-version.vue
new file mode 100644
index 0000000..d813923
--- /dev/null
+++ b/src/views/system/version/components/add-version.vue
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/system/version/components/upload-file.vue b/src/views/system/version/components/upload-file.vue
new file mode 100644
index 0000000..d927572
--- /dev/null
+++ b/src/views/system/version/components/upload-file.vue
@@ -0,0 +1,125 @@
+
+ 设置为当前版本
+
From c887f480350944a05555df289b1daaf481417b3c Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 29 Aug 2024 09:24:27 +0800
Subject: [PATCH 18/51] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E5=8F=B0=E6=A1=8C=E5=88=97=E8=A1=A8=E4=BF=AE=E5=A4=8D=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81=E4=B8=8D=E5=AD=98=E5=9C=A8?=
=?UTF-8?q?=E6=97=B6=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E5=AF=BC=E8=87=B4?=
=?UTF-8?q?=E7=99=BD=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/table/components/addTable.vue | 5 +++--
src/views/table/table_list.vue | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/table/components/addTable.vue b/src/views/table/components/addTable.vue
index 7982d07..c019b3c 100644
--- a/src/views/table/components/addTable.vue
+++ b/src/views/table/components/addTable.vue
@@ -55,8 +55,8 @@ export default {
{value:'idle',name:'空闲'},
{value:'subscribe',name:'预定'},
{value:'closed',name:'关台'},
- {value:'opening ',name:'开台中'},
- {value:'cleaning ',name:'台桌清理中'},
+ {value:'opening',name:'开台中'},
+ {value:'cleaning',name:'台桌清理中'},
],
form: {
id: '',
@@ -91,6 +91,7 @@ export default {
try {
let res = await tbShopTable({
...this.form,
+ qrcode:this.form.tableId,
shopId: localStorage.getItem('shopId')
}, this.form.id ? 'put' : 'post')
this.$emit('success', res)
diff --git a/src/views/table/table_list.vue b/src/views/table/table_list.vue
index a5c3740..31e37d6 100644
--- a/src/views/table/table_list.vue
+++ b/src/views/table/table_list.vue
@@ -50,9 +50,9 @@
-
+
-
+
-
+
![]()
@@ -20,11 +20,11 @@
编辑
-
+
diff --git a/src/views/shop/components/securitySetting.vue b/src/views/shop/components/securitySetting.vue
index ea00be8..76b3de3 100644
--- a/src/views/shop/components/securitySetting.vue
+++ b/src/views/shop/components/securitySetting.vue
@@ -1,11 +1,7 @@
-
- 退款
- 会员充值
- 会员退款
-
+
保存
+
+
+
+ 退款
+ 会员充值
+ 会员退款
+
+
+ 保存
+
+
+
+
From eb7522c222acd6f06135208f01b68b823a1d129d Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 30 Aug 2024 16:59:12 +0800
Subject: [PATCH 31/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B0=E6=A1=8C?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E5=BC=80=E5=8F=B0=E4=B8=AD=E6=97=B6?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E5=B1=95=E7=A4=BA=E5=8A=A0=E8=8F=9C=E5=92=8C?=
=?UTF-8?q?=E7=BB=93=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/table/table_list.vue | 73 +++++++++++++++++++++++-----------
1 file changed, 50 insertions(+), 23 deletions(-)
diff --git a/src/views/table/table_list.vue b/src/views/table/table_list.vue
index 08e5cf4..894320e 100644
--- a/src/views/table/table_list.vue
+++ b/src/views/table/table_list.vue
@@ -50,9 +50,13 @@
+
+ 选择文件
+
+
+ ![]()
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/system/version/index.vue b/src/views/system/version/index.vue
new file mode 100644
index 0000000..47afe97
--- /dev/null
+++ b/src/views/system/version/index.vue
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 9aaeb7f0d6f62659da08610aa071daf52519634f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 29 Aug 2024 09:10:56 +0800
Subject: [PATCH 17/51] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?=
=?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0=E9=80=89?=
=?UTF-8?q?=E4=B8=AD=E5=BD=93=E5=89=8D=E7=89=88=E6=9C=AC=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/version.js | 2 +-
src/views/system/version/index.vue | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/api/version.js b/src/api/version.js
index 057f352..3b8f2d5 100644
--- a/src/api/version.js
+++ b/src/api/version.js
@@ -8,7 +8,7 @@ export const $version = new $api('/api/tbVersion')
*/
export function $upSel(data) {
return request({
- url: 'upSel',
+ url: 'api/tbVersion/upSel',
method: "put",
data: {
shopId: localStorage.getItem("shopId"),
diff --git a/src/views/system/version/index.vue b/src/views/system/version/index.vue
index 47afe97..aac592e 100644
--- a/src/views/system/version/index.vue
+++ b/src/views/system/version/index.vue
@@ -49,7 +49,13 @@
:active-value="1"
:inactive-value="0"
>
-
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新增版本
+
+
+
+
+
+
+
+ 设置为当前版本
+
+
+
+
+
+
+
+
+
+ {{ scope.row.url }}
+
+
+
+
+
+
+ {{ dayjs(scope.row.createdAt).format("YYYY-MM-DD HH:mm:ss") }}
+
+
+
+
+ {{
+ dayjs(scope.row.updatedAt).format("YYYY-MM-DD HH:mm:ss")
+ }}
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
- {{ status[item.status].label }}
+ {{ status[item.status]?status[item.status].label:'' }}
From d9c9e6ac9cef6b18fb28c4f2929c8edbc0530616 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 29 Aug 2024 09:29:26 +0800
Subject: [PATCH 19/51] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0=E5=8F=B0=E6=A1=8C=20=E5=89=94?=
=?UTF-8?q?=E9=99=A4=E6=97=A7=E7=9A=84=E5=BC=80=E5=8F=B0=E4=B8=AD=E7=8A=B6?=
=?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/table/components/addTable.vue | 2 +-
src/views/table/table_list.vue | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/table/components/addTable.vue b/src/views/table/components/addTable.vue
index c019b3c..17993d0 100644
--- a/src/views/table/components/addTable.vue
+++ b/src/views/table/components/addTable.vue
@@ -55,7 +55,7 @@ export default {
{value:'idle',name:'空闲'},
{value:'subscribe',name:'预定'},
{value:'closed',name:'关台'},
- {value:'opening',name:'开台中'},
+ // {value:'opening',name:'开台中'},
{value:'cleaning',name:'台桌清理中'},
],
form: {
diff --git a/src/views/table/table_list.vue b/src/views/table/table_list.vue
index 31e37d6..08e5cf4 100644
--- a/src/views/table/table_list.vue
+++ b/src/views/table/table_list.vue
@@ -157,10 +157,10 @@ export default {
label: "关台",
type: "#F56C6C",
},
- opening: {
- label: "开台中",
- type: "#67C23A",
- },
+ // opening: {
+ // label: "开台中",
+ // type: "#67C23A",
+ // },
cleaning: {
label: "台桌清理中",
type: "#909399",
From 97680afa8e87b2b504393b059c4bd7d7df187fd6 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 29 Aug 2024 13:38:16 +0800
Subject: [PATCH 20/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=85=E5=8A=A9?=
=?UTF-8?q?=E7=B1=BB=E5=85=AC=E5=85=B1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/util.scss | 312 ++++++++++++++++++++++++++++++++++++
src/main.js | 1 +
2 files changed, 313 insertions(+)
create mode 100644 src/assets/styles/util.scss
diff --git a/src/assets/styles/util.scss b/src/assets/styles/util.scss
new file mode 100644
index 0000000..be155a0
--- /dev/null
+++ b/src/assets/styles/util.scss
@@ -0,0 +1,312 @@
+.u-relative,
+.u-rela {
+ position: relative;
+}
+
+.u-absolute,
+.u-abso {
+ position: absolute;
+}
+.u-fixed,.u-fix{
+ position: fixed;
+}
+
+// nvue不能用标签命名样式，不能放在微信组件中，否则微信开发工具会报警告，无法使用标签名当做选择器
+/* #ifndef APP-NVUE */
+image {
+ display: inline-block;
+}
+
+// 在weex，也即nvue中，所有元素默认为border-box
+view,
+text {
+ box-sizing: border-box;
+}
+/* #endif */
+
+.u-font-xs {
+ font-size: 11px;
+}
+
+.u-font-sm {
+ font-size: 13px;
+}
+
+.u-font-md {
+ font-size: 14px;
+}
+
+.u-font-lg {
+ font-size: 15px;
+}
+
+.u-font-xl {
+ font-size: 17px;
+}
+
+.u-flex {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+}
+
+.u-flex-wrap {
+ flex-wrap: wrap;
+}
+
+.u-flex-nowrap {
+ flex-wrap: nowrap;
+}
+
+.u-col-center {
+ align-items: center;
+}
+
+.u-col-top {
+ align-items: flex-start;
+}
+
+.u-col-bottom {
+ align-items: flex-end;
+}
+
+.u-row-center {
+ justify-content: center;
+}
+
+.u-row-left {
+ justify-content: flex-start;
+}
+
+.u-row-right {
+ justify-content: flex-end;
+}
+
+.u-row-between {
+ justify-content: space-between;
+}
+
+.u-row-around {
+ justify-content: space-around;
+}
+
+.u-text-left {
+ text-align: left;
+}
+
+.u-text-center {
+ text-align: center;
+}
+
+.u-text-right {
+ text-align: right;
+}
+
+.u-flex-col {
+ display: flex;
+ flex-direction: column;
+}
+
+// 定义flex等分
+@for $i from 0 through 12 {
+ .u-flex-#{$i} {
+ flex: $i;
+ }
+}
+
+// 定义字体(px)单位，小于20都为px单位字体
+@for $i from 9 to 20 {
+ .u-font-#{$i} {
+ font-size: $i + px;
+ }
+}
+
+// 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
+@for $i from 20 through 40 {
+ .u-font-#{$i} {
+ font-size: $i + px;
+ }
+}
+
+// 定义内外边距，历遍1-80
+@for $i from 0 through 80 {
+ // 只要双数和能被5除尽的数
+ @if $i % 2 == 0 or $i % 5 == 0 {
+ // 得出：u-margin-30或者u-m-30
+ .u-margin-#{$i}, .u-m-#{$i} {
+ margin: $i + px!important;
+ }
+
+ // 得出：u-padding-30或者u-p-30
+ .u-padding-#{$i}, .u-p-#{$i} {
+ padding: $i + px!important;
+ }
+
+ @each $short, $long in l left, t top, r right, b bottom {
+ // 缩写版，结果如： u-m-l-30
+ // 定义外边距
+ .u-m-#{$short}-#{$i} {
+ margin-#{$long}: $i + px!important;
+ }
+
+ // 定义内边距
+ .u-p-#{$short}-#{$i} {
+ padding-#{$long}: $i + px!important;
+ }
+
+ // 完整版，结果如：u-margin-left-30
+ // 定义外边距
+ .u-margin-#{$long}-#{$i} {
+ margin-#{$long}: $i + px!important;
+ }
+
+ // 定义内边距
+ .u-padding-#{$long}-#{$i} {
+ padding-#{$long}: $i + px!important;
+ }
+ }
+ }
+}
+
+// 重置nvue的默认关于flex的样式
+.u-reset-nvue {
+ flex-direction: row;
+ align-items: center;
+}
+
+/* start--文本行数限制--start */
+.u-line-1 {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
+.u-line-2 {
+ -webkit-line-clamp: 2;
+}
+
+.u-line-3 {
+ -webkit-line-clamp: 3;
+}
+
+.u-line-4 {
+ -webkit-line-clamp: 4;
+}
+
+.u-line-5 {
+ -webkit-line-clamp: 5;
+}
+
+.u-line-2, .u-line-3, .u-line-4, .u-line-5 {
+ overflow: hidden;
+ word-break: break-all;
+ text-overflow: ellipsis;
+ display: -webkit-box; // 弹性伸缩盒
+ -webkit-box-orient: vertical; // 设置伸缩盒子元素排列方式
+}
+
+/* end--文本行数限制--end */
+
+
+/* start--不同颜色文字--start */
+.color-333{
+ color: #333;
+}
+.color-666{
+ color: #666;
+}
+.color-999{
+ color: #999;
+}
+
+/* end--不同颜色文字--end */
+
+
+.tranistion{
+ transition: all .3s ease-in-out;
+}
+.tranistion-1{
+ transition: all .1s ease-in-out;
+}
+.tranistion-2{
+ transition: all .2s ease-in-out;
+}
+.font-bold{
+ font-weight: 700;
+}
+
+
+.bg-gray{
+ background-color: #F9F9F9;
+}
+.w-full{
+ width: 100%;
+}
+.gap-10{
+ gap: 10px;
+}
+.gap-20{
+ gap: 20px;
+}
+.color-aaa{
+ color: #aaa;
+}
+.color-000{
+ color: #000;
+}
+.color-fff{
+ color: #fff;
+}
+.bg-fff{
+ background-color: #fff;
+}
+.bg-gray{
+ background-color: #F9F9F9;
+}
+.overflow-hide{
+ overflow: hidden;
+}
+.no-wrap{
+ white-space: nowrap;
+}
+.border-r-12{
+ border-radius: 12px;
+}
+.border-r-18{
+ border-radius: 18px;
+}
+.border-top{
+ border-top: 1px solid #E5E5E5;
+}
+.border-bottom{
+ border-bottom: 1px solid #E5E5E5;
+}
+.scale7{
+ transform: scale(0.7);
+}
+
+.position-all{
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+}
+
+.lh16 {
+ line-height: 16px;
+}
+.default-box-padding{
+ padding: 16px 14px;
+}
+
+.zIndex-999{
+ z-index: 999;
+}
+.icon-default-size{
+ width: 14px;
+ height: 14px;
+}
+
+.filter-gray{
+ filter: grayscale(1);
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 2170f53..1d8870f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,6 +22,7 @@ import "./assets/styles/element-variables.scss";
// global css
import "./assets/styles/index.scss";
+import "./assets/styles/util.scss";
import App from "./App";
import store from "./store";
From 5b95ce2d562b1a4b301fcd9e6882152b7a0c674c Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 29 Aug 2024 13:38:42 +0800
Subject: [PATCH 21/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98?=
=?UTF-8?q?=E6=94=AF=E4=BB=98=E4=B8=BA=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/systemMerchant/payTypes.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/systemMerchant/payTypes.js b/src/views/systemMerchant/payTypes.js
index 450b07d..ff7b1f5 100644
--- a/src/views/systemMerchant/payTypes.js
+++ b/src/views/systemMerchant/payTypes.js
@@ -20,7 +20,7 @@ export default [
icon: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240302/18d40f471a924d55b4eb13e5f553734d.png'
},
{
- lable: '会员支付',
+ lable: '余额支付',
key: 'vipPay',
icon:'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240823/8f8bb342ea71429d8cdba7085ef9ec8f.png'
// icon: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240823/81bc318a65f2483fa71f0a5dfd50346c.png'
From 5292956f594e337b967bfd5ef4fb648e5662194a Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 29 Aug 2024 13:53:27 +0800
Subject: [PATCH 22/51] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98=E9=80=80?=
=?UTF-8?q?=E6=AC=BE=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../table-diancan-components/scan-pay.vue | 133 ++++++++++++++++++
src/views/table/components/table-diancan.vue | 122 ++++++----------
src/views/table/components/util.js | 47 +++++++
3 files changed, 222 insertions(+), 80 deletions(-)
create mode 100644 src/views/table/components/table-diancan-components/scan-pay.vue
create mode 100644 src/views/table/components/util.js
diff --git a/src/views/table/components/table-diancan-components/scan-pay.vue b/src/views/table/components/table-diancan-components/scan-pay.vue
new file mode 100644
index 0000000..5c039e0
--- /dev/null
+++ b/src/views/table/components/table-diancan-components/scan-pay.vue
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index 321d51b..e14f731 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -311,8 +311,8 @@
![]()
-
-
@@ -646,10 +638,12 @@
-->
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+ ![]()
+
+ 32.00元
+
+
+ 等待用户支付
+
+
+
@@ -988,6 +988,7 @@
import chooseUser from "./choose-user.vue";
import payType from "./pay-type.vue";
import chooseTable from "./table-diancan-components/choose-table-master.vue";
+import scanPay from "./table-diancan-components/scan-pay.vue";
import orderNote from "./table-diancan-components/note.vue";
import moneyKeyboard from "./money-keyboard.vue";
import dayjs from "dayjs";
@@ -1008,53 +1009,7 @@ import {
$payOrder,
} from "@/api/table";
import { tbShopCategoryGet } from "@/api/shop";
-//判断商品是否可以下单
-function isCanBuy(goods) {
- return goods.isGrounding && goods.isPauseSale == 0 && goods.stockNumber > 0;
-}
-
-// 一个数组是否包含另外一个数组全部元素
-function arrayContainsAll(arr1, arr2) {
- for (let i = 0; i < arr2.length; i++) {
- if (!arr1.includes(arr2[i])) {
- return false;
- }
- }
- return true;
-}
-
-//n项 n-1项组合，生成全部结果
-function generateCombinations(arr, k) {
- let result = [];
-
- function helper(index, current) {
- if (current.length === k) {
- result.push(current.slice()); // 使用slice()来避免直接修改原始数组
- } else {
- for (let i = index; i < arr.length; i++) {
- current.push(arr[i]); // 将当前元素添加到组合中
- helper(i + 1, current); // 递归调用，索引增加以避免重复选择相同的元素
- current.pop(); // 回溯，移除当前元素以便尝试其他组合
- }
- }
- }
-
- helper(0, []); // 从索引0开始，初始空数组作为起点
- return result;
-}
-
-function returnReverseVal(val, isReturnString = true) {
- const isBol = typeof val === "boolean";
- const isString = typeof val === "string";
- let reverseNewval = "";
- if (isBol) {
- reverseNewval = !val;
- }
- if (isString) {
- reverseNewval = val === "true" ? "false" : "true";
- }
- return reverseNewval;
-}
+import { isCanBuy,arrayContainsAll,generateCombinations,returnReverseVal } from "./util.js";
export default {
components: {
@@ -1063,6 +1018,7 @@ export default {
payType,
orderNote,
moneyKeyboard,
+ scanPay,
},
data() {
return {
@@ -1250,7 +1206,7 @@ export default {
},
allNumber() {
return this.order.list.reduce((a, b) => {
- return a + b.number*1;
+ return a + b.number * 1;
}, 0);
},
selGoodsHide() {
@@ -1405,8 +1361,8 @@ export default {
});
},
"goods.query.productId": function (newval) {
- if(!this.$goodsData){
- return
+ if (!this.$goodsData) {
+ return;
}
if (newval == "") {
this.goods.list = this.$goodsData || [];
@@ -1422,31 +1378,38 @@ export default {
mounted() {
// this.getGoods();
// this.getCategory();
+
+ // this.refToggle('refScanCode',true)
},
methods: {
- //购物车商品输入框数量输入
- cartGoodsNumberInput(newval,item){
- if(newval<=0){
- return this.order.cacheNumber=1
+ refToggle(key,isShow){
+ if(!this.$refs[key]){
+ return
}
- newval=`${newval}`.split('.')[0]*1
- this.order.cacheNumber=newval
- this.$nextTick(()=>{
- item.number=newval
- })
+ isShow?this.$refs[key].open():this.$refs[key].close()
+ },
+ //购物车商品输入框数量输入
+ cartGoodsNumberInput(newval, item) {
+ if (newval <= 0) {
+ return (this.order.cacheNumber = 1);
+ }
+ newval = `${newval}`.split(".")[0] * 1;
+ this.order.cacheNumber = newval;
+ this.$nextTick(() => {
+ item.number = newval;
+ });
},
//购物车商品输入框数量改变
- cartGoodsNumberChange(newval,item){
- console.log(newval)
- if(newval<=0){
- item.number=1
- return this.order.number=1
+ cartGoodsNumberChange(newval, item) {
+ console.log(newval);
+ if (newval <= 0) {
+ item.number = 1;
+ return (this.order.number = 1);
}
- newval=`${newval}`.split('.')[0]*1
- console.log(newval)
- this.order.cacheNumber=newval
- this.order.number=newval
-
+ newval = `${newval}`.split(".")[0] * 1;
+ console.log(newval);
+ this.order.cacheNumber = newval;
+ this.order.number = newval;
},
//判读单规格商品是否售尽
isSellOut(item) {
@@ -2386,9 +2349,9 @@ export default {
},
async getGoods() {
const res = await getGoodsLists(this.goods.query);
- const goods= res.records.filter((v) => {
- if(!v){
- return false
+ const goods = res.records.filter((v) => {
+ if (!v) {
+ return false;
}
let isShow = true;
if (v.typeEnum !== "sku") {
@@ -2396,7 +2359,7 @@ export default {
}
return isShow;
});
- this.goods.list =goods
+ this.goods.list = goods;
this.goods.total = res.total;
this.$goodsData = goods;
},
@@ -2943,7 +2906,6 @@ input[type="number"]::-webkit-outer-spin-button {
cursor: pointer;
}
-
::v-deep .tag-group .el-tag {
min-width: 80px;
height: 28px;
diff --git a/src/views/table/components/util.js b/src/views/table/components/util.js
new file mode 100644
index 0000000..3472dd6
--- /dev/null
+++ b/src/views/table/components/util.js
@@ -0,0 +1,47 @@
+//判断商品是否可以下单
+export function isCanBuy(goods) {
+ return goods.isGrounding && goods.isPauseSale == 0 && goods.stockNumber > 0;
+}
+
+// 一个数组是否包含另外一个数组全部元素
+export function arrayContainsAll(arr1, arr2) {
+ for (let i = 0; i < arr2.length; i++) {
+ if (!arr1.includes(arr2[i])) {
+ return false;
+ }
+ }
+ return true;
+}
+
+//n项 n-1项组合，生成全部结果
+export function generateCombinations(arr, k) {
+ let result = [];
+
+ function helper(index, current) {
+ if (current.length === k) {
+ result.push(current.slice()); // 使用slice()来避免直接修改原始数组
+ } else {
+ for (let i = index; i < arr.length; i++) {
+ current.push(arr[i]); // 将当前元素添加到组合中
+ helper(i + 1, current); // 递归调用，索引增加以避免重复选择相同的元素
+ current.pop(); // 回溯，移除当前元素以便尝试其他组合
+ }
+ }
+ }
+
+ helper(0, []); // 从索引0开始，初始空数组作为起点
+ return result;
+}
+
+export function returnReverseVal(val, isReturnString = true) {
+ const isBol = typeof val === "boolean";
+ const isString = typeof val === "string";
+ let reverseNewval = "";
+ if (isBol) {
+ reverseNewval = !val;
+ }
+ if (isString) {
+ reverseNewval = val === "true" ? "false" : "true";
+ }
+ return reverseNewval;
+}
From 36b307fbbef20b85f5f0a74f03405ae151826096 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 29 Aug 2024 18:10:01 +0800
Subject: [PATCH 23/51] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=98=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/util.scss | 152 +++++++++-----
src/views/table/components/choose-user.vue | 5 +-
.../table-diancan-components/discount.vue | 197 ++++++++++++++++++
src/views/table/components/table-diancan.vue | 81 ++++---
4 files changed, 350 insertions(+), 85 deletions(-)
create mode 100644 src/views/table/components/table-diancan-components/discount.vue
diff --git a/src/assets/styles/util.scss b/src/assets/styles/util.scss
index be155a0..6c90650 100644
--- a/src/assets/styles/util.scss
+++ b/src/assets/styles/util.scss
@@ -7,7 +7,9 @@
.u-abso {
position: absolute;
}
-.u-fixed,.u-fix{
+
+.u-fixed,
+.u-fix {
position: fixed;
}
@@ -22,6 +24,7 @@ view,
text {
box-sizing: border-box;
}
+
/* #endif */
.u-font-xs {
@@ -130,39 +133,44 @@ text {
// 定义内外边距，历遍1-80
@for $i from 0 through 80 {
+
// 只要双数和能被5除尽的数
- @if $i % 2 == 0 or $i % 5 == 0 {
+ @if $i % 2==0 or $i % 5==0 {
+
// 得出：u-margin-30或者u-m-30
- .u-margin-#{$i}, .u-m-#{$i} {
- margin: $i + px!important;
+ .u-margin-#{$i},
+ .u-m-#{$i} {
+ margin: $i + px !important;
}
-
+
// 得出：u-padding-30或者u-p-30
- .u-padding-#{$i}, .u-p-#{$i} {
- padding: $i + px!important;
+ .u-padding-#{$i},
+ .u-p-#{$i} {
+ padding: $i + px !important;
}
-
+
@each $short, $long in l left, t top, r right, b bottom {
+
// 缩写版，结果如： u-m-l-30
// 定义外边距
.u-m-#{$short}-#{$i} {
- margin-#{$long}: $i + px!important;
+ margin-#{$long}: $i + px !important;
}
-
+
// 定义内边距
.u-p-#{$short}-#{$i} {
- padding-#{$long}: $i + px!important;
+ padding-#{$long}: $i + px !important;
}
-
+
// 完整版，结果如：u-margin-left-30
// 定义外边距
.u-margin-#{$long}-#{$i} {
- margin-#{$long}: $i + px!important;
+ margin-#{$long}: $i + px !important;
}
-
+
// 定义内边距
.u-padding-#{$long}-#{$i} {
- padding-#{$long}: $i + px!important;
+ padding-#{$long}: $i + px !important;
}
}
}
@@ -176,116 +184,146 @@ text {
/* start--文本行数限制--start */
.u-line-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.u-line-2 {
- -webkit-line-clamp: 2;
+ -webkit-line-clamp: 2;
}
.u-line-3 {
- -webkit-line-clamp: 3;
+ -webkit-line-clamp: 3;
}
.u-line-4 {
- -webkit-line-clamp: 4;
+ -webkit-line-clamp: 4;
}
.u-line-5 {
- -webkit-line-clamp: 5;
+ -webkit-line-clamp: 5;
}
-.u-line-2, .u-line-3, .u-line-4, .u-line-5 {
- overflow: hidden;
+.u-line-2,
+.u-line-3,
+.u-line-4,
+.u-line-5 {
+ overflow: hidden;
word-break: break-all;
- text-overflow: ellipsis;
- display: -webkit-box; // 弹性伸缩盒
- -webkit-box-orient: vertical; // 设置伸缩盒子元素排列方式
+ text-overflow: ellipsis;
+ display: -webkit-box; // 弹性伸缩盒
+ -webkit-box-orient: vertical; // 设置伸缩盒子元素排列方式
}
/* end--文本行数限制--end */
/* start--不同颜色文字--start */
-.color-333{
+.color-333 {
color: #333;
}
-.color-666{
+
+.color-666 {
color: #666;
}
-.color-999{
+
+.color-999 {
color: #999;
}
+.color-red {
+ color: rgb(250, 85, 85);
+}
+
+
/* end--不同颜色文字--end */
-
-.tranistion{
+.tranistion {
transition: all .3s ease-in-out;
}
-.tranistion-1{
+
+.tranistion-1 {
transition: all .1s ease-in-out;
}
-.tranistion-2{
+
+.tranistion-2 {
transition: all .2s ease-in-out;
}
-.font-bold{
+
+.font-bold {
font-weight: 700;
}
+.font-600 {
+ font-weight: 600;
+}
-.bg-gray{
+.bg-gray {
background-color: #F9F9F9;
}
-.w-full{
+
+.w-full {
width: 100%;
}
-.gap-10{
+
+.gap-10 {
gap: 10px;
}
-.gap-20{
+
+.gap-20 {
gap: 20px;
}
-.color-aaa{
+
+.color-aaa {
color: #aaa;
}
-.color-000{
+
+.color-000 {
color: #000;
}
-.color-fff{
+
+.color-fff {
color: #fff;
}
-.bg-fff{
+
+.bg-fff {
background-color: #fff;
}
-.bg-gray{
+
+.bg-gray {
background-color: #F9F9F9;
}
-.overflow-hide{
+
+.overflow-hide {
overflow: hidden;
}
-.no-wrap{
+
+.no-wrap {
white-space: nowrap;
}
-.border-r-12{
+
+.border-r-12 {
border-radius: 12px;
}
-.border-r-18{
+
+.border-r-18 {
border-radius: 18px;
}
-.border-top{
+
+.border-top {
border-top: 1px solid #E5E5E5;
}
-.border-bottom{
+
+.border-bottom {
border-bottom: 1px solid #E5E5E5;
}
-.scale7{
+
+.scale7 {
transform: scale(0.7);
}
-.position-all{
+.position-all {
left: 0;
right: 0;
top: 0;
@@ -295,18 +333,20 @@ text {
.lh16 {
line-height: 16px;
}
-.default-box-padding{
+
+.default-box-padding {
padding: 16px 14px;
}
-.zIndex-999{
+.zIndex-999 {
z-index: 999;
}
-.icon-default-size{
+
+.icon-default-size {
width: 14px;
height: 14px;
}
-.filter-gray{
+.filter-gray {
filter: grayscale(1);
}
\ No newline at end of file
diff --git a/src/views/table/components/choose-user.vue b/src/views/table/components/choose-user.vue
index 6427ca7..c391b32 100644
--- a/src/views/table/components/choose-user.vue
+++ b/src/views/table/components/choose-user.vue
@@ -128,9 +128,7 @@ export default {
},
},
mounted() {
- cacheData = { ...this.query };
- this.getTableData();
- this.getShopInfo();
+ // this.getTableData();
},
methods: {
cellClick(user){
@@ -155,6 +153,7 @@ export default {
this.show = false;
},
open() {
+ this.getTableData();
this.show = true;
},
toPage(type) {
diff --git a/src/views/table/components/table-diancan-components/discount.vue b/src/views/table/components/table-diancan-components/discount.vue
new file mode 100644
index 0000000..bc9e9b8
--- /dev/null
+++ b/src/views/table/components/table-diancan-components/discount.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index e14f731..9108fa0 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -162,7 +162,7 @@
alt=""
/>
+
+
+
+
+
+
+
+ 元
+
+
+
+
+ %
+
+
+
+
+ 元
+
+
+
+
+ ￥{{ form.money }}
+
+
+ 取消
+ 确定
+
+
-
{{ vipUser.nickName }}
@@ -592,14 +592,6 @@
+
+ 整单打折/减免
+
+
+
@@ -698,7 +692,12 @@
整单改价
- -￥0.00
+
+ -￥{{
+ ((1 - createOrder.discount) * createOrder.data.amount)
+ | to2
+ }}
+
@@ -719,7 +718,9 @@
@@ -981,6 +982,9 @@
+
@@ -989,6 +993,7 @@ import chooseUser from "./choose-user.vue";
import payType from "./pay-type.vue";
import chooseTable from "./table-diancan-components/choose-table-master.vue";
import scanPay from "./table-diancan-components/scan-pay.vue";
+import moneyDiscount from "./table-diancan-components/discount.vue";
import orderNote from "./table-diancan-components/note.vue";
import moneyKeyboard from "./money-keyboard.vue";
import dayjs from "dayjs";
@@ -1009,7 +1014,12 @@ import {
$payOrder,
} from "@/api/table";
import { tbShopCategoryGet } from "@/api/shop";
-import { isCanBuy,arrayContainsAll,generateCombinations,returnReverseVal } from "./util.js";
+import {
+ isCanBuy,
+ arrayContainsAll,
+ generateCombinations,
+ returnReverseVal,
+} from "./util.js";
export default {
components: {
@@ -1019,6 +1029,7 @@ export default {
orderNote,
moneyKeyboard,
scanPay,
+ moneyDiscount,
},
data() {
return {
@@ -1143,6 +1154,7 @@ export default {
canUpdate: true,
//下单
createOrder: {
+ discount: 1,
form: {},
data: {},
quan: {
@@ -1243,6 +1255,11 @@ export default {
masterId: function (val) {
console.log(val);
},
+ isCreateOrder: function (val) {
+ if (!val) {
+ this.createOrder.discount = 1;
+ }
+ },
"vipUser.id": async function (val) {
let masterId = this.order.masterId;
if (!masterId) {
@@ -1378,16 +1395,26 @@ export default {
mounted() {
// this.getGoods();
// this.getCategory();
-
// this.refToggle('refScanCode',true)
+ // this.refToggle("refDiscount", true);
},
methods: {
- refToggle(key,isShow){
- if(!this.$refs[key]){
- return
+ ChangeDiscount(discount) {
+ this.createOrder.discount = discount;
+ },
+ disCountShow() {
+ const { amount } = this.createOrder.data;
+ this.refToggle("refDiscount", true, {
+ amount,
+ discount: this.createOrder.discount * 100,
+ });
+ },
+ refToggle(key, isShow, data) {
+ if (!this.$refs[key]) {
+ return;
}
- isShow?this.$refs[key].open():this.$refs[key].close()
- },
+ isShow ? this.$refs[key].open(data) : this.$refs[key].close(data);
+ },
//购物车商品输入框数量输入
cartGoodsNumberInput(newval, item) {
if (newval <= 0) {
@@ -1486,6 +1513,7 @@ export default {
orderId: this.createOrder.data.id,
payType: this.order.payType,
vipUserId: this.vipUser.id,
+ discount: this.createOrder.discount.toFixed(2),
});
this.payOrderSuccess();
},
@@ -2114,6 +2142,7 @@ export default {
this.allPack = false;
this.note.content = "";
this.isPrverOrder = false;
+ this.createOrder.discount = 1;
},
//获取购物车数据
async getCart() {
@@ -2456,10 +2485,6 @@ input[type="number"]::-webkit-outer-spin-button {
text-align: center;
}
-::v-deep .number-box .el-input__inner::-webkit-outer-spin-button {
- -webkit-appearance: none;
- margin: 0;
-}
::v-deep .el-button--success:not(.is-disabled) {
background: #22bf64;
color: #fff;
@@ -2490,6 +2515,10 @@ input[type="number"]::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}
+::v-deep .number-box .el-input__inner::-webkit-outer-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+}
.carts_list_title {
padding: 16px 0 12px 0;
display: flex;
From 06e4292de8dfcd06e312747b168d144530e7a92b Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 29 Aug 2024 18:22:29 +0800
Subject: [PATCH 24/51] =?UTF-8?q?=E4=BB=A3=E8=AF=BE=E4=B8=8B=E5=8D=95?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=98=E6=89=A3=E4=BC=A0=E5=8F=82=E4=BD=8D?=
=?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/table/components/table-diancan.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index 9108fa0..a45a789 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -1252,10 +1252,10 @@ export default {
},
},
watch: {
- masterId: function (val) {
+ "masterId": function (val) {
console.log(val);
},
- isCreateOrder: function (val) {
+ "isCreateOrder": function (val) {
if (!val) {
this.createOrder.discount = 1;
}
@@ -1513,7 +1513,7 @@ export default {
orderId: this.createOrder.data.id,
payType: this.order.payType,
vipUserId: this.vipUser.id,
- discount: this.createOrder.discount.toFixed(2),
+ discount: this.createOrder.discount,
});
this.payOrderSuccess();
},
From ae6dcc295af46e9e713ed1901bf7da6da9174bec Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 30 Aug 2024 09:16:32 +0800
Subject: [PATCH 25/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=82?=
=?UTF-8?q?=E4=B8=A4=E7=AB=AF=E7=9A=84=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/shop/components/extend.vue | 31 ++++++++++++++--------------
src/views/user_manage/user_list.vue | 6 +++++-
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/views/shop/components/extend.vue b/src/views/shop/components/extend.vue
index 6e353bf..d42a9f5 100644
--- a/src/views/shop/components/extend.vue
+++ b/src/views/shop/components/extend.vue
@@ -1,6 +1,6 @@
应付金额
- ￥{{ createOrder.data.amount | to2 }}
+ ￥{{
+ (createOrder.data.amount * createOrder.discount) | to2
+ }}
- 添加
+
@@ -8,21 +8,20 @@
-
-
+
- ![]()
+
+ ![]()
+
{{ row.row.value }}
-
-
编辑
+ @click="edit(scope.row)">编辑
-
+
删除
@@ -35,18 +34,20 @@
文本
图片
-
+
+
+
![]()
+ {{form.detail}}
充值
消费退款
消费
- 充值退款
+ 充值退款
@@ -277,6 +277,10 @@ export default {
this.getTableData();
},
async sumbit() {
+ if (!this.userinfo.amount) {
+ this.$message.error("请填写金额")
+ return
+ }
let res = await midfiyAccount(this.userinfo)
this.dialogVisible = false
this.$message.success('修改成功')
From aee738ca004945dd5e3efef362675f4f6bd21569 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 30 Aug 2024 16:28:05 +0800
Subject: [PATCH 26/51] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E7=BA=BF?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AE=89=E5=85=A8=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/order_manage/order_list.vue | 39 +++++-----
src/views/shop/components/extend.vue | 10 +--
src/views/shop/components/securitySetting.vue | 72 ++++++++++++-------
src/views/user_manage/user_list.vue | 2 +-
4 files changed, 67 insertions(+), 56 deletions(-)
diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue
index 239c203..eeb4a8f 100644
--- a/src/views/order_manage/order_list.vue
+++ b/src/views/order_manage/order_list.vue
@@ -39,21 +39,13 @@
v-if="timeValue == 'custom'">
-
+
-
- 查询
重置
@@ -61,7 +53,7 @@
下载中...
-
+
@@ -108,8 +100,8 @@
-
- {{ item.productName }}
+
+ {{ item.productName }}
(退 - {{ item.refundNumber }})
@@ -194,7 +186,7 @@ export default {
payType: "",
orderNo: "",
createdAt: [],
- productName:''
+ productName: ''
},
tableData: {
data: [],
@@ -239,7 +231,7 @@ export default {
if (this.$route.query.tableName) {
this.query.tableName = this.$route.query.tableName
}
- if(this.$route.query.orderNo){
+ if (this.$route.query.orderNo) {
this.query.orderNo = this.$route.query.orderNo
}
this.resetQuery = { ...this.query };
@@ -290,7 +282,7 @@ export default {
this.timeValue = "";
this.query = { ...this.resetQuery };
this.page = 0;
- this.getTableData();
+ this.getTableData(true);
},
// 分页大小改变
sizeChange(e) {
@@ -303,18 +295,18 @@ export default {
this.getTableData();
},
// 获取商品列表
- async getTableData() {
+ async getTableData(switchs = false) {
this.tableData.loading = true;
try {
this.payCount();
- const productName=this.query.productName.replace(/\s+/g,'')
+ const productName = this.query.productName.replace(/\s+/g, '')
const res = await tbOrderInfoData({
page: this.tableData.page,
pageSize: this.tableData.size,
orderType: this.orderType,
...this.query,
productName,
- userId:this.$route.query.userId
+ userId: switchs == true ? '' : this.$route.query.userId
});
this.tableData.loading = false;
this.tableData.data = res.content;
@@ -521,7 +513,8 @@ export default {
}
}
}
-.colorStyle{
-color: #ffc315;
+
+.colorStyle {
+ color: #ffc315;
}
diff --git a/src/views/shop/components/extend.vue b/src/views/shop/components/extend.vue
index d42a9f5..e62f811 100644
--- a/src/views/shop/components/extend.vue
+++ b/src/views/shop/components/extend.vue
@@ -2,13 +2,13 @@
+
- {{ status[item.status]?status[item.status].label:'' }}
+ {{ status[item.status] ? status[item.status].label : "" }}
@@ -67,12 +71,24 @@
客座次数：{{ item.maxCapacity }}人
- 点餐
+
+ 点餐
+
+
+ 加菜
+ 结账
+
@@ -133,17 +149,17 @@ export default {
total: 0,
tableList: [],
status: {
- pending:{
- label: "挂单中",
- type: "#E6A23C",
+ pending: {
+ label: "挂单中",
+ type: "#E6A23C",
},
- using:{
- label: "开台中",
- type: "#E6A23C",
+ using: {
+ label: "开台中",
+ type: "#E6A23C",
},
- paying:{
- label: "结算中",
- type: "#E6A23C",
+ paying: {
+ label: "结算中",
+ type: "#E6A23C",
},
idle: {
label: "空闲",
@@ -172,11 +188,13 @@ export default {
this.tbShopAreaGet();
},
methods: {
- onDiancanClose(){
- this.tbShopTableGet()
+ onDiancanClose() {
+ this.tbShopTableGet();
},
- diancanShow(item) {
- this.$refs.dianan.open(item);
+ diancanShow(item,key) {
+ //key isAddGoods 加菜
+ //key isPayOrder结账
+ this.$refs.dianan.open(item,key);
},
tabClick() {
this.tbShopTableGet();
@@ -209,7 +227,14 @@ export default {
areaId: this.tabVlaue,
});
console.log(content);
- this.tableList = content;
+ this.tableList=content
+ // this.tableList = content.sort((a,b)=>{
+ // if(a.status=='idle'&&b.status!='idle'){
+ // return 1
+ // }else if(a.status!='idle'&&b.status=='idle'){
+ // return -1
+ // }
+ // });
this.total = total;
setTimeout(() => {
this.loading = false;
@@ -259,7 +284,9 @@ export default {
.item {
border: 1px solid #ddd;
-
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
.top {
padding: 20px;
From d889b9b1ad67224da845b308b8d8d629f2a0b92a Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 30 Aug 2024 17:00:29 +0800
Subject: [PATCH 32/51] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95=EF=BC=8C?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../table-diancan-components/cart-item.vue | 265 ++++++++++++++++
src/views/table/components/table-diancan.vue | 297 +++++++++---------
2 files changed, 415 insertions(+), 147 deletions(-)
create mode 100644 src/views/table/components/table-diancan-components/cart-item.vue
diff --git a/src/views/table/components/table-diancan-components/cart-item.vue b/src/views/table/components/table-diancan-components/cart-item.vue
new file mode 100644
index 0000000..8cc1701
--- /dev/null
+++ b/src/views/table/components/table-diancan-components/cart-item.vue
@@ -0,0 +1,265 @@
+
+
去结账
@@ -270,75 +270,46 @@
+ 包
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index a45a789..1935de0 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -260,7 +260,7 @@
+
+
+ ![]()
+
+
+
+
+
+ {{ item.name }}
+ 赠
+
+ {{ item.specSnap }}
+
+
+
+
+
+
+ X{{ item.number }}
+
+
+
+
+
+
+
+
+
+
+ ￥0
+
+ ￥{{ item.salePrice }}
+
+
-
+
+
+
-
- 包
-
-
-
+
+
+
-
-
- ![]()
-
-
-
-
-
- {{ item.name }}
- 赠
-
- {{ item.specSnap }}
-
-
-
-
-
-
- X{{ item.number }}
-
-
-
-
-
-
-
-
-
- ￥{{ item.salePrice }}
-
- 以下是优惠菜品
-
已下单菜品
+
+
+
订单备注： {{ note.content }}
@@ -346,7 +317,10 @@
-
去结账
@@ -373,14 +373,14 @@
+
-
+
-
@@ -804,7 +761,7 @@
@@ -989,9 +958,11 @@
+
+
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index f773164..98c7bfb 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -250,7 +250,7 @@
type="success"
size="medium"
:disabled="!order.list.length"
- @click="toCreateOrder(false)"
+ @click="toCreateOrderDebounce(false)"
>
仅下单
@@ -261,7 +261,7 @@
-
存单
取单
@@ -699,12 +673,16 @@
}}
+
打包费
+
+ ￥{{ createOrder.data.packFee || "0.00" }}
+
+ 桌位费/附加费
￥0.00
总价
@@ -772,27 +750,6 @@
>
{{ val.name }}
-
￥{{ skuGoods.data.salePrice | to2 }}
{{ skuText }}
- 库存：{{ skuGoods.data.stockNumber || "" }}
+ 库存：{{ skuGoods.data.stockNumber || 0 }}
@@ -829,7 +786,15 @@
>
已下架
-
存单
取单
@@ -1133,6 +1133,7 @@ export default {
canUpdate: true,
//下单
createOrder: {
+ status: "",
discount: 1,
form: {},
data: {},
@@ -1532,6 +1533,13 @@ export default {
this.isCreateOrder = false;
},
//生成订单
+ toCreateOrderDebounce(isNowPay){
+ if(this.createOrder.status!=''&&this.createOrder.status!='success'){
+ return
+ }
+ this.createOrder.status='loading'
+ this.toCreateOrder(isNowPay)
+ },
async toCreateOrder(isNowPay = false) {
console.log(this.order)
console.log(this.order.orderId)
@@ -1547,6 +1555,7 @@ export default {
console.log(this.postPay);
console.log(isNowPay);
console.log(this.postPay && isNowPay);
+ this.createOrder.status='success'
if (this.postPay && !isNowPay) {
this.$notify({
title: "下单成功",
@@ -1559,7 +1568,6 @@ export default {
const { masterId } = await this.getMasterId();
this.masterId = masterId;
}
-
this.isCreateOrder = true;
},
@@ -2158,6 +2166,7 @@ export default {
this.prveOrder.selIndex=-1
this.order.old.selIndex = -1;
this.isCreateOrder = false;
+ this.createOrder.status=""
this.note.content = "";
this.vipUser = { id: "" };
this.allPack = false;
@@ -2175,10 +2184,10 @@ export default {
masterId: this.masterId,
tableId: this.table.tableId,
});
+ this.order.list = res.records;
if (this.key) {
- this.order.old.list = res.records;
+ // this.order.old.list = res.records;
} else {
- this.order.list = res.records;
}
this.order.total = res.total;
},
From 0e50ec69989788ade526dfae6148fccdb395e574 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 2 Sep 2024 17:25:26 +0800
Subject: [PATCH 45/51] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/shop.js | 10 +++++-
src/views/user_manage/user_list.vue | 49 ++++++++++++++++++++++++++---
2 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/src/api/shop.js b/src/api/shop.js
index ce3fdc9..a9eb4bb 100644
--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -625,10 +625,18 @@ export function tbShopUseredit(data) {
});
}
// 通过活动id获取赠送商品列表
-
export function activate(id) {
return request({
url: `shop/storage/activate/${id}`,
method: "get"
});
+}
+
+// 通过活动id获取赠送商品列表
+export function queryShopUserFlow(params) {
+ return request({
+ url: `/api/tbShopUser/queryShopUserFlow`,
+ method: "get",
+ params
+ });
}
\ No newline at end of file
diff --git a/src/views/user_manage/user_list.vue b/src/views/user_manage/user_list.vue
index 1033278..cc841ae 100644
--- a/src/views/user_manage/user_list.vue
+++ b/src/views/user_manage/user_list.vue
@@ -74,7 +74,7 @@
-
+
{{ scope.row.amount }}
@@ -184,8 +184,29 @@
-
-
+
+
-
+
-
+
+
+
+
+ {{ scope.row.type }} {{ scope.row.amount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -194,7 +215,7 @@
@@ -1068,7 +1382,7 @@ export default {
z-index: 10;
}
-.showStyle:hover>.buttonstyle {
+.showStyle:hover > .buttonstyle {
display: block;
}
From 299a38f3f90aee466df8aa809169d51ace4c6ec2 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 3 Sep 2024 16:02:58 +0800
Subject: [PATCH 48/51] =?UTF-8?q?=E5=95=86=E5=93=81=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0=E8=A1=A8=E6=A0=BC=E9=9A=90=E8=97=8F?=
=?UTF-8?q?=E5=8E=9F=E4=BB=B7=E5=92=8C=E6=88=90=E6=9C=AC=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/product/add_shop.vue | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index bd8a360..f6d5a16 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -115,19 +115,19 @@
controls-position="right">
+
+
-
-
+
-
+
- 取消
- 确定
+ 取消
+ 确定
@@ -55,18 +62,26 @@
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index 98c7bfb..a77977b 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -142,7 +142,7 @@
+
+
+
立即支付
@@ -788,24 +793,21 @@
+ class="my-btn disabled flex-1"
+ v-if="skuGoods.data.stockNumber <= 0"
+ disabled
+ >
+ 库存不足
+
-
-
+ class="my-btn success flex-1"
+ v-else
+ :disabled="CanConfirm"
+ @click="chooseSkuConfirm"
+ >
+ 确定
+
-
@@ -950,7 +952,14 @@
-
@@ -1004,6 +1013,8 @@ export default {
},
data() {
return {
+ //整体点餐页面loading
+ loading: false,
//台桌点餐页面打开时带来的参数 isAddGoods 加菜 isPayOrder结账
key: "",
//是否是从挂单里取出来的订单
@@ -1060,7 +1071,7 @@ export default {
total: 0,
},
order: {
- orderId:"",
+ orderId: "",
payType: "",
masterId: "",
allPack: false,
@@ -1133,10 +1144,13 @@ export default {
canUpdate: true,
//下单
createOrder: {
+ code: "",
status: "",
discount: 1,
form: {},
- data: {},
+ data: {
+ amount: 0,
+ },
quan: {
list: [],
sel: "",
@@ -1323,7 +1337,7 @@ export default {
},
"order.selIndex": function (val, oldval) {
console.log(val);
- this.order.old.selIndex=-1
+ this.order.old.selIndex = -1;
if (val === -1) {
// return (this.order.number = 1);
this.order.cacheNumber = 1;
@@ -1393,6 +1407,18 @@ export default {
// this.refToggle("refDiscount", true);
},
methods: {
+ //扫码支付弹窗确认
+ scanPayConfirm(code) {
+ this.createOrder.code = code;
+ this.payOrder();
+ },
+ payTypeItemClick(item) {
+ console.log(item);
+ if (item.payType == "scanCode") {
+ //扫码支付
+ this.refToggle("refScanCode", true);
+ }
+ },
ChangeDiscount(discount) {
this.createOrder.discount = discount;
},
@@ -1493,15 +1519,22 @@ export default {
orderId: this.createOrder.data.id,
payType: this.order.payType,
});
- const res = await $payOrder({
- tableId: this.table.tableId,
- masterId: this.masterId,
- orderId: this.createOrder.data.id,
- payType: this.order.payType,
- vipUserId: this.vipUser.id,
- discount: this.createOrder.discount,
- });
- this.payOrderSuccess();
+ this.loading = true;
+ try {
+ const res = await $payOrder({
+ tableId: this.table.tableId,
+ masterId: this.masterId,
+ orderId: this.createOrder.data.id,
+ payType: this.order.payType,
+ vipUserId: this.vipUser.id,
+ discount: this.createOrder.discount,
+ code: this.createOrder.code,
+ });
+ this.loading = false;
+ this.payOrderSuccess();
+ } catch (error) {
+ this.loading = false;
+ }
},
payOrderSuccess() {
this.$notify({
@@ -1533,29 +1566,32 @@ export default {
this.isCreateOrder = false;
},
//生成订单
- toCreateOrderDebounce(isNowPay){
- if(this.createOrder.status!=''&&this.createOrder.status!='success'){
- return
+ toCreateOrderDebounce(isNowPay) {
+ if (
+ this.createOrder.status != "" &&
+ this.createOrder.status != "success"
+ ) {
+ return;
}
- this.createOrder.status='loading'
- this.toCreateOrder(isNowPay)
+ this.createOrder.status = "loading";
+ this.toCreateOrder(isNowPay);
},
async toCreateOrder(isNowPay = false) {
- console.log(this.order)
- console.log(this.order.orderId)
+ console.log(this.order);
+ console.log(this.order.orderId);
const res = await $createOrder({
masterId: this.order.masterId || this.masterId,
vipUserId: this.vipUser.id,
tableId: this.table.tableId,
note: this.note.content,
postPay: this.postPay,
- orderld:this.order.orderId
+ orderld: this.order.orderId,
});
//后付款
console.log(this.postPay);
console.log(isNowPay);
console.log(this.postPay && isNowPay);
- this.createOrder.status='success'
+ this.createOrder.status = "success";
if (this.postPay && !isNowPay) {
this.$notify({
title: "下单成功",
@@ -1713,12 +1749,12 @@ export default {
// masterId:order.carList[0].masterId
// })
- const { masterId, tableId, userId, remark,id } = await $cacheOrder({
+ const { masterId, tableId, userId, remark, id } = await $cacheOrder({
orderId: this.prveOrder.list[this.prveOrder.sel].orderId,
isPending: false,
});
this.order.orderId = id;
- console.log( this.order.orderId)
+ console.log(this.order.orderId);
this.masterId = masterId;
this.isPrverOrder = true;
@@ -1739,8 +1775,8 @@ export default {
//删除挂单
async delPrveOrder(isRequest = true) {
const { sel } = this.prveOrder;
- if(this.prveOrder.list<=0||sel<0){
- return
+ if (this.prveOrder.list <= 0 || sel < 0) {
+ return;
}
const order = this.prveOrder.list[sel];
const orderMasterId = order.carList[0].masterId;
@@ -1816,7 +1852,7 @@ export default {
this.order.list = [];
this.order.selIndex = -1;
this.note.content = "";
- this.order.orderId=""
+ this.order.orderId = "";
this.$nextTick(() => {
this.getCacheOrder();
});
@@ -2116,13 +2152,13 @@ export default {
.filter((v) => v.specSnap.match(i))
.every((v) => {
// return isCanBuy(v,this.selGoods.data.isStock)
- return isCanBuy(v)
+ return isCanBuy(v);
});
}
}
return prve;
}, {});
- console.log(includeSkuMap)
+ console.log(includeSkuMap);
for (let i in includeSkuMap) {
for (let k in skuList) {
const index = skuList[k].valueArr.findIndex((val) => val === i);
@@ -2155,6 +2191,7 @@ export default {
},
reset() {
// this.goods.list = [];
+ this.loading = false;
this.order.masterId = "";
this.order.list = [];
this.order.query.page = 1;
@@ -2162,20 +2199,21 @@ export default {
this.order.list = [];
this.order.selIndex = -1;
this.order.old.list = [];
- this.prveOrder.list=[];
- this.prveOrder.selIndex=-1
+ this.prveOrder.list = [];
+ this.prveOrder.selIndex = -1;
this.order.old.selIndex = -1;
this.isCreateOrder = false;
- this.createOrder.status=""
+ this.createOrder.status = "";
+ this.createOrder.code = "";
this.note.content = "";
this.vipUser = { id: "" };
this.allPack = false;
this.note.content = "";
this.isPrverOrder = false;
this.createOrder.discount = 1;
- this.order.cacheNumber=1
+ this.order.cacheNumber = 1;
this.key = "";
- this.order.orderId=''
+ this.order.orderId = "";
},
//获取购物车数据
async getCart() {
@@ -2294,14 +2332,14 @@ export default {
} else {
//增加
console.log(item);
- const num= item.specList[0].suit
+ const num = item.specList[0].suit;
res = await addCart({
masterId: this.masterId,
vipUserId: this.vipUser.id,
productId: item.id,
skuId: item.specList[0].id,
tableId: this.table.tableId,
- num:num<=0?1:num, // 0会删除此商品
+ num: num <= 0 ? 1 : num, // 0会删除此商品
isPack: false, // 是否打包
});
this.orderListPush(res);
From 24a044427b9afb103e7ba6d383fa60017c8b1582 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 5 Sep 2024 09:32:50 +0800
Subject: [PATCH 51/51] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=82=A8=E5=80=BC=E5=8D=A1=E4=B8=BA=E6=89=AB?=
=?UTF-8?q?=E7=A0=81=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/table/components/table-diancan.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index a77977b..1d6b52b 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -1414,7 +1414,7 @@ export default {
},
payTypeItemClick(item) {
console.log(item);
- if (item.payType == "scanCode") {
+ if (item.payType == "deposit") {
//扫码支付
this.refToggle("refScanCode", true);
}
@@ -619,7 +619,12 @@
-