747\739\748 Bug

This commit is contained in:
gaoyuanwei 2022-07-29 15:27:24 +08:00
parent 35d8487a5f
commit c8a8a58705
5 changed files with 72 additions and 13 deletions

View File

@ -40,29 +40,48 @@
v-for="multipleAdditionsItem in itemsonson.note1" v-for="multipleAdditionsItem in itemsonson.note1"
:key="multipleAdditionsItem" :key="multipleAdditionsItem"
> >
<div> <el-tooltip placement="top">
<div slot="content"> {{
multipleAdditionsItem.question ||
multipleAdditionsItem.type ||
multipleAdditionsItem.name
}}</div>
<div>
{{ {{
multipleAdditionsItem.question || multipleAdditionsItem.question ||
multipleAdditionsItem.type || multipleAdditionsItem.type ||
multipleAdditionsItem.name multipleAdditionsItem.name
}} }}
</div> </div>
<div> </el-tooltip>
<el-tooltip placement="top">
<div slot="content">{{
multipleAdditionsItem.answer ||
multipleAdditionsItem.price ||
multipleAdditionsItem.img
}}</div>
<div>
{{ {{
multipleAdditionsItem.answer || multipleAdditionsItem.answer ||
multipleAdditionsItem.price || multipleAdditionsItem.price ||
multipleAdditionsItem.img multipleAdditionsItem.img
}} }}
</div> </div>
<div>{{ multipleAdditionsItem.desc }}</div> </el-tooltip>
<el-tooltip placement="top">
<div slot="content">{{ multipleAdditionsItem.desc }}</div>
<div>{{ multipleAdditionsItem.desc }}</div>
</el-tooltip>
<!-- <div>{{ multipleAdditionsItem }}</div> --> <!-- <div>{{ multipleAdditionsItem }}</div> -->
</div> </div>
</div> </div>
<el-tooltip v-else placement="top">
<div slot="content">{{ itemsonson.note1 }}</div>
<el-input <el-input
v-else
v-model="itemsonson.note1" v-model="itemsonson.note1"
disabled="disabled" disabled="disabled"
></el-input> ></el-input>
</el-tooltip>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-for="itemsonson in itemson.children" v-for="itemsonson in itemson.children"
@ -94,7 +113,10 @@
style="border: 1px solid #3c9bcd;margin" style="border: 1px solid #3c9bcd;margin"
> >
<div>{{ itemDataFormValue.name }}</div> <div>{{ itemDataFormValue.name }}</div>
<div>{{ itemDataFormValue.desc }}</div> <el-tooltip placement="top">
<div slot="content">{{ itemDataFormValue.desc }}</div>
<div>{{ itemDataFormValue.desc }}</div>
</el-tooltip>
</div> </div>
</div> </div>
</div> </div>
@ -115,7 +137,10 @@
style="border: 1px solid #3c9bcd;margin" style="border: 1px solid #3c9bcd;margin"
> >
<div>{{ itemDataFormValue.name }}</div> <div>{{ itemDataFormValue.name }}</div>
<div>{{ itemDataFormValue.desc }}</div> <el-tooltip placement="top">
<div slot="content">{{ itemDataFormValue.desc }}</div>
<div>{{ itemDataFormValue.desc }}</div>
</el-tooltip>
<div @click="videoAndImg(itemDataFormValue.img)">浏览</div> <div @click="videoAndImg(itemDataFormValue.img)">浏览</div>
</div> </div>
</div> </div>
@ -137,7 +162,10 @@
style="border: 1px solid #3c9bcd;margin" style="border: 1px solid #3c9bcd;margin"
> >
<div>{{ itemDataFormValue.name }}</div> <div>{{ itemDataFormValue.name }}</div>
<div>{{ itemDataFormValue.desc }}</div> <el-tooltip placement="top">
<div slot="content">{{ itemDataFormValue.desc }}</div>
<div>{{ itemDataFormValue.desc }}</div>
</el-tooltip>
<div @click="videoAndImg(itemDataFormValue.img)">浏览</div> <div @click="videoAndImg(itemDataFormValue.img)">浏览</div>
</div> </div>
</div> </div>
@ -432,6 +460,11 @@ export default {
} }
} }
</script> </script>
<style lang="scss">
.el-tooltip__popper {
max-width: 300px;
}
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrapper { .wrapper {
.dataTitle { .dataTitle {
@ -464,6 +497,28 @@ export default {
margin-bottom: 10px; margin-bottom: 10px;
font-weight: bold; font-weight: bold;
line-height: 14px; line-height: 14px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
& > div:nth-child(2) {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 6;
line-height: initial;
}
& > div:nth-child(3) {
width: 90%;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 6;
line-height: initial;
} }
} }
} }
@ -503,7 +558,7 @@ export default {
& > div:nth-child(3) { & > div:nth-child(3) {
margin-top: 10px; margin-top: 10px;
position: absolute; position: absolute;
bottom: 30px; bottom: 8px;
cursor: pointer; cursor: pointer;
font-size: 12px; font-size: 12px;
border: 1px solid #3c9bcd; border: 1px solid #3c9bcd;

View File

@ -59,7 +59,11 @@
<template #icon><form-outlined /></template> <template #icon><form-outlined /></template>
申请使用 申请使用
</a-button> </a-button>
<a-button v-if="!dataList.fuseResourceList" type="primary" @click="addShoppingCart()"> <a-button
v-if="!dataList.fuseResourceList"
type="primary"
@click="addShoppingCart()"
>
<template #icon><shopping-cart-outlined /></template> <template #icon><shopping-cart-outlined /></template>
加入购物车 加入购物车
</a-button> </a-button>
@ -257,7 +261,7 @@
margin-right: 0.2rem; margin-right: 0.2rem;
font-size: 0.4rem; font-size: 0.4rem;
margin-right: 0.2rem; margin-right: 0.2rem;
max-width: 7rem; max-width: 6rem;
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

View File

@ -243,7 +243,7 @@
// white-space: nowrap; // white-space: nowrap;
font-size: 0.4rem; font-size: 0.4rem;
margin-right: 0.2rem; margin-right: 0.2rem;
max-width: 7rem; max-width: 6rem;
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

View File

@ -246,7 +246,7 @@
// white-space: nowrap; // white-space: nowrap;
font-size: 0.4rem; font-size: 0.4rem;
margin-right: 0.2rem; margin-right: 0.2rem;
max-width: 7rem; max-width: 6rem;
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

View File

@ -239,7 +239,7 @@
// white-space: nowrap; // white-space: nowrap;
font-size: 0.4rem; font-size: 0.4rem;
margin-right: 0.2rem; margin-right: 0.2rem;
max-width: 7rem; max-width: 6rem;
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;