From 1bc4cf134c5aa1c78c82b7088251d6d3922114f3 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 21 Aug 2024 13:30:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=8B=E5=8D=95=E5=85=B3=E9=97=AD=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E7=82=B9=E9=A4=90=E9=A1=B5=E9=9D=A2=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E5=88=B7=E6=96=B0=E6=A1=8C=E5=8F=B0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/table/components/table-diancan.vue | 100 +++++++++++++------ src/views/table/table_list.vue | 5 +- 2 files changed, 75 insertions(+), 30 deletions(-) diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue index 646a103..bcea355 100644 --- a/src/views/table/components/table-diancan.vue +++ b/src/views/table/components/table-diancan.vue @@ -5,7 +5,7 @@ :title="title" fullscreen :visible.sync="informationdialogshow" - @close="reset" + @close="onclose" >
@@ -406,14 +406,22 @@ v-for="(item, index) in goods.list" :key="index" > +
{{ item | returntypeName }}
{{ item.name }}
-
-
￥{{ item.lowPrice }}
+
+
+
￥{{ item.lowPrice }}
+
+
售罄
+
+
@@ -1084,8 +1092,8 @@ export default { }, }, watch: { - masterId:function(val){ - console.log(val) + masterId: function (val) { + console.log(val); }, "vipUser.id": async function (val) { let masterId = this.order.masterId; @@ -1253,7 +1261,7 @@ export default { type: "success", }); this.reset(); - this.close() + this.close(); }, chooseTableConfirm(item) { console.log(item); @@ -1285,7 +1293,7 @@ export default { note: this.note.content, }); this.createOrder.data = res; - const masterId = await this.getMasterId(); + const {masterId} = await this.getMasterId(); this.masterId = masterId; this.isCreateOrder = true; }, @@ -1665,6 +1673,7 @@ export default { type: "success", }); this.selGoods.show = false; + this.order.cacheNumber = this.skuGoods.number; return; } @@ -1795,6 +1804,10 @@ export default { this.skuGoods.number = skuGoods.suit || 1; } }, + onclose(){ + this.$emit('close') + this.reset() + }, reset() { // this.goods.list = []; this.order.masterId = ""; @@ -1823,9 +1836,12 @@ export default { this.selGoods.data = item; this.selGoods.skuMap = {}; const specList = item.specList; - this.setSelGoodsSkuMap(specList) - this.setSelGoodsSkuList(JSON.parse(item.skuResult.tagSnap),item.specSnap) - this.setTagDisabled() + this.setSelGoodsSkuMap(specList); + this.setSelGoodsSkuList( + JSON.parse(item.skuResult.tagSnap), + item.specSnap + ); + this.setTagDisabled(); const skuGoods = this.selGoods.skuMap[item.specSnap]; this.skuGoods.data = skuGoods; this.skuGoods.number = item.number ? item.number : skuGoods.suit || 1; @@ -1967,24 +1983,24 @@ export default { this.setTagDisabled(); }, // 设置当前选中商品skuList - setSelGoodsSkuList(skuList,specSnap) { - const specSnapArr=specSnap?specSnap.split(","):[] - this.selGoods.skuList = skuList.map((v,index) => { - const values = v.value.split(","); - return { - ...v, - valueArr: values, - sel:specSnap?specSnapArr[index]:'', - values: values.map((name) => { - return { name, disabled: false }; - }), - }; - }); + setSelGoodsSkuList(skuList, specSnap) { + const specSnapArr = specSnap ? specSnap.split(",") : []; + this.selGoods.skuList = skuList.map((v, index) => { + const values = v.value.split(","); + return { + ...v, + valueArr: values, + sel: specSnap ? specSnapArr[index] : "", + values: values.map((name) => { + return { name, disabled: false }; + }), + }; + }); }, setSelGoodsSkuMap(specList) { for (let i in specList) { - this.selGoods.skuMap[specList[i].specSnap] = specList[i]; - } + this.selGoods.skuMap[specList[i].specSnap] = specList[i]; + } }, //根据右侧商品单规格多规格做不同处理 async goodsClick(item) { @@ -1992,9 +2008,9 @@ export default { this.selGoods.data = item; this.selGoods.skuMap = {}; const specList = item.specList; - this.setSelGoodsSkuMap(specList) + this.setSelGoodsSkuMap(specList); console.log(this.selGoods.skuMap); - this.setSelGoodsSkuList( JSON.parse(item.skuResult.tagSnap)) + this.setSelGoodsSkuList(JSON.parse(item.skuResult.tagSnap)); this.setSkugoodsDefaultInit(); this.selGoods.title = item.name; this.selGoods.show = true; @@ -2055,6 +2071,7 @@ export default { }, close() { this.informationdialogshow = false; + this.$emit('close') }, resetCommodityArr() { this.commodityArr = []; @@ -2364,7 +2381,10 @@ input[type="number"]::-webkit-outer-spin-button { border-color: #ebeef5; } } - +.flex-xy-cnter { + justify-content: center; + align-items: center; +} .flex-wrap { flex: 1; } @@ -2843,7 +2863,29 @@ input[type="number"]::-webkit-outer-spin-button { opacity: 1; margin: 0 7px 14px; border-radius: 4px; - + .timeSale { + text-align: center; + border-radius: 10px; + background-color: hsla(0, 0%, 99.2%, 0.5); + color: #fff; + font-size: 10px; + line-height: 16px; + padding: 2px 10px; + margin-top: 2px; + } + .sell-out { + width: 100%; + height: 100%; + padding: 10px; + background: rgba(0, 0, 0, 0.4); + z-index: 2; + position: absolute; + top: 0; + font-size: 14px; + font-weight: 400; + text-align: left; + color: #fff; + } overflow: hidden; position: relative; diff --git a/src/views/table/table_list.vue b/src/views/table/table_list.vue index 58737f3..dbffff3 100644 --- a/src/views/table/table_list.vue +++ b/src/views/table/table_list.vue @@ -103,7 +103,7 @@ - + @@ -164,6 +164,9 @@ export default { this.tbShopAreaGet(); }, methods: { + onDiancanClose(){ + this.tbShopTableGet() + }, diancanShow(item) { this.$refs.dianan.open(item); },