From 6e54af776db885ad1a22ec582bdc97d7e1273c6c Mon Sep 17 00:00:00 2001 From: queenwuli <942534046@qq.com> Date: Wed, 13 Jan 2021 17:31:30 +0800 Subject: [PATCH] 系统优化 --- hive-app/pages/workbench/selectProduct/index.vue | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/hive-app/pages/workbench/selectProduct/index.vue b/hive-app/pages/workbench/selectProduct/index.vue index fbc7de0..b9b3f7f 100644 --- a/hive-app/pages/workbench/selectProduct/index.vue +++ b/hive-app/pages/workbench/selectProduct/index.vue @@ -54,7 +54,7 @@ </view> <button class="blue-btn btn mr-0" @click="submit" :disabled="isEnableSumbit">提交订单</button> </view> - <shopping-cart ref="shopCart" :list="selectItems" @addGoods="addGoods" @decreaseGoods="decreaseGoods" @reset="clearShopCart"></shopping-cart> + <shopping-cart ref="shopCart" :list="selectItems" @freeChange="freeChange" @addGoods="addGoods" @decreaseGoods="decreaseGoods" @reset="clearShopCart"></shopping-cart> </view> </template> @@ -97,7 +97,9 @@ totalAmount(){ let amount = 0; this.selectItems.forEach((item) => { - amount += item.price * item.num; + if(!item.isFree){ + amount += item.price * item.num; + } }) return amount; }, @@ -207,6 +209,11 @@ this.cateId = id; this.reloadData(); }, + freeChange(data){ + data.goods.isFree = !data.goods.isFree; + this.$set(this.selectItems, data.index, data.goods) + }, + // 添加商品 addGoods(goods){ goods.num ++ // 所有商品列表的下标 @@ -228,7 +235,7 @@ if(selectIndex > -1){ this.selectItems[selectIndex].num = goods.num; }else{ - this.selectItems.push(goods); + this.selectItems.push(Object.assign(goods, {isFree: false})); } }, @@ -306,9 +313,11 @@ border-bottom: 0; } .uni-collapse{ - background: transparent; + background-color: #F6F6F8!important; } - + .uni-collapse-cell{ + border-color: #F6F6F8!important; + } .uni-collapse-cell__title:active, .uni-collapse-cell--hover, .uni-collapse-cell--open, .uni-collapse-cell--disabled{ background-color: #FFFFFF!important; } -- Gitblit v1.9.1