Commit 16b8f00d authored by gaia's avatar gaia

Merge remote-tracking branch 'origin/feature/20240918_1005_091801' into release_pre_20240929113256

parents 07ff68f8 11a4257e
......@@ -62,7 +62,6 @@
height="60px">
</template>
</el-table-column>
<el-table-column align="center" label="藏品名称" min-width="150px" prop="itemName">
<template slot-scope="scope">
<Line2Hidden :text="scope.row.itemName" />
......
......@@ -42,12 +42,30 @@
<span v-if="scope.row.receiverName" >{{ scope.row.receiverName + ',' + scope.row.receiverPhone + ',' + scope.row.receiverAddress }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="藏品图片" prop="homePageImage">
<template slot-scope="scope">
<img v-if="scope.row.homePageImage && scope.row.homePageImage.url" :src="scope.row.homePageImage.url" width="60px" height="60px">
<!-- <img v-if="scope.row.homePageImage && scope.row.homePageImage.url" :src="scope.row.homePageImage.url" width="60px" height="60px"> -->
<el-image
:preview-src-list="[scope.row.homePageImage.url]"
:src="scope.row.homePageImage.url"
class="table-td-thumb"
/>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="申请方藏品图片" min-width="120px" prop="homePageImage">
<template slot-scope="scope">
<div v-if="scope.row.homePageImage && scope.row.homePageImage.length > 0" class="image_preview">
<el-image
:preview-src-list="[scope.row.homePageImage.url]"
:src="scope.row.homePageImage.url"
class="table-td-thumb"
/>
</div>
</template>
</el-table-column> -->
<el-table-column align="center" label="藏品名称" min-width="150px" prop="itemName">
<template slot-scope="scope">
<Line2Hidden :text="scope.row.itemName" />
......@@ -237,4 +255,9 @@ export default {
}
}
.table-td-thumb {
width: 60px;
height: 60px;
}
</style>
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