页面迁移

pages.json

@@ -435,7 +435,7 @@
 			}
 
 		},{
-            "path" : "pages/client/pay/pay",
+            "path" : "pages/pay/pay",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "充值",
@@ -452,6 +452,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/zhuiju/index",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/zhuiju/zjgk",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -465,7 +483,7 @@
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
-				"pagePath": "pages/client/zui",
+				"pagePath": "pages/zhuiju/index",
 				"iconPath": "static/icon/zj.png",
 				"selectedIconPath": "static/icon/xz_zj.png",
 				"text": "追剧"

pages/index/index.vue

@@ -21,7 +21,7 @@
 		</view>
 		<view class="integral-mall-main plr15" style="margin-top: 30upx;">
 			<view class="integal-mall-menu flex pt10 pb10">
-				<view class="col2 text-center" @click="linkTo" data-link="/pages/client/zui" data-type='tabbar'>
+				<view class="col2 text-center" @click="linkTo" data-link="/pages/zhuiju/index" data-type='tabbar'>
 					<view>
 						<!-- <image style="width: 100rpx; height: 100rpx;" :src="statics.zhuico[0]"></image> -->
 						<image style="width: 100rpx; height: 100rpx;" src="/static/icon/index/zuiju.png"></image>

pages/member/index.vue

@@ -30,7 +30,7 @@
 						<label class="coin-text">赠送看币</label>
 					</div>
 				</div>
-				<navigator  url="/pages/client/pay/pay">
+				<navigator  url="/pages/pay/pay">
 				<div class="mt16 box-cj"><label class="btn-cz">去充值</label></div>
 				</navigator>
 
@@ -99,7 +99,7 @@
 						name: '我的追剧',
 						type: 'link',
 						model: 'tab',
-						link: '/pages/client/zui',
+						link: '/pages/zhuiju/index',
 						icon: this.$config.zystaticUrl + '/static/img/wode/zhuij.png',
 						show: 1
 					},

pages/video/index.nvue

@@ -197,7 +197,8 @@
 			return {
 				limitPage: 15,
 				top_height: 0,
-				episode: 1,
+				episode: 1,
+				ranse_id:0,
 				swiperCurrent: 0,
 				videoContext: '',
 				currentVideoInfo: {},
@@ -280,7 +281,8 @@
 				this.initTabs();
 			})
 		},
-		onLoad(e) {
+		onLoad(e) {
+			// console.log('11111111111111111111',e)
 			let that = this;
 			uni.getSystemInfo({
 				success(res) {
@@ -289,6 +291,9 @@
 			});
 			if (e.video_id) {
 				this.video_id = Number(e.video_id)
+			}
+			if(e.chapter_id && Number(e.chapter_id) >  0){
+				this.swiperCurrent = Number(e.chapter_id) -1;
 			}
 			uni.getSystemInfo({
 				success: res => {

pages/zhuiju/index.vue

@@ -0,0 +1,197 @@
+<template>
+	<view>
+		<view class="body">
+			<view class="pd16_15" style="box-shadow: 0px 0px 20upx 0px rgba(0,0,0,0.2);  border-radius: 20upx;">
+				<view>
+					<view class="flex alcenter space top-show">
+						<view class="flex alcenter">
+							<text class="ft16 ftw600 cl-main">最近观看</text>
+						</view>
+
+						<navigator url="/pages/zhuiju/zjgk">
+							<view class="ft14 cl-notice" v-show="historyList.length >  3">更多</view>
+							<!-- <view class="ft14 cl-notice" >更多</view> -->
+						</navigator>
+					</view>
+				</view>
+				<view class="mt16 history-box ">
+					<block v-for="(value,key) in historyList" :key="key" v-if="key<3">
+						<view class="history-item-box" @click="detail(value.video_id,value.watch_episode_num)">
+							<image class="history-item-image" :src="value.cover_image"></image>
+							<label class="history-item-title">{{value.name}}</label>
+						</view>
+					</block>
+					<view class="box pb10 history-item-box  history-add-box" @click="goToJuYuan">
+						<image class="add-icon" src="/static/img/zhuiju/add.png"></image>
+					</view>
+
+				</view>
+			</view>
+			<view class="mt24 pd16_15">
+				<view class="flex alcenter space">
+					<view class="flex alcenter">
+						<text class="ft16 ftw600 cl-main">我的追剧</text>
+					</view>
+				</view>
+				<view class="mt16 zuiju-box">
+					<block v-if="zhuijuList.length >  0" v-for="(value,key) in zhuijuList" :key="key">
+						<view class="box pd16_15  mb16 zuiju-box-item">
+							<image @click="detail(value.video_id,value.watch_episode_num)" class="zuiju-box-item-cover" :src="value.cover_image"></image>
+							<view class="zuiju-box-item-info" @click="detail(value.video_id,value.watch_episode_num)">
+								<label class="zuiju-box-item-info-title">{{value.name}}</label>
+								<label class="zuiju-box-item-info-juji">看到<span
+										class="guankan">{{value.watch_episode_num}}集</span></label>
+								<label class="zuiju-box-item-info-gx">更新至<span
+										class="update-ji">{{value.updated_episode_num}}集</span></label>
+							</view>
+							<view class="zuiju-box-item-del-box" @click="delzj(value.video_id)">
+								<image class="del-icon" src="../../static/img/zhuiju/delete.png"></image>
+							</view>
+						</view>
+
+					</block>
+				</view>
+				<view v-if="is_show" class="mt16 zuiju-box-kong">
+					<image src="../../static/img/zhuiju/kong.png"></image>
+					<text class="ft14">暂无追剧</text>
+					<label class="ft16" @click="goToJuYuan()">去追剧</label>
+				</view>
+			</view>
+		</view>
+
+	</view>
+	</view>
+</template>
+<script>
+	import {
+		watchRecord,
+		shelfList,
+		delShelf
+	} from "@/common/apis/zju.js";
+	export default {
+		data() {
+			return {
+				more_text: "查看全部",
+				qdjl: 0,
+				tdsy: 0,
+				navLock: false,
+				datasa: [],
+				showdyxx: true,
+				dataconfig: [],
+				banners: [],
+				datainfo: [],
+				dataindex: [],
+				newsa: [],
+				record: [],
+				historyList: [],
+				zhuijuList: [],
+				mbgColor: this.$mbgColor,
+				is_show_more: false,
+				is_show: false
+			}
+		},
+		computed: {
+
+		},
+		onPageScroll(e) {
+
+		},
+		onShareAppMessage(e) {
+
+		},
+		onShareTimeline(e) {
+
+		},
+		onLoad(e) {},
+		onShow() {
+			this.getList();
+		},
+		methods: {
+			changeList() {
+				if (this.is_show_more) {
+					this.more_text = "查看全部";
+				} else {
+					this.more_text = "收起"
+				}
+				this.is_show_more = !this.is_show_more;
+			},
+			async getList() {
+				this.historyList = await watchRecord();
+				this.zhuijuList = await shelfList();
+				if (this.zhuijuList.length < 1) {
+					this.is_show = 1;
+				}else{
+					this.is_show =0;
+				}
+			},
+			saoma() {
+				//#ifdef APP-PLUS  
+				uni.scanCode({
+					success: function(res) {
+						if (res.result.indexOf("uid") != -1) {
+							var obj = JSON.parse(res.result);
+							if (obj.uid) {
+								uni.navigateTo({
+									url: '/pages/login/reg?uid=' + obj.uid
+								})
+							}
+						} else {
+							uni.showToast({
+								title: res.result,
+								icon: "none"
+							});
+						}
+					}
+				});
+				//#endif
+
+			},
+			detail(video_id,item_id) {
+				// console.log(value);
+				uni.navigateTo({url: '/pages/video/index?video_id='+video_id+"&chapter_id="+item_id})
+				// uni.navigateTo({
+				// 	url: '/pages/video/index?video_id=' + value.video_id 
+				// })
+			},
+			linkTo(e) {
+				if (this.isLogin == false) {
+					this.showLogin = true;
+				} else {
+					let link = e.currentTarget.dataset.link;
+					uni.navigateTo({
+						url: link
+					})
+				}
+			},
+			async delzj(id) {
+				let res = await delShelf(id);
+				uni.showToast({
+					title: "删除成功",
+					icon: "none"
+				});
+				// 更新最近列表数据
+				this.zhuijuList = await shelfList();
+				console.log(res);
+			},
+			exchange(e) {
+				if (this.isLogin == false) {
+					this.showLogin = true;
+				} else {
+					let id = e.currentTarget.dataset.id;
+					uni.navigateTo({
+						url: '/pages/client/integral/exchange?id=' + id
+					})
+				}
+			},
+			goToJuYuan() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
+			}
+		},
+	}
+</script>
+
+<style>
+	@import url("style/index.css");
+</style>

pages/zhuiju/style/index.css

@@ -0,0 +1,318 @@
+.home-header {
+	height: 300rpx;
+	width: 100%;
+	position: relative;
+	border-radius: 0rpx 0rpx 48rpx 48rpx;
+}
+
+.history-box {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+}
+
+.history-item-box {
+	display: flex;
+	max-width: 22%;
+	margin-left: .5rem;
+	margin-bottom: .5rem;
+	justify-content: center;
+	flex-flow: column;
+}
+
+.history-add-box {
+	height: 200rpx;
+	align-items: center;
+
+}
+
+.history-item-box:first {
+	margin-left: 0px;
+}
+
+.history-item-image {
+	height: 200rpx;
+	max-width: 100%;
+	position: relative;
+	border-radius: 20rpx;
+}
+
+.history-item-title {
+	font-size: 28rpx;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	text-align: left;
+}
+
+.add-icon {
+	align-items: center;
+	width: 60rpx;
+	height: 60rpx;
+}
+
+.top-show {
+	margin-bottom: .5rem;
+}
+
+.home-main {
+	width: 100%;
+	position: relative;
+	margin-top: -156rpx;
+	padding: 0 30rpx;
+}
+
+.home-mendian {
+	width: 100%;
+	height: 84rpx;
+	background: rgba(255, 255, 255, 0.1);
+	border-radius: 42rpx;
+}
+
+.integral-mall-header {
+	position: relative;
+	height: 320rpx;
+}
+
+.integral-mall-header .bg {
+	width: 100%;
+	height: 320rpx;
+}
+
+.integral-mall-header .main {
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 320rpx;
+}
+
+.swiper-integral {
+	height: 32rpx;
+	width: 100%;
+}
+
+.integral-mall-main {
+	position: relative;
+	/* margin-top: -104rpx; */
+}
+
+.integal-mall-menu {
+	width: 100%;
+	height: 190rpx;
+	background: #FFFFFF;
+	border-radius: 20rpx;
+}
+
+.integral-tuan-l {
+	width: 100%;
+	height: 280rpx;
+	background: #f2f2f2;
+	border-radius: 16rpx;
+}
+
+
+.integral-mall-coupon {
+	background: #FFFFFF;
+	position: relative;
+	border-radius: 16rpx;
+	overflow: hidden;
+}
+
+.integral-mall-coupon .top {
+	padding: 0rpx 0rpx 24rpx 0rpx;
+	border-bottom: 2rpx dashed #FEC675;
+}
+
+.integral-mall-coupon .y-l,
+.integral-mall-coupon .y-r {
+	width: 20rpx;
+	height: 20rpx;
+	border-radius: 10rpx;
+	background: #F5F6FA;
+	position: absolute;
+	z-index: 2;
+	top: 284rpx;
+}
+
+.integral-mall-coupon .y-l {
+	left: -10rpx;
+}
+
+.integral-mall-coupon .y-r {
+	right: -10rpx;
+}
+
+.integral-mall-coupon .coupon-value {
+	width: 100%;
+}
+
+.integral-mall-coupon .coupon-value image {
+	width: 100%;
+}
+
+.integral-mall-coupon .coupon-value .num {
+	width: 100%;
+	height: 64rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	left: 0;
+	top: 0;
+}
+
+.integral-mall-goods {
+	width: 100%;
+	height: 280rpx;
+	background: #F2F2F2;
+	border-radius: 16upx;
+}
+
+.titleNview-placing {
+	height: var(--status-bar-height);
+	padding-top: 44px;
+	box-sizing: content-box;
+}
+
+.tuan-product-l {
+	width: 150rpx;
+	height: 200rpx;
+	border-radius: 16rpx;
+	background: #F2F2F2;
+}
+
+.tuan-product-r {
+	width: calc(100% - 150rpx);
+}
+
+.btn-vip-adviser {
+	width: 150rpx;
+	height: 60rpx;
+	border-radius: 20rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 28rpx;
+	/* font-weight: 600; */
+	background: #FF6600;
+	color: #FFFFFF;
+}
+
+.zuiju-box {
+	display: flex;
+	width: 100%;
+	flex-direction: column;
+
+}
+
+.zuiju-box-item {
+	display: flex;
+	flex-direction: row;
+}
+
+.zuiju-box-item-cover {
+	flex-grow: 1;
+	min-width: 150rpx;
+	max-width: 150rpx;
+	height: 200rpx;
+	border-radius: 16rpx;
+	background: #F2F2F2;
+}
+
+.zuiju-box-item-info {
+	max-width: 70%;
+	display: flex;
+	flex-grow: 4;
+	padding: 0 5px;
+	flex-direction: column;
+}
+
+.zuiju-box-item-info-title {
+	display: block;
+	font-size: 17px;
+	height: 55px;
+	line-height: 25px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	text-align: left;
+	font-weight: bold;
+	grid-row: 4;
+}
+
+.zuiju-box-item-info-juji {
+	grid-row: 1;
+
+	display: block;
+	font-size: 12px;
+	line-height: 20px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	text-align: left;
+}
+
+.zuiju-box-item-info-gx {
+	display: block;
+	font-size: 12px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	text-align: left;
+	line-height: 20px;
+	grid-row: 1;
+}
+
+.zuiju-box-item-del-box {
+	height: 100%;
+	min-width: 30rpx;
+	flex-grow: 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 220rpx;
+	align-items: center;
+}
+
+.del-icon {
+	width: 20px;
+	height: 20px;
+	align-items: center;
+}
+.guankan{
+	padding-left: 5px;
+	color: #FF6600;
+}
+.update-ji{
+	padding-left: 5px;
+	font-weight: bold;
+}
+.zuiju-box-kong{
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	align-items: center; 
+	padding-bottom: 50rpx;
+}
+.zuiju-box-kong image {
+	width: 100px;
+	height: 100px;
+}
+.zuiju-box-kong text {
+	padding-top: 10rpx;
+	color: #b2b2b2;
+	
+}
+
+.zuiju-box-kong label {
+	margin: 10rpx 0rpx;
+	padding: 15rpx 60rpx;
+	color: #fff;
+	background-color: #FF6600;
+	border-radius: 9rpx;
+}
+
+.body{
+	background-color: #fff;
+}

pages/zhuiju/style/zuijin.css

@@ -0,0 +1,67 @@
+.integral-mall-goods {
+	width: 100%;
+	height: 280rpx;
+	background: #F2F2F2;
+	border-radius: 16upx;
+}
+
+.user-not-vip {
+	width: 100%;
+	height: 80rpx;
+	background: #FDF6EC;
+	border-radius: 40rpx;
+	border: 2rpx solid #EFC381;
+	text-align: center;
+	line-height: 76rpx;
+	font-size: 24rpx;
+	color: #000000;
+	font-weight: bold;
+}
+
+
+.tuan-product-l {
+	width: 150rpx;
+	height: 200rpx;
+	border-radius: 16rpx;
+	background: #F2F2F2;
+}
+
+.tuan-product-r {
+	width: calc(100% - 150rpx);
+}
+
+.btn-vip-adviser {
+	width: 150rpx;
+	height: 60rpx;
+	border-radius: 20px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 28rpx;
+	/* font-weight: 600; */
+	background: #FF6600;
+	color: #FFFFFF;
+}
+
+.search-result {
+	padding-top: 10px;
+	padding-bottom: 20px;
+	text-align: center;
+}
+
+.search-result-text {
+	text-align: center;
+	font-size: 14px;
+	color: #666;
+}
+
+.example-body {
+	/* #ifndef APP-NVUE */
+	display: block;
+	/* #endif */
+	padding: 0px;
+}
+
+.uni-mt-10 {
+	margin-top: 10px;
+}

pages/zhuiju/zjgk.vue

@@ -0,0 +1,60 @@
+<template>
+	<view>
+		<view class="" style="padding: 30upx 30upx 0px 30upx;">
+			<block v-for="(value,key) in list" :key="key">
+				<view @click="detail(value.video_id,value.video_series_sequence)" style="position: relative;"
+					class="flex alcenter mb16">
+					<image mode="aspectFill" class="tuan-product-l" :src="value.cover_image"></image>
+					<view class="tuan-product-r pl15">
+						<view class="ft16 ftw600 cl-main text-over2">{{value.name}}</view>
+						<view class="mt16">
+							<p class="ft14 "> </p>
+						</view> 
+						<view class="mt16 flex space alcenter">
+							<p class="ft14 ">看到 <label class="ft14 cl-orange">&nbsp;&nbsp;{{value.video_series_sequence}}集</label></p>
+							<view class="btn-vip-adviser ml15">继续观看</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		watchRecord,
+		shelfList,
+		delShelf
+	} from "@/common/apis/zju.js";
+	export default {
+		data() {
+			return {
+				list: []
+			}
+		},
+		onLoad(e) {
+
+		},
+		async onShow() {
+			this.list = await watchRecord();
+		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+		onReachBottom() {
+
+		},
+		methods: {
+			detail(vid, item_id) {
+				uni.navigateTo({url: '/pages/video/index?video_id='+vid+"&chapter_id="+item_id})
+			}
+		}
+	}
+</script>
+
+<style>
+@import url("style/zuijin.css");
+</style>