zqwang 1 年之前
父節點
當前提交
45ef24d672
共有 10 個文件被更改,包括 621 次插入684 次删除
  1. 19 0
      common/apis/zju.js
  2. 1 7
      pages.json
  3. 1 1
      pages/client/member/index.vue
  4. 289 0
      pages/client/style/zui.css
  5. 67 0
      pages/client/tuan/style/zuijin.css
  6. 65 367
      pages/client/tuan/zjgk.vue
  7. 179 309
      pages/client/zui.vue
  8. 二進制
      static/img/zhuiju/add.png
  9. 二進制
      static/img/zhuiju/delete.png
  10. 二進制
      static/img/zhuiju/kong.png

+ 19 - 0
common/apis/zju.js

@@ -0,0 +1,19 @@
+import http from "../http.js";
+// 最近观看
+export const watchRecord = () => {
+	return http.get('/api/user/watchrecord/list');
+} 
+
+// 追剧列表
+export const shelfList = () => {
+	return http.get('/api/user/watchrecord/getshelf');
+} 
+
+// 删除追剧
+export const delShelf = id => {
+	return http.post('/api/user/watchrecord/cancelshelf',{video_id:id});
+} 
+// 添加追剧
+export const storeshelf = id => {
+	return http.post('/api/user/watchrecord/storeshel',{video_id:id});
+} 

+ 1 - 7
pages.json

@@ -439,14 +439,8 @@
 				"pagePath": "pages/client/index",
 				"iconPath": "static/icon/jy.png",
 				"selectedIconPath": "static/icon/xz_jy.png",
-				"text": "小剧场"
+				"text": "剧院"
 			},
-			// {
-			// 	"pagePath": "pages/client/video",
-			// 	"iconPath": "static/icon/yzy_zys.png",
-			// 	"selectedIconPath": "static/icon/yzy_zyss.png",
-			// 	"text": "推荐"
-			// }, 
 			{
 				"pagePath": "pages/client/member/index",
 				"iconPath": "static/icon/wd.png",

+ 1 - 1
pages/client/member/index.vue

@@ -115,7 +115,7 @@
 						show: 1
 					},
 
-					// {name:'收货地址',type:'link',model:'',link:'/pages/client/member/address',icon:this.$config.staticUrl + 'vipcard_icon_my_address@2x.png',show:0},
+					// {name:'收货地址',type:'git link',model:'',link:'/pages/client/member/address',icon:this.$config.staticUrl + 'vipcard_icon_my_address@2x.png',show:0},
 					// {name:'官方商城',type:'link',model:'',link:'/pages/client/shop',icon:this.$config.staticUrl + 'vipcard_icon_my_integral@2x.png',show:0},
 					// {name:'联系客服',type:'link',model:'',link:'/pages/client/vipcard/adviser',icon:this.$config.staticUrl + 'vipcard_icon_my_advise@2x.png',show:1},
 					// {name:'我的团队',type:'link',model:'',link:'/pages/client/mytuandui',icon:this.$config.staticUrl + 'vipcard_icon_my_invite@2x.png',show:3},

+ 289 - 0
pages/client/style/zui.css

@@ -0,0 +1,289 @@
+.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;
+}

+ 67 - 0
pages/client/tuan/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;
+}

+ 65 - 367
pages/client/tuan/zjgk.vue

@@ -1,368 +1,66 @@
-<template>
-	<view>
-		<!-- <sub-tabnav :tabs="tabs" @change="changeIndex" :selectIndex="selectIndex" :scrollTop="scrollTop"></sub-tabnav> -->
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- <view class="" style="background: #ffffff;"> 
-			<uni-search-bar @confirm="search" :focus="false" placeholder="请输入搜索内容" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
-							@cancel="cancel" @clear="clear">
-			</uni-search-bar>
-		</view> -->
-		<!-- #endif -->
-		<!-- <view style="margin:10upx 30upx 0 30upx;box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.04);">
-			<home-banner :banners="banners"></home-banner>
-		</view> -->
-		<view class="" style="padding: 30upx 30upx 0px 30upx;">
-			<block v-for="(value,key) in listData" :key="key">
-			<view @click="detail(value.vid,value.mid)" style="position: relative;" class="flex alcenter mb16">
-				<image mode="aspectFill" class="tuan-product-l" :src="value.img"></image>
-				<!-- <view class="btn-mini" style="position: absolute; top: 40upx; left: 280upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx;" :style="getBtnStyle">{{value.lxname}}</view> -->
-				<view class="tuan-product-r pl15">
-					<view class="ft16 ftw600 cl-main text-over2">{{value.vname}}</view>
-					<view class="mt16">
-						<text class="ft14 cl-orange">{{value.dqname}}</text>
-					</view>
-					<view class="mt16 flex space alcenter">
-						<view class="ft14 cl-notice">{{value.mname}}</view>
-						<view class="btn-vip-adviser ml15">继续观看</view>
-					</view>
-				</view>
-			</view>
-			</block>
-			<!-- <uni-pagination title="" @change="onPageChange" v-if="total>pageSize" show-icon="true" :pageSize="pageSize" :total="total" current="1"></uni-pagination> -->
-		</view>
-		<uni-load-more :status="status" :content-text="contentText" />
-		<view style="width: 100%; height: 30upx;"></view>
-		<!-- <dialog-login v-if="showLogin" @loginYes="loginYes" @closed="showLogin = false"></dialog-login> -->
-		<!-- <com-footer model="tuan"></com-footer> -->
-		
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	  export default {
-		  components: {
-		  	uniLoadMore
-		  },
-		data(){
-			return {
-				banners:[],
-				vipLevel:0,
-				isLogin:true,
-				showLogin:false,
-				datasa:[],
-				dataconfig:[],
-				searchValue:'',
-				total:0,
-				pageSize:10,
-				tabs:[
-					{name:'全部'},
-					{name:'视频'},
-					{name:'音频'},
-					{name:'小说'},
-					{name:'壁纸'},
-				],
-				selectIndex:0,
-				scrollTop:0,
-				
-				type2tab:[],
-				selecttype2:0,
-				type2id:'',
-				
-				type3tab:[],
-				selecttype3:0,
-				type3id:'',
-				
-				type4tab:[],
-				selecttype4:0,
-				type4id:'',
-				
-				typetab:[],
-				selecttype:0,
-				typeid:'',
-				
-				addddtab:[],
-				selectadddd:0,
-				addddid:'',
-				
-				yeartab:[],
-				selectyear:0,
-				yearid:'',
-				
-				type:'',
-				keytext:'',
-				listData: [],
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-			}
-		},
-		onLoad(e){
-			//console.log(111)
-			if(e.selectIndex){
-				this.selectIndex=e.selectIndex*1
-			}
-			this.status = 'more';
-			this.getList();
-			this.banners=uni.getStorageSync("config").banner
-		},
-		onPageScroll(e){
-			this.scrollTop = e.scrollTop;
-		},
-		onReachBottom() {
-			this.status = 'more';
-			this.getList();
-		},
-		//监听搜索框文本变化
-		onNavigationBarSearchInputChanged(e) {
-			let text = e.text;
-			if(text){
-				this.keytext=text;	
-			}
-			console.log(text)
-		},
-		//监听点击搜索按钮事件
-		onNavigationBarSearchInputConfirmed(e) {
-			// #ifdef APP-PLUS
-			plus.key.hideSoftKeybord();
-			// #endif
-			var this_=this
-			let text = e.text;
-			if (!text) {
-				uni.showModal({
-					title: '',
-					content:"请输入搜索内容",
-					showCancel: false,
-					confirmText: "确定",
-					confirmColor:"#e19503",
-					success: function (res) {
-						this_.keytext='';
-						this_.getList(0)
-					}
-				});
-				return;
-			} else {
-				this.keytext=text;
-				this.listData=[];
-				this.last_id=0;
-				this.type='';	
-				this.getList(0)
-			}
-			
-		},
-		methods:{
-			detail(vid,mid){
-				var fxpid=1
-				if(uni.getStorageSync("userinfo")){
-					 fxpid=uni.getStorageSync("userinfo").id
-				}
-				uni.navigateTo({
-					url:'/pages/client/tuan/detail?vid='+vid+'&mid='+mid+'&fxpid='+fxpid
-				})
-			},
-			onPageChange(e) {
-			    this.last_id=0
-			    this.reload=true
-			    this.getList()
-				uni.pageScrollTo({
-				    scrollTop: 0,
-				    duration: 100
-				});
-			},
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				if (this.last_id>0) {
-					//说明已有数据,目前处于上拉加载
-					this.status = 'loading';
-					data.offset = this.last_id*limit;
-					data._ = new Date().getTime() + '';
-				}
-				data.limit=limit	
-				if(uni.getStorageSync("userinfo")){
-					data.uid = uni.getStorageSync("userinfo").id;
-				}
-				uni.request({
-					url: this.configs.webUrl+'/api/video/videolog',
-					data: data,
-					success: data => {
-						//console.log(data.data)
-						
-						
-						if (data.data.total>0) {
-							let list = data.data.rows;
-							this.listData = this.reload ? list : this.listData.concat(list);
-							this.reload = false;
-							this.last_id = this.last_id+1;
-							if(data.data.total<this.last_id*limit){
-								this.status = '';
-							}
-						}else{
-							this.listData=[];
-							this.contentText.contentdown='没有数据'
-							this.status=''
-							
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-			changeIndex(index){
-				this.selectIndex = index;
-				this.type=this.tabs[index].name
-				this.getdata()				
-			},
-			changetype(index){
-				this.selecttype = index;
-				this.typeid=this.typetab[index].id
-				this.getdata()				
-			},
-			changeadddd(index){
-				this.selectadddd = index;
-				this.addddid=this.addddtab[index].id
-				this.getdata()				
-			},
-			changeyear(index){
-				this.selectyear = index;
-				this.yearid=this.yeartab[index].id
-				this.getdata()				
-			},
-			
-			changetype2(index){
-				this.selecttype2 = index;
-				this.type2id=this.type2tab[index].id
-				this.getdata()				
-			},
-			changetype3(index){
-				this.selecttype3 = index;
-				this.type3id=this.type3tab[index].id
-				this.getdata()				
-			},
-			changetype4(index){
-				this.selecttype4 = index;
-				this.type4id=this.type4tab[index].id
-				this.getdata()				
-			},
-			getdata(){
-				this.last_id=0
-				this.reload=true
-				this.getList()
-			},
-			loginYes(){
-				
-			},
-			mlinkTo(e){
-				if(this.isLogin == true){
-					let link = e.currentTarget.dataset.link;
-				}else{
-					this.showLogin = true;
-				}
-			},
-			search(res) {
-				this.listData=[];
-				this.last_id=0;
-				this.keytext=res.value;
-				this.type='';	
-				this.getList(0)
-			},
-	
-			clear(res) {
-			
-			},
-			input(res) {
-				console.log('----input:', res)
-			},
-			blur(res) { 
-				// this.listData=[];
-				// this.last_id=0;
-				// this.keytext=res.value;
-				// this.type='';	
-				// this.getList(0)
-				//res.value 
-			},
-			focus(e) {
-
-			},
-			cancel(res) {
-				this.keytext='';
-				this.type='';	
-				this.getList(0)
-			}
-		}
-	}
-</script>
-
-<style>
-.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: 20rpx;
-		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;
-		}
+<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, mid) {
+				var fxpid = 1
+				if (uni.getStorageSync("userinfo")) {
+					fxpid = uni.getStorageSync("userinfo").id
+				}
+				uni.navigateTo({
+					url: '/pages/client/tuan/detail?vid=' + vid + '&mid=' + mid + '&fxpid=' + fxpid
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+@import url("style/zuijin.css");
 </style>

+ 179 - 309
pages/client/zui.vue

@@ -1,314 +1,184 @@
-<template>
-	<view>
-		<!-- 标题栏和状态栏占位符 -->
-		<!-- <view class="titleNview-placing"> </view> -->
-		<!-- <siginIn :sign_list="sign_list" :qdjl="qdjl" :tdsy="tdsy"  @cksigin="cksigin" @click="getsigin"></siginIn> -->
-		<view class="pd16_15 mt16">
-			<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">
-						<view class="flex alcenter">
-							<!-- <image style="width: 40rpx;height: 40rpx;" :src="statics.zhuico[0]"></image> -->
-							<text class="ft16 ftw600 cl-main">最近观看</text>
-						</view>
+<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/client/tuan/zjgk">
-						<view class="ft14 cl-notice">更多</view>
-						</navigator>
-					</view>
-					<view class="mt16 flex space">
-						<block v-for="(value,key) in newsa" :key="key" v-if="key<3">
-						<view class="box pb10" style="width:31%; position: relative; border-radius:20rpx;" @click="detail(value.vid,value.mid)">
-							<!-- <view class="btn-mini" style="position: absolute; top: 20upx; right: 20upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx; z-index: 1;" :style="getBtnStyle">{{value.lxname}}</view> -->
-							<image class="integral-mall-goods" mode="aspectFill" :src="value.img"></image>
-							<view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{value.vname}}</view>
-						</view>
-						</block>	
-				
-					</view>
-				</view>	
-				<view class="mt24">
-					<view class="flex alcenter space">
-						<view class="flex alcenter">
-							<!-- <image style="width: 40rpx;height: 40rpx;" :src="statics.zhuico[0]"></image> -->
-							<text class="ft16 ftw600 cl-main">我的追剧</text>
-						</view>
-						<navigator url="/pages/client/tuan/zjjl">
-						<view class="ft14 cl-notice">更多</view>
-						</navigator>
-					</view>
-					<view class="mt16">
-						<block v-for="(value,key) in record" :key="key">
-						<view @click="detail(value.vid,value.mid)" style="position: relative;" class="flex alcenter mb16">
-							<image mode="aspectFill" class="tuan-product-l" :src="value.img"></image>
-							<!-- <view class="btn-mini" style="position: absolute; top: 40upx; left: 280upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx;" :style="getBtnStyle">{{value.lxname}}</view> -->
-							<view class="tuan-product-r pl15">
-								<view class="ft16 ftw600 cl-main text-over2">{{value.vname}}</view>
-								<view class="mt16">
-									<text class="ft14 cl-orange">{{value.dqname}}</text>
-								</view>
-								<view class="mt16 flex space alcenter">
-									<view class="ft14 cl-notice">{{value.mname}}</view>
-									<view class="btn-vip-adviser ml15">继续观看</view>
-								</view>
+							<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.video_series_sequence)">
+								<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">
+					<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.atch_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>
-						</view>
-						</block>
-					</view>
-				</view>	
-			</view>
-			
-		</view>
-	</view>
-</template>
-<script>
-	import siginIn from '@/components/fanxiao-sign/sigin-in.vue';
-	export default{
-		components: {
-		    siginIn
-		},
-		data(){
-			return {
-				qdjl:0,
-				tdsy:0,
-				navLock:false,
-				datasa:[],
-				showdyxx:true,
-				dataconfig:[],
-				banners:[],
-				datainfo:[],
-				dataindex:[],
-				newsa:[],
-				record:[],
-				mbgColor:this.$mbgColor,
-				sign_list: []
-			}
-		},
-		computed:{
-			
-		},
-		onPageScroll(e){
-			
-		},
-		onShareAppMessage(e){
-			
-		},
-		onShareTimeline(e){
-			
-		},
-		onLoad(e){
-		},
-		onShow() {
-			this.getList();
-			let this_=this
-			console.log(this.dataindex)
-		},
-		methods:{
-			cksigin(){
-				this.getList();
+							
+						</block>
+					</view>
+					<view class="mt16 zuiju-box-kong">
+						<image src="../../static/img/zhuiju/kong.png"></image>
+						<label>去追剧</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,
+			}
+		},
+		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();
+			},
+			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(vid, mid) {
+				var fxpid = 1
+				if (uni.getStorageSync("userinfo")) {
+					fxpid = uni.getStorageSync("userinfo").id
+				}
+				uni.navigateTo({
+					url: '/pages/client/tuan/detail?vid=' + vid + '&mid=' + mid + '&fxpid=' + fxpid
+				})
+			},
+			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);
+				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
+					})
+				}
 			},
-			getsigin(e) {
-			    console.log('已点击签到------');
-			},
-			getList() {
-				let this_=this
-				let data = {};
-				if(uni.getStorageSync("userinfo")){
-					data.uid = uni.getStorageSync("userinfo").id;
-				}
-				uni.request({
-					url: this.configs.webUrl+'/api/video/zuiju',
-					data: data,
-					success: data => {
-						this.newsa=data.data.new
-						this.record=data.data.record
-						this.sign_list=data.data.getweek
-						this.qdjl=data.data.qdjl
-						this.tdsy=data.data.tdsy
-					},
-					fail: (data, code) => {
-					}
-				});
-			},
-			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(vid,mid){
-				var fxpid=1
-				if(uni.getStorageSync("userinfo")){
-					 fxpid=uni.getStorageSync("userinfo").id
-				}
-				uni.navigateTo({
-					url:'/pages/client/tuan/detail?vid='+vid+'&mid='+mid+'&fxpid='+fxpid
+			goToJuYuan(){
+				uni.switchTab({
+					url: '/pages/client/index'
 				})
-			},
-			linkTo(e){
-				if(this.isLogin == false){
-					this.showLogin = true;
-				}else{
-					let link = e.currentTarget.dataset.link;
-					uni.navigateTo({
-						url:link
-					})
-				}
-			},
-			
-			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
-					})
-				}
-			},
-		},
-	}
-</script>
-
-<style>
-	.home-header{
-		height: 300rpx;
-		width: 100%;
-		position: relative;
-		border-radius: 0rpx 0rpx 48rpx 48rpx;
-	}
-	.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;
-	}
+			}
+		},
+	}
+</script>
+
+<style>
+	@import url("style/zui.css");
 </style>

二進制
static/img/zhuiju/add.png


二進制
static/img/zhuiju/delete.png


二進制
static/img/zhuiju/kong.png