|
@@ -242,7 +242,21 @@
|
|
|
? data.unified_attrib.topic_color
|
|
? data.unified_attrib.topic_color
|
|
|
: '#346cda',
|
|
: '#346cda',
|
|
|
}"
|
|
}"
|
|
|
|
|
+ v-if="items && items.type === 'hanzi'"
|
|
|
/>
|
|
/>
|
|
|
|
|
+ <template v-if="items && items.type === 'img'">
|
|
|
|
|
+ <el-image
|
|
|
|
|
+ v-if="items.file_list[0]"
|
|
|
|
|
+ class="items-image"
|
|
|
|
|
+ :class="['frame-size-' + data.property.frame_size]"
|
|
|
|
|
+ :src="items.file_list[0].file_url"
|
|
|
|
|
+ fit="contain"
|
|
|
|
|
+ :style="{
|
|
|
|
|
+ borderColor:
|
|
|
|
|
+ data.unified_attrib && data.unified_attrib.topic_color ? data.unified_attrib.topic_color : '',
|
|
|
|
|
+ }"
|
|
|
|
|
+ />
|
|
|
|
|
+ </template>
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
@@ -544,15 +558,19 @@ export default {
|
|
|
if (item.content.trim()) {
|
|
if (item.content.trim()) {
|
|
|
for (let i = 0; i < this.data.property.write_number; i++) {
|
|
for (let i = 0; i < this.data.property.write_number; i++) {
|
|
|
item.content_list.forEach((items) => {
|
|
item.content_list.forEach((items) => {
|
|
|
- arr.push({ imgArr: null, flag: null });
|
|
|
|
|
|
|
+ if (items.type === 'hanzi') {
|
|
|
|
|
+ arr.push({ imgArr: null, flag: null });
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
for (let i = 0; i < this.data.property.miao_number; i++) {
|
|
for (let i = 0; i < this.data.property.miao_number; i++) {
|
|
|
item.content_list.forEach((items) => {
|
|
item.content_list.forEach((items) => {
|
|
|
- miao_arr.push({
|
|
|
|
|
- strokes: items && items.hz_info && items.hz_info[0] ? items.hz_info[0].hzDetail.hz_json : null,
|
|
|
|
|
- length: item.content_list.length,
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ if (items && items.hz_info && items.hz_info[0]) {
|
|
|
|
|
+ miao_arr.push({
|
|
|
|
|
+ strokes: items && items.hz_info && items.hz_info[0] ? items.hz_info[0].hzDetail.hz_json : null,
|
|
|
|
|
+ length: item.content_list.length,
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
item.imgArr = arr;
|
|
item.imgArr = arr;
|