Commit f20989fd authored by Mac's avatar Mac

1

parent f8bbfa39
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }"> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }">
<template v-if="list.length > 0 && emptyshow==false"> <template v-if="list.length > 0 && emptyshow==false">
<view class="cartList" :style="{ 'margin-bottom': listbottom }" v-for="(c, i) in list" :key="i"> <view class="cartList" :style="{ 'margin-bottom': listbottom }" v-for="(c, i) in list" :key="i">
<view <view @click.stop="abc()"
style=" padding: 0 12px 12px 12px; border-bottom: 1rpx solid #f5f5f5; width: 100%;"> style=" padding: 0 12px 12px 12px; border-bottom: 1rpx solid #f5f5f5; width: 100%;">
<u-checkbox-group @change="mch_SelectAll(c.checked, i)"> <u-checkbox-group @change="mch_SelectAll(c.checked, i)">
<u-checkbox v-model="c.checked" shape="circle" :active-color="mc">{{ c.MallName }}</u-checkbox> <u-checkbox v-model="c.checked" shape="circle" :active-color="mc">{{ c.MallName }}</u-checkbox>
</u-checkbox-group> </u-checkbox-group>
</view> </view>
<view class="cartList_item" v-for="(item, index) in c.GoodsList" :key="index" @click="btnclick(item,index,i)" > <view class="cartList_item" v-for="(item, index) in c.GoodsList" :key="index" @click="btnclick(item,index,i)" >
<view style="width: 40px;text-align: center;" v-if="(item.GoodsStatus == 1 && item.InventoryNum!=0 && IsEducation!=1) || (editType == true&& IsEducation!=1)"> <view @click.stop="abc()" style="width: 40px;text-align: center;" v-if="(item.GoodsStatus == 1 && item.InventoryNum!=0 && IsEducation!=1) || (editType == true&& IsEducation!=1)">
<u-checkbox-group @change="clickcheckbox(item.checked, item.Price, index, i)"> <u-checkbox-group @change="clickcheckbox(item.checked, item.Price, index, i)">
<u-checkbox v-model="item.checked" shape="circle" :active-color="mc"></u-checkbox> <u-checkbox v-model="item.checked" shape="circle" :active-color="mc"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
</view> </view>
<view style="width: 40px;text-align: center;" v-if="(item.GoodsStatus == 1 && IsEducation==1) || (editType == true && IsEducation==1)"> <view @click.stop="abc()" style="width: 40px;text-align: center;" v-if="(item.GoodsStatus == 1 && IsEducation==1) || (editType == true && IsEducation==1)">
<u-checkbox-group @change="clickcheckbox(item.checked, item.Price, index, i)"> <u-checkbox-group @change="clickcheckbox(item.checked, item.Price, index, i)">
<u-checkbox v-model="item.checked" shape="circle" :active-color="mc"></u-checkbox> <u-checkbox v-model="item.checked" shape="circle" :active-color="mc"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</Text> </Text>
</view> </view>
</view> </view>
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;" > <view @click.stop="abc()" style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;" >
<Text style="font-size: 30rpx;" :style="{ color: pricecolor }"> <Text style="font-size: 30rpx;" :style="{ color: pricecolor }">
<Text style="40rpx">{{ item.Price }}</Text> <Text style="40rpx">{{ item.Price }}</Text>
</Text> </Text>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
shape="circle" shape="circle"
@click="delete_btn" @click="delete_btn"
:custom-style="{ :custom-style="{
backgroundColor: secondary, backgroundColor: mc,
height: '80rpx', height: '80rpx',
color: '#FFF', color: '#FFF',
fontSize: '14px', fontSize: '14px',
...@@ -614,6 +614,9 @@ export default { ...@@ -614,6 +614,9 @@ export default {
url: url url: url
}); });
}, },
abc(){//阻止change的事件冒泡
},
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment