Merge branch 'master_dev'

‘chensiAb’

7 days ago fbb96ab8a5a00015227612d9706f0ca1a7f85461

 layout/card/CCardAction.vue

@@ -4,8 +4,14 @@
 */

<template>
    <view class="c-card-action">
    </view>
    <scroll-view
        class="c-card-action m-border-strong-top"
        :scroll-x="true"
        @touchstart.stop="evt => null"
        @touchmove.stop="evt => null"
    >
        <slot />
    </scroll-view>
</template>

<script>