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

gdpao #223

Merged
gyh merged 1 commits from gyh into master 2020-08-17 08:58:53 +00:00
Conversation 0 Commits 1 Files Changed 8 +95 -31
8 changed files with 95 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
App.vue
View File

@ -20,6 +20,12 @@
if (this.hasLogin) { if (this.hasLogin) {
this.refreshToken_function(); this.refreshToken_function();
} }
// #ifdef APP-PLUS
//app关闭默认的启动 方法关闭启动图。但是这个时间不能太晚，6s 超时后依旧会主动关闭。
setTimeout(()=>{
plus.navigator.closeSplashscreen();
},3000)
// #endif
}, },
methods: { methods: {
...mapMutations(['loginIn']), ...mapMutations(['loginIn']),

2
components/index/video-item/index.vue
View File

@ -242,6 +242,8 @@ export default {
if(res.errCode == 0) { if(res.errCode == 0) {
this.$u.toast(res.message); this.$u.toast(res.message);
this.$emit("updateList"); this.$emit("updateList");
} else {
this.$u.toast(res.message);
} }
}) })
}, },

4
manifest.json
View File

@ -11,8 +11,8 @@
"nvueCompiler" : "uni-app", "nvueCompiler" : "uni-app",
"compilerVersion" : 3, "compilerVersion" : 3,
"splashscreen" : { "splashscreen" : {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender" : false,
"waiting" : true, "waiting" : false,
"autoclose" : true, "autoclose" : true,
"delay" : 0 "delay" : 0
}, },

2
pageA/bindinges/bindinges.vue
View File

@ -9,7 +9,7 @@
</view> </view>
<view class="labales flex-inp"> <view class="labales flex-inp">
<input type="number" maxlength="6" placeholder="请输入验证码" v-model="sms_code" /> <input type="number" maxlength="6" placeholder="请输入验证码" v-model="sms_code" />
<button class="identifying" :class="is_sendcode ? 'sended' : ''" @click="getCode" :disabled="is_sendcode">{{ is_sendcode ? time_count + "后可以重新发送" : "发送验证码" }}</button> <u-button id="btn" class="identifying" :hair-line="false" hover-class="none" :class="is_sendcode ? 'sended' : ''" @click="getCode" :disabled="is_sendcode">{{ is_sendcode ? time_count + "后可以重新发送" : "发送验证码" }}</u-button>
</view> </view>
<!-- 服务协议 --> <!-- 服务协议 -->
<view class="pact"> <view class="pact">

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

@ -1,7 +1,7 @@
<template> <template>
<view class="userinfo" @click="stopClick()"> <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" @click="gotoInfo(item.member_id)"></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> <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>
@ -238,6 +238,12 @@
cart: this.is_cart cart: this.is_cart
}); });
}, },
gotoInfo(id) {
console.log(id);
uni.navigateTo({
url: "/pageB/details/index?id=" + id
})
},
// 冒泡 // 冒泡
stopClick() { stopClick() {
} }

34
pageB/details/index.vue
View File

@ -20,6 +20,7 @@
<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>
<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@ -75,6 +76,13 @@ export default {
listInfo: [], // 列表详情 listInfo: [], // 列表详情
member_id: 0, member_id: 0,
page: 1, page: 1,
status: 'loadmore',
iconType: 'circle',
loadText: {
loadmore: '轻轻上拉',
loading: '努力加载中',
nomore: '实在没有了'
},
} }
}, },
onLoad(option) { onLoad(option) {
@ -84,6 +92,10 @@ export default {
this.getArticlelist(); this.getArticlelist();
}, },
onReachBottom() {
// this.page++;
this.getArticlelist();
},
methods:{ methods:{
// 获取信息 // 获取信息
getUserInfo(id) { getUserInfo(id) {
@ -107,13 +119,27 @@ export default {
}).then(res => { }).then(res => {
if (res.errCode == 0) { if (res.errCode == 0) {
// console.log(res); // console.log(res);
this.listInfo = res.data.list; // this.listInfo = res.data.list;
// console.log(this.listInfo); // console.log(this.listInfo);
if (this.page == 1) {
this.listInfo = res.data.list;
this.status = "loadmore";
} else if (res.data.length == 0 && this.page > 1) {
this.status = "nomore";
} else {
this.listInfo = this.listInfo.concat(res.data.list);
console.log(this.listInfo)
}
if (res.data.length == 0 && this.page > 1) {
} else {
this.page++;
}
} else { } else {
console.log(res.message); console.log(res.message);
} }
}) })
}, },
dianji(a){ dianji(a){
console.log(a); console.log(a);
if(typeof a == "object"){ if(typeof a == "object"){
@ -121,7 +147,13 @@ export default {
}else{ }else{
this.num = a this.num = a
} }
if (a == 0) {
this.page = 1;
this.getArticlelist(); this.getArticlelist();
} else if (a == 1) {
this.page = 1;
this.getArticlelist();
}
} }
} }
} }

34
pageB/video/video.nvue
View File

@ -1,28 +1,28 @@
<template> <template>
<view class="container"> <view class="container">
<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"
@pause="pausing" @ended="videoEnd" @timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping" @pause="pausing" @ended="videoEnd" @timeupdate="timeupdate" :show-play-btn="false" :controls="false" @click="stoping"
:enable-progress-gesture="false" :show-center-play-btn="false"></video> :enable-progress-gesture="false" :show-center-play-btn="false"></video>
<!-- 用户操作 --> <!-- 用户操作 -->
<userinfo class="user-info" :style="{ top: fixTop }" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" <userinfo class="user-info" :style="{ top: fixTop }" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num"
@openCart="openPopup"></userinfo> @openCart="openPopup"></userinfo>
<!-- 视频信息 --> <!-- 视频信息 -->
<cover-view class="info-box" @click="stopClick"> <cover-view class="info-box">
<view class="video-info-box" :style="{ width: time_count > 99 ? '180rpx' : '160rpx' }"> <view class="video-info-box" :style="{ width: time_count > 99 ? '180rpx' : '160rpx' }">
<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 }}s</text> <text class="time">{{ time_count }}s</text>
</view> </view>
<view> <view>
<text class="name">@{{ list.member_nickname }}</text> <text class="name" @click="gotoInfo(list)">@{{ list.member_nickname }}</text>
</view> </view>
<view> <view @click="stopClick">
<text class="title">{{ list.article_title }}</text> <text class="title">{{ list.article_title }}</text>
</view> </view>
<view> <view @click="stopClick">
<text class="centent">{{ list.article_content }}</text> <text class="centent">{{ list.article_content }}</text>
</view> </view>
<view class="label-box"> <view class="label-box" @click="stopClick">
<block v-for="(item,index) in list.label" :key="index"> <block v-for="(item,index) in list.label" :key="index">
<text class="label" :style="{ width: labelLen[index] * 40 + 'rpx' }">{{ item.name }}</text> <text class="label" :style="{ width: labelLen[index] * 40 + 'rpx' }">{{ item.name }}</text>
</block> </block>
@ -344,11 +344,7 @@
width: "750rpx", width: "750rpx",
height: res.screenHeight + "px", height: res.screenHeight + "px",
} }
this.fixTop = "400rpx";
this.fixTop = res.screenHeight / 3; this.fixTop = res.screenHeight / 3;
// #ifdef H5
this.fixTop = 400 + 'rpx'
// #endif
} }
}) })
}, },
@ -460,6 +456,9 @@
url: "/pageB/sdetails/index?id=" + id + "&type=" + 1, url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
}) })
}, },
gotoInfo(id) {
console.log(id);
},
// 收起键盘 // 收起键盘
hideEdit() {}, hideEdit() {},
// stop // stop
@ -476,8 +475,10 @@
</script> </script>
<style> <style>
.container { .container {
position: relative; position: relative;
background-color: #FF0000 !important;
} }
/* 关闭 */ /* 关闭 */
@ -497,6 +498,9 @@
left: 330rpx; left: 330rpx;
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
/* #ifdef H5 */
top: 500rpx;
/* #endif */
} }
.pause-img { .pause-img {
@ -507,7 +511,10 @@
/* 用户操作 */ /* 用户操作 */
.user-info { .user-info {
position: fixed; position: fixed;
right: 30rpx; right: 26rpx;
/* #ifdef H5 */
top: 400rpx;
/* #endif */
} }
/* 底部信息 */ /* 底部信息 */
@ -839,13 +846,16 @@
} }
.title { .title {
width: 700rpx;
color: #fff; color: #fff;
font-size: 26rpx; font-size: 26rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
lines: 1;
text-overflow: ellipsis;
} }
.centent { .centent {
width: 500rpx; width: 600rpx;
color: #fff; color: #fff;
font-size: 28rpx; font-size: 28rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;

30
pages/index/index.vue
View File

@ -240,6 +240,7 @@
num: 0, num: 0,
page: 1, // 0即第一页 page: 1, // 0即第一页
follow_page: 0, // follow_page: 0, //
live_page: 1, //
articleList: [], articleList: [],
recommendList: [], // 推荐达人 recommendList: [], // 推荐达人
indexImageSwiper: [], indexImageSwiper: [],
@ -314,24 +315,27 @@
uni.showLoading({ uni.showLoading({
title: "loading..." title: "loading..."
}) })
this.$u.api.tabLiveList({page:this.page}).then((res) => { this.$u.api.tabLiveList({page:this.live_page}).then((res) => {
// uni.stopPullDownRefresh(); // uni.stopPullDownRefresh();
this.status = "loading"; this.status = "loading";
console.log(res) console.log(res)
if (res.errCode == 0) { if (res.errCode == 0) {
uni.hideLoading(); uni.hideLoading();
if (this.page == 1) { if (this.live_page == 1) {
this.tabLiveLists = res.data.data; this.tabLiveLists = res.data.data;
this.status = "loadmore"; this.status = "loadmore";
} else if (res.data.data.length == 0 && this.page > 1) { if (res.data.data.length < 6) {
this.status = "nomore";
}
} else if (res.data.data.length == 0 && this.live_page > 1) {
this.status = "nomore"; this.status = "nomore";
} else { } else {
this.tabLiveLists = this.tabLiveLists.concat(res.data.data); this.tabLiveLists = this.tabLiveLists.concat(res.data.data);
console.log(this.tabLiveLists) console.log(this.tabLiveLists)
} }
if (res.data.data.length == 0 && this.page > 1) { if (res.data.data.length == 0 && this.live_page > 1) {
} else { } else {
this.page++; this.live_page++;
} }
} else { } else {
this.status = "nomore" this.status = "nomore"
@ -384,7 +388,7 @@
this.getArticlelist(); this.getArticlelist();
this.getSwiper(); this.getSwiper();
} else if (this.num == 1) { } else if (this.num == 1) {
this.page = 1; this.live_page = 1;
this.getZhiBoSwiper(); // 直播轮播 this.getZhiBoSwiper(); // 直播轮播
this.tabLiveList(); this.tabLiveList();
} else if (this.num == 2) { } else if (this.num == 2) {
@ -412,15 +416,20 @@
this.status = "loading"; this.status = "loading";
if (res.errCode == 0) { if (res.errCode == 0) {
uni.hideLoading(); uni.hideLoading();
console.log(this.page,res.data.list.length);
if (this.page == 1) { if (this.page == 1) {
this.articleList = res.data.list; this.articleList = res.data.list;
this.status = "loadmore"; this.status = "loadmore";
if (res.data.list.length < 4) {
this.status = "nomore";
}
} else if (res.data.length == 0 && this.page > 1) { } 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);
} }
if (res.data.length == 0 && this.page > 1) { if (res.data.length == 0 && this.page > 1) {
console.log(111);
} else { } else {
this.page++; this.page++;
} }
@ -432,17 +441,16 @@
// 屏蔽更新列表 // 屏蔽更新列表
updateList() { updateList() {
this.page = 1; this.page = 1;
this.articleList = [];
this.getArticlelist(); this.getArticlelist();
this.tabLiveList() this.tabLiveList();
}, },
// 发现下拉加载 // 发现下拉加载
swiperBottom(e) { swiperBottom(e) {
if(this.num == 0 ){ if(this.num == 0){
this.getArticlelist(); this.getArticlelist();
}else if(this.num == 1){ }else if(this.num == 1){
console.log(123) this.tabLiveList();
this.tabLiveList()
} }
// console.log(e); // console.log(e);
}, },