Skip to content

M
mallapp
Commit 0f3aa86b authored by Mac's avatar Mac
Browse files
Options

修改一些已知的样式问题

parent 8d3da617
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 35 deletions
components/tabbar/index.vue
View file @ 0f3aa86b
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
.imgse { .imgse {
/* width: 48upx; */ /* width: 48upx; */
height: 48upx; height: 48upx;
width: auto;
} }
.txtBtn { .txtBtn {
font-size: 24upx; font-size: 24upx;
......
pages/kotra/activeInner.vue
View file @ 0f3aa86b
...@@ -69,34 +69,90 @@ ...@@ -69,34 +69,90 @@
.ac-x-r{ .ac-x-r{
width: 90px; width: 90px;
font-size: 10px; font-size: 10px;
text-align: right;
font-family: aa; font-family: aa;
display: flex;
flex-direction: column;
align-items: flex-end;
}
.activeInnerB{
width: 100%;
padding: 15px;
display: flex;
align-items: flex-start;
justify-content: space-between;
}
.activeInnerB-l{
width: calc(100vw - 60px - 90px);
font-size:14px;
color:#404040;
font-weight: bold;
}
.activeJoin-x{
color:#fff;
background-color: #000450;
width:60px;
height:22px;
border-radius: 3px;
text-align: center;
line-height: 22px;
font-size:12px;
}
.activeInnerB-l-title{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
} }
</style> </style>
<template> <template>
<view class="activeInner" style="height:100vh;"> <view class="activeInner" style="height:100vh;">
<u-empty v-if="dataList.length==0" text="暂无数据" mode="data"></u-empty> <u-empty v-if="dataList.length==0" text="暂无数据" mode="data"></u-empty>
<scroll-view v-else :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" <scroll-view v-else :scroll-y="true" :enable-back-to-top="true" :enable-flex="true"
@scrolltolower="lower" :style="{ 'height': `calc(100%)-15`}"> @scrolltolower="lower" style="height: calc(100vh - 15px);">
<view v-if="IsOpenMiAi==0">
<view class="activeList" v-for="(item,index) in dataList" :key="index" @click="goActiveDetail(item)"> <view class="activeList" v-for="(item,index) in dataList" :key="index" @click="goActiveDetail(item)">
<view class="activeInnerTop"> <view class="activeInnerTop">
<img :src="item.CoverImg" mode='aspectFill' style="width:100%;height:100%;" alt="" /> <img :src="item.CoverImg" mode='aspectFill' style="width:100%;height:100%;" alt="" />
</view> </view>
<view class="activeInnerTitle" v-if="IsOpenMiAi==0">{{item.ActivityName}}</view> <view class="activeInnerTitle" v-if="IsOpenMiAi==0">{{item.ActivityName}}</view>
<view class="activeInnerTitle-x" v-if="IsOpenMiAi==1">
<view class="ac-x-l"> <view class="activeDate">{{item.StartTimeStr}} 至 {{item.EndTimeStr}}</view>
<view class="activeJoin" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="item.ActivityStatus==0">未开始</view>
<view class="activeJoin" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="item.ActivityStatus==1">马上加入</view>
<view class="activeJoin activeJieshu" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="item.ActivityStatus==2">已结束</view>
</view>
</view>
<view v-if="IsOpenMiAi == 1">
<view class="activeList" style="border-radius: 8px;height: auto;" v-for="(item,index) in dataList" :key="index" @click="goActiveDetail(item)">
<view class="activeInnerTop">
<img :src="item.CoverImg" mode='aspectFill' style="width:100%;height:100%;border-top-left-radius: 8px;border-top-right-radius: 8px;" alt="" />
</view>
<view class="activeInnerB">
<view class="activeInnerB-l">
<view class="activeInnerB-l-title">
{{item.ActivityName}} {{item.ActivityName}}
</view> </view>
<view class="activeDate" style="margin-left: 0;margin-top: 8px;">{{item.StartTimeStr}} 至 {{item.EndTimeStr}}</view>
</view>
<view class="ac-x-r" :style="{'color':mainColor}"> <view class="ac-x-r" :style="{'color':mainColor}">
<view style="margin-bottom: 5px;">
{{item.IsFree==1?'免费':'需要星星:'+item.Price }} {{item.IsFree==1?'免费':'需要星星:'+item.Price }}
</view> </view>
<view class="activeJoin-x" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="item.ActivityStatus==0">未开始</view>
<view class="activeJoin-x" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="item.ActivityStatus==1">马上加入</view>
<view class="activeJoin-x activeJieshu" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="item.ActivityStatus==2">已结束</view>
</view>
</view> </view>
<view class="activeDate">{{item.StartTimeStr}} 至 {{item.EndTimeStr}}</view>
<view class="activeJoin" v-if="item.ActivityStatus==0">未开始</view>
<view class="activeJoin" v-if="item.ActivityStatus==1">马上加入</view>
<view class="activeJoin activeJieshu" v-if="item.ActivityStatus==2">已结束</view>
</view> </view>
</view>
<view style="padding:10px 0;"> <view style="padding:10px 0;">
<u-loadmore :status="status" bg-color="transparent" :load-text="loadText" :font-size="24" :margin-top="0" :margin-bottom="0" /> <u-loadmore :status="status" bg-color="transparent" :load-text="loadText" :font-size="24" :margin-top="0" :margin-bottom="0" />
</view> </view>
......
pages/kotra/activeInnerDetail.vue
View file @ 0f3aa86b
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
</view> </view>
<view class="acdetaiWriter"> <view class="acdetaiWriter">
<view>作者：{{dataList.CreateByName}}</view> <view>作者：{{dataList.CreateByName}}</view>
<view class="acdetailLittleBtn" v-if="dataList.ActivityStatus==0" style="background-color: #000450;">{{dataList.ActivityStatusStr}}</view> <view class="acdetailLittleBtn" v-if="dataList.ActivityStatus==0" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}">{{dataList.ActivityStatusStr}}</view>
<view class="acdetailLittleBtn" v-if="dataList.ActivityStatus==1" style="background-color: #000450;">{{dataList.ActivityStatusStr}}</view> <view class="acdetailLittleBtn" v-if="dataList.ActivityStatus==1" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}">{{dataList.ActivityStatusStr}}</view>
<view class="acdetailLittleBtn" v-if="dataList.ActivityStatus==2">{{dataList.ActivityStatusStr}}</view> <view class="acdetailLittleBtn" v-if="dataList.ActivityStatus==2">{{dataList.ActivityStatusStr}}</view>
</view> </view>
</view> </view>
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
</view> </view>
<template v-if="isShowBtn"> <template v-if="isShowBtn">
<view class="acdetailBtn" v-if="dataList.ActivityStatus==2">报名活动（已结束）</view> <view class="acdetailBtn" v-if="dataList.ActivityStatus==2">报名活动（已结束）</view>
<view class="acdetailBtn" @click="IsOpenMiAi==1?gosignUp():showModal=true" style="background-color: #000450;" v-if="dataList.ActivityStatus==1&&dataList.IsSignUp==1">马上报名</view> <view class="acdetailBtn" @click="IsOpenMiAi==1?gosignUp():showModal=true" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="dataList.ActivityStatus==1&&dataList.IsSignUp==1">马上报名</view>
<view class="acdetailBtn" style="background-color: #000450;" v-if="dataList.ActivityStatus==0">未开始</view> <view class="acdetailBtn" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="dataList.ActivityStatus==0">未开始</view>
<view class="acdetailBtn" v-if="dataList.IsJoinActivity==1">已报名</view> <view class="acdetailBtn" v-if="dataList.IsJoinActivity==1">已报名</view>
</template> </template>
<u-popup v-model="showModal" mode="center" length="80%"> <u-popup v-model="showModal" mode="center" length="80%">
......
pages/kotra/baomingorder.vue
View file @ 0f3aa86b
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<view>{{x.PeopleNum}}</view> <view>{{x.PeopleNum}}</view>
<u-icon name="phone-o" :size="28" color="#999999" style='margin-right: 5px;margin-left: 10px;' ></u-icon> <u-icon name="phone-o" :size="28" color="#999999" style='margin-right: 5px;margin-left: 10px;' ></u-icon>
<view>{{x.LinkTel}}</view> <view>{{x.LinkTel}}</view>
<u-icon name="star-o" :size="28" color="#999999" style='margin-right: 5px;margin-left: 10px;' ></u-icon> <u-icon name="star-o" :size="28" :color="mainColor" style='margin-right: 5px;margin-left: 10px;' ></u-icon>
<view v-if="x.Money>0" :style="{color:mainColor}">{{x.Money}}</view> <view v-if="x.Money>0" :style="{color:mainColor}">{{x.Money}}</view>
<view v-if="x.Money==0" :style="{color:mainColor}">免费</view> <view v-if="x.Money==0" :style="{color:mainColor}">免费</view>
</view> </view>
......
pages/user-center/components/blinddate-user.vue
View file @ 0f3aa86b
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</view> </view>
<view class="userBox" :style="{ 'margin-bottom': bottommargin }"> <view class="userBox" :style="{ 'margin-bottom': bottommargin }">
<view <view
class="imgbg" style="background:linear-gradient( #9EE3E1,5%, #f3f4f6);height: 217px;"> class="imgbg" style="background:linear-gradient( #9EE3E1,5%, #f3f4f6);height: auto;">
<view class="titlenav" :style="{paddingTop:nav,color:'#000'}">{{pageTitle}}</view> <view class="titlenav" :style="{paddingTop:nav,color:'#000'}">{{pageTitle}}</view>
<view class='topheard' style="margin-top: 30px;justify-content: space-between;" <view class='topheard' style="margin-top: 30px;justify-content: space-between;"
v-if="meueData.user_center.top_style == 1" @click="goperson()"> v-if="meueData.user_center.top_style == 1" @click="goperson()">
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
<view style="display: flex;flex-direction: column;justify-content: center;height: 50px;margin-left: 20rpx"> <view style="display: flex;flex-direction: column;justify-content: center;height: 50px;margin-left: 20rpx">
<Text style="color: #000000;font-size: 40rpx;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;" <Text style="color: #000000;font-size: 40rpx;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;"
@click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" v-if="is_icon_members_grade == 1&& user_info.nickname"> <view style="display: flex;align-items: center;">
<view class="member" v-if="is_icon_members_grade == 1&& user_info.nickname" style="margin-right: 5px;">
<image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image> <image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image>
<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text> <Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text>
</view> </view>
...@@ -35,6 +36,8 @@ ...@@ -35,6 +36,8 @@
已认证 已认证
</view> </view>
</view> </view>
</view>
</view> </view>
<u-icon name="arrow" color="#A5A4AC" size="40" style='margin-right: 10px;'></u-icon> <u-icon name="arrow" color="#A5A4AC" size="40" style='margin-right: 10px;'></u-icon>
...@@ -221,6 +224,6 @@ ...@@ -221,6 +224,6 @@
top:10px ; top:10px ;
} }
.renzhen{ .renzhen{
width: 40px;height: 15px;font-size: 10px;color: #555555;border-radius: 7px;border: 1px solid #999999;display: flex;align-items: center;justify-content: center; width: 40px;height: 15px;font-size: 10px;margin-top: 10px;color: #555555;border-radius: 7px;border: 1px solid #999999;display: flex;align-items: center;justify-content: center;
} }
</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