theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'xbx' (#257) from xbx into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/257
This commit is contained in:
luyuan 2020-08-20 11:10:11 +08:00
commit c6cd88dc48
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pageD/logistics/logistics.vue
View File

@ -2,18 +2,18 @@
<view id="actives"> <view id="actives">
<!-- 活动消息推送 --> <!-- 活动消息推送 -->
<view class="activity" v-for="(item, index) in actives" :key="index"> <view class="activity" v-for="(item, index) in actives" :key="index">
<view class="times">{{item.type}}</view> <view class="times">{{item.kd_time}}</view>
<view class="content"> <view class="content">
<view class="store_name"> <view class="store_name">
<image src="../../pageE/static/mine/1.png"></image> <image src="../../pageE/static/mine/1.png"></image>
<view>小时代</view> <view>小时代</view>
</view> </view>
<view class="xiantiao"></view> <view class="xiantiao"></view>
<view class="title">{{item.name}}</view> <view class="title">{{item.title}}</view>
<view class="images_about"> <view class="images_about">
<image :src="item.url"></image> <image :src="item.picture"></image>
<view> <view>
<text>{{item.about}}</text> <text>{{item.summary}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -35,8 +35,9 @@
methods: { methods: {
getCartList() { getCartList() {
this.$u.post("message/orderDeliveryList",{page: this.page}).then(res => { this.$u.post("message/orderDeliveryList",{page: this.page}).then(res => {
console.log(res.data.data)
if (res.errCode == 0) { if (res.errCode == 0) {
this.actives == res.data; this.actives = res.data.data;
} }
}) })
} }
@ -46,7 +47,10 @@
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" >
page{
background-color: #ECECEC;
}
#actives{ #actives{
height: 100%; height: 100%;
} }

22
pages/index/index.vue
View File

@ -39,7 +39,8 @@
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item> <swiper-item>
<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottomLive(e)"> <scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottomLive(e)" :refresher-enabled="true" @refresherrefresh="dianji(1)" :refresher-triggered="refresher" @refresherpulling="onPulling"
@refresherrestore="onRestore" @refresherabort="onAbort">
<view class="box"> <view class="box">
<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper> <u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
<view class="list"> <view class="list">
@ -261,6 +262,7 @@
loading: '努力加载中', loading: '努力加载中',
nomore: '实在没有了' nomore: '实在没有了'
}, },
refresher:true
} }
}, },
components: { components: {
@ -356,6 +358,7 @@
this.$u.api.tabLiveList({page:this.live_page}).then((res) => { this.$u.api.tabLiveList({page:this.live_page}).then((res) => {
// uni.stopPullDownRefresh(); // uni.stopPullDownRefresh();
this.status_live = "loading"; this.status_live = "loading";
this.refresher = false;
console.log(res) console.log(res)
if (res.errCode == 0) { if (res.errCode == 0) {
uni.hideLoading(); uni.hideLoading();
@ -410,7 +413,8 @@
}, },
// 切换导航 // 切换导航
dianji(a) { dianji(a) {
// console.log(a); console.log(a);
if (a.type == "change") { if (a.type == "change") {
this.num = a.detail.current; this.num = a.detail.current;
} else { } else {
@ -418,7 +422,7 @@
} }
// console.log(this.num); // console.log(this.num);
// 状态请求 // 状态请求
if (a.type == "change") { // 强制请求一次 if (a.type == "change" || this.num == 1) { // 强制请求一次
if (this.num == 0) { if (this.num == 0) {
this.page = 1; this.page = 1;
this.articleList = []; this.articleList = [];
@ -429,7 +433,7 @@
this.live_page = 1; this.live_page = 1;
this.status_live = "nomore"; this.status_live = "nomore";
this.getZhiBoSwiper(); // 直播轮播 this.getZhiBoSwiper(); // 直播轮播
this.tabLiveList(); this.tabLiveList();
} else if (this.num == 2) { } else if (this.num == 2) {
this.follow_page = 0; this.follow_page = 0;
this.fansList = []; this.fansList = [];
@ -558,6 +562,16 @@
} }
}) })
}, },
onPulling(e) {
console.log("onpulling", e);
},
onRestore() {
this.refresher = 'restore'; // 需要重置
console.log("onRestore");
},
onAbort() {
console.log("onAbort");
},
jumpPage(uri) { jumpPage(uri) {
// console.log(uri); // console.log(uri);
common.jumpPage({ type: uri.type, id: uri.id }); common.jumpPage({ type: uri.type, id: uri.id });