现有接口对接完成

master
Lee1203 2022-08-18 15:26:31 +08:00
parent 697a1af4e1
commit 69386222a4
64 changed files with 1822 additions and 900 deletions

24
App.vue
View File

@ -4,7 +4,29 @@
projectname:'', // projectname:'', //
lat:'', // lat:'', //
lng:'' ,// lng:'' ,//
hostapi:'https://laonon.scdxtc.cn' // hostapi:'https://jizheng.scdxtc.cn' //
},
// show
onLaunch: function() {
uni.login({
success: (res) => {
uni.request({
url: this.globalData.hostapi +'/api/user/login',
data:{code:res.code},
success: (result) => {
if(result.data.code == 0) {
uni.setStorageSync('userId',result.data.account_id);
uni.setStorageSync('token',result.data.data.token);//token
uni.setStorageSync('openid',result.data.data.openid);//openid
uni.setStorageSync('expire',result.data.data.expire);//
uni.setStorageSync('phone_active',result.data.data.phone_active);//
uni.setStorageSync('is_active',result.data.data.is_active);//
uni.setStorageSync('invite_code',result.data.data.invite_code);//
}
}
})
}
})
}, },
}; };
</script> </script>

View File

@ -53,9 +53,7 @@
uni.reLaunch({url:'/pages/gps/gps'}) uni.reLaunch({url:'/pages/gps/gps'})
break; break;
case 3: case 3:
if(this.$toolAll.tools.judgeAuth()) { uni.reLaunch({url:'/pages/cargo/cargo'})
uni.reLaunch({url:'/pages/cargo/cargo'})
}
break; break;
} }
}, },

View File

@ -16,25 +16,25 @@
<view class="item pad-sx25 pad-zy20 border-box radius8 flex" v-for="(item,index) in lineList" :key="index"> <view class="item pad-sx25 pad-zy20 border-box radius8 flex" v-for="(item,index) in lineList" :key="index">
<view class="left"> <view class="left">
<view class="top flex"> <view class="top flex">
<view class="flag font24">{{item.flag}}</view> <view class="flag font24" v-if="item.flag!==''">{{item.flag}}</view>
<view class="title font26 bold clips1">{{item.title}}</view> <view class="title font26 bold clips1">{{item.title}}</view>
</view> </view>
<view class="addr font22 opacity-08 clips1"> <view class="addr font22 opacity-08 clips1">
<text>始发地{{item.start_addr}}</text> <text>始发地:{{item.start_addr}}</text>
<text>目的地{{item.arrive_addr}}</text> <text>目的地:{{item.arrive_addr}}</text>
</view> </view>
<view class="time font22 opacity-08 clips1"> <view class="time font22 opacity-08 clips1">
<text>开始日期{{item.start_time}}</text> <text>开始日期:{{item.start_time}}</text>
<text>结束日期{{item.end_time}}</text> <text>结束日期:{{item.end_time}}</text>
</view> </view>
</view> </view>
<view class="right"> <view class="right">
<view class="price"> <view class="price">
<text class="font22 opacity-08">最高价</text> <text class="font22 opacity-08">最高价:</text>
<text class="font28" style="color: #e20615;">{{item.max_price}}</text> <text class="font28" style="color: #e20615;">{{item.max_price}}</text>
</view> </view>
<view class="price"> <view class="price">
<text class="font22 opacity-08">最低价</text> <text class="font22 opacity-08">最低价:</text>
<text class="font28" style="color: #e20615;">{{item.min_price}}</text> <text class="font28" style="color: #e20615;">{{item.min_price}}</text>
</view> </view>
</view> </view>
@ -42,7 +42,7 @@
</view> </view>
<!-- 资讯列表 --> <!-- 资讯列表 -->
<view class="list-news pad-zy20 radius8 border-box" v-if="newsList.length"> <view class="list-news pad-zy20 radius8 border-box" v-if="newsList.length">
<view class="item pad-sx25 border-box flex" @tap="toDetail()" v-for="(item,index) in newsList" :key="index"> <view class="item pad-sx25 border-box flex" @tap="toDetail(item.id)" v-for="(item,index) in newsList" :key="index">
<view class="img radius6"> <view class="img radius6">
<image :src="item.cover" mode="widthFix"></image> <image :src="item.cover" mode="widthFix"></image>
</view> </view>
@ -147,6 +147,12 @@
margin-top: 20rpx; margin-top: 20rpx;
line-height: 1.8; line-height: 1.8;
} }
.list-line>.item .left{
min-width: calc(100% - 210rpx);
}
.list-line>.item .right{
max-width: 200rpx;
}
.list-line>.item .top{ .list-line>.item .top{
align-items: center; align-items: center;
width: 100%; width: 100%;
@ -154,15 +160,18 @@
line-height: 1.5; line-height: 1.5;
} }
.list-line>.item .top>.flag{ .list-line>.item .top>.flag{
width: auto; width: 62rpx;
line-height: 32rpx; line-height: 32rpx;
padding: 0 6rpx;
margin-right: 6rpx; margin-right: 6rpx;
text-align: center;
background-color: #1c2588; background-color: #1c2588;
border: 2rpx solid #1551a0; border: 2rpx solid #1551a0;
border-radius: 4rpx; border-radius: 4rpx;
color: #ffffff; color: #ffffff;
} }
.list-line>.item .top>.title{
width: calc(100% - 68rpx);
}
.list-line>.item .addr>text:nth-of-type(1), .list-line>.item .addr>text:nth-of-type(1),
.list-line>.item .time>text:nth-of-type(1){ .list-line>.item .time>text:nth-of-type(1){
margin-right: 14rpx; margin-right: 14rpx;

View File

@ -285,7 +285,7 @@ const tools = {
}) })
.replace('<section', '<div') .replace('<section', '<div')
.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/gi, (match, p1) => { .replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/gi, (match, p1) => {
return `<img mode="widthFix" style="max-width:100%!important;height:auto" src='${p1.indexOf('http') > -1 ? p1 : 'https://laonon.scdxtc.cn' + p1}' />` return `<img mode="widthFix" style="max-width:100%!important;height:auto" src='${p1.indexOf('http') > -1 ? p1 : 'https://jizheng.scdxtc.cn' + p1}' />`
}) })
}, },

View File

@ -69,7 +69,7 @@
/* */ /* */
"mp-weixin" : { "mp-weixin" : {
/* */ /* */
"appid" : "wxa02e44170bc722cd", "appid" : "wxf97aea6594a7f7ad",
"setting" : { "setting" : {
"urlCheck" : true, "urlCheck" : true,
"es6" : true "es6" : true

View File

@ -1,5 +1,5 @@
<template> <template>
<view class="pad-x110"> <view class="pad-x100">
<!-- 头部 --> <!-- 头部 -->
<status-nav :ifReturn="false" navBarTitle="货物" :marginBottom="0"></status-nav> <status-nav :ifReturn="false" navBarTitle="货物" :marginBottom="0"></status-nav>
<!-- 搜索 --> <!-- 搜索 -->

View File

@ -84,8 +84,7 @@
onShareAppMessage(res) { onShareAppMessage(res) {
let shareObj = { let shareObj = {
title:'上海集正', title:'上海集正',
path: uni.getStorageSync('page-path-options'), imageUrl:'/static/public/shear-logo.jpg',
imageUrl:'',
} }
// shareObj // shareObj
return shareObj; return shareObj;
@ -94,7 +93,7 @@
onShareTimeline(res){ onShareTimeline(res){
let shareObj = { let shareObj = {
title:'上海集正', title:'上海集正',
imageUrl:'', imageUrl:'/static/public/shear-logo.jpg',
} }
// shareObj // shareObj
return shareObj; return shareObj;
@ -102,53 +101,86 @@
methods: { methods: {
// banner // banner
getBannerList(){ getBannerList(){
this.bannerList = [ this.$requst.get('/api/common/slides',{position:'home-banner'}).then(res=>{
{ if(res.code==0){
imgSrc: '/static/public/banner.jpg', console.log(res,'轮播列表');
url: '', let bannerArr= []
isVideo: false, res.data.forEach(item=>{
poster: '' let obj = {
}, imgSrc: item.src,
{ url: item.url
imgSrc: '/static/public/banner.jpg', }
url: '', bannerArr.push(obj);
isVideo: false, })
poster: '' this.bannerList = bannerArr;
},
{
imgSrc: '/static/public/banner.jpg',
url: '',
isVideo: false,
poster: ''
} }
] })
}, },
// //
getVideoList(){ getVideoList(){
this.videoList = [ this.$requst.post('/api/common/recommend-video').then(res=>{
{cover:'/static/public/video.jpg',src:'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4'} if(res.code==0){
] console.log(res,'推荐视频');
console.log(this.lineList,'推荐视频') let obj = {
id:res.data.id,
title:res.data.title,
cover:res.data.cover,
src:res.data.src,
}
this.videoList.push(obj);
}
})
}, },
// 线 // 线
getLineList(){ getLineList(){
this.lineList = [ let params = {
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, page:1,
{flag:'航空',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, size:4
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, }
{flag:'航空',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'} this.$requst.post('/api/common/line-list',params).then(res=>{
] if(res.code==0){
console.log(this.lineList,'推荐线路') console.log(res,'推荐线路');
let lineArr = [];
res.data.list.forEach(item=>{
let obj = {
flag:item.logistics_type_text,
title:item.title,
start_addr:item.place_origin,
arrive_addr:item.destination,
start_time:item.start_time.slice(0,10).split('-').join('.'),
end_time:item.end_time.slice(0,10).split('-').join('.'),
max_price:item.highest_price,
min_price:item.minimum_price
}
lineArr.push(obj);
})
this.lineList = lineArr;
}
})
}, },
// //
getNewsList(){ getNewsList(){
this.newsList = [ let params = {
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, page:1,
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, size:4
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, }
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'} this.$requst.post('/api/common/news-list',params).then(res=>{
] if(res.code==0){
console.log(this.lineList,'推荐资讯') console.log(res,'推荐资讯');
let newsArr = [];
res.data.list.forEach(item=>{
let obj = {
id:item.id,
cover:item.cover,
title:item.title,
info:item.summary,
click:item.view
}
newsArr.push(obj);
})
this.newsList = newsArr;
}
})
}, },
} }
} }

View File

@ -1,5 +1,5 @@
<template> <template>
<view class="pad-x100"> <view class="pad-x100" v-if="isLoading">
<!-- 头部 --> <!-- 头部 -->
<status-nav :ifReturn="false" navBarTitle="线路信息及报价" :marginBottom="0"></status-nav> <status-nav :ifReturn="false" navBarTitle="线路信息及报价" :marginBottom="0"></status-nav>
<!-- 搜索 --> <!-- 搜索 -->
@ -37,13 +37,13 @@
<view class="list pad-zy10 border-box flex"> <view class="list pad-zy10 border-box flex">
<view class="item flex"> <view class="item flex">
<view class="font24 opacity-08">物流类型</view> <view class="font24 opacity-08">物流类型</view>
<picker @change="bindPickerChange" v-model="logistics_type" :range="typeArray" style="width: 100%;"> <picker @change="bindPickerChange" :range="typeArray" style="width: 100%;">
<input class="input font30" type="text" v-model="logistics_type" disabled="true" placeholder="请选择物流类型" placeholder-style="color:#b4b4b4"/> <input class="input font30" type="text" v-model="logistics_type" disabled="true" placeholder="请选择物流类型" placeholder-style="color:#b4b4b4"/>
</picker> </picker>
</view> </view>
</view> </view>
<view class="line-btn pad-sx25"> <view class="line-btn pad-sx25">
<view class="submit-btn font26 radius35 flex">立即搜</view> <view class="submit-btn font26 radius35 flex" @tap="searchEv"></view>
</view> </view>
</view> </view>
@ -87,8 +87,9 @@
}), }),
startDate: getDate('start'), startDate: getDate('start'),
endDate: getDate('end'), endDate: getDate('end'),
typeArray: ['空运', '海运', '陆运'], typeArray: [],
typeKey:[],
typeIndex:-1,
start_addr:'' ,// start_addr:'' ,//
arrive_addr:'',// arrive_addr:'',//
start_time:'',// start_time:'',//
@ -100,32 +101,90 @@
size:10, size:10,
total:0, total:0,
noMore:false, noMore:false,
isLoading:false,
} }
}, },
onLoad(op) { onLoad(op) {
//
this.getLogisticsType();
// 线 // 线
this.getLineList(); this.getLineList();
}, },
// //
onReachBottom(e) { onReachBottom(e) {
if(!this.noMore){
this.page++;
// 线
this.getLineList();
}
}, },
methods: { methods: {
//
getLogisticsType(){
this.$requst.post('/api/common/line-all-logistics-type').then(res=>{
if(res.code==0){
console.log(res,'物流类型');
let logisticsArr = [];
let logisticsKey = [];
res.data.forEach(item=>{
logisticsArr.push(item.value);
logisticsKey.push(item.key);
})
this.typeArray = logisticsArr;
this.typeKey = logisticsKey;
}
})
},
// 线 // 线
getLineList(){ getLineList(){
this.lineList = [ uni.showLoading({
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, title:'加载中'
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, })
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, let params = {
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, page:this.page,
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, size:this.size,
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, place_origin:this.start_addr,
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, destination:this.arrive_addr,
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, start_time:this.start_time,
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'}, end_time:this.end_time,
{flag:'航海',title:'小商品运输到黄冈专线准时准点',start_addr:'成都',arrive_addr:'九寨沟',start_time:'2022.08.03',end_time:'2022.09.03',max_price:'360.00',min_price:'280.00'} logistics_type: this.typeIndex<0?'':this.typeKey[this.typeIndex]
] }
console.log(this.lineList,'线路列表') this.$requst.post('/api/common/line-list',params).then(res=>{
if(res.code==0){
console.log(res,'线路列表');
this.total = res.data.total;
let lineArr = [];
res.data.list.forEach(item=>{
let obj = {
flag:item.logistics_type_text,
title:item.title,
start_addr:item.place_origin,
arrive_addr:item.destination,
start_time:item.start_time.slice(0,10).split('-').join('.'),
end_time:item.end_time.slice(0,10).split('-').join('.'),
max_price:item.highest_price,
min_price:item.minimum_price
}
lineArr.push(obj);
})
this.lineList = this.lineList.concat(lineArr);
if(this.lineList.length == this.total){
this.noMore = true;
this.tags = '~ 暂无更多内容 ~';
}
uni.hideLoading();
this.isLoading = true;
}
})
},
//
searchEv(){
this.page = 1;
this.lineList = [];
// 线
this.getLineList();
}, },
// //
@ -142,8 +201,8 @@
// //
bindPickerChange: function(e) { bindPickerChange: function(e) {
let typeIndex = e.target.value; this.typeIndex = e.target.value;
this.logistics_type = this.typeArray[typeIndex]; this.logistics_type = this.typeArray[this.typeIndex];
}, },
} }
} }
@ -157,7 +216,7 @@
.line-search .list{ .line-search .list{
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 120rpx; height: 132rpx;
border-bottom: 2rpx solid #ebebeb; border-bottom: 2rpx solid #ebebeb;
} }
.line-search .list .item{ .line-search .list .item{

View File

@ -20,7 +20,7 @@
return { return {
userInfo: {}, // userInfo: {}, //
canIGetUserProfile: false, canIGetUserProfile: false,
imgSrc: '/static/img/logo.png', //logo imgSrc: '/static/public/logo.jpg', //logo
appletName:'上海集正', // appletName:'上海集正', //
isShowP:false, isShowP:false,
}; };
@ -31,14 +31,6 @@
} }
}, },
methods: { methods: {
// logo
setLogo(){
this.$requst.get('index/base-config').then(res=>{
this.imgSrc = this.$http + res.data.logo;
this.appletName = res.data.appletName;
})
},
// //
refuse(){ refuse(){
this.isShowP=false; this.isShowP=false;

View File

@ -1,5 +1,5 @@
<template> <template>
<view> <view v-if="isLoading">
<!-- 头部 --> <!-- 头部 -->
<status-nav navBarTitle="新闻资讯" :marginBottom="0"></status-nav> <status-nav navBarTitle="新闻资讯" :marginBottom="0"></status-nav>
<!-- 资讯详情 --> <!-- 资讯详情 -->
@ -16,8 +16,7 @@
</view> </view>
</view> </view>
<view class="content font24"> <view class="content font24">
{{newsDetail.content}} <rich-text :nodes="content"></rich-text>
<!-- <rich-text :nodes="newsDetail.conent"></rich-text> -->
</view> </view>
</view> </view>
<!-- 尾部 --> <!-- 尾部 -->
@ -31,25 +30,36 @@
screenHeight:uni.getSystemInfoSync().screenHeight, screenHeight:uni.getSystemInfoSync().screenHeight,
statusHeight:uni.getSystemInfoSync().statusBarHeight, statusHeight:uni.getSystemInfoSync().statusBarHeight,
newsDetail:[], // newsDetail:[], //
content:'',//
isLoading:false,
} }
}, },
onLoad(op) { onLoad(op) {
// if(op.id){
this.getNewsDetail(); //
}, this.getNewsDetail(op.id);
onReachBottom(e) { }
}, },
methods: { methods: {
// //
getNewsDetail(){ getNewsDetail(id){
this.newsDetail = { uni.showLoading({
title:'河源到江阴物流是河源闽顺物流公司的物流货运专线', title:'加载中'
time:'2022.08.06', })
click:'5869', this.$requst.post('/api/common/news-detail',{id:id}).then(res=>{
content:'很多跨境卖家做了俄罗斯这个地区,但对于刚入行的新手卖家来说,对于俄罗斯跨境物流专线的运输线路有一定的疑惑,那么今天运盟国际物流来简单的说一下。很多跨境卖家做了俄罗斯这个地区,但对于刚入行的新手卖家来说,对于俄罗斯跨境物流专线的运输线路有一定的疑惑,那么今天运盟国际物流来简单的说一下。' if(res.code==0){
} console.log(res,'资讯详情');
console.log(this.newsDetail,'资讯详情') let obj = {
title:res.data.title,
click:res.data.view,
time:res.data.create_time.slice(0,10).split('-').join('.')
}
this.newsDetail = obj;
this.content = this.$toolAll.tools.escape2Html(res.data.content);
uni.hideLoading();
this.isLoading = true;
}
})
}, },
} }
} }

View File

@ -1,5 +1,5 @@
<template> <template>
<view class="pad-x100"> <view class="pad-x100" v-if="isLoading">
<!-- 头部 --> <!-- 头部 -->
<status-nav navBarTitle="新闻资讯" :marginBottom="0"></status-nav> <status-nav navBarTitle="新闻资讯" :marginBottom="0"></status-nav>
<!-- 资讯列表 --> <!-- 资讯列表 -->
@ -28,31 +28,55 @@
size:10, size:10,
total:0, total:0,
noMore:false, noMore:false,
isLoading:false,
} }
}, },
onLoad(op) { onLoad(op) {
// //
this.getNewsList(); this.getNewsList();
}, },
//
onReachBottom(e) { onReachBottom(e) {
if(!this.noMore){
this.page++;
// 线
this.getNewsList();
}
}, },
methods: { methods: {
// //
getNewsList(){ getNewsList(){
this.newsList = [ uni.showLoading({
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, title:'加载中'
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, })
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, let params = {
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, page:this.page,
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, size:this.size
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, }
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, this.$requst.post('/api/common/news-list',params).then(res=>{
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, if(res.code==0){
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'}, console.log(res,'资讯列表');
{cover:'/static/public/news.jpg',click:'365',title:'北京文艺之旅(用胶片记录行走时光)',info:'冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...'} this.total = res.data.total;
] let newsArr = [];
console.log(this.newsList,'资讯列表') res.data.list.forEach(item=>{
let obj = {
id:item.id,
cover:item.cover,
title:item.title,
info:item.summary,
click:item.view
}
newsArr.push(obj);
})
this.newsList = this.newsList.concat(newsArr);
if(this.newsList.length == this.total){
this.noMore = true;
this.tags = '~ 暂无更多内容 ~';
}
uni.hideLoading();
this.isLoading = true;
}
})
}, },
} }
} }

View File

@ -28,6 +28,7 @@
size:10, size:10,
total:0, total:0,
noMore:false, noMore:false,
isLoading:false,
} }
}, },
onLoad(op) { onLoad(op) {
@ -36,22 +37,45 @@
}, },
// //
onReachBottom(e) { onReachBottom(e) {
if(!this.noMore){
this.page++;
//
this.getVideoList();
}
}, },
methods: { methods: {
// //
getVideoList(){ getVideoList(){
this.videoList = [ uni.showLoading({
{cover:'/static/public/video.jpg',src:'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4'}, title:'加载中'
{cover:'/static/public/video.jpg',src:'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4'}, })
{cover:'/static/public/video.jpg',src:'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4'}, let params = {
{cover:'/static/public/video.jpg',src:'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4'}, page:this.page,
{cover:'/static/public/video.jpg',src:'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4'}, size:this.size
{cover:'/static/public/video.jpg',src:'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4'}, }
{cover:'/static/public/video.jpg',src:'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4'}, this.$requst.post('/api/common/video-list',params).then(res=>{
{cover:'/static/public/video.jpg',src:'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4'} if(res.code==0){
] console.log(res,'视频列表');
console.log(this.videoList,'视频列表') this.total = res.data.total;
let videoArr = [];
res.data.list.forEach(item=>{
let obj = {
id:item.id,
title:item.title,
cover:item.cover,
src:item.src
}
videoArr.push(obj);
})
this.videoList = this.videoList.concat(videoArr);
if(this.videoList.length == this.total){
this.noMore = true;
this.tags = '~ 暂无更多内容 ~';
}
uni.hideLoading();
this.isLoading = true;
}
})
}, },
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

BIN
static/public/logo.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

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

View File

@ -1,38 +1,37 @@
{ {
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/line/line", "pages/line/line",
"pages/gps/gps", "pages/gps/gps",
"pages/cargo/cargo", "pages/cargo/cargo",
"pages/login/login" "pages/login/login"
], ],
"subPackages": [ "subPackages": [
{ {
"root": "pagesA", "root": "pagesA",
"pages": [ "pages": [
"news/news", "news/news",
"news/detail", "news/detail",
"video/video", "video/video",
"video/playVideo" "video/playVideo"
] ]
} }
], ],
"window": { "window": {
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationStyle": "custom", "navigationStyle": "custom",
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
"transparentTitle": "none" "transparentTitle": "none"
}, },
"permission": { "permission": {
"scope.userLocation": { "scope.userLocation": {
"desc": "您的位置信息将用于小程序位置接口的效果展示" "desc": "您的位置信息将用于小程序位置接口的效果展示"
} }
}, },
"usingComponents": { "usingComponents": {
"status-nav": "/components/status-nav/status-nav", "status-nav": "/components/status-nav/status-nav",
"foot-tab": "/components/foot-tab/foot-tab" "foot-tab": "/components/foot-tab/foot-tab"
}, }
"sitemapLocation": "sitemap.json"
} }

View File

@ -7,7 +7,9 @@
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(uni, createApp) {__webpack_require__(/*! uni-pages */ 5);var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3)); /* WEBPACK VAR INJECTION */(function(uni, createApp) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 6)); var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 6));
var _store = _interopRequireDefault(__webpack_require__(/*! ./store */ 12)); var _store = _interopRequireDefault(__webpack_require__(/*! ./store */ 12));
@ -23,15 +25,15 @@ var _tools = _interopRequireDefault(__webpack_require__(/*! @/jsFile/tools.js */
var _requst = _interopRequireDefault(__webpack_require__(/*! @/jsFile/requst.js */ 17));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;_vue.default.prototype.$store = _store.default;var statusNav = function statusNav() {__webpack_require__.e(/*! require.ensure | components/status-nav/status-nav */ "components/status-nav/status-nav").then((function () {return resolve(__webpack_require__(/*! ./components/status-nav/status-nav.vue */ 84));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);}; //引入头部组件 var _requst = _interopRequireDefault(__webpack_require__(/*! @/jsFile/requst.js */ 17));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;_vue.default.prototype.$store = _store.default;var statusNav = function statusNav() {__webpack_require__.e(/*! require.ensure | components/status-nav/status-nav */ "components/status-nav/status-nav").then((function () {return resolve(__webpack_require__(/*! ./components/status-nav/status-nav.vue */ 84));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);}; //引入头部组件
_vue.default.component('status-nav', statusNav); //全局注册头部组件 _vue.default.component('status-nav', statusNav); //全局注册头部组件
var footTab = function footTab() {__webpack_require__.e(/*! require.ensure | components/foot-tab/foot-tab */ "components/foot-tab/foot-tab").then((function () {return resolve(__webpack_require__(/*! ./components/foot-tab/foot-tab.vue */ 91));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);}; //引入尾部组件 var footTab = function footTab() {__webpack_require__.e(/*! require.ensure | components/foot-tab/foot-tab */ "components/foot-tab/foot-tab").then((function () {return resolve(__webpack_require__(/*! ./components/foot-tab/foot-tab.vue */ 91));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);}; //引入尾部组件
_vue.default.component('foot-tab', footTab); //全局注册尾部组件 _vue.default.component('foot-tab', footTab); //全局注册尾部组件
// 常用便捷式公共方法 // 常用便捷式公共方法
_vue.default.prototype.$toolAll = _tools.default; // 响应数据 _vue.default.prototype.$toolAll = _tools.default; // 响应数据
_vue.default.prototype.$requst = _requst.default; //不显示console.log _vue.default.prototype.$requst = _requst.default; //不显示console.log
if (uni.getSystemInfoSync().platform !== "devtools") {console.log = function () {};} if (uni.getSystemInfoSync().platform !== "devtools") {console.log = function () {};}_App.default.mpType = 'app';
_App.default.mpType = 'app';
var app = new _vue.default(_objectSpread({ var app = new _vue.default(_objectSpread({
store: _store.default }, store: _store.default },
@ -109,14 +111,37 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default = /* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default =
{ {
globalData: { globalData: {
projectname: '', // 项目名称 projectname: '', // 项目名称
lat: '', // 公司地址维度 lat: '', // 公司地址维度
lng: '', // 公司地址经度 lng: '', // 公司地址经度
hostapi: 'https://laonon.scdxtc.cn' // 域名配置 hostapi: 'https://jizheng.scdxtc.cn' // 域名配置
},
// 优先于show方法
onLaunch: function onLaunch() {var _this = this;
uni.login({
success: function success(res) {
uni.request({
url: _this.globalData.hostapi + '/api/user/login',
data: { code: res.code },
success: function success(result) {
if (result.data.code == 0) {
uni.setStorageSync('userId', result.data.account_id);
uni.setStorageSync('token', result.data.data.token); //缓存token
uni.setStorageSync('openid', result.data.data.openid); //缓存openid
uni.setStorageSync('expire', result.data.data.expire); //缓存失效时间(时间戳格式)
uni.setStorageSync('phone_active', result.data.data.phone_active); //是否授权手机号
uni.setStorageSync('is_active', result.data.data.is_active); //是否授权头像和昵称
uni.setStorageSync('invite_code', result.data.data.invite_code); //缓存邀请码
}
} });
} });
} };exports.default = _default; } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ }), /***/ }),
/* 9 */ /* 9 */

View File

@ -10,6 +10,28 @@
/* 阿里巴巴矢量图标库 start */ /* 阿里巴巴矢量图标库 start */
@font-face { @font-face {
font-family: "iconfont"; /* Project id 3180711 */ font-family: "iconfont"; /* Project id 3180711 */

File diff suppressed because it is too large Load Diff

View File

@ -169,9 +169,7 @@ var _default =
uni.reLaunch({ url: '/pages/gps/gps' }); uni.reLaunch({ url: '/pages/gps/gps' });
break; break;
case 3: case 3:
if (this.$toolAll.tools.judgeAuth()) { uni.reLaunch({ url: '/pages/cargo/cargo' });
uni.reLaunch({ url: '/pages/cargo/cargo' });
}
break;} break;}
} } };exports.default = _default; } } };exports.default = _default;

View File

@ -1 +1 @@
<view class="list-all border-box pad-zy20 flex data-v-7bc4c798"><block wx:if="{{videoList.length}}"><view class="list-video data-v-7bc4c798"><block wx:for="{{videoList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item radius8 border-box data-v-7bc4c798" style="{{'padding:'+(videoPadding)+';'}}"><view class="cover data-v-7bc4c798"><image src="{{item.cover}}" mode="widthFix" class="data-v-7bc4c798"></image></view><view data-event-opts="{{[['tap',[['playEv',['$0'],[[['videoList','',index,'src']]]]]]]}}" class="play-btn data-v-7bc4c798" bindtap="__e"><image style="width:70rpx;height:70rpx;" src="/static/icon/icon-play.png" mode="widthFix" class="data-v-7bc4c798"></image></view></view></block></view></block><block wx:if="{{lineList.length}}"><view class="list-line data-v-7bc4c798"><block wx:for="{{lineList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item pad-sx25 pad-zy20 border-box radius8 flex data-v-7bc4c798"><view class="left data-v-7bc4c798"><view class="top flex data-v-7bc4c798"><view class="flag font24 data-v-7bc4c798">{{item.flag}}</view><view class="title font26 bold clips1 data-v-7bc4c798">{{item.title}}</view></view><view class="addr font22 opacity-08 clips1 data-v-7bc4c798"><text class="data-v-7bc4c798">{{"始发地"+item.start_addr}}</text><text class="data-v-7bc4c798">{{"目的地:"+item.arrive_addr}}</text></view><view class="time font22 opacity-08 clips1 data-v-7bc4c798"><text class="data-v-7bc4c798">{{"开始日期"+item.start_time}}</text><text class="data-v-7bc4c798">{{"结束日期:"+item.end_time}}</text></view></view><view class="right data-v-7bc4c798"><view class="price data-v-7bc4c798"><text class="font22 opacity-08 data-v-7bc4c798">最高价¥</text><text class="font28 data-v-7bc4c798" style="color:#e20615;">{{item.max_price}}</text></view><view class="price data-v-7bc4c798"><text class="font22 opacity-08 data-v-7bc4c798">最低价¥</text><text class="font28 data-v-7bc4c798" style="color:#e20615;">{{item.min_price}}</text></view></view></view></block></view></block><block wx:if="{{newsList.length}}"><view class="list-news pad-zy20 radius8 border-box data-v-7bc4c798"><block wx:for="{{newsList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['toDetail']]]]}}" class="item pad-sx25 border-box flex data-v-7bc4c798" bindtap="__e"><view class="img radius6 data-v-7bc4c798"><image src="{{item.cover}}" mode="widthFix" class="data-v-7bc4c798"></image></view><view class="txt data-v-7bc4c798"><view class="title font26 bold clips1 data-v-7bc4c798">{{item.title}}</view><view class="info font22 opacity-08 clips2 data-v-7bc4c798">{{item.info}}</view><view class="look flex data-v-7bc4c798"><view class="icon flex data-v-7bc4c798"><image style="width:21rpx;height:15rpx;" src="/static/icon/icon-look.png" mode="widthFix" class="data-v-7bc4c798"></image></view><view class="font20 data-v-7bc4c798">{{"浏览 "+item.click}}</view></view></view></view></block></view></block></view> <view class="list-all border-box pad-zy20 flex data-v-7bc4c798"><block wx:if="{{videoList.length}}"><view class="list-video data-v-7bc4c798"><block wx:for="{{videoList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item radius8 border-box data-v-7bc4c798" style="{{'padding:'+(videoPadding)+';'}}"><view class="cover data-v-7bc4c798"><image src="{{item.cover}}" mode="widthFix" class="data-v-7bc4c798"></image></view><view data-event-opts="{{[['tap',[['playEv',['$0'],[[['videoList','',index,'src']]]]]]]}}" class="play-btn data-v-7bc4c798" bindtap="__e"><image style="width:70rpx;height:70rpx;" src="/static/icon/icon-play.png" mode="widthFix" class="data-v-7bc4c798"></image></view></view></block></view></block><block wx:if="{{lineList.length}}"><view class="list-line data-v-7bc4c798"><block wx:for="{{lineList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item pad-sx25 pad-zy20 border-box radius8 flex data-v-7bc4c798"><view class="left data-v-7bc4c798"><view class="top flex data-v-7bc4c798"><block wx:if="{{item.flag!==''}}"><view class="flag font24 data-v-7bc4c798">{{item.flag}}</view></block><view class="title font26 bold clips1 data-v-7bc4c798">{{item.title}}</view></view><view class="addr font22 opacity-08 clips1 data-v-7bc4c798"><text class="data-v-7bc4c798">{{"始发地:"+item.start_addr}}</text><text class="data-v-7bc4c798">{{"目的地:"+item.arrive_addr}}</text></view><view class="time font22 opacity-08 clips1 data-v-7bc4c798"><text class="data-v-7bc4c798">{{"开始日期:"+item.start_time}}</text><text class="data-v-7bc4c798">{{"结束日期:"+item.end_time}}</text></view></view><view class="right data-v-7bc4c798"><view class="price data-v-7bc4c798"><text class="font22 opacity-08 data-v-7bc4c798">最高价:¥</text><text class="font28 data-v-7bc4c798" style="color:#e20615;">{{item.max_price}}</text></view><view class="price data-v-7bc4c798"><text class="font22 opacity-08 data-v-7bc4c798">最低价:¥</text><text class="font28 data-v-7bc4c798" style="color:#e20615;">{{item.min_price}}</text></view></view></view></block></view></block><block wx:if="{{newsList.length}}"><view class="list-news pad-zy20 radius8 border-box data-v-7bc4c798"><block wx:for="{{newsList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['newsList','',index,'id']]]]]]]}}" class="item pad-sx25 border-box flex data-v-7bc4c798" bindtap="__e"><view class="img radius6 data-v-7bc4c798"><image src="{{item.cover}}" mode="widthFix" class="data-v-7bc4c798"></image></view><view class="txt data-v-7bc4c798"><view class="title font26 bold clips1 data-v-7bc4c798">{{item.title}}</view><view class="info font22 opacity-08 clips2 data-v-7bc4c798">{{item.info}}</view><view class="look flex data-v-7bc4c798"><view class="icon flex data-v-7bc4c798"><image style="width:21rpx;height:15rpx;" src="/static/icon/icon-look.png" mode="widthFix" class="data-v-7bc4c798"></image></view><view class="font20 data-v-7bc4c798">{{"浏览 "+item.click}}</view></view></view></view></block></view></block></view>

View File

@ -147,6 +147,12 @@
margin-top: 20rpx; margin-top: 20rpx;
line-height: 1.8; line-height: 1.8;
} }
.list-line>.item .left.data-v-7bc4c798{
min-width: calc(100% - 210rpx);
}
.list-line>.item .right.data-v-7bc4c798{
max-width: 200rpx;
}
.list-line>.item .top.data-v-7bc4c798{ .list-line>.item .top.data-v-7bc4c798{
align-items: center; align-items: center;
width: 100%; width: 100%;
@ -154,15 +160,18 @@
line-height: 1.5; line-height: 1.5;
} }
.list-line>.item .top>.flag.data-v-7bc4c798{ .list-line>.item .top>.flag.data-v-7bc4c798{
width: auto; width: 62rpx;
line-height: 32rpx; line-height: 32rpx;
padding: 0 6rpx;
margin-right: 6rpx; margin-right: 6rpx;
text-align: center;
background-color: #1c2588; background-color: #1c2588;
border: 2rpx solid #1551a0; border: 2rpx solid #1551a0;
border-radius: 4rpx; border-radius: 4rpx;
color: #ffffff; color: #ffffff;
} }
.list-line>.item .top>.title.data-v-7bc4c798{
width: calc(100% - 68rpx);
}
.list-line>.item .addr>text.data-v-7bc4c798:nth-of-type(1), .list-line>.item .addr>text.data-v-7bc4c798:nth-of-type(1),
.list-line>.item .time>text.data-v-7bc4c798:nth-of-type(1){ .list-line>.item .time>text.data-v-7bc4c798:nth-of-type(1){
margin-right: 14rpx; margin-right: 14rpx;

View File

@ -9,9 +9,11 @@
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5); /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
var _cargo = _interopRequireDefault(__webpack_require__(/*! ./pages/cargo/cargo.vue */ 41));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
createPage(_cargo.default); var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _cargo = _interopRequireDefault(__webpack_require__(/*! ./pages/cargo/cargo.vue */ 41));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_cargo.default);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
/***/ }), /***/ }),

File diff suppressed because one or more lines are too long

View File

@ -9,9 +9,11 @@
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5); /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
var _gps = _interopRequireDefault(__webpack_require__(/*! ./pages/gps/gps.vue */ 35));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
createPage(_gps.default); var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _gps = _interopRequireDefault(__webpack_require__(/*! ./pages/gps/gps.vue */ 35));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_gps.default);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
/***/ }), /***/ }),

View File

@ -9,9 +9,11 @@
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5); /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/index/index.vue */ 19));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
createPage(_index.default); var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/index/index.vue */ 19));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_index.default);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
/***/ }), /***/ }),
@ -242,8 +244,7 @@ __webpack_require__.r(__webpack_exports__);
onShareAppMessage: function onShareAppMessage(res) { onShareAppMessage: function onShareAppMessage(res) {
var shareObj = { var shareObj = {
title: '上海集正', title: '上海集正',
path: uni.getStorageSync('page-path-options'), imageUrl: '/static/public/shear-logo.jpg' };
imageUrl: '' };
// 返回shareObj // 返回shareObj
return shareObj; return shareObj;
@ -252,61 +253,94 @@ __webpack_require__.r(__webpack_exports__);
onShareTimeline: function onShareTimeline(res) { onShareTimeline: function onShareTimeline(res) {
var shareObj = { var shareObj = {
title: '上海集正', title: '上海集正',
imageUrl: '' }; imageUrl: '/static/public/shear-logo.jpg' };
// 返回shareObj // 返回shareObj
return shareObj; return shareObj;
}, },
methods: { methods: {
// 获取banner // 获取banner
getBannerList: function getBannerList() { getBannerList: function getBannerList() {var _this2 = this;
this.bannerList = [ this.$requst.get('/api/common/slides', { position: 'home-banner' }).then(function (res) {
{ if (res.code == 0) {
imgSrc: '/static/public/banner.jpg', console.log(res, '轮播列表');
url: '', var bannerArr = [];
isVideo: false, res.data.forEach(function (item) {
poster: '' }, var obj = {
imgSrc: item.src,
{ url: item.url };
imgSrc: '/static/public/banner.jpg',
url: '',
isVideo: false,
poster: '' },
{
imgSrc: '/static/public/banner.jpg',
url: '',
isVideo: false,
poster: '' }];
bannerArr.push(obj);
});
_this2.bannerList = bannerArr;
}
});
}, },
// 获取推荐视频 // 获取推荐视频
getVideoList: function getVideoList() { getVideoList: function getVideoList() {var _this3 = this;
this.videoList = [ this.$requst.post('/api/common/recommend-video').then(function (res) {
{ cover: '/static/public/video.jpg', src: 'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4' }]; if (res.code == 0) {
console.log(res, '推荐视频');
var obj = {
id: res.data.id,
title: res.data.title,
cover: res.data.cover,
src: res.data.src };
console.log(this.lineList, '推荐视频'); _this3.videoList.push(obj);
}
});
}, },
// 获取推荐线路 // 获取推荐线路
getLineList: function getLineList() { getLineList: function getLineList() {var _this4 = this;
this.lineList = [ var params = {
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, page: 1,
{ flag: '航空', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, size: 4 };
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' },
{ flag: '航空', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }];
console.log(this.lineList, '推荐线路'); this.$requst.post('/api/common/line-list', params).then(function (res) {
if (res.code == 0) {
console.log(res, '推荐线路');
var lineArr = [];
res.data.list.forEach(function (item) {
var obj = {
flag: item.logistics_type_text,
title: item.title,
start_addr: item.place_origin,
arrive_addr: item.destination,
start_time: item.start_time.slice(0, 10).split('-').join('.'),
end_time: item.end_time.slice(0, 10).split('-').join('.'),
max_price: item.highest_price,
min_price: item.minimum_price };
lineArr.push(obj);
});
_this4.lineList = lineArr;
}
});
}, },
// 获取推荐资讯 // 获取推荐资讯
getNewsList: function getNewsList() { getNewsList: function getNewsList() {var _this5 = this;
this.newsList = [ var params = {
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' }, page: 1,
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' }, size: 4 };
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' },
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' }];
console.log(this.lineList, '推荐资讯'); this.$requst.post('/api/common/news-list', params).then(function (res) {
if (res.code == 0) {
console.log(res, '推荐资讯');
var newsArr = [];
res.data.list.forEach(function (item) {
var obj = {
id: item.id,
cover: item.cover,
title: item.title,
info: item.summary,
click: item.view };
newsArr.push(obj);
});
_this5.newsList = newsArr;
}
});
} } };exports.default = _default; } } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

View File

@ -133,6 +133,38 @@

View File

@ -9,9 +9,11 @@
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5); /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
var _line = _interopRequireDefault(__webpack_require__(/*! ./pages/line/line.vue */ 27));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
createPage(_line.default); var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _line = _interopRequireDefault(__webpack_require__(/*! ./pages/line/line.vue */ 27));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_line.default);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
/***/ }), /***/ }),
@ -245,8 +247,9 @@ function getDate(type) {
startDate: getDate('start'), startDate: getDate('start'),
endDate: getDate('end'), endDate: getDate('end'),
typeArray: ['空运', '海运', '陆运'], typeArray: [],
typeKey: [],
typeIndex: -1,
start_addr: '', // 始发地 start_addr: '', // 始发地
arrive_addr: '', // 目的地 arrive_addr: '', // 目的地
start_time: '', // 开始日期 start_time: '', // 开始日期
@ -257,33 +260,91 @@ function getDate(type) {
page: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
noMore: false }; noMore: false,
isLoading: false };
}, },
onLoad: function onLoad(op) { onLoad: function onLoad(op) {
//获取物流类型
this.getLogisticsType();
// 获取线路列表 // 获取线路列表
this.getLineList(); this.getLineList();
}, },
// 触底 // 触底
onReachBottom: function onReachBottom(e) { onReachBottom: function onReachBottom(e) {
if (!this.noMore) {
this.page++;
// 获取线路列表
this.getLineList();
}
}, },
methods: { methods: {
// 获取线路列表 // 获取物流方式
getLineList: function getLineList() { getLogisticsType: function getLogisticsType() {var _this = this;
this.lineList = [ this.$requst.post('/api/common/line-all-logistics-type').then(function (res) {
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, if (res.code == 0) {
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, console.log(res, '物流类型');
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, var logisticsArr = [];
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, var logisticsKey = [];
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, res.data.forEach(function (item) {
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, logisticsArr.push(item.value);
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, logisticsKey.push(item.key);
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, });
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }, _this.typeArray = logisticsArr;
{ flag: '航海', title: '小商品运输到黄冈专线准时准点', start_addr: '成都', arrive_addr: '九寨沟', start_time: '2022.08.03', end_time: '2022.09.03', max_price: '360.00', min_price: '280.00' }]; _this.typeKey = logisticsKey;
}
});
},
console.log(this.lineList, '线路列表'); // 获取线路列表
getLineList: function getLineList() {var _this2 = this;
uni.showLoading({
title: '加载中' });
var params = {
page: this.page,
size: this.size,
place_origin: this.start_addr,
destination: this.arrive_addr,
start_time: this.start_time,
end_time: this.end_time,
logistics_type: this.typeIndex < 0 ? '' : this.typeKey[this.typeIndex] };
this.$requst.post('/api/common/line-list', params).then(function (res) {
if (res.code == 0) {
console.log(res, '线路列表');
_this2.total = res.data.total;
var lineArr = [];
res.data.list.forEach(function (item) {
var obj = {
flag: item.logistics_type_text,
title: item.title,
start_addr: item.place_origin,
arrive_addr: item.destination,
start_time: item.start_time.slice(0, 10).split('-').join('.'),
end_time: item.end_time.slice(0, 10).split('-').join('.'),
max_price: item.highest_price,
min_price: item.minimum_price };
lineArr.push(obj);
});
_this2.lineList = _this2.lineList.concat(lineArr);
if (_this2.lineList.length == _this2.total) {
_this2.noMore = true;
_this2.tags = '~ 暂无更多内容 ~';
}
uni.hideLoading();
_this2.isLoading = true;
}
});
},
// 搜索
searchEv: function searchEv() {
this.page = 1;
this.lineList = [];
// 获取线路列表
this.getLineList();
}, },
// 时间选择 // 时间选择
@ -300,8 +361,8 @@ function getDate(type) {
// 物流类型选择 // 物流类型选择
bindPickerChange: function bindPickerChange(e) { bindPickerChange: function bindPickerChange(e) {
var typeIndex = e.target.value; this.typeIndex = e.target.value;
this.logistics_type = this.typeArray[typeIndex]; this.logistics_type = this.typeArray[this.typeIndex];
} } };exports.default = _default; } } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

View File

@ -1 +1 @@
<view class="pad-x100"><status-nav vue-id="2c6ce440-1" ifReturn="{{false}}" navBarTitle="线路信息及报价" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="line-search pad-zy30 border-box"><view class="list pad-zy10 border-box flex"><view class="item flex"><view class="font24 opacity-08">始发地</view><input class="input font30" type="text" placeholder="请输入始发地" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','start_addr','$event',[]]]]]]}}" value="{{start_addr}}" bindinput="__e"/></view><view class="icon flex"><image style="width:48rpx;height:48rpx;" src="/static/icon/icon-arrow-right.png" mode="widthFix"></image></view><view class="item item-right flex"><view class="font24 opacity-08">目的地</view><input class="input font30" type="text" placeholder="请输入目的地" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','arrive_addr','$event',[]]]]]]}}" value="{{arrive_addr}}" bindinput="__e"/></view></view><view class="list pad-zy10 border-box flex"><view class="item flex"><picker mode="date" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['chooseTime',[1,'$event']]]]]}}" bindchange="__e"><view class="font24 opacity-08">开始日期</view><input class="input font30" type="text" disabled="true" placeholder="请选择开始日期" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','start_time','$event',[]]]]]]}}" value="{{start_time}}" bindinput="__e"/></picker></view><view class="icon flex"><image style="width:44rpx;height:44rpx;" src="/static/icon/icon-calendar.png" mode="widthFix"></image></view><view class="item item-right flex"><picker mode="date" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['chooseTime',[2,'$event']]]]]}}" bindchange="__e"><view class="font24 opacity-08">结束日期</view><input class="input font30" type="text" disabled="true" placeholder="请选择结束日期" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','end_time','$event',[]]]]]]}}" value="{{end_time}}" bindinput="__e"/></picker></view></view><view class="list pad-zy10 border-box flex"><view class="item flex"><view class="font24 opacity-08">物流类型</view><picker style="width:100%;" range="{{typeArray}}" value="{{logistics_type}}" data-event-opts="{{[['change',[['bindPickerChange',['$event']]]],['input',[['__set_model',['','logistics_type','$event',[]]]]]]}}" bindchange="__e" bindinput="__e"><input class="input font30" type="text" disabled="true" placeholder="请选择物流类型" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','logistics_type','$event',[]]]]]]}}" value="{{logistics_type}}" bindinput="__e"/></picker></view></view><view class="line-btn pad-sx25"><view class="submit-btn font26 radius35 flex">立即搜索</view></view></view><view class="line"><list-all vue-id="2c6ce440-2" lineList="{{lineList}}" bind:__l="__l"></list-all></view><view class="tags font20 opacity-05">{{tags}}</view><foot-tab vue-id="2c6ce440-3" current="{{1}}" bind:__l="__l"></foot-tab></view> <block wx:if="{{isLoading}}"><view class="pad-x100"><status-nav vue-id="2c6ce440-1" ifReturn="{{false}}" navBarTitle="线路信息及报价" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="line-search pad-zy30 border-box"><view class="list pad-zy10 border-box flex"><view class="item flex"><view class="font24 opacity-08">始发地</view><input class="input font30" type="text" placeholder="请输入始发地" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','start_addr','$event',[]]]]]]}}" value="{{start_addr}}" bindinput="__e"/></view><view class="icon flex"><image style="width:48rpx;height:48rpx;" src="/static/icon/icon-arrow-right.png" mode="widthFix"></image></view><view class="item item-right flex"><view class="font24 opacity-08">目的地</view><input class="input font30" type="text" placeholder="请输入目的地" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','arrive_addr','$event',[]]]]]]}}" value="{{arrive_addr}}" bindinput="__e"/></view></view><view class="list pad-zy10 border-box flex"><view class="item flex"><picker mode="date" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['chooseTime',[1,'$event']]]]]}}" bindchange="__e"><view class="font24 opacity-08">开始日期</view><input class="input font30" type="text" disabled="true" placeholder="请选择开始日期" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','start_time','$event',[]]]]]]}}" value="{{start_time}}" bindinput="__e"/></picker></view><view class="icon flex"><image style="width:44rpx;height:44rpx;" src="/static/icon/icon-calendar.png" mode="widthFix"></image></view><view class="item item-right flex"><picker mode="date" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['chooseTime',[2,'$event']]]]]}}" bindchange="__e"><view class="font24 opacity-08">结束日期</view><input class="input font30" type="text" disabled="true" placeholder="请选择结束日期" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','end_time','$event',[]]]]]]}}" value="{{end_time}}" bindinput="__e"/></picker></view></view><view class="list pad-zy10 border-box flex"><view class="item flex"><view class="font24 opacity-08">物流类型</view><picker style="width:100%;" range="{{typeArray}}" data-event-opts="{{[['change',[['bindPickerChange',['$event']]]]]}}" bindchange="__e"><input class="input font30" type="text" disabled="true" placeholder="请选择物流类型" placeholder-style="color:#b4b4b4" data-event-opts="{{[['input',[['__set_model',['','logistics_type','$event',[]]]]]]}}" value="{{logistics_type}}" bindinput="__e"/></picker></view></view><view class="line-btn pad-sx25"><view data-event-opts="{{[['tap',[['searchEv',['$event']]]]]}}" class="submit-btn font26 radius35 flex" bindtap="__e">立即搜索</view></view></view><view class="line"><list-all vue-id="2c6ce440-2" lineList="{{lineList}}" bind:__l="__l"></list-all></view><view class="tags font20 opacity-05">{{tags}}</view><foot-tab vue-id="2c6ce440-3" current="{{1}}" bind:__l="__l"></foot-tab></view></block>

View File

@ -128,6 +128,65 @@
@ -157,7 +216,7 @@
.line-search .list{ .line-search .list{
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 120rpx; height: 132rpx;
border-bottom: 2rpx solid #ebebeb; border-bottom: 2rpx solid #ebebeb;
} }
.line-search .list .item{ .line-search .list .item{

View File

@ -9,9 +9,11 @@
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5); /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
var _login = _interopRequireDefault(__webpack_require__(/*! ./pages/login/login.vue */ 49));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
createPage(_login.default); var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _login = _interopRequireDefault(__webpack_require__(/*! ./pages/login/login.vue */ 49));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_login.default);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
/***/ }), /***/ }),
@ -175,7 +177,7 @@ var _default =
return { return {
userInfo: {}, //用户信息 userInfo: {}, //用户信息
canIGetUserProfile: false, canIGetUserProfile: false,
imgSrc: '/static/img/logo.png', //默认logo头像 imgSrc: '/static/public/logo.jpg', //默认logo头像
appletName: '上海集正', //小程序名称 appletName: '上海集正', //小程序名称
isShowP: false }; isShowP: false };
@ -186,14 +188,6 @@ var _default =
} }
}, },
methods: { methods: {
// 设置logo图
setLogo: function setLogo() {var _this = this;
this.$requst.get('index/base-config').then(function (res) {
_this.imgSrc = _this.$http + res.data.logo;
_this.appletName = res.data.appletName;
});
},
//暂不绑定事件 //暂不绑定事件
refuse: function refuse() { refuse: function refuse() {
this.isShowP = false; this.isShowP = false;
@ -202,18 +196,18 @@ var _default =
}, },
//授权绑定手机号 //授权绑定手机号
getphonenumber: function getphonenumber(e) {var _this2 = this; getphonenumber: function getphonenumber(e) {var _this = this;
var ya = this; var ya = this;
wx.login({ wx.login({
success: function success(res) { success: function success(res) {
_this2.$requst.post('/api/user/login', { code: res.code }).then(function (result) { _this.$requst.post('/api/user/login', { code: res.code }).then(function (result) {
if (e.detail.errMsg == "getPhoneNumber:ok") { if (e.detail.errMsg == "getPhoneNumber:ok") {
_this2.$requst.post('user/bind-phone', { openid: result.data.openid, session_key: result.data.session_key, iv: e.detail.iv, encryptedData: e.detail.encryptedData }).then(function (res) { _this.$requst.post('user/bind-phone', { openid: result.data.openid, session_key: result.data.session_key, iv: e.detail.iv, encryptedData: e.detail.encryptedData }).then(function (res) {
console.log('手机号信息:', res); console.log('手机号信息:', res);
if (res.code == 0) { if (res.code == 0) {
_this2.$toolAll.tools.showToast('手机号绑定成功'); _this.$toolAll.tools.showToast('手机号绑定成功');
_this2.isShowP = true; _this.isShowP = true;
} else _this2.$toolAll.tools.showToast(res.msg); } else _this.$toolAll.tools.showToast(res.msg);
}, function (error) {}); }, function (error) {});
} else { } else {
// console.log('取消授权手机号') // console.log('取消授权手机号')

View File

@ -9,9 +9,11 @@
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5); /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
var _detail = _interopRequireDefault(__webpack_require__(/*! ./pagesA/news/detail.vue */ 63));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
createPage(_detail.default); var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _detail = _interopRequireDefault(__webpack_require__(/*! ./pagesA/news/detail.vue */ 63));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_detail.default);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
/***/ }), /***/ }),
@ -181,33 +183,43 @@ __webpack_require__.r(__webpack_exports__);
// //
// //
// //
//
var _default = var _default =
{ {
data: function data() { data: function data() {
return { return {
screenHeight: uni.getSystemInfoSync().screenHeight, screenHeight: uni.getSystemInfoSync().screenHeight,
statusHeight: uni.getSystemInfoSync().statusBarHeight, statusHeight: uni.getSystemInfoSync().statusBarHeight,
newsDetail: [] //资讯详情 newsDetail: [], //资讯详情
}; content: '', //文章内容
isLoading: false };
}, },
onLoad: function onLoad(op) { onLoad: function onLoad(op) {
// 获取资讯详情 if (op.id) {
this.getNewsDetail(); // 获取资讯详情
}, this.getNewsDetail(op.id);
onReachBottom: function onReachBottom(e) { }
}, },
methods: { methods: {
// 获取资讯详情 // 获取资讯详情
getNewsDetail: function getNewsDetail() { getNewsDetail: function getNewsDetail(id) {var _this = this;
this.newsDetail = { uni.showLoading({
title: '河源到江阴物流是河源闽顺物流公司的物流货运专线', title: '加载中' });
time: '2022.08.06',
click: '5869',
content: '很多跨境卖家做了俄罗斯这个地区,但对于刚入行的新手卖家来说,对于俄罗斯跨境物流专线的运输线路有一定的疑惑,那么今天运盟国际物流来简单的说一下。很多跨境卖家做了俄罗斯这个地区,但对于刚入行的新手卖家来说,对于俄罗斯跨境物流专线的运输线路有一定的疑惑,那么今天运盟国际物流来简单的说一下。' };
console.log(this.newsDetail, '资讯详情'); this.$requst.post('/api/common/news-detail', { id: id }).then(function (res) {
if (res.code == 0) {
console.log(res, '资讯详情');
var obj = {
title: res.data.title,
click: res.data.view,
time: res.data.create_time.slice(0, 10).split('-').join('.') };
_this.newsDetail = obj;
_this.content = _this.$toolAll.tools.escape2Html(res.data.content);
uni.hideLoading();
_this.isLoading = true;
}
});
} } };exports.default = _default; } } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

View File

@ -1 +1 @@
<view class="data-v-62e84989"><status-nav vue-id="0bbd2ec6-1" navBarTitle="新闻资讯" marginBottom="{{0}}" class="data-v-62e84989" bind:__l="__l"></status-nav><view class="news-detail pad-sx25 pad-zy25 border-box data-v-62e84989" style="{{'min-height:'+(screenHeight-statusHeight-50+'px')+';'}}"><view class="title font28 bold data-v-62e84989">{{newsDetail.title}}</view><view class="info flex data-v-62e84989"><view class="look flex data-v-62e84989"><view class="icon flex data-v-62e84989"><image style="width:21rpx;height:15rpx;" src="/static/icon/icon-click.png" mode="widthFix" class="data-v-62e84989"></image></view><view class="font22 opacity-07 data-v-62e84989">{{"浏览 "+newsDetail.click}}</view></view><view class="time flex data-v-62e84989"><view class="icon flex data-v-62e84989"><image style="width:20rpx;height:20rpx;" src="/static/icon/icon-time.png" mode="widthFix" class="data-v-62e84989"></image></view><view class="font22 opacity-07 data-v-62e84989">{{"发布时间:"+newsDetail.time}}</view></view></view><view class="content font24 data-v-62e84989">{{''+newsDetail.content+''}}</view></view><foot-tab vue-id="0bbd2ec6-2" current="{{99}}" class="data-v-62e84989" bind:__l="__l"></foot-tab></view> <block wx:if="{{isLoading}}"><view class="data-v-62e84989"><status-nav vue-id="0bbd2ec6-1" navBarTitle="新闻资讯" marginBottom="{{0}}" class="data-v-62e84989" bind:__l="__l"></status-nav><view class="news-detail pad-sx25 pad-zy25 border-box data-v-62e84989" style="{{'min-height:'+(screenHeight-statusHeight-50+'px')+';'}}"><view class="title font28 bold data-v-62e84989">{{newsDetail.title}}</view><view class="info flex data-v-62e84989"><view class="look flex data-v-62e84989"><view class="icon flex data-v-62e84989"><image style="width:21rpx;height:15rpx;" src="/static/icon/icon-click.png" mode="widthFix" class="data-v-62e84989"></image></view><view class="font22 opacity-07 data-v-62e84989">{{"浏览 "+newsDetail.click}}</view></view><view class="time flex data-v-62e84989"><view class="icon flex data-v-62e84989"><image style="width:20rpx;height:20rpx;" src="/static/icon/icon-time.png" mode="widthFix" class="data-v-62e84989"></image></view><view class="font22 opacity-07 data-v-62e84989">{{"发布时间:"+newsDetail.time}}</view></view></view><view class="content font24 data-v-62e84989"><rich-text nodes="{{content}}" class="data-v-62e84989"></rich-text></view></view><foot-tab vue-id="0bbd2ec6-2" current="{{99}}" class="data-v-62e84989" bind:__l="__l"></foot-tab></view></block>

View File

@ -9,9 +9,11 @@
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5); /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
var _news = _interopRequireDefault(__webpack_require__(/*! ./pagesA/news/news.vue */ 57));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
createPage(_news.default); var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _news = _interopRequireDefault(__webpack_require__(/*! ./pagesA/news/news.vue */ 57));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_news.default);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
/***/ }), /***/ }),
@ -183,32 +185,56 @@ __webpack_require__.r(__webpack_exports__);
page: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
noMore: false }; noMore: false,
isLoading: false };
}, },
onLoad: function onLoad(op) { onLoad: function onLoad(op) {
// 获取资讯列表 // 获取资讯列表
this.getNewsList(); this.getNewsList();
}, },
// 触底
onReachBottom: function onReachBottom(e) { onReachBottom: function onReachBottom(e) {
if (!this.noMore) {
this.page++;
// 获取线路列表
this.getNewsList();
}
}, },
methods: { methods: {
// 获取资讯列表 // 获取资讯列表
getNewsList: function getNewsList() { getNewsList: function getNewsList() {var _this = this;
this.newsList = [ uni.showLoading({
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' }, title: '加载中' });
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' },
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' },
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' },
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' },
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' },
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' },
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' },
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' },
{ cover: '/static/public/news.jpg', click: '365', title: '北京文艺之旅(用胶片记录行走时光)', info: '冬季北京2013年最后的跨年之旅留给了河北蔚县和北京箭扣其实这两个地方也是风马牛不相干的而且都...' }];
console.log(this.newsList, '资讯列表'); var params = {
page: this.page,
size: this.size };
this.$requst.post('/api/common/news-list', params).then(function (res) {
if (res.code == 0) {
console.log(res, '资讯列表');
_this.total = res.data.total;
var newsArr = [];
res.data.list.forEach(function (item) {
var obj = {
id: item.id,
cover: item.cover,
title: item.title,
info: item.summary,
click: item.view };
newsArr.push(obj);
});
_this.newsList = _this.newsList.concat(newsArr);
if (_this.newsList.length == _this.total) {
_this.noMore = true;
_this.tags = '~ 暂无更多内容 ~';
}
uni.hideLoading();
_this.isLoading = true;
}
});
} } };exports.default = _default; } } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

View File

@ -1 +1 @@
<view class="pad-x100"><status-nav vue-id="24f4ef5b-1" navBarTitle="新闻资讯" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="news"><list-all vue-id="24f4ef5b-2" newsList="{{newsList}}" bind:__l="__l"></list-all></view><view class="tags font20 opacity-05">{{tags}}</view><foot-tab vue-id="24f4ef5b-3" current="{{99}}" bind:__l="__l"></foot-tab></view> <block wx:if="{{isLoading}}"><view class="pad-x100"><status-nav vue-id="24f4ef5b-1" navBarTitle="新闻资讯" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="news"><list-all vue-id="24f4ef5b-2" newsList="{{newsList}}" bind:__l="__l"></list-all></view><view class="tags font20 opacity-05">{{tags}}</view><foot-tab vue-id="24f4ef5b-3" current="{{99}}" bind:__l="__l"></foot-tab></view></block>

View File

@ -9,9 +9,11 @@
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5); /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
var _playVideo = _interopRequireDefault(__webpack_require__(/*! ./pagesA/video/playVideo.vue */ 77));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
createPage(_playVideo.default); var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _playVideo = _interopRequireDefault(__webpack_require__(/*! ./pagesA/video/playVideo.vue */ 77));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_playVideo.default);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
/***/ }), /***/ }),

View File

@ -9,9 +9,11 @@
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5); /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
var _video = _interopRequireDefault(__webpack_require__(/*! ./pagesA/video/video.vue */ 71));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
createPage(_video.default); var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
var _video = _interopRequireDefault(__webpack_require__(/*! ./pagesA/video/video.vue */ 71));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_video.default);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
/***/ }), /***/ }),
@ -183,7 +185,8 @@ __webpack_require__.r(__webpack_exports__);
page: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
noMore: false }; noMore: false,
isLoading: false };
}, },
onLoad: function onLoad(op) { onLoad: function onLoad(op) {
@ -192,22 +195,45 @@ __webpack_require__.r(__webpack_exports__);
}, },
// 触底 // 触底
onReachBottom: function onReachBottom(e) { onReachBottom: function onReachBottom(e) {
if (!this.noMore) {
this.page++;
// 获取视频列表
this.getVideoList();
}
}, },
methods: { methods: {
// 获取视频列表 // 获取视频列表
getVideoList: function getVideoList() { getVideoList: function getVideoList() {var _this = this;
this.videoList = [ uni.showLoading({
{ cover: '/static/public/video.jpg', src: 'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4' }, title: '加载中' });
{ cover: '/static/public/video.jpg', src: 'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4' },
{ cover: '/static/public/video.jpg', src: 'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4' },
{ cover: '/static/public/video.jpg', src: 'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4' },
{ cover: '/static/public/video.jpg', src: 'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4' },
{ cover: '/static/public/video.jpg', src: 'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4' },
{ cover: '/static/public/video.jpg', src: 'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4' },
{ cover: '/static/public/video.jpg', src: 'http://static.dothis.top/storage/videos/202208/62f38e29a23ad.mp4' }];
console.log(this.videoList, '视频列表'); var params = {
page: this.page,
size: this.size };
this.$requst.post('/api/common/video-list', params).then(function (res) {
if (res.code == 0) {
console.log(res, '视频列表');
_this.total = res.data.total;
var videoArr = [];
res.data.list.forEach(function (item) {
var obj = {
id: item.id,
title: item.title,
cover: item.cover,
src: item.src };
videoArr.push(obj);
});
_this.videoList = _this.videoList.concat(videoArr);
if (_this.videoList.length == _this.total) {
_this.noMore = true;
_this.tags = '~ 暂无更多内容 ~';
}
uni.hideLoading();
_this.isLoading = true;
}
});
} } };exports.default = _default; } } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"])) /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

View File

@ -15,7 +15,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.25.2", "libVersion": "2.25.2",
"appid": "wxa02e44170bc722cd", "appid": "wxf97aea6594a7f7ad",
"projectname": "上海集正", "projectname": "上海集正",
"condition": {}, "condition": {},
"editorSetting": { "editorSetting": {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB