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

Merge pull request 'gdpaoup' (#157) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/157
This commit is contained in:
gyh 2020-08-11 22:18:08 +08:00
commit 1db45d40a7
11 changed files with 376 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App.vue
View File

@ -41,6 +41,7 @@
@import "/static/css/normalize"; @import "/static/css/normalize";
/* 顶部自定义导航留白 */ /* 顶部自定义导航留白 */
.status_bar { .status_bar {
z-index: 1000;
width: 100%; width: 100%;
height: var(--status-bar-height); height: var(--status-bar-height);
} }

42
common/http.interceptor.js
View File

@ -47,24 +47,30 @@ const install = (Vue, vm) => {
// 假设201为token失效，这里跳转登录 // 假设201为token失效，这里跳转登录
// vm.$u.toast('您还没有登录哦，请先去登录！'); // vm.$u.toast('您还没有登录哦，请先去登录！');
if (res.data.data.action != "memberinfo") { if (res.data.data.action != "memberinfo") {
uni.showModal({ setTimeout(() => {
title: "温馨提示", // 此为uView的方法，详见路由相关文档
content: "您还未登录，请立即登录", uni.navigateTo({
cancelText: "以后再说", url: "/pageA/login/login",
confirmText: "立即登录", })
confirmColor: "#FF780F", }, 1000)
success(res) { // uni.showModal({
// console.log(res); // title: "温馨提示",
if (res.confirm) { // content: "您还未登录，请立即登录",
setTimeout(() => { // cancelText: "以后再说",
// 此为uView的方法，详见路由相关文档 // confirmText: "立即登录",
vm.$u.route('/pageA/login/login') // confirmColor: "#FF780F",
}, 500) // success(res) {
} // // console.log(res);
if (res.cancel) { // if (res.confirm) {
} // setTimeout(() => {
} // // 此为uView的方法，详见路由相关文档
}) // vm.$u.route('/pageA/login/login')
// }, 500)
// }
// if (res.cancel) {
// }
// }
// })
} }
return false; return false;
} else if (res.errCode == 1) { } else if (res.errCode == 1) {

2
components/shop/list/index.vue
View File

@ -14,7 +14,7 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
<!-- 加载更多 --> <!-- 加载更多 -->
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore"></u-loadmore> <u-loadmore class="load-size" :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore"></u-loadmore>
</view> </view>
</template> </template>
<script> <script>

40
pageB/components/userinfo/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<view class="userinfo"> <view class="userinfo" @click="stopClick()">
<view class="userhead"> <view class="userhead">
<image class="avatar" :src="item.member_avatar"></image> <image class="avatar" :src="item.member_avatar"></image>
<text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text> <!-- <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text> -->
<image class="follow" :src=" !is_follow ? '../../static/image/userinfo/follow.png' : '../../static/image/userinfo/followed.png' " mode="" @click="following(item.member_id)"></image>
</view> </view>
<!-- 点赞 --> <!-- 点赞 -->
<view class="operat zan"> <view class="operat zan">
@ -62,16 +63,10 @@
.follow { .follow {
z-index: 100; z-index: 100;
position: absolute; position: absolute;
top: 90rpx; top: 80rpx;
left: 40rpx; left: 30rpx;
width: 36rpx; width: 50rpx;
height: 36rpx; height: 50rpx;
text-align: center;
line-height: 36rpx;
font-size: 34rpx;
border-radius: 50%;
color: #fff;
background-color: #FF780F;
} }
.operat { .operat {
@ -80,6 +75,7 @@
/* #endif */ /* #endif */
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
padding: 0 30rpx;
} }
.operat-span { .operat-span {
@ -110,7 +106,7 @@
}, },
watch: { watch: {
list(newValue, old) { list(newValue, old) {
console.log(newValue); // console.log(newValue);
this.item = newValue || {}; this.item = newValue || {};
this.is_follow = this.list.is_attention || false; this.is_follow = this.list.is_attention || false;
this.is_like = this.list.is_like || false; this.is_like = this.list.is_like || false;
@ -152,6 +148,11 @@
title: res.data.message, title: res.data.message,
icon: "none" icon: "none"
}) })
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none"
})
} }
} }
}) })
@ -174,6 +175,11 @@
// console.log(res); // console.log(res);
this.is_like = !this.is_like; this.is_like = !this.is_like;
this.list.like_num = res.data.data.num; this.list.like_num = res.data.data.num;
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none"
})
} else { } else {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
@ -200,6 +206,11 @@
console.log(res.data.num); console.log(res.data.num);
this.is_collect = !this.is_collect; this.is_collect = !this.is_collect;
this.list.collect_num = res.data.data.num; this.list.collect_num = res.data.data.num;
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none"
})
} else { } else {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
@ -227,6 +238,9 @@
cart: this.is_cart cart: this.is_cart
}); });
}, },
// 冒泡
stopClick() {
}
} }
} }
</script> </script>

4
pageB/details/index.vue
View File

@ -19,7 +19,7 @@
<view class="box"> <view class="box">
<videoItem v-for="item in listInfo" :key="item.article_id" :item="item" <videoItem v-for="item in listInfo" :key="item.article_id" :item="item"
@getArticlelist="getArticlelist"></videoItem> @getArticlelist="getArticlelist"></videoItem>
<view class="no-data" v-show="!listInfo && !page">暂无数据</view> <view class="no-data" v-show="!listInfo && page">暂无数据</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@ -74,7 +74,7 @@ export default {
userInfo: {}, // 用户信息 userInfo: {}, // 用户信息
listInfo: [], // 列表详情 listInfo: [], // 列表详情
member_id: 0, member_id: 0,
page: 0, page: 1,
} }
}, },
onLoad(option) { onLoad(option) {

3
pageB/photo/index.vue
View File

@ -81,7 +81,6 @@
<image :src="item.goods_image" mode="aspectFill"></image> <image :src="item.goods_image" mode="aspectFill"></image>
<view> <view>
<text class="title">{{ item.goods_advword }}</text> <text class="title">{{ item.goods_advword }}</text>
<text class="name">{{ item.goods_name }}</text>
<text class="price">{{ item.goods_promotion_price }}</text> <text class="price">{{ item.goods_promotion_price }}</text>
</view> </view>
</view> </view>
@ -330,7 +329,7 @@
& > view { & > view {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-around;
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
.title { .title {

278
pageB/video/video.nvue
View File

@ -1,18 +1,17 @@
<template> <template>
<view> <view>
<video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing" <video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing"
@timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping" :enable-progress-gesture="false"></video> @pause="pausing" @ended="videoEnd" @timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping"
<cover-image class="close" @click="goBack" src="../../static/close.png"> :enable-progress-gesture="false" :show-center-play-btn="false"></video>
</cover-image>
<cover-image class="pause" @click="stoping" src="../../static/videoPlay.png" v-if="!is_play">
</cover-image>
<!-- 用户操作 --> <!-- 用户操作 -->
<userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo> <userinfo class="user-info" :style="{ top: fixTop }" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num"
<cover-view class="info-box" @click="stopClick">> @openCart="openPopup"></userinfo>
<!-- 视频信息 -->
<cover-view class="info-box" @click="stopClick">
<view class="video-info-box"> <view class="video-info-box">
<image class="image-play" src="../../static/videoIcon.png" mode=""></image> <image class="image-play" src="../../static/videoIcon.png" mode=""></image>
<text class="video-slip">视频</text> <text class="video-slip">视频</text>
<text class="time">{{ time_count == 1 ? 0 : time_count }}s</text> <text class="time">{{ time_count }}s</text>
</view> </view>
<view> <view>
<text class="name">@{{ list.member_nickname }}</text> <text class="name">@{{ list.member_nickname }}</text>
@ -29,40 +28,81 @@
</block> </block>
</view> </view>
</cover-view> </cover-view>
<cover-view class="content-box" v-if="is_comment"> <!-- 单个商品 -->
<view class="content-title"> <cover-view class="good-one" v-if="cart_len == 1">
<text class="tips">评论</text> <view class="one-list" v-for="(item,index) in list.goods" :key="index">
<text class="close-down" @click="closeComment">×</text> <image class="one-image" :src="item.goods_image" mode=""></image>
<view class="one-box">
<view class="title-one">{{ item.goods_advword }}</view>
<view class="content-one">{{ item.goods_name }}</view>
<view class="good-price">￥{{ item.goods_promotion_price }}</view>
</view>
</view> </view>
<scroller class="comment-list"> </cover-view>
<view class="" v-for="(item,index) in commentList" :key="index"> <!-- 遮罩层 -->
<view class="comment-list-box"> <cover-view class="mask" @click.stop="stopClick" :style="videoSize" v-if="is_comment || cart_type">
<view class="comment-list-header"> <!-- 评论 -->
<image class="avatar" :src="item.member_avatar" mode=""></image> <cover-view class="content-box" v-if="is_comment" ref="contentBox">
<view> <view class="content-title">
<text class="comment-title">{{ item.member_nickname }}</text> <text class="tips">评论</text>
<text class="comment-time">{{ item.create_time }}</text> <text class="close-down" @click="closeComment">×</text>
</view>
<scroller class="comment-list">
<view class="" v-for="(item,index) in commentList" :key="index">
<view class="comment-list-box">
<view class="comment-list-header">
<image class="avatar" :src="item.member_avatar" mode=""></image>
<view>
<text class="comment-title">{{ item.member_nickname }}</text>
<text class="comment-time">{{ item.create_time }}</text>
</view>
</view>
<text class="reply">回复</text>
</view>
<view class="content-main">
<text class="content-style">{{ item.content }}</text>
</view>
</view>
<view class="send-box">
<input class="send-val" type="text" value="" />
<text class="btn-send">发送</text>
</view>
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
<loading-indicator class="indicator"></loading-indicator>
<text class="indicator-text">努力加载中</text>
</loading>
</scroller>
</cover-view>
<!-- 购物车 -->
<cover-view class="cart-box" v-if="cart_type">
<view class="cart-title">
<text class="tips">全部商品</text>
<text class="close-down" @click="cart_type = false">×</text>
</view>
<scroller class="cart-list">
<view class="" v-for="(item,index) in list.goods" :key="index">
<view class="cart-list-header" @click="goGoodInfo(item.goods_id)">
<image class="goods-img" :src="item.goods_image" mode=""></image>
<view class="goods-info">
<text class="good-title">{{ item.goods_advword }}</text>
<text class="good-price">{{ item.goods_promotion_price }}</text>
</view> </view>
</view> </view>
<text class="reply">回复</text>
</view> </view>
<view class="content-main"> <loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
<text class="content-style">{{ item.content }}</text> <loading-indicator class="indicator"></loading-indicator>
</view> <text class="indicator-text">努力加载中</text>
</view> </loading>
<view class="send-box"> </scroller>
<input class="send-val" type="text" value="" /> </cover-view>
<text class="btn-send">发送</text>
</view>
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
<loading-indicator class="indicator"></loading-indicator>
<text class="indicator-text">努力加载中</text>
</loading>
</scroller>
</cover-view> </cover-view>
<list class="cart-box"> <!-- 返回按钮 -->
<cell></cell> <cover-image class="close" @click="goBack" src="../../static/close.png">
</list> </cover-image>
<!-- 暂停按钮 -->
<cover-image class="pause" :style="{ top: fixTop + 100 }" @click="stoping" src="../../static/videoPlay.png"
v-if="!is_play">
</cover-image>
</view> </view>
</template> </template>
@ -76,6 +116,7 @@
data() { data() {
return { return {
videoSize: {}, videoSize: {},
fixTop: 0,
list: {}, list: {},
labelLen: [], labelLen: [],
cart_type: false, // 显示购物车 cart_type: false, // 显示购物车
@ -98,7 +139,22 @@
onReady() { onReady() {
this.videoBox = uni.createVideoContext("videoId", this); this.videoBox = uni.createVideoContext("videoId", this);
}, },
onBackPress() {
if (this.cart_type) {
this.cart_type = !this.cart_type;
} else if (this.is_edit) {
this.is_edit = !this.is_edit;
} else if (this.is_comment) {
this.is_comment = !this.is_comment;
} else {
return false;
}
return true;
},
methods: { methods: {
moveHandle() {
return false;
},
// 获取信息 // 获取信息
getVideoInfo(article_id) { getVideoInfo(article_id) {
uni.request({ uni.request({
@ -113,6 +169,7 @@
success: (res) => { success: (res) => {
this.list = res.data.data.info; this.list = res.data.data.info;
this.src = res.data.data.info.video_path; this.src = res.data.data.info.video_path;
this.cart_len = res.data.data.info.goods.length;
let item = res.data.data.info.label; let item = res.data.data.info.label;
let arr = []; let arr = [];
item.forEach(data => { item.forEach(data => {
@ -139,7 +196,7 @@
}, },
success: (res) => { success: (res) => {
if (res.data.errCode == 0) { if (res.data.errCode == 0) {
console.log(res.data); // console.log(res.data);
this.commentList = res.data.data; this.commentList = res.data.data;
} }
} }
@ -180,8 +237,13 @@
success: (res) => { success: (res) => {
this.videoSize = { this.videoSize = {
width: "750rpx", width: "750rpx",
height: res.screenHeight + "px" height: res.screenHeight + "px",
} }
this.fixTop = "400rpx";
this.fixTop = res.screenHeight / 3;
// #ifdef H5
this.fixTop = 400 + 'rpx'
// #endif
} }
}) })
}, },
@ -190,6 +252,19 @@
// console.log(e); // console.log(e);
if (e.type == "play") {} if (e.type == "play") {}
}, },
pausing(e) {
if (e.type == "pause") {
this.is_play = false;
}
},
// 结束
videoEnd(e) {
// console.log(e);
if (e.type == "ended") {
this.is_play = false;
this.time_count = 0;
}
},
// 暂停 // 暂停
stoping() { stoping() {
this.is_play = !this.is_play; this.is_play = !this.is_play;
@ -202,8 +277,9 @@
// 监听视频 // 监听视频
timeupdate(e) { timeupdate(e) {
this.time_count = parseInt(e.detail.duration) - parseInt(e.detail.currentTime); this.time_count = parseInt(e.detail.duration) - parseInt(e.detail.currentTime);
// console.log(e.detail.currentTime,e.detail.duration);
if (e.detail.duration == e.detail.currentTime) { if (e.detail.duration == e.detail.currentTime) {
this.is_play = false; // this.is_play = false;
} }
// let num = parseInt((e.detail.currentTime/e.detail.duration)*100); // let num = parseInt((e.detail.currentTime/e.detail.duration)*100);
// this.linear = num + "%"; // this.linear = num + "%";
@ -211,17 +287,23 @@
}, },
// 打开弹窗 // 打开弹窗
openPopup(data) { openPopup(data) {
console.log(data); // console.log(data);
this.cart_type = data.cart; this.cart_type = data.cart;
this.is_comment = data.comment; this.is_comment = data.comment;
if (this.is_comment) { if (this.is_comment) {
this.page = 0; this.page = 0;
this.getComment(); this.getComment();
// this.is_play = true;
} }
}, },
// 关闭评论 // 关闭评论
closeComment() { closeComment() {
this.is_comment = false; this.is_comment = false;
// console.log(this.is_comment,this.is_play);
// if (!this.is_comment && this.is_play) {
// console.log(1);
// this.is_play = false;
// }
}, },
// 下拉加载 // 下拉加载
onloading(e) { onloading(e) {
@ -231,6 +313,12 @@
this.loadinging = false; this.loadinging = false;
}, 2000) }, 2000)
}, },
// 跳转
goGoodInfo(id) {
uni.navigateTo({
url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
})
},
// stop // stop
stopClick(event) { stopClick(event) {
event.stopPropagation(); event.stopPropagation();
@ -248,16 +336,16 @@
/* 关闭 */ /* 关闭 */
.close { .close {
position: fixed; position: fixed;
top: 80rpx; top: 100rpx;
right: 60rpx; right: 70rpx;
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
} }
/* 暂停 */ /* 暂停 */
.pause { .pause {
z-index: 99;
position: fixed; position: fixed;
top: 600rpx;
left: 330rpx; left: 330rpx;
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
@ -266,7 +354,6 @@
/* 用户操作 */ /* 用户操作 */
.user-info { .user-info {
position: fixed; position: fixed;
top: 360rpx;
right: 30rpx; right: 30rpx;
} }
@ -290,6 +377,53 @@
background-color: rgba(255, 255, 255, .6); background-color: rgba(255, 255, 255, .6);
} }
.good-one {
position: absolute;
bottom: 300rpx;
right: 100rpx;
width: 450rpx;
padding: 20rpx;
border-radius: 10rpx;
background-color: rgba(0,0,0,0.6);
}
.one-list {
flex-direction: row;
}
.one-image {
width: 160rpx;
height: 160rpx;
margin-right: 20rpx;
border-radius: 4rpx;
}
.one-box {
justify-content: space-between;
}
.title-one {
width: 100rpx;
font-size: 28rpx;
color: #fff;
lines: 1;
}
.content-one {
width: 100rpx;
font-size: 24rpx;
color: #fff;
lines: 2;
}
.mask {
z-index: 999999;
position: fixed;
top: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.5);
}
.content-box { .content-box {
z-index: 99; z-index: 99;
position: fixed; position: fixed;
@ -360,6 +494,7 @@
font-weight: 500; font-weight: 500;
color: #333; color: #333;
} }
.send-box { .send-box {
z-index: 10000; z-index: 10000;
position: fixed; position: fixed;
@ -388,11 +523,64 @@
} }
.close-down { .close-down {
padding: 10rpx;
font-size: 50rpx; font-size: 50rpx;
text-align: center; text-align: center;
color: #333; color: #333;
} }
.cart-box {
z-index: 99;
position: fixed;
bottom: 0;
left: 0;
width: 750rpx;
height: 700rpx;
background-color: #fff;
}
.cart-title {
flex-direction: row;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 20rpx;
border-color: #f2f2f2;
border-bottom-width: 1rpx;
background-color: #fff;
}
.cart-list {
}
.cart-list-header {
padding: 20rpx;
flex-direction: row;
border-bottom-width: 1rpx;
border-bottom-color: #ececec;
}
.goods-img {
width: 160rpx;
height: 160rpx;
margin-right: 10rpx;
}
.goods-info {
justify-content: space-around;
}
.good-title {
color: #333;
font-size: 30rpx;
}
.good-price {
font-size: 28rpx;
color: #FF3131;
}
.image-play { .image-play {
width: 22rpx; width: 22rpx;
height: 20rpx; height: 20rpx;

8
pages.json
View File

@ -57,8 +57,7 @@
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle": "custom", "navigationStyle": "custom",
"app-plus": { "app-plus": {
"titleNView": false, "titleNView": false
"animationType": "slide-in-bottom"
} }
} }
}, },
@ -105,7 +104,10 @@
{ {
"path" : "video/video", "path" : "video/video",
"style" : { "style" : {
"navigationStyle":"custom" "navigationStyle":"custom",
"app-plus": {
"softinputMode": "adjustResize"
}
} }
}, },
{ {

66
pages/index/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view> <view>
<view class="status_bar"></view> <view class="status_bar"></view>
<view class="index"> <view class="index" @touchmove.stop.prevent="moveHandle">
<view class="top"> <view class="top">
<view class="sosuo" @click="goSearch"> <view class="sosuo" @click="goSearch">
<u-icon name="search" color="#555" size="34rpx"></u-icon> <u-icon name="search" color="#555" size="34rpx"></u-icon>
@ -20,7 +20,7 @@
</view> </view>
<swiper class="card" @change="dianji" :current="num"> <swiper class="card" @change="dianji" :current="num">
<swiper-item> <swiper-item>
<scroll-view style="width:100%;height:100%" scroll-y="true" lower-threshold="200" @scrolltolower="swiperBottom"> <scroll-view style="width:100%;height:100%" scroll-y="true" lower-threshold="200" upper-threshold="100" @scrolltolower="swiperBottom" @scrolltoupper="swiperTop">
<view class="box"> <view class="box">
<!-- <indexad style="width:690rpx"></indexad> --> <!-- <indexad style="width:690rpx"></indexad> -->
<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper> <u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
@ -91,17 +91,24 @@
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
page {
background-color: #fff;
}
.index { .index {
width: 750rpx; width: 750rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100vh; height: 100vh;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
padding-bottom: 100rpx; padding-bottom: 88rpx;
/* #endif */ /* #endif */
overflow: hidden; overflow: hidden;
.top { .top {
z-index: 10000;
position: fixed;
top: var(--status-bar-height);
left: 0;
display: flex; display: flex;
flex-shrink: 0; flex-shrink: 0;
align-items: center; align-items: center;
@ -109,6 +116,7 @@
width: 100%; width: 100%;
height: 88rpx; height: 88rpx;
padding: 0 30rpx; padding: 0 30rpx;
background-color: #fff;
.sosuo { .sosuo {
width: 32rpx; width: 32rpx;
@ -126,8 +134,9 @@
} }
.card { .card {
height: 100%;
width: 100%; width: 100%;
height: 100%;
margin-top: 88rpx;
// pointer-events: none; // pointer-events: none;
.box { .box {
@ -138,6 +147,8 @@
.list { .list {
display: flex; display: flex;
padding-bottom: 50rpx;
margin-bottom: 50rpx;
} }
} }
@ -229,7 +240,7 @@
name: '关注' name: '关注'
}], }],
num: 0, num: 0,
page: 0, // 0即第一页 page: 1, // 0即第一页
follow_page: 0, // follow_page: 0, //
articleList: [], articleList: [],
recommendList: [], // 推荐达人 recommendList: [], // 推荐达人
@ -254,12 +265,18 @@
darenItem darenItem
}, },
onShow() { onShow() {
this.articleList = []; this.page = 1;
this.page = 0; if (this.page != 1) {
this.getArticlelist(); this.articleList = [];
this.getSwiper(); }
this.getArticlelist();
if (this.hasLogin) {
this.isNewmembervoucher();
}
}, },
onLoad(){ onLoad(){
this.getSwiper();
// 优惠券
if(this.$store.state.hasLogin){ if(this.$store.state.hasLogin){
this.isNewmembervoucher(); this.isNewmembervoucher();
const user = uni.getStorageSync('user_info'); const user = uni.getStorageSync('user_info');
@ -278,10 +295,14 @@
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.page = 1;
this.getArticlelist(); this.getArticlelist();
// this.getManicureList({ load: 'reload' }); // this.getManicureList({ load: 'reload' });
}, },
methods: { methods: {
moveHandle() {
return;
},
// 直播列表 // 直播列表
tabLiveList() { tabLiveList() {
this.$u.api.tabLiveList().then((res) => { this.$u.api.tabLiveList().then((res) => {
@ -328,7 +349,8 @@
// 状态请求 // 状态请求
if (a.type == "change") { // 强制请求一次 if (a.type == "change") { // 强制请求一次
if (this.num == 0) { if (this.num == 0) {
this.page = 0; this.page = 1;
this.articleList = [];
this.status = "loadmore"; this.status = "loadmore";
this.getArticlelist(); this.getArticlelist();
this.getSwiper(); this.getSwiper();
@ -347,23 +369,30 @@
}, },
// 发现别表 // 发现别表
getArticlelist() { getArticlelist() {
uni.showLoading({
title: "loading..."
})
this.$u.api.getArticlelist({ this.$u.api.getArticlelist({
page: this.page, page: this.page,
is_video_img: 0, // 查询视频1 图文2 都查0 is_video_img: 0, // 查询视频1 图文2 都查0
}).then(res => { }).then(res => {
// uni.stopPullDownRefresh();
this.status = "loading"; this.status = "loading";
if (res.errCode == 0) { if (res.errCode == 0) {
// uni.stopPullDownRefresh(); uni.hideLoading();
// console.log('37647744ghj', res) if (this.page == 1) {
if (this.page == 0) {
this.articleList = res.data.list; this.articleList = res.data.list;
this.status = "loadmore"; this.status = "loadmore";
} else if (res.data.length == 0 && this.page > 0) { } else if (res.data.length == 0 && this.page > 1) {
this.status = "nomore"; this.status = "nomore";
} else { } else {
this.articleList = this.articleList.concat(res.data.list); this.articleList = this.articleList.concat(res.data.list);
} }
this.page++; if (res.data.length == 0 && this.page > 1) {
console.log(111);
} else {
this.page++;
}
} else { } else {
this.status = "nomore" this.status = "nomore"
} }
@ -371,8 +400,7 @@
}, },
// 屏蔽更新列表 // 屏蔽更新列表
updateList() { updateList() {
console.log(111); this.page = 1;
this.page = 0;
this.getArticlelist(); this.getArticlelist();
}, },
// 发现下拉加载 // 发现下拉加载
@ -380,6 +408,10 @@
this.getArticlelist(); this.getArticlelist();
// console.log(e); // console.log(e);
}, },
swiperTop() {
// uni.startPullDownRefresh();
},
// 关注下拉
followBotton(e) { followBotton(e) {
this.getFollowList(); this.getFollowList();
// console.log(e); // console.log(e);

BIN
static/image/userinfo/follow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/image/userinfo/followed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB