11

11

common/apis/zju.js

@@ -0,0 +1,10 @@
+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');
+} 

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},

pages/client/style/zui.css

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

pages/client/zui.vue

@@ -1,39 +1,39 @@
 <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="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">
 						<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/zjgk">
-						<view class="ft14 cl-notice">更多</view>
-						</navigator>
+						<view class="ft14 cl-notice" v-if="historyList.length >  0"  @click="changeList" >{{more_text}}</view>
 					</view>
-					<view class="mt16 flex space">
+					<view class="mt16 flex space" v-if="historyList.length >  0" >
 						<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> -->
+							<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 class="mt16 flex space" v-if="historyList.length <  1" >
+						<block>
+							<view class="box pb10"  style="width:31%; position: relative; border-radius:20rpx;">
+								
+							</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>
+						<!-- <view class="ft14 cl-notice">更多</view> -->
 						</navigator>
 					</view>
 					<view class="mt16">
@@ -54,6 +54,9 @@
 						</view>
 						</block>
 					</view>
+					<view class="mt16">
+						
+					</view>
 				</view>	
 			</view>
 			
@@ -68,6 +71,7 @@
 		},
 		data(){
 			return {
+				more_text:"查看全部",
 				qdjl:0,
 				tdsy:0,
 				navLock:false,
@@ -79,8 +83,11 @@
 				dataindex:[],
 				newsa:[],
 				record:[],
+				historyList:[],
+				zhuijuLits:[],
 				mbgColor:this.$mbgColor,
-				sign_list: []
+	
+				is_show_more:false,
 			}
 		},
 		computed:{
@@ -108,6 +115,13 @@
 			},
 			getsigin(e) {
 			    console.log('已点击签到------');
+			},changeList(){
+				if(this.is_show_more){
+					this.more_text = "收起";
+				}else{
+					this.more_text = "查看全部"
+				}
+				this.is_show_more = !this.is_show_more;
 			},
 			getList() {
 				let this_=this
@@ -183,132 +197,5 @@
 </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;
-	}
+	@import url("style/zui.css");
 </style>