Commit 95108eed authored by 罗超's avatar 罗超

1

parent c07f7c05
...@@ -5,7 +5,10 @@ ...@@ -5,7 +5,10 @@
:current="current" :current="current"
:active-color="mainColor" :active-color="mainColor"
@change="change" @change="change"
:active-item-style="activeTab"
:bar-style="barStyle"
style="margin-bottom: 30rpx" style="margin-bottom: 30rpx"
v-if="dataObj.showCat" v-if="dataObj.showCat"
></u-tabs> ></u-tabs>
<u-empty <u-empty
...@@ -13,7 +16,7 @@ ...@@ -13,7 +16,7 @@
text="暂无内容" text="暂无内容"
mode="list" mode="list"
></u-empty> ></u-empty>
<view v-if="curDataObj.goodsList.length > 0"> <view v-if="curDataObj.goodsList.length > 0" :style="{'background-color':dataObj.background?dataObj.background:'#fff'}">
<view class="con" v-if="dataObj.listStyle == 5"> <view class="con" v-if="dataObj.listStyle == 5">
<view class="left"> <view class="left">
<view <view
...@@ -216,6 +219,14 @@ export default { ...@@ -216,6 +219,14 @@ export default {
showtext: "", showtext: "",
u: {}, u: {},
isAttestation: 0, isAttestation: 0,
activeTab:{
color:'#111111',
'font-weight': 800,
'font-size':'34rpx'
},
barStyle:{
height:'6rpx',
}
}; };
}, },
computed: {}, computed: {},
...@@ -378,7 +389,7 @@ export default { ...@@ -378,7 +389,7 @@ export default {
}, },
mounted() { mounted() {
this.getisAttestation(); this.getisAttestation();
console.log("tag", this.dataObj); console.log("388", this.dataObj);
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.dataObj.catList.map((item, index) => { this.dataObj.catList.map((item, index) => {
if (index === this.current) { if (index === this.current) {
...@@ -406,7 +417,7 @@ export default { ...@@ -406,7 +417,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 90rpx; padding-bottom: 90rpx;
padding: 30rpx; padding: 30rpx;
background-color: #eaebec; // background-color: #eaebec;
} }
.CreateByInfo { .CreateByInfo {
background-color: #fff; background-color: #fff;
...@@ -425,6 +436,8 @@ export default { ...@@ -425,6 +436,8 @@ export default {
.item-img { .item-img {
width: 100%; width: 100%;
height: auto; height: auto;
display:block;
min-height: 20rpx;
} }
.item-headimg { .item-headimg {
...@@ -444,13 +457,15 @@ export default { ...@@ -444,13 +457,15 @@ export default {
.left, .left,
.right { .right {
width: 330rpx; width: 330rpx;
.left-item { .left-item {
width: 100%; width: 100%;
height: auto; height: auto;
margin-bottom: 30rpx; margin-bottom: 30rpx;
border-radius: 30rpx; border-radius: 30rpx;
overflow: hidden; overflow: hidden;
box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
// display: flex;
// flex-wrap: wrap;
} }
} }
// -----------列表模式样式----------- // -----------列表模式样式-----------
...@@ -458,7 +473,7 @@ export default { ...@@ -458,7 +473,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 90rpx; padding-bottom: 90rpx;
padding: 30rpx; padding: 30rpx;
background-color: #eaebec; // background-color: #eaebec;
} }
.list-item { .list-item {
width: 100%; width: 100%;
...@@ -468,6 +483,7 @@ export default { ...@@ -468,6 +483,7 @@ export default {
} }
.list-item-img { .list-item-img {
width: 100%; width: 100%;
height: 20rpx;
} }
.choosetype { .choosetype {
position: fixed; position: fixed;
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
:src="x.active_icon" :src="x.active_icon"
></image> --> ></image> -->
<text <text
class="txtBtn" class="txtBtn2"
:class="{ activeTxtBtn2: active == i }" :class="{ activeTxtBtn2: active == i }"
:style="{ color: active == i ? x.active_color : x.color }" :style="{ color: active == i ? x.active_color : x.color }"
>{{ x.text }}</text >{{ x.text }}</text
......
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
</view> </view>
</view> --> </view> -->
<view class="dianzanNum"> <view class="dianzanNum" v-if="commentData.ActivityCount>0">
<view class="peopleNum" <view class="peopleNum"
>点赞人数({{ commentData.ActivityCount }})</view >点赞人数({{ commentData.ActivityCount }})</view
> >
......
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
:is-scroll="true" :is-scroll="true"
:current="current" :current="current"
@change="change" @change="change"
:active-item-style="activeTab"
:active-color="mainColor" :active-color="mainColor"
:bar-style="barStyle"
></u-tabs> ></u-tabs>
<view class="fabu" @click="toggleFabu"> <view class="fabu" @click="toggleFabu">
<u-icon name="plus" :size="40" :color="mainColor"></u-icon> <u-icon name="plus" :size="40" :color="mainColor"></u-icon>
...@@ -155,7 +157,7 @@ ...@@ -155,7 +157,7 @@
<view v-for="(x, i) in g" :key="i"> <view v-for="(x, i) in g" :key="i">
<view class="maxbox2" @click="gopostdetails(x)"> <view class="maxbox2" @click="gopostdetails(x)">
<view class="left"> <view class="left">
<view class="img-box"> <view class="img-box" style="box-shadow: 0rpx 5rpx 10rpx 0rpx rgba(36, 36, 36, 0.2);">
<image <image
:src="x.ImageList[0]" :src="x.ImageList[0]"
mode="aspectFill" mode="aspectFill"
...@@ -172,12 +174,15 @@ ...@@ -172,12 +174,15 @@
>{{ x.UserName }}</view >{{ x.UserName }}</view
> >
</view> </view>
<view class="right"> <view class="right" :class="{'no-border':i==g.length-1}">
<view class="activetitle">{{ x.ActivityTitle }}</view> <view class="activetitle">{{ x.ActivityTitle }}</view>
<view class="Content">{{ x.LabelList.join(",") }}</view> <view class="Content" v-if="x.textContent">{{x.textContent}}</view>
<view class="hot" v-if="x.HotCommentList.length > 0"> <view class="Content" v-html="x.Content" v-if="!x.textContent"></view>
<view class="hotTag">人气点评</view> <view class="hot" >
<view class="hotCon">{{ x.HotCommentList[0].Comment }}</view> <view class="hotTag">
<image mode="widthFix" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/renqidianping.png" ></image>
</view>
<view class="hotCon"> <text v-if="x.HotCommentList.length > 0">{{ x.HotCommentList[0].Comment }}</text><text v-if="x.HotCommentList.length == 0">暂无热评</text></view>
</view> </view>
<view class="hotCon2" v-if="x.HotCommentList.length > 1">{{ <view class="hotCon2" v-if="x.HotCommentList.length > 1">{{
x.HotCommentList[1].Comment x.HotCommentList[1].Comment
...@@ -192,7 +197,7 @@ ...@@ -192,7 +197,7 @@
:font-size="24" :font-size="24"
:margin-top="20" :margin-top="20"
:margin-bottom="20" :margin-bottom="20"
bg-color="#F5F5F5" bg-color="#fff"
/> />
<view style="width: 100%; height: 50px"></view> <view style="width: 100%; height: 50px"></view>
</scroll-view> </scroll-view>
...@@ -275,6 +280,14 @@ export default { ...@@ -275,6 +280,14 @@ export default {
showtext: "去认证", showtext: "去认证",
ppplusStyle: 1, //拼拼plus展示样式,1-卡片,2-列表 ppplusStyle: 1, //拼拼plus展示样式,1-卡片,2-列表
isShowFabu: false, isShowFabu: false,
activeTab:{
color:'#111111',
'font-weight': 800,
'font-size':'34rpx'
},
barStyle:{
height:'6rpx',
}
}; };
}, },
created() { created() {
...@@ -710,6 +723,7 @@ export default { ...@@ -710,6 +723,7 @@ export default {
margin-bottom: 18rpx; margin-bottom: 18rpx;
} }
.Content { .Content {
height: 26rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
...@@ -718,6 +732,7 @@ export default { ...@@ -718,6 +732,7 @@ export default {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
margin-bottom: 18rpx; margin-bottom: 18rpx;
overflow: hidden;
p { p {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
...@@ -731,11 +746,9 @@ export default { ...@@ -731,11 +746,9 @@ export default {
width: 98rpx; width: 98rpx;
height: 30rpx; height: 30rpx;
background-color: #00c6c1; background-color: #00c6c1;
border-radius: 4rpx 0rpx 0rpx 4rpx; border-radius: 6rpx 0rpx 0rpx 6rpx;
font-size: 22rpx; box-sizing: border-box;
font-family: FZZongYi-M05S; padding: 4rpx 6rpx;
font-weight: 400;
color: #ffffff;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -755,7 +768,7 @@ export default { ...@@ -755,7 +768,7 @@ export default {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
border-radius: 0px 4rpx 4rpx 0px; border-radius: 0px 6rpx 6rpx 0px;
} }
} }
.hotCon2 { .hotCon2 {
...@@ -811,4 +824,7 @@ export default { ...@@ -811,4 +824,7 @@ export default {
} }
} }
} }
.no-border{
border: none !important;
}
</style> </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