首页瀑布流修改

master
chen 2021-08-29 09:36:29 +08:00
parent 3349b9a301
commit 75657ca089
27 changed files with 391 additions and 34 deletions

View File

@ -105,10 +105,10 @@
.width100{width: 100%;}
.width33{width: 33%;}
.posAll{position: fixed;top: 0;left: 0;right: 0;bottom: 0;background-color: rgba(0,0,0,.45);z-index: 3;}
.posAll{position: fixed;top: 0;left: 0;right: 0;bottom: 0;background-color: rgba(0,0,0,.45);z-index: 12;}
.posir{position: relative;}
.posia{position: absolute;}
.posiszy{position: fixed;left: 0;right: 0;z-index: 2;}
.posiszy{position: fixed;left: 0;right: 0;z-index: 5;}
.posixzy{position: fixed;left: 0;right: 0;z-index: 2;bottom: 0;}
.syxzo{top: 0;left: 0;right: 0;bottom: 0;opacity: 0;}

View File

@ -170,7 +170,7 @@
font-size: 24rpx;
border-top: 1rpx solid #FFFFFF;
background-color: #FFFFFF;
position: fixed;bottom: 0;left: 0;right: 0;z-index: 2;
position: fixed;bottom: 0;left: 0;right: 0;z-index: 10;
display: flex;flex-direction: column;justify-content: center;
}
.item-box{display: flex;justify-content: space-around;align-items: center;}

160
components/wfalls-flow.vue Normal file
View File

@ -0,0 +1,160 @@
<template>
<view>
<view v-if="list.length==0" class="" style="display: flex;flex-direction: column;align-items: center;">
<image src="/static/public/nothing.png" style="width: 474rpx;height: 273rpx;" mode="aspectFill"></image>
<view class="fon24 col3" style="margin-bottom: 60rpx;">暂无内容</view>
</view>
<view class="list-container">
<view id="wf-list" class="list" v-for="(list,listIndex) of viewList" :key="listIndex">
<view @tap="goDetail(listIndex,index)" class="item" style="position: relative;" v-for="(item,index) of list.list" :key="index">
<image style="border-radius: 30rpx;min-height: 260rpx;" @load="handleViewRender(listIndex,index)" @error="handleViewRender(listIndex,index)" :src="item.main_img" mode="widthFix"></image>
<view style="position: absolute;top: 18rpx;right: 18rpx;z-index: 3;" @tap.stop="chooseLike(listIndex,index)">
<!-- <image src="/static/public/like.png" style="width: 69rpx;height: 69rpx;border-radius: 100%;" mode=""></image> -->
<!-- 不喜欢 -->
<image v-if="item.is_collected!=1" style="width: 69rpx;height: 69rpx;border-radius: 100%;" src="/static/public/no-like.png"></image>
<!-- 喜欢 -->
<image v-if="item.is_collected==1" :class="item.is_collected==1?'bounceIn':'bounceOut'" style="width: 69rpx;height: 69rpx;border-radius: 100%;" class="animated" src="/static/public/like.png" mode="aspectFill"></image>
</view>
<view style="position: absolute;z-index: 1;bottom: 8rpx;color: #FFFFFF;background: -webkit-linear-gradient(bottom,rgba(0,0,0,0.79),rgba(255,255,255,0));width: 100%;padding-top: 100rpx;border-bottom-left-radius: 30rpx;border-bottom-right-radius: 30rpx;">
<view style="margin: 20rpx;font-size: 22rpx;line-height: 40rpx;">
<view style="display: flex;align-items: center;font-size: 30rpx;">
<view class="clips1 mar-y10">{{item.title}}</view>
<text v-if="item.isVideo" :style="{fontSize:(nFon-2)+'px',marginLeft:nmarz+'px'}" style="border-radius: 5rpx;padding: 0 6rpx;text-align: center;" class="pbackc flexs fon30"></text>
</view>
<view class="clips1" style="opacity: .7;">{{item.content}}</view>
<view style="display: flex;align-items: center;">
<image :src="item.head_img" style="width: 28rpx;height: 28rpx;border-radius: 100%;" mode=""></image>
<view class="mar-z10" style="opacity: .7;">{{item.name}}</view>
</view>
</view>
</view>
<image v-if="item.isVideo" :style="{width:nWidth+'rpx',height:nHeight+'rpx'}" class="posia" style="top: 50%;left: 50%;transform: translate(-50%,-50%);z-index: 3;" src="/static/public/video.png" mode=""></image>
</view>
</view>
</view>
<!-- 弹框 -->
<pu-po :isShowT="isShowT" :contentVal="pu_content" @comfirmev="comfirmev" @cancleev="cancleev"></pu-po>
</view>
</template>
<script>
export default {
props:{
list:{
type:Array, //
},
nWidth:{
type:String,
default:'120'
},
nHeight:{
type:String,
default:'120'
},
nFon:{
type:String,
default:'15'
},
},
data() {
return {
viewList:[{list:[]},{list:[]}], //
everyNum:2,
jieDuan:false,
pu_content:'是否需要取消收藏?',
isShowT:false,
current:{}
}
},
watch:{
list(oldVal,newVal){
this.init()
}
},
methods: {
comfirmev(){
// console.log('');
this.$emit('comfirmev',this.current)
this.isShowT = false
},
cancleev(){
// console.log('');
this.isShowT = false
},
chooseLike(index,indext){//
// console.log('',index);
if(this.jieDuan==false){
let isAuth = this.$toolAll.tools.returnAuth()
if(!isAuth){
this.$emit('chooseLike',this.viewList[index].list[indext].id)
this.current = this.viewList[index].list[indext].id
if(this.viewList[index].list[indext].is_collected==1) {
this.isShowT = true
} else {
let maiOjb = {
e:3,//
c:this.viewList[index].list[indext].id,
t:new Date().getTime()//
}
this.$toolAll.tools.maiDian(maiOjb)
}
} else this.jieDuan = true
}
},
goDetail(index,indext){//
if(this.jieDuan==false){
let isAuth = this.$toolAll.tools.returnAuth()
if(!isAuth){
uni.navigateTo({
// url:'/pagesB/problemDetail/problemDetail?isCate='+this.list[index].isCate
url:'/pagesB/problemDetail/problemDetail?id='+this.viewList[index].list[indext].id+'&category_id='+this.viewList[index].list[indext].category_id
})
} else this.jieDuan = true
}
},
init(){
this.viewList = [{list:[]},{list:[]}];
setTimeout(()=>{
this.handleViewRender(0,0)
},0)
},
handleViewRender(x,y){
const index = this.viewList.reduce((total,current)=>total + current.list.length,0)
if(index>this.list.length-1) {
//
return
};
const query = uni.createSelectorQuery().in(this);
let listFlag = 0;
query.selectAll('#wf-list').boundingClientRect(data => {
listFlag = data[0].bottom - data[1].bottom<=0?0:1;
this.viewList[listFlag].list.push(this.list[index])
}).exec()
},
},
mounted() {
if(this.list.length){
this.init()
}
}
}
</script>
<style lang="stylus" scoped>
.list-container
display flex
justify-content space-between
align-items:flex-start
padding-top 20rpx
.list
width calc(48%)
display flex
flex-direction column
.item
margin-bottom 30rpx
image
width 100%
.desc
padding 20rpx
font-size 22rpx
</style>

View File

@ -62,7 +62,8 @@
<cate-pu :activeb="publicColor" :newcateList="ktList" :isMinW="true" :newCurrent="newCurrent*1" @choosecateEv="choosecateEv" :newbmo="'#E0E0E0'"></cate-pu>
</view>
<!-- 列表 -->
<list-pu @chooseLike="chooseLike" @comfirmev="comfirmev" :list="dataList"></list-pu>
<wfalls-flow @chooseLike="chooseLike" @comfirmev="comfirmev" :list="dataList" ref="wfalls"></wfalls-flow>
<!-- <list-pu @chooseLike="chooseLike" @comfirmev="comfirmev" :list="dataList"></list-pu> -->
</view>
</view>
</template>
@ -83,10 +84,12 @@
<script>
const {log} = console;
import swiperPu from '@/components/swiper-pu.vue';
import wfallsFlow from '@/components/wfalls-flow'
import {collectionEV,cancleCollectionEV,checkBanner} from '@/jsFile/publicAPI.js';
export default {
components:{
swiperPu
swiperPu,
wfallsFlow
},
data() {
return {
@ -123,6 +126,7 @@
reNum:0,
bannerList:[],//
jieDuan:false,
isNewRenderDone:false //
}
},
onPageScroll(e) {
@ -148,12 +152,17 @@
}
this.$toolAll.tools.maiDian(maiOjb)
if(uni.getStorageSync('token')!='' && uni.getStorageSync('chu')=='') {
this.$toolAll.tools.daoTime()
this.$toolAll.tools.daoTime()
uni.setStorageSync('chu',1)
}
this.checkKT()
this.checkKT()//
},
onLoad(options) {
//
setTimeout(()=>{
// this.list = list;
this.$refs.wfalls.init();
},1000)
if (options && options.q) {
let arr = decodeURIComponent(options.q).split('?')[1].split('&')
let obj = {}
@ -395,17 +404,29 @@
},
chooseLike(e){//
// log(this.dataList[e].is_collected);
if(this.dataList[e].is_collected==0){
this.dataList[e].is_collected = 1
let active = ''
this.dataList.forEach((item,index)=>{
if(e==item.id){
active = index
}
})
if(this.dataList[active].is_collected==0){
this.dataList[active].is_collected = 1
//
collectionEV({action:'collect',archive_id:this.dataList[e].id})
collectionEV({action:'collect',archive_id:e})
}
},
comfirmev(e){//
this.dataList[e].is_collected = 0
let active = ''
this.dataList.forEach((item,index)=>{
if(e==item.id){
active = index
}
})
this.dataList[active].is_collected = 0
this.$toolAll.tools.showToast('正在取消...','loading')
//
cancleCollectionEV({action:'collect',archive_id:this.dataList[e].id})
cancleCollectionEV({action:'collect',archive_id:e})
},
chooseGon(index){//
if(!this.jieDuan){

View File

@ -156,11 +156,12 @@
console.log('二级分类:',index);
this.isZanw = true
this.page = 1
this.category_id = this.cateListTwo[index].id
this.checkAbout(this.cateListTwo[index].id)
},
goDetail(index){
uni.navigateTo({
url:'/pagesB/articleDetail/articleDetail?id='+this.dataList[index].id
url:'/pagesB/articleDetail/articleDetail?id='+this.dataList[index].id +"&category_id="+this.category_id
})
},
backTop(){//

View File

@ -21,6 +21,24 @@
<view style="margin-bottom:50rpx;">打造乡村旅游品牌形成示范带动作用参观了解村民居住环境参观了解村民居住环境了解村民们的生活习俗风土人情了解村民们的生活习俗风土人情</view> -->
<rich-text :nodes="content"></rich-text>
</view>
<!-- 导航 -->
<view class="mar-s50 pad-s10">
<cate-pu :newCurrent="newCurrent*1" :activeb="publicColor" :isCenter="cateListTwo.length<=4?false:true" :newbmo="'#F5F5F5'" @choosecateEv="chooseTwo" :newcateList="cateListTwo"></cate-pu>
</view>
<!-- 列表 -->
<view v-if="dataList.length!=0" class="mar-x20">
<view @tap="goDetail(index)" class="pad-sx30 width100 disjb bbot" v-for="(item,index) in dataList" :key="index">
<view class="disjb fc">
<view class="fon30 col3 clips2" style="height: 84rpx;">{{item.title}}</view>
<view class="fon24 col9 mar-s25">{{item.time}}</view>
</view>
<image v-if="item.imgSrc!=''" class="flexs mar-z30" style="width: 140rpx;height: 140rpx;" :src="item.imgSrc" mode="aspectFill"></image>
</view>
</view>
<view v-if="dataList.length==0" class="disjcac fc" style="margin-top: 20%;">
<image class="zanw-img" src="/static/public/zanwn.png" mode="aspectFill"></image>
<view class="fon24 col3">暂无内容</view>
</view>
</view>
<view class="posixzy disjbac bacf pad-zy32 btnBKS">
<view class="posir">
@ -76,10 +94,18 @@
content:'',//
isLoading:false,
haveImg:true,
detailId:'',
detailId:'',//ID
invite_code:'',
vision:false,
isShowP:false
isShowP:false,
newCurrent:0,
cateListTwo:[],
dataList:[],
category_id:0,
size:10,
page:1,
total:'',//
isZanw:true,
}
},
onShareAppMessage(res) {
@ -104,6 +130,7 @@
onLoad(options) {
this.checkDetail(options.id)
this.detailId = options.id
this.category_id = options.category_id
if(options.invite_code!='' && options.invite_code!=undefined){
uni.login({
provider: 'weixin',
@ -125,8 +152,72 @@
},
});
}
this.checkAbout(this.category_id)
},
onReachBottom() {//
if(this.total!=this.dataList.length){
this.page++
this.checkAbout(this.category_id)//
} else {
if(this.isZanw) this.$toolAll.tools.showToast('暂无更多列表','none',1000)
this.isZanw = false
}
},
methods: {
checkAbout(category_id){
let params = {
category_id:category_id,
page:this.page,
size:this.size
}
this.$requst.post('archives/about',params).then(res=>{
// console.log('',res);
if(res.code==0){
if(this.cateListTwo.length==0){
if(res.data.category.length!=0){
res.data.category.forEach((item,index)=>{
let cateObj = {
id:item.id,
mode_id:item.mode_id,
title:item.title
}
this.cateListTwo.push(cateObj)
if(this.category_id==item.id) this.newCurrent = index
})
}
}
if(this.page==1) this.dataList = []
if(res.data.list.list.length!=0){
this.total = res.data.list.total
res.data.list.list.forEach(item=>{
let newImg = ''
if(item.cover=='') newImg = '/static/public/logo.png'
else newImg = this.$http + item.cover
let aobj = {
id:item.id,
title:item.title,
time:item.published_at,
imgSrc:newImg
}
if(this.detailId!=item.id) this.dataList.push(aobj)
})
}
}
},error=>{})
},
chooseTwo(index){//
this.newCurrent = index
// console.log('',index);
this.isZanw = true
this.page = 1
this.category_id = this.cateListTwo[index].id
this.checkAbout(this.cateListTwo[index].id)
},
goDetail(index){
uni.navigateTo({
url:'/pagesB/articleDetail/articleDetail?id='+this.dataList[index].id +"&category_id="+this.category_id
})
},
moveHandle(){//
return false
},

View File

@ -236,7 +236,7 @@
var shareObj = {
     title: `${ya.detailObj.title}`, // (slogan)
     path: `/pagesB/problemDetail/problemDetail?id=${this.detailObj.id}&category_id=${this.category_id}&share_id=${uni.getStorageSync('userId')}&invite_code=${uni.getStorageSync('invite_code')}`, // /
     imageUrl: ''//PNGJPG imageUrl 使 5:4
     imageUrl: ya.$http + ya.detailObj.share_img//PNGJPG imageUrl 使 5:4
  };
  return shareObj;
},

View File

@ -0,0 +1,83 @@
{
"list": [{
"id": 1,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469409&di=f6ed0a0960506e12af88b62e7329142d&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2F361b2f98c2a56a98731e84759a52170fc670db51.jpg",
"content": "漫威大电影在美国文化输出中具有典型性,代表性和时事性。"
},{
"id": 2,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469410&di=6bdb6526f0117380db303ac285c94974&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fpic%2Fd%2Fdc%2F0f45274990.jpg",
"content": "其中《X 战警》系列,《神奇四侠》系"
},{
"id": 3,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469426&di=5707559fd718e43f330ed9f14be75a17&imgtype=0&src=http%3A%2F%2Fpic.soutu123.cn%2Felement_origin_min_pic%2F16%2F09%2F11%2F2057d54d4e4f399.jpg%2521%2Ffw%2F700%2Fquality%2F90%2Funsharp%2Ftrue%2Fcompress%2Ftrue",
"content": "第一季》登陆美国广播公司,宣告漫威全方位注入"
},{
"id": 4,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469425&di=001b3485550e21458f16d7329c9e622e&imgtype=0&src=http%3A%2F%2Fhbimg.huabanimg.com%2F4b4b2b42a8a147d413c2ea2ffb7fc911b18359e4158c5-gHpSFO_fw658",
"content": "容过多并没有通过广电总局的审批通过,故本文不对其记性研究。),电视剧 55 集。第 14 部《美国队长第三部--内"
},{
"id": 5,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469424&di=516a27964c81a724d3014bc51363dc23&imgtype=0&src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F39996d8ac90edaed81917fab6f103a98b26631d1180d4-KJn4HP_fw658",
"content": "画与漫威电影中人物设定的区别,但都未考虑到电影的制作方式"
},{
"id": 6,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671681615&di=ea4d107c05fabc27d4f7fb7f39f557a5&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fblog%2F201503%2F27%2F20150327181548_LE48G.thumb.400_0.jpeg",
"content": "类文献中很少考虑电影与漫画的本质区别,不同的艺术载体有着不同的艺术表达方式"
},{
"id": 7,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469436&di=7c9efbe8c2a841bb9809b14cd10e50bb&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20181114%2F03781533510447daa81b588ac75791f9.jpeg",
"content": "目前为止,仅有的几篇文献多以商业价值角度视"
},{
"id": 8,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469436&di=68c7f9051bbe0d3ebb51b06314c75f19&imgtype=0&src=http%3A%2F%2F2b.zol-img.com.cn%2Fproduct%2F133_501x2000%2F223%2Fce71kpGYA23Lc.jpg",
"content": "字好莱坞真人版超级英雄改编电影研究》中提到新的电影热潮并不是一触而发的"
},{
"id": 9,
"image": "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1692553019,941925969&fm=26&gp=0.jpg",
"content": "漫威影业的超级英雄电影在 7 年内席卷全球 24.75 亿票房成为史上最卖座的系列电影,"
},{
"id": 10,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469431&di=f93b3aa2cd955f7a25146619dcb61f69&imgtype=0&src=http%3A%2F%2F00imgmini.eastday.com%2Fmobile%2F20181114%2F20181114032555_052f60dc9edc8456b9a7ab6baa1d1043_7.jpeg",
"content": "《神盾局特工》在整个漫威大电影系列中只起到了辅助作用,在整个漫威大电影系列中的"
},{
"id": 11,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469409&di=f6ed0a0960506e12af88b62e7329142d&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2F361b2f98c2a56a98731e84759a52170fc670db51.jpg",
"content": "漫威大电影在美国文化输出中具有典型性,代表性和时事性。"
},{
"id": 12,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469410&di=6bdb6526f0117380db303ac285c94974&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fpic%2Fd%2Fdc%2F0f45274990.jpg",
"content": "其中《X 战警》系列,《神奇四侠》系"
},{
"id": 13,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469426&di=5707559fd718e43f330ed9f14be75a17&imgtype=0&src=http%3A%2F%2Fpic.soutu123.cn%2Felement_origin_min_pic%2F16%2F09%2F11%2F2057d54d4e4f399.jpg%2521%2Ffw%2F700%2Fquality%2F90%2Funsharp%2Ftrue%2Fcompress%2Ftrue",
"content": "第一季》登陆美国广播公司,宣告漫威全方位注入"
},{
"id": 14,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469425&di=001b3485550e21458f16d7329c9e622e&imgtype=0&src=http%3A%2F%2Fhbimg.huabanimg.com%2F4b4b2b42a8a147d413c2ea2ffb7fc911b18359e4158c5-gHpSFO_fw658",
"content": "容过多并没有通过广电总局的审批通过,故本文不对其记性研究。),电视剧 55 集。第 14 部《美国队长第三部--内"
},{
"id":15,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469424&di=516a27964c81a724d3014bc51363dc23&imgtype=0&src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F39996d8ac90edaed81917fab6f103a98b26631d1180d4-KJn4HP_fw658",
"content": "画与漫威电影中人物设定的区别,但都未考虑到电影的制作方式"
},{
"id": 16,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671681615&di=ea4d107c05fabc27d4f7fb7f39f557a5&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fblog%2F201503%2F27%2F20150327181548_LE48G.thumb.400_0.jpeg",
"content": "类文献中很少考虑电影与漫画的本质区别,不同的艺术载体有着不同的艺术表达方式"
},{
"id": 17,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469436&di=7c9efbe8c2a841bb9809b14cd10e50bb&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20181114%2F03781533510447daa81b588ac75791f9.jpeg",
"content": "目前为止,仅有的几篇文献多以商业价值角度视"
},{
"id": 18,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469436&di=68c7f9051bbe0d3ebb51b06314c75f19&imgtype=0&src=http%3A%2F%2F2b.zol-img.com.cn%2Fproduct%2F133_501x2000%2F223%2Fce71kpGYA23Lc.jpg",
"content": "字好莱坞真人版超级英雄改编电影研究》中提到新的电影热潮并不是一触而发的"
},{
"id": 19,
"image": "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1692553019,941925969&fm=26&gp=0.jpg",
"content": "漫威影业的超级英雄电影在 7 年内席卷全球 24.75 亿票房成为史上最卖座的系列电影,"
},{
"id": 20,
"image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1583671469431&di=f93b3aa2cd955f7a25146619dcb61f69&imgtype=0&src=http%3A%2F%2F00imgmini.eastday.com%2Fmobile%2F20181114%2F20181114032555_052f60dc9edc8456b9a7ab6baa1d1043_7.jpeg",
"content": "《神盾局特工》在整个漫威大电影系列中只起到了辅助作用,在整个漫威大电影系列中的"
}]
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long