提交 7c99390a authored 作者: 刘旭's avatar 刘旭

优化

上级 4d9eac81
...@@ -1285,7 +1285,6 @@ export default { ...@@ -1285,7 +1285,6 @@ export default {
handler: function(newVal, oldValue) { handler: function(newVal, oldValue) {
let that = this; let that = this;
that.partList = that.localdata.partsData; that.partList = that.localdata.partsData;
// console.log(that.localdata, 'localdata');
}, },
}, },
}, },
......
...@@ -200,6 +200,16 @@ const showModel = reactive({ ...@@ -200,6 +200,16 @@ const showModel = reactive({
// 管理 // 管理
const tapDel = () => { const tapDel = () => {
if (delCircle.value) { if (delCircle.value) {
// 把全部勾选的失效商品去掉
if (checkedAll.value) {
let ids: any = [];
_.each(cartList.value, (v: any) => {
if (!v.isSubmit) ids.push(v.id);
});
// 把失效商品的id去掉
initCartChecked(0, ids, type.value);
checkedAll.value = false;
}
initCartIndex(type.value); initCartIndex(type.value);
delCircle.value = false; delCircle.value = false;
administration.value = '管理'; administration.value = '管理';
...@@ -341,8 +351,10 @@ const onConfirm = () => { ...@@ -341,8 +351,10 @@ const onConfirm = () => {
const checkboxChange = () => { const checkboxChange = () => {
let ids: any = []; let ids: any = [];
_.each(cartList.value, (v: any) => { _.each(cartList.value, (v: any) => {
ids.push(v.id); if (delCircle.value) ids.push(v.id);
else if (v.isSubmit) ids.push(v.id);
}); });
// 把失效商品的id去掉
if (checkedAll.value) { if (checkedAll.value) {
initCartChecked(1, ids, type.value); initCartChecked(1, ids, type.value);
checkedAll.value = true; checkedAll.value = true;
......
...@@ -35,11 +35,11 @@ let skuKey = ref(false); ...@@ -35,11 +35,11 @@ let skuKey = ref(false);
let goodsInfo = ref({} as any); let goodsInfo = ref({} as any);
let skuPopupRef = ref(); let skuPopupRef = ref();
let detailData = ref() let detailData = ref()
let partsIds = ref([] as any) let partsIds = ref([] as any) // 选择的配件id
let detailId = ref() let detailId = ref()
let selectedGoodsItem = ref('') let selectedGoodsItem = ref('')
let selectedGoodsSum = ref(1) let selectedGoodsSum = ref(1)
let emits = defineEmits(['selected', 'addProduct', 'close-sku','partsClose']) let emits = defineEmits(['selected', 'addProduct', 'close-sku'])
let props = defineProps({ let props = defineProps({
cartId : { cartId : {
type: Number type: Number
...@@ -185,7 +185,6 @@ let addCartFn = (obj: any) => { ...@@ -185,7 +185,6 @@ let addCartFn = (obj: any) => {
duration: 300, duration: 300,
success() { success() {
handleClose() handleClose()
emits('partsClose') // 还原
skuKey.value = false skuKey.value = false
} }
}); });
...@@ -202,7 +201,6 @@ let addCartFn = (obj: any) => { ...@@ -202,7 +201,6 @@ let addCartFn = (obj: any) => {
duration: 300, duration: 300,
success() { success() {
handleClose() handleClose()
emits('partsClose') // 还原
skuKey.value = false skuKey.value = false
} }
}); });
...@@ -270,7 +268,6 @@ let buyNow = (selectShop: any) => { ...@@ -270,7 +268,6 @@ let buyNow = (selectShop: any) => {
}); });
setTimeout(function() { setTimeout(function() {
handleClose() handleClose()
emits('partsClose') // 还原
skuKey.value = false skuKey.value = false
}, 300); }, 300);
} }
...@@ -340,7 +337,8 @@ defineExpose({ ...@@ -340,7 +337,8 @@ defineExpose({
skuKey, skuKey,
skuMode, skuMode,
init, init,
handleClose handleClose,
partsIds
}); });
</script> </script>
......
...@@ -111,12 +111,7 @@ ...@@ -111,12 +111,7 @@
</u-popup> </u-popup>
</view> </view>
<goodsSku <goodsSku ref="goodsSkuRef" :cartId="cartId" @selected="selected"></goodsSku>
ref="goodsSkuRef"
:cartId="cartId"
@selected="selected"
@partsClose="partsClose"
></goodsSku>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
...@@ -203,7 +198,6 @@ const selected = (data: any) => { ...@@ -203,7 +198,6 @@ const selected = (data: any) => {
bool = true bool = true
} }
}) })
console.log(productId);
if(productId) { if(productId) {
let productIds = productId let productIds = productId
initAttribute(productIds) initAttribute(productIds)
...@@ -256,14 +250,6 @@ const buttonClick = () => { ...@@ -256,14 +250,6 @@ const buttonClick = () => {
goodsSkuRef.value.skuKey = true goodsSkuRef.value.skuKey = true
}; };
// 还原配件信息数据
const partsClose = () =>{
partsData.value.forEach((item: any) => {
item.show = false
})
}
// 选择选项卡 // 选择选项卡
const onClickItem = (e: any) => { const onClickItem = (e: any) => {
if (current.value != e.currentIndex) { if (current.value != e.currentIndex) {
...@@ -321,6 +307,7 @@ const initParts = (goodsId: number, productId: number) => { ...@@ -321,6 +307,7 @@ const initParts = (goodsId: number, productId: number) => {
item['show'] = false item['show'] = false
}) })
partsData.value = res.data.data partsData.value = res.data.data
goodsSkuRef.value.partsIds = [] // 清楚之前选择的配件ids
} }
}) })
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论