Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-17 abd93f604df5251bf993ac483978e8fb084071db

 h5_standard/src/components/common/Warehouse.vue

@@ -2,7 +2,7 @@
    <van-popup
        v-model:show="props.show"
        position="bottom"
        :style="{ height: '100%' }">
        :style="{ height: props.height }">
        <div class="title">
            <div class="close" @click="close"><van-icon name="arrow-down" size="30" color="#ffffff" /></div>
        </div>
@@ -16,8 +16,7 @@
                    v-model:loading="loading"
                    :finished="finished"
                    finished-text="没有更多了~"
                    @load="onLoad"
                >
                    @load="onLoad">
                    <div class="content_list">
                        <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
                            <div class="content_list_item_name">{{item.name}}</div>
@@ -136,6 +135,10 @@
        systemDicDataId: {
            type: String,
            default: ''
        },
        height: {
            type: String,
            default: '100%'
        }
    })