+
-->
-
未找到相关商品
+
-->
@@ -1317,7 +1329,7 @@ export default {
productId: "",
categoryId: "",
page: 1,
- size: 300,
+ size: 20,
},
loading: false,
total: 0,
@@ -1581,6 +1593,11 @@ export default {
},
},
watch: {
+ "goods.query.categoryId": function (newval) {
+ this.goods.query.page = 1;
+ this.goods.list = [];
+ this.getGoods();
+ },
"useTypes.sel": function (newval, oldval) {
console.log(newval);
this.setPostPay();
@@ -1740,15 +1757,20 @@ export default {
this.open(this.$route.query.tableId ? this.$route.query : "");
},
methods: {
+ loadMoreGoods() {
+ if (this.goods.query.page * this.goods.query.size < this.goods.total) {
+ this.goods.query.page = this.goods.query.page + 1;
+ this.getGoods();
+ }
+ },
async shoukuanClick() {
this.canShoukuan = await hasPermission("允许收款");
- return this.canShoukuan;
+ return this.canShoukuan;
},
// 打开页面
async xiadanClick() {
this.canXiadan = await hasPermission("允许下单");
- return this.canXiadan;
-
+ return this.canXiadan;
},
changeOrderExtraSel(index, canChangeNumber, placeNum) {
// console.log(index,canChangeNumber,placeNum)
@@ -1856,7 +1878,7 @@ export default {
return;
}
await this.returnCreateOrderData();
- console.log( this.createOrder.data )
+ console.log(this.createOrder.data);
this.order.payType = "scanCode";
this.payTypeItemClick({ payType: "scanCode" });
this.payBeforeClear();
@@ -2048,7 +2070,7 @@ export default {
}
if (item.payType == "scanCode") {
//扫码支付
- return this.refToggle("refWxScanCode", true,this.createOrder.data);
+ return this.refToggle("refWxScanCode", true, this.createOrder.data);
}
},
ChangeDiscount(discount) {
@@ -2182,7 +2204,7 @@ export default {
return this.refChooseUserOpen();
}
if (this.order.payType == "scanCode") {
- return this.refToggle("refWxScanCode", true,this.createOrder.data);
+ return this.refToggle("refWxScanCode", true, this.createOrder.data);
}
if (this.order.payType == "deposit") {
return this.refToggle("refScanCode", true);
@@ -2250,7 +2272,7 @@ export default {
if (!canXiadan) {
return;
}
- }else{
+ } else {
//去结算
const canJiesuan = await this.shoukuanClick();
if (!canJiesuan) {
@@ -2273,14 +2295,15 @@ export default {
console.log(this.order.orderId);
let res = "";
try {
- const seatFee = await $choseCount({
- masterId: this.masterId,
- tableId: this.table.tableId,
- num: this.perpole,
- });
- this.order.seatFee = seatFee;
-
- this.order.seatFee = res;
+ if (!this.shopInfo.isTableFee) {
+ const seatFee = await $choseCount({
+ masterId: this.masterId,
+ tableId: this.table.tableId,
+ num: this.perpole,
+ });
+ this.order.seatFee = seatFee;
+ this.order.seatFee = res;
+ }
res = await $createOrder({
masterId: this.order.masterId || this.masterId,
vipUserId: this.vipUser.id,
@@ -2316,23 +2339,15 @@ export default {
},
// 获取取餐号
- getMasterId() {
- // if(!this.table.tableId){
- // return this.$message.error("请选择桌台");
- // }
- if (this.table.tableId) {
- return $getMasterId({
+ async getMasterId() {
+ const res=await $getMasterId({
tableId: this.table.tableId,
orderId: this.table.orderId,
vipUserId: this.vipUser.id,
- useType: this.useTypes.sel == "takeout" ? "takeout" : "",
- });
- } else {
- // return $getMasterId({
- // useType:'takeout',
- // vipUserId: this.vipUser.id,
- // });
- }
+ useType: this.useTypes.sel == "takeout" ? "takeout" : ""
+ })
+ this.masterId=res.masterId;
+ return res
},
onSelGoodsSkuClose() {
this.selGoods.isEdit = false;
@@ -3057,9 +3072,9 @@ export default {
},
//根据右侧商品单规格多规格做不同处理
async goodsClick(item) {
- if (!this.table) {
- return this.$message.error("暂不支持无桌台下单，请先选择桌台");
- }
+ // if (!this.table) {
+ // return this.$message.error("暂不支持无桌台下单，请先选择桌台");
+ // }
if (item.typeEnum === "sku") {
this.selGoods.data = item;
this.selGoods.skuMap = {};
@@ -3125,8 +3140,9 @@ export default {
});
return isShow;
});
- console.log($goodsMap);
- this.goods.list = goods;
+ for (let i in goods) {
+ this.goods.list.push(goods[i]);
+ }
this.goods.total = res.total;
this.$goodsData = goods;
},
@@ -3976,11 +3992,12 @@ input[type="number"]::-webkit-outer-spin-button {
.goods-list {
display: flex;
flex-wrap: wrap;
-
+ min-height: 10px;
.goods-item {
position: relative;
cursor: pointer;
- min-width: 98px;
+ // min-width: 98px;
+ min-width: 100px;
max-width: 100px;
height: 100px;
// flex: 1;
@@ -4448,6 +4465,11 @@ input[type="number"]::-webkit-outer-spin-button {
::v-deep .cashier_left .el-form-item__label {
text-align: left;
}
+::v-deep .goods .el-image {
+ display: flex;
+ width: 100%;
+ justify-content: center;
+}
.cashier_left .detail_box .usercard .info .nickname .vip_level {
font-size: 12px;
padding: 0 5px;
From c473f30a37692bf360b956138dc8629a2f885034 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 24 Oct 2024 14:52:52 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E5=AE=A2?=
=?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=95=86=E5=93=81=E6=98=AF=E5=90=A6=E8=83=BD?=
=?UTF-8?q?=E5=A4=9F=E4=B8=8B=E5=8D=95=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/tool/Instead/index.vue | 352 ++++++++++++++++++-------------
src/views/tool/Instead/util.js | 13 +-
2 files changed, 211 insertions(+), 154 deletions(-)
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 6bc212d..0ad93a2 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -594,7 +594,11 @@
- ![]()
+
+
+
+ 未找到相关商品
+
@@ -1166,7 +1178,7 @@
+
未找到相关商品
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item | returntypeName }}
-
-
-
+ {{ item.name }}
-
-
-
-
+
+
+
+ ￥{{ item.lowPrice }}
-
-
-
-
+ 售罄
-
+ {{ item | returntypeName }}
+
+
+
{{ item.name }}
+
+
+
+
+
+
+
+ ￥{{ item.lowPrice }}
+
+
+
+
+ 售罄
+ {{
+ goods.status=='end'?'没有更多了':'加载中'
+ }}
+
-
-
-
-
@@ -1305,10 +1339,7 @@ export default {
},
skuGoods: {
number: 1,
- data: {
- stockNumber: 0,
- salePrice: 0,
- },
+ data: undefined,
},
selGoods: {
isEdit: false,
@@ -1324,12 +1355,13 @@ export default {
informationdialogshow: false,
informationdialogshowedit: false,
goods: {
+ status:'loadmore',//loadmore end
list: [],
query: {
productId: "",
categoryId: "",
page: 1,
- size: 20,
+ size: 66,
},
loading: false,
total: 0,
@@ -1566,13 +1598,22 @@ export default {
this.selGoods.show = false;
},
CanConfirm() {
- if (!this.selGoods.skuList.length) {
- return true;
- }
- return (
- this.selGoods.skuList.filter((v) => v.sel !== "").length !==
- this.selGoods.skuList.length
- );
+ // if (!this.skuGoods.data) {
+ // return;
+ // }
+ // if (!this.selGoods.skuList.length) {
+ // return true;
+ // }
+ // const canBuyArr = this.selGoods.skuList.filter((v) =>
+ // isCanBuy(v, this.selGoods.isStock)
+ // );
+ // if (canBuyArr.length <= 0) {
+ // return true;
+ // }
+ // return (
+ // this.selGoods.skuList.filter((v) => v.sel !== "").length !==
+ // this.selGoods.skuList.length
+ // );
},
},
filters: {
@@ -1596,6 +1637,7 @@ export default {
"goods.query.categoryId": function (newval) {
this.goods.query.page = 1;
this.goods.list = [];
+ this.goods.status='loadmore'
this.getGoods();
},
"useTypes.sel": function (newval, oldval) {
@@ -2340,14 +2382,14 @@ export default {
// 获取取餐号
async getMasterId() {
- const res=await $getMasterId({
- tableId: this.table.tableId,
- orderId: this.table.orderId,
- vipUserId: this.vipUser.id,
- useType: this.useTypes.sel == "takeout" ? "takeout" : ""
- })
- this.masterId=res.masterId;
- return res
+ const res = await $getMasterId({
+ tableId: this.table.tableId,
+ orderId: this.table.orderId,
+ vipUserId: this.vipUser.id,
+ useType: this.useTypes.sel == "takeout" ? "takeout" : "",
+ });
+ this.masterId = res.masterId;
+ return res;
},
onSelGoodsSkuClose() {
this.selGoods.isEdit = false;
@@ -2900,7 +2942,7 @@ export default {
.filter((v) => v.specSnap.match(i))
.every((v) => {
// return isCanBuy(v,this.selGoods.data.isStock)
- return !isCanBuy(v, true);
+ return !isCanBuy(v, this.selGoods.data);
});
}
}
@@ -3023,7 +3065,7 @@ export default {
return prve;
}, {});
const canBudyGoods = this.selGoods.data.specList
- .filter((v) => isCanBuy(v, true))
+ .filter((v) => isCanBuy(v, this.selGoods.data))
.sort((a, b) => {
const aNumber = a.specSnap.split(",").reduce((prve, cur) => {
return prve + skuMapNumber[cur];
@@ -3037,6 +3079,7 @@ export default {
},
//设置商品默认选中,规格禁止以及选中
setSkugoodsDefaultInit() {
+ this.skuGoods.data = undefined;
const skuList = this.selGoods.skuList;
const goodsListMap = this.selGoods.skuMap;
const skuGoods = this.findGoods(skuList, goodsListMap);
@@ -3125,6 +3168,10 @@ export default {
}
},
async getGoods() {
+ if(this.goods.status=='end'){
+ return
+ }
+ this.goods.status='loadmore'
const res = await getGoodsLists(this.goods.query);
let $goodsMap = {};
const goods = res.records.filter((v) => {
@@ -3143,6 +3190,7 @@ export default {
for (let i in goods) {
this.goods.list.push(goods[i]);
}
+ this.goods.status= this.goods.list.length>=res.total ? 'end' : 'loadmore'
this.goods.total = res.total;
this.$goodsData = goods;
},
diff --git a/src/views/tool/Instead/util.js b/src/views/tool/Instead/util.js
index 3b7bd4d..6967221 100644
--- a/src/views/tool/Instead/util.js
+++ b/src/views/tool/Instead/util.js
@@ -1,6 +1,13 @@
//判断商品是否可以下单
-export function isCanBuy(goods,isStock) {
- return goods.isGrounding && goods.isPauseSale == 0 && (isStock?goods.stockNumber > 0:true) ;
+export function isCanBuy(skuGoods,goods) {
+ if(goods.typeEnum=='normal'){
+ //单规格
+ return goods.isGrounding&&goods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+ }else{
+ //多规格
+ return goods.isGrounding&&goods.isPauseSale==0&&skuGoods.isGrounding&&skuGoods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+
+ }
}
// 一个数组是否包含另外一个数组全部元素
@@ -15,6 +22,8 @@ export function arrayContainsAll(arr1, arr2) {
//n项 n-1项组合，生成全部结果
export function generateCombinations(arr, k) {
+ console.log(arr)
+ console.log(k)
let result = [];
function helper(index, current) {
From 709036c05022f96b7d412d9c6bbc63e8555df2bb Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 25 Oct 2024 14:50:52 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A0=E5=8F=B0?=
=?UTF-8?q?=E6=A1=8C=E4=B8=8B=E5=8D=95=E5=88=87=E6=8D=A2=E5=8F=B0=E6=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/table.js | 11 +++
.../tool/Instead/components/scan-pay.vue | 35 ++++----
src/views/tool/Instead/index.vue | 84 ++++++++++++++-----
3 files changed, 97 insertions(+), 33 deletions(-)
diff --git a/src/api/table.js b/src/api/table.js
index 57bf688..1a691c3 100644
--- a/src/api/table.js
+++ b/src/api/table.js
@@ -450,3 +450,14 @@ export function $returnOrder(data) {
}
});
}
+//获取台桌详情状态
+export function $returnTableDetail(data) {
+ return request({
+ url: '/api/tbShopTable/state',
+ method: "get",
+ params:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
diff --git a/src/views/tool/Instead/components/scan-pay.vue b/src/views/tool/Instead/components/scan-pay.vue
index fd68e0e..a4c7099 100644
--- a/src/views/tool/Instead/components/scan-pay.vue
+++ b/src/views/tool/Instead/components/scan-pay.vue
@@ -118,6 +118,7 @@ export default {
number: "0",
show: false,
timer: null,
+ payPar:{}
};
},
watch: {
@@ -136,18 +137,10 @@ export default {
this.$refs.refInputCode.focus();
});
} else {
+ this.getPayUrl()
this.tips = "请用户使用微信/支付宝扫描付款码";
this.startGetOrderInfo();
- this.$nextTick(() => {
- QRCode.toCanvas(
- this.$refs.canvas,
- this.paymentQrcode,{width: 160,
- height: 160,},
- function (error) {
- console.log(error);
- }
- );
- });
+
}
},
number(newval) {
@@ -193,14 +186,28 @@ export default {
this.close();
this.$emit("confirm", this.form.code);
},
+ getPayUrl(){
+ $getOrderPayUrl(this.payPar).then((res) => {
+ console.log(res);
+ this.paymentQrcode = res;
+ this.$nextTick(() => {
+ QRCode.toCanvas(
+ this.$refs.canvas,
+ this.paymentQrcode,{width: 160,
+ height: 160,},
+ function (error) {
+ console.log(error);
+ }
+ );
+ });
+ });
+ },
open(data) {
this.show = true;
this.form.money = Number(this.price).toFixed(2);
+ this.payPar=data
if (this.openSwitch) {
- $getOrderPayUrl({ orderId: this.order.id||data.id,payAmount:this.form.money||data.settlementAmount }).then((res) => {
- console.log(res);
- this.paymentQrcode = res;
- });
+ // this.getPayUrl();
}
this.$nextTick(() => {
this.$refs.refInputCode.focus();
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 0ad93a2..38864c5 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -54,7 +54,7 @@
@click="changeTable(item, index)"
>
{{ item.name }}
-
+
{{
status[item.status] ? status[item.status].label : ""
}}
￥{{ skuGoods.data.salePrice | to2 }}
-
- {{ skuText }}
- 库存：{{ skuGoods.data.stockNumber || 0 }}
+
+
-
+
-
+
+ ￥ {{ skuGoods.data.salePrice | to2 }}
+
+ {{ skuText }}
+ 库存：{{ skuGoods.data.stockNumber || 0 }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+ ￥
+
+
+ 库存：
+
+
+
+
+
+
+
+
+
+
+
+
{{
- goods.status=='end'?'没有更多了':'加载中'
- }}
+
+ {{ goods.status == "end" ? "没有更多了" : "加载中" }}
+
0) {
+ try {
+ res1 = await this.$confirm(
+ "该台桌购物车里有商品，是否清除该台桌里的商品?",
+ "提示",
+ {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }
+ );
+ } catch (e) {
+ console.log(e);
+ }
+ await $choseTable({
+ masterId: this.masterId,
+ tableId: item.tableId,
+ isClear: res1 == "confirm" ? true : false,
+ });
+ }
+
this.table = item;
this.tableShow = false;
},
@@ -2100,9 +2144,10 @@ export default {
}
this.pays();
},
- payTypeItemClick(item) {
- console.log(item);
- console.log(this.vipUser.id);
+ payTypeItemClick(item,order) {
+ order=order?order:this.createOrder.data;
+ console.log('--------order------')
+ console.log(order)
if (item.payType == "vipPay") {
return this.refChooseUserOpen();
}
@@ -2112,7 +2157,7 @@ export default {
}
if (item.payType == "scanCode") {
//扫码支付
- return this.refToggle("refWxScanCode", true, this.createOrder.data);
+ return this.refToggle("refWxScanCode", true, {orderId:order.id,payAmount: (this.createOrder.data.amount * order.discount).toFixed(2)});
}
},
ChangeDiscount(discount) {
@@ -2246,7 +2291,7 @@ export default {
return this.refChooseUserOpen();
}
if (this.order.payType == "scanCode") {
- return this.refToggle("refWxScanCode", true, this.createOrder.data);
+ return this.refToggle("refWxScanCode", true, {orderId:this.createOrder.data.id,payAmount: (this.createOrder.data.amount * this.createOrder.discount).toFixed(2)});
}
if (this.order.payType == "deposit") {
return this.refToggle("refScanCode", true);
@@ -3168,10 +3213,10 @@ export default {
}
},
async getGoods() {
- if(this.goods.status=='end'){
- return
+ if (this.goods.status == "end") {
+ return;
}
- this.goods.status='loadmore'
+ this.goods.status = "loadmore";
const res = await getGoodsLists(this.goods.query);
let $goodsMap = {};
const goods = res.records.filter((v) => {
@@ -3190,7 +3235,8 @@ export default {
for (let i in goods) {
this.goods.list.push(goods[i]);
}
- this.goods.status= this.goods.list.length>=res.total ? 'end' : 'loadmore'
+ this.goods.status =
+ this.goods.list.length >= res.total ? "end" : "loadmore";
this.goods.total = res.total;
this.$goodsData = goods;
},
@@ -3246,7 +3292,7 @@ export default {
},
close() {
if (this.table.tableId) {
- this.$router.replace({ path: "/table/table_list" });
+ this.$router.replace({ path: "/tool/table_list" });
} else {
this.$router.go(0);
// this.reset();
From ca827999b8de0c510ae3bdd9de500c2e3ac469f8 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 25 Oct 2024 15:25:16 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E6=9C=AA=E8=B0=83=E7=94=A8=E9=80=89=E5=8F=96=E6=A1=8C=E5=8F=B0?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/tool/Instead/index.vue | 40 ++++++++++++++++++--------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 38864c5..b60aa75 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1929,10 +1929,10 @@ export default {
if (!canJiesuan) {
return;
}
- const order= await this.returnCreateOrderData();
+ const order = await this.returnCreateOrderData();
console.log(this.createOrder.data);
this.order.payType = "scanCode";
- this.payTypeItemClick({ payType: "scanCode",order });
+ this.payTypeItemClick({ payType: "scanCode", order });
this.payBeforeClear();
},
async changeOrderUseType(useType) {
@@ -2096,12 +2096,13 @@ export default {
}
},
async changeTable(item) {
- if(this.table||this.order.list.length<=0){
+ console.log(this.table);
+ if (this.table || this.order.list.length <= 0) {
this.table = item;
this.tableShow = false;
- return
+ return;
}
- if(item.status!='idle'){
+ if (item.status != "idle") {
return this.$message.error("该台桌已在使用中");
}
const res = await $returnTableDetail({
@@ -2122,13 +2123,12 @@ export default {
} catch (e) {
console.log(e);
}
- await $choseTable({
- masterId: this.masterId,
- tableId: item.tableId,
- isClear: res1 == "confirm" ? true : false,
- });
}
-
+ await $choseTable({
+ masterId: this.masterId,
+ tableId: item.tableId,
+ isClear: res1 == "confirm" ? true : false,
+ });
this.table = item;
this.tableShow = false;
},
@@ -2144,10 +2144,8 @@ export default {
}
this.pays();
},
- payTypeItemClick(item,order) {
- order=order?order:this.createOrder.data;
- console.log('--------order------')
- console.log(order)
+ payTypeItemClick(item, order) {
+ order = order ? order : this.createOrder.data;
if (item.payType == "vipPay") {
return this.refChooseUserOpen();
}
@@ -2157,7 +2155,10 @@ export default {
}
if (item.payType == "scanCode") {
//扫码支付
- return this.refToggle("refWxScanCode", true, {orderId:order.id,payAmount: (this.createOrder.data.amount * order.discount).toFixed(2)});
+ return this.refToggle("refWxScanCode", true, {
+ orderId: order.id,
+ payAmount: (this.createOrder.data.amount * order.discount).toFixed(2),
+ });
}
},
ChangeDiscount(discount) {
@@ -2291,7 +2292,12 @@ export default {
return this.refChooseUserOpen();
}
if (this.order.payType == "scanCode") {
- return this.refToggle("refWxScanCode", true, {orderId:this.createOrder.data.id,payAmount: (this.createOrder.data.amount * this.createOrder.discount).toFixed(2)});
+ return this.refToggle("refWxScanCode", true, {
+ orderId: this.createOrder.data.id,
+ payAmount: (
+ this.createOrder.data.amount * this.createOrder.discount
+ ).toFixed(2),
+ });
}
if (this.order.payType == "deposit") {
return this.refToggle("refScanCode", true);
From 41648aa4c56b53eb759aea6c1d46c653a5703c93 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 25 Oct 2024 16:01:27 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/product/add_shop.vue | 2 +-
src/views/shop/components/addPadPage.vue | 205 ++++++++++++++++++++++-
src/views/shop/pad_setting.vue | 5 +-
3 files changed, 207 insertions(+), 5 deletions(-)
diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index 8037377..2a00fa7 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -790,7 +790,7 @@ export default {
this.form.selectSpec = JSON.stringify(this.selectSpec);
this.form.specTableHeaders = JSON.stringify(this.specTableHeaders);
this.form.specInfo = JSON.stringify(this.form.skuList);
- this.form.skuList[0].costPrice = 0
+ // this.form.skuList[0].costPrice = 0
this.form.skuList[0].originPrice = this.form.skuList[0].salePrice
if (this.form.id) {
await tbProductPut(this.form);
diff --git a/src/views/shop/components/addPadPage.vue b/src/views/shop/components/addPadPage.vue
index 21529d4..dbfab5d 100644
--- a/src/views/shop/components/addPadPage.vue
+++ b/src/views/shop/components/addPadPage.vue
@@ -17,9 +17,18 @@
-
+
+
- 一键生成菜单
+ 一键生成菜单
+
+
+
@@ -43,6 +52,7 @@
+
+ {{ item.name }}
+ ￥{{ item.lowPrice }}
+