Skip to content

M
mallapp
Commit 1c1c51b7 authored by 罗超's avatar 罗超
Browse files
Options

修改部分样式

parent 6bf1af19
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 110 deletions
components/pagetitle/index.vue
View file @ 1c1c51b7
......@@ -53,12 +53,13 @@ export default {
},
methods: {
clickTitleHandler() {
console.log(this.ts)
if (
this.ts.link &&
this.ts.link.url &&
this.ts.link.url != ""
this.ts.link.name &&
this.ts.link.name != ""
) {
uni.navigateTo({ url: this.ts.link.url });
uni.navigateTo({ url: this.ts.link.name });
}
}
}
......@@ -169,6 +170,7 @@ export default {
}
.page-title .arrowRight {
width: 8px;
margin-right: 10px;
text-align: right;
}
</style>
\ No newline at end of file
components/study/style5.vue
View file @ 1c1c51b7
......@@ -16,7 +16,7 @@
<view class="good-info">
<view class="good-name" v-if="item.name">{{ item.name }}</view>
<view class="good-price-info" v-if="item.lableName">
<span class="price" style="font-size:12px;">{{ item.lableName }}</span>
<view class="price" style="font-size:12px;">{{ item.lableName }}</view>
</view>
</view>
</view>
......@@ -107,26 +107,22 @@
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
width:130px;
font-weight: 600;
}
.myStudy_five_study .good-info .good-price-info {
display: flex;
justify-items: center;
padding-bottom: 10rpx;
}
.myStudy_five_study .good-info .good-price-info .price {
color: #999999;
flex: 1;
font-size: 14px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.myStudy_five_study .good-info .good-price-info .buy {
width: 24px;
text-align: right;
display: block;
width:130px;
margin-top:10px;
}
.her_Two_study {
overflow-x: auto !important;
......
pages/kotra/activeInner.vue
View file @ 1c1c51b7
<style>
.activeInner{
background-color: #F3F5F7;
background-color: #f6f6f6;
font-family: pingfang;
}
.activeList{
height:255px;
......@@ -9,17 +10,18 @@
border-radius: 3px;
overflow: hidden;
position: relative;
border-radius: 30rpx;
}
.activeInnerTop{
width:100%;
height:190px;
border-radius: 3px;
overflow: hidden;
}
.activeInnerTitle{
font-size:14px;
color:#404040;
font-weight: bold;
font-size:28rpx;
color:#111;
font-weight: 600;
margin:10px 0 8px 15px;
width: calc(100vw - 60px);
overflow: hidden;
......@@ -28,8 +30,8 @@
}
.activeDate{
color:#B9B9B9;
font-size: 12px;
color:#999;
font-size: 24rpx;
margin-left:15px;
}
.activeJoin{
......@@ -119,12 +121,10 @@
<img :src="item.CoverImg" mode='aspectFill' style="width:100%;height:100%;" alt="" />
</view>
<view class="activeInnerTitle" v-if="IsOpenMiAi==0">{{item.ActivityName}}</view>
<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 style="margin-top: 12rpx;display: flex;">
<view class="activeDate" style="flex: 1;">{{item.StartTimeStr}}</view>
<view class="activeDate" style="flex: 1;text-align: right;margin-right: 12px;">{{item.ActivityTypeName}}</view>
</view>
</view>
</view>
<view v-if="IsOpenMiAi == 1">
......
pages/kotra/activeInnerDetail.vue
View file @ 1c1c51b7
<style>
.activeDetails{}
.activeDetails{font-family: pingfang;}
.acdetailTop{
width:100%;
background-color: #fff;
background-color: #FFF;
padding:15px;
}
.acdetailImg{
width:100%;
height:190px;
border-radius: 3px;
border-radius: 30rpx;
overflow: hidden;
}
.acdetaiTitle{
margin:15px auto;
color:#0B0B0B;
font-size:16px;
font-weight: bold;
color:#1F1F1F;
font-size:38rpx;
text-align: center;
font-weight: 600;
}
.acdetaiDate{
display: flex;
justify-content: space-between;
font-size: 12px;
color:#FF5D69;
font-weight: bold;
color:#999;
}
.acdetaiDate2{
display: flex;
justify-content: flex-end;
font-size: 12px;
color:#FF5D69;
color:#999;
font-weight: bold;
}
.acdetaiWriter{
......@@ -38,7 +38,6 @@
justify-content: space-between;
color:#B9B9B9;
font-size:12px;
font-weight: bold;
margin-top:10px;
align-items: center;
}
......@@ -48,7 +47,7 @@
text-align: center;
line-height: 22px;
background-color: #AFAFAF;
color:#fff;
color:#FFF;
border-radius: 3px;
font-size: 12px;
}
......@@ -61,7 +60,7 @@
width:100%;
min-height:283px;
padding:15px;
background-color: #fff;
background-color: #FFF;
}
.acdetail_Intro{
color:#404040;
......@@ -75,10 +74,10 @@
width:100%;
height:50px;
line-height: 50px;
font-size:15px;
font-weight: bold;
font-size:30rpx;
font-weight: 600;
background-color: #AFAFAF;
color:#fff;
color:#FFF;
text-align: center;
}
</style>
......@@ -94,37 +93,35 @@
<view>结束日期：<text v-if="dataList.EndTimeStr">{{dataList.EndTimeStr}}</text></view>
</view>
<view class="acdetaiDate" style="margin-top:10px;">
<view>报名日期：<text v-if="dataList.SignStartTimeStr&&dataList.SignStartTimeStr!='0001-01-01 00:00:00'">{{dataList.SignStartTimeStr}}</text></view>
<view>报名日期：<text v-if="dataList.SignStartTimeStr&&dataList.SignStartTimeStr!='0001-01-01 00:00:00'">{{dataList.SignStartTimeStr.split(' ')[0]}}</text></view>
<view v-if="IsOpenMiAi==0">截止日期：<text v-if="dataList.SignEndTimeStr&&dataList.SignEndTimeStr!='0001-01-01 00:00:00'">{{dataList.SignEndTimeStr.split(' ')[0]}}</text></view>
</view>
<view class="acdetaiDate" style="margin-top:10px;">
<view class="acdetaiDate" style="margin-top:10px;" v-if="IsOpenMiAi==1">
<view>截止日期：<text v-if="dataList.SignEndTimeStr&&dataList.SignEndTimeStr!='0001-01-01 00:00:00'">{{dataList.SignEndTimeStr}}</text></view>
</view>
<view class="acdetaiDate2" :style="{'margin-top':'10px','color':mainColor}">
<view class="acdetaiDate2" v-if="IsOpenMiAi==1" :style="{'margin-top':'10px','color':mainColor}">
<view v-if='dataList.IsFree==1'>免费</view>
<view v-if='dataList.IsFree==2'>需要星星：{{dataList.Price}}</view>
</view>
<view class="acdetaiWriter">
<view>作者：{{dataList.CreateByName}}</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':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==0 && IsOpenMiAi==1" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}">{{dataList.ActivityStatusStr}}</view>
<view class="acdetailLittleBtn" v-if="dataList.ActivityStatus==1 && IsOpenMiAi==1" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}">{{dataList.ActivityStatusStr}}</view>
<view class="acdetailLittleBtn" v-if="dataList.ActivityStatus==2 && IsOpenMiAi==1">{{dataList.ActivityStatusStr}}</view>
</view>
</view>
<view class="acdetaiLine"></view>
<!-- <view class="acdetaiLine"></view> -->
<view class="acdetailBottom">
<u-divider color="#0B0B0B;" half-width="50" border-color="#0B0B0B" fontSize="35">活动详情</u-divider>
<view class="acdetail_Intro" v-html="dataList.ActivityInfo">
<rich-text :nodes="dataList.ActivityInfo"></rich-text>
</view>
<!-- <u-divider color="#0B0B0B;" half-width="50" border-color="#0B0B0B" fontSize="35">活动详情</u-divider> -->
<view class="acdetail_Intro" v-html="richtext"></view>
</view>
<template v-if="isShowBtn">
<view class="acdetailBtn" v-if="dataList.ActivityStatus==2">报名活动（已结束）</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':IsOpenMiAi==1?mainColor:'#000450'}" v-if="dataList.ActivityStatus==0">未开始</view>
<view class="acdetailBtn" @click="IsOpenMiAi==1?gosignUp():showModal=true" :style="{'background-color':IsOpenMiAi==1?mainColor:'#1F1F1F'}" v-if="dataList.ActivityStatus==1&&dataList.IsSignUp==1">马上报名</view>
<view class="acdetailBtn" :style="{'background-color':IsOpenMiAi==1?mainColor:'#80808A'}" v-if="dataList.ActivityStatus==0">未开始</view>
<view class="acdetailBtn" v-if="dataList.IsJoinActivity==1">已报名</view>
</template>
<u-popup v-model="showModal" mode="center" length="80%">
<view style='display: flex;flex-direction: column;align-items: center;background: #fff;'>
<view style='display: flex;flex-direction: column;align-items: center;background: #FFF;'>
<view style="display: flex;width: 100%;margin-top:30px;padding-left:20px;">
<Text style='display:inline-block;width:80px;text-align: right;margin-top: 6px;'>姓名：</Text>
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="signMsg.LinkMan" placeholder="请输入姓名" />
......@@ -164,6 +161,7 @@
isShowBtn:true,
IsOpenMiAi:0,//1开始 0 没开启
mainColor:'',
richtext:""
}
},
created() {},
......@@ -191,10 +189,17 @@
(res) => {
if (res.resultCode == 1) {
this.dataList = res.data;
let richtext = res.data.ActivityInfo;
let regex = new RegExp('<img', 'gi');
richtext = richtext.replace(regex, `<img width="100%"`); //图片超出的处理
this.dataList.ActivityInfo = richtext
let tempRichtext=""
tempRichtext = this.dataList.ActivityInfo.replace(/<img[^>]*>/gi, function(match, capture) {
var match = match.replace(/style=\"(.*)\"/gi,
'style="width:100% !important"');
return match;
});
// let regex = new RegExp('<section', 'gi');
// tempRichtext = tempRichtext.replace(regex, `<div`); //图片超出的处理
// regex = new RegExp('</section>', 'gi');
// tempRichtext = tempRichtext.replace(regex, `</div>`);
this.richtext=tempRichtext
}
}
);
......
pages/kotra/news.vue
View file @ 1c1c51b7
......@@ -3,6 +3,7 @@
width: 100%;
height: 100vh;
background: #F6F6F6;
overflow: hidden;
}
.koraNewsList{
......@@ -44,17 +45,22 @@
padding: 10px 15px;
}
.koraRName{
color:#404040;
font-size:14px;
color:#111111;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
font-size: 28rpx;
line-height: 30rpx;
font-weight: 600;
}
.koraRName-f{
font-size: 12px;color:#999999;
font-size: 12px;
color:#999999;
margin-top: 5px;
overflow: hidden;white-space: nowrap;text-overflow: ellipsis
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.koraNewsSearch{
padding: 0px 10px 10px;
......@@ -63,18 +69,26 @@
<template>
<view class="koraNews">
<view class="koraNewsSearch">
<u-search action-text="搜索" :focus="true" :clearabled="true" style="width:95%" :show-action="true" radius="40" v-model="msg.Title"
<u-search action-text="搜索" :focus="true" :clearabled="true" style="width:95%" :show-action="false" radius="40" v-model="msg.Title"
@search="getList(1)" @custom="getList(1)"></u-search>
</view>
<view style="display: flex;align-items: center;margin-bottom: 30rpx;padding: 0px 15px;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616490607000_36.png" style="flex:1;width:1px;margin-right: 15rpx;" mode="widthFix"></image>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616490607000_108.png" style="flex:1;width:1px;margin-left: 15rpx;" mode="widthFix"></image>
</view>
<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"
@scrolltolower="lower" style="height: calc(100vh - 45px);">
@scrolltolower="lower" style="height: calc(100vh - 128px);">
<view style="font-size: 30rpx;font-weight: 700;color: #111;padding: 0 15px;">资讯信息</view>
<view>
<view class="koraNewsList" v-for="(item,index) in dataList" :key="index" @click="goNewsDetail(item)">
<view class="koraNews-time">{{item.CreateDate?item.CreateDate.replace('T',' '):''}}</view>
<view class="koraNews-box">
<view class="newsimgs">
<view class="newsimgs" style="position: relative;">
<image :src="item.CoverImg" mode="aspectFill" class='n-img'/>
<view style="top:10px;left:10px;position: absolute;" v-if="item.Industry&&item.Industry.length>0">
<u-tag :text="item.Industry" mode="dark" bg-color="rgba(0,0,0,.4)" color="#FFF" size="mini"></u-tag>
</view>
</view>
<view class="box-conet">
<view class="koraRName">{{item.Title}}</view>
......@@ -103,7 +117,7 @@
export default {
data() {
return {
pageTitle: "新闻",
pageTitle: "首店经济",
msg:{
pageIndex: 1,
pageSize: 10,
......@@ -115,7 +129,7 @@
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
nomore: "",
},
status:'',
}
......
pages/kotra/newsInDetail.vue
View file @ 1c1c51b7
<style>
.newsInDetail .acdetailTop{
width:100%;
height:auto;
.newsInDetail .acdetailTop {
width: 100%;
height: auto;
background-color: #fff;
padding:15px;
font-family: pingfang !important;
padding: 10px;
}
.newsInDetail .acdetailImg{
width:100%;
height:190px;
.newsInDetail .acdetailImg {
width: 100%;
height: 190px;
border-radius: 3px;
overflow: hidden;
}
.newsInDetail .acdetaiTitle{
margin:15px auto;
color:#0B0B0B;
font-size:16px;
font-weight: bold;
text-align: center;
.newsInDetail .acdetaiTitle {
margin: 15px auto;
color: #0B0B0B;
font-size: 16px;
font-weight: 600;
}
.newsInDetail .acdetaiWriter{
.newsInDetail .acdetaiWriter {
display: flex;
justify-content: space-between;
color:#B9B9B9;
font-size:12px;
font-weight: bold;
margin-top:10px;
color: #B9B9B9;
font-size: 12px;
margin-top: 10px;
align-items: center;
}
.newsInDetail .acdetaiLine{
width:100%;
height:10px;
.newsInDetail .acdetaiLine {
width: 100%;
height: 10px;
background-color: #F3F5F7;
}
.newsInDetail .acdetailBottom{
width:100%;
min-height:283px;
padding:15px;
.newsInDetail .acdetailBottom {
width: 100%;
min-height: 283px;
padding: 15px 10px;
background-color: #fff;
}
.newsInDetail .newsInDetail_Intro{
color:#404040;
font-size:14px;
.newsInDetail .newsInDetail_Intro {
color: #404040;
font-size: 14px;
line-height: 25px;
margin-top:20px;
margin-top: 20px;
}
</style>
<template>
<view class="newsInDetail" style="height:100vh;">
<view class="acdetailTop">
<view class="acdetailImg">
<img :src="dataList.CoverImg" alt="" style="width:100%;height:100%;"/>
</view>
<view class="acdetaiTitle">{{dataList.Title}}</view>
<view class="acdetaiWriter">
<view>行业：{{dataList.Industry}}</view>
</view>
<view class="acdetaiWriter">
<view>发布：{{dataList.PublishTimeStr}}</view>
<view>
<u-tag :text="dataList.Industry" type="primary" style="margin-right: 12px;"></u-tag>
<text>{{dataList.PublishTimeStr}}</text>
</view>
</view>
</view>
<view class="acdetaiLine"></view>
<view class="acdetailBottom">
<u-divider color="#0B0B0B;" half-width="50" border-color="#0B0B0B" fontSize="35">详情内容</u-divider>
<view class="newsInDetail_Intro" v-html="dataList.NewsInfo"></view>
<view class="newsInDetail_Intro" v-html="richtext"></view>
</view>
</view>
</template>
......@@ -73,9 +73,11 @@
return {
pageTitle: '新闻详情',
msg: {
Id:0
Id: 0
},
dataList:{}
dataList: {},
richtext: '',
mainColor:''
}
},
created() {},
......@@ -89,7 +91,7 @@
this.getList();
},
methods: {
getList(){
getList() {
this.request2({
url: "/api/AppletTrade/GetCommerceNews",
data: this.msg,
......@@ -97,6 +99,11 @@
(res) => {
if (res.resultCode == 1) {
this.dataList = res.data
this.richtext = this.dataList.NewsInfo.replace(/<img[^>]*>/gi, function(match, capture) {
var match = match.replace(/style=\"(.*)\"/gi,
'style="max-width:100% !important"');
return match;
});
}
}
);
......
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