Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/duanju/video_app into test

common/config.js

@@ -1,10 +1,10 @@
 // const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
 // const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
-// const ROOTPATH2 = "https://dj-api.hnsiyao.cn"; //后台服务域名
+// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
 
 const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
 const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
-const ROOTPATH2 = "https://video.hnsiyao.cn"; //后台服务域名
+const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
 
 module.exports = {
 	APIHOST: ROOTPATH,

pages.json

@@ -12,6 +12,15 @@
 
 			}
 		},
+		{
+			"path": "pages/task/index",
+			"style": {
+				"navigationBarTitleText": "任务",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
+		
+			}
+		},
 		{
 			"path": "pages/me/erweimaRegister",
 			"style": {
@@ -617,6 +626,12 @@
 				"selectedIconPath": "static/tabbar/learn_@2x.png",
 				"text": "推荐"
 			},
+			{
+				"pagePath": "pages/task/index",
+				"iconPath": "static/tabbar/task@2x.png",
+				"selectedIconPath": "static/tabbar/task_@2x.png",
+				"text": "任务"
+			},
 			{
 				"pagePath": "pages/chasingDrama/chasingDrama",
 				"iconPath": "static/tabbar/zhuiju.png",

pages/index/index.vue

@@ -175,6 +175,9 @@
 			<!-- 追剧悬浮 -->
 			<drag-button v-if="shodrag && shodrags" @clickClose="clickClose" :videoInfo="videoInfo" :isDock="true"
 				:existTabBar="true" @btnClick="btnClick" />
+			<u-image @click="goMsg('/me/choujiang/choujiang')" :src="`../../static/images/draw/draw_${draw}.png`" 
+				style="width: 110rpx;height: 110rpx;position: fixed;right: 30rpx;bottom: 180rpx;"
+			></u-image>
 	</view>
 </template>
 
@@ -230,6 +233,7 @@
 				phbVideoList: [], //排行榜视频
 				newVideList: [], //最新热播
 				videoInfo: [],
+				draw: Math.floor((Math.random() * 12) + 1),
 			};
 		},
 		onShareAppMessage(res) {
@@ -713,7 +717,7 @@
 				});
 			},
 			// 跳转公告链接
-			goMsg(e) {
+			goMsg(url) {
 				if (url.indexOf('/pages/') !== -1 || url.indexOf('/me/') !== -1) {
 					uni.navigateTo({
 						url

pages/task/index.vue

@@ -0,0 +1,198 @@
+<!-- 任务中心 -->
+<template>
+	<view class="container">
+		<u-navbar :background="background" :is-back="false" :title="title" :border-bottom="false"></u-navbar>
+		<view class="task_bg u-absolute">
+			<u-image class="task_bg" src="../../static/images/me/task_bg.png" ></u-image>
+		</view>
+		<view class="icon u-relative padding">
+			<u-image class="task_icon1 u-relative" src="../../static/images/me/task_icon1.png"></u-image>
+			<view class="icon_title u-font-32 text-bold u-relative">新人好礼送不停</view>
+			<u-image class="task_icon2 u-relative" src="../../static/images/me/task_icon2.png"></u-image>
+		</view>
+		<view class="content margin-lr padding bg-white u-relative" v-if="cellList.length>0">
+
+			<view class="cell flex justify-between" v-for="(item,index) in cellList" :key="index">
+				<view class="cell_left flex">
+					<view class="cell_title flex">
+						<view class="u-font-28 text-bold">{{ item.title}}</view>
+						<u-image v-if="item.rewardImg " class="cell_icon" :src="item.rewardImg "></u-image>
+						<view class="u-font-24 tip">{{ item.rewardDetail  }}</view>
+					</view>
+					<view class="subhead u-font-24">{{ item.detail }}</view>
+				</view>
+				<view class="cell_right flex">
+					<view v-if=" item.type == 2 " class="btn u-font-24 text-bold opt" @click="goNav(item)">{{ item.buttonTitle }}</view>
+					<view v-else-if=" item.type == 3 " class="btn u-font-24 text-bold disabled">{{ item.buttonTitle }}</view>
+					<view v-else class="btn u-font-24 text-bold" @click="goNav(item)">{{ item.buttonTitle }}</view>
+					<view v-if=" item.type ==4 " class="u-font-20 tip" @click="goNav('/me/gift/gift', item.type)">查看奖品列表</view>
+				</view>
+			</view>
+
+		</view>
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+		},
+		data() {
+			return {
+				title: '',
+				page: 1,
+				limit: 999,
+				background: {
+					backgroundImage: 'linear-gradient(to right, #FFE5EA 0%, #E4F5FB 49%, #FFF0EE 100%)'
+				},
+				cellList: [
+					{
+						title: '分享奖励', type: 1, url: '/me/invite/index', icon: '../../static/images/me/task_icon3.png', tip: '奖励888金币', subhead: '分享好友即可获得', btnText:'立即分享'
+					},
+					{
+						title: '每日签到奖励', type: 2, url: '/pages/index/index', icon: '../../static/images/me/task_icon3.png', tip: '奖励8898金币', subhead: '每日付款满3笔即可获得', btnText:'立即看剧'
+					},
+					{
+						title: '每周打卡奖励', type: 3, url: '/me/invite/index', icon: '', tip: '', subhead: '签到满7天即可获得丰富好礼', btnText:'剩余23次'
+					},
+					{
+						title: '每月打卡奖励1', type: 4, url: '/me/invite/index', icon: '', tip: '', subhead: '当月签到满21天获得丰富好礼', btnText:'剩余233次'
+					},
+					{
+						title: '每月打卡奖励2', type: 5, url: '/me/invite/index', icon: '../../static/images/me/task_icon4.png', tip: '奖励金币', subhead: '当月签到满21天即可免费领取', btnText:'立即领取'
+					},
+					{
+						title: '观看视频奖励', type: 6, url: '/me/invite/index', icon: '../../static/images/me/task_icon3.png', tip: '奖励金币', subhead: '观看完整视频即可获得奖励', btnText:'观看视频'
+					},
+				]	
+			}
+		},
+		onShow() {
+			this.getvipdata()
+		},
+		methods: {
+			//
+			goNav( item ) {
+				console.log(url)
+				if ( type == 2) {
+					uni.switchTab({
+						url: item.buttonUrl
+					})
+				} else {
+					uni.navigateTo({
+						url: item.buttonUrl
+					})
+				}
+				
+			},
+			getvipdata() {
+				let data = {
+					page: this.page,
+					limit: this.limit
+				}
+				this.$Request.getT('app/taskCenter/selectTaskCenter', data).then(res => {
+					if (res.code == 0 ) {
+						this.cellList = res.data.records
+					} else {
+						
+
+					}
+				})
+			},
+		
+			
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.container{
+		width: 100%;
+		.task_bg{
+			width: 100%!important;
+			height: 494rpx!important;
+		}
+		.icon{
+			.icon_title{
+				color: #000000;
+				margin-left: 28rpx;
+				top: -20rpx;
+
+			}
+			.task_icon1{
+				width: 74rpx!important;
+				height: 78rpx!important;
+				margin-left: 235rpx;
+			}
+			.task_icon2{
+				width: 126rpx!important;
+				height: 120rpx!important;
+				top: -40rpx;
+			}
+		}
+		.content{
+			border-radius: 16rpx;
+			top: -115rpx;
+			padding: 28rpx;
+			.cell{
+				align-items: center;
+				padding: 32rpx 0;
+				border-bottom: 2rpx solid #EBEBEB;
+				.cell_left{
+					flex-direction: column;
+					.cell_title{
+						align-items: center;
+						margin-bottom: 12rpx;
+						color: #333;
+						.cell_icon{
+							width: 34rpx!important;
+							height: 34rpx!important;
+							margin-left: 16rpx;
+						}
+						.tip{
+							margin-left: 22rpx;
+							color: #FC5B67;
+						}
+					}
+					.subhead{
+						color: #999;
+					}
+				}
+				.cell_right{
+					flex-direction: column;
+					align-items: center;
+					.btn{
+						width: 148rpx;
+						height: 56rpx;
+						line-height: 56rpx;
+						text-align: center;
+						background-color: #EC6F48;
+						color: #FFFFFF;
+						border-radius: 12rpx 12rpx 12rpx 12rpx;
+					}
+					.tip{
+						color: #666;
+						height: 44rpx;
+						line-height: 44rpx;
+					}
+					.opt{
+						color: #D39B7E;
+						background-color: #FBF3EB;
+					}
+					.disabled{
+						color: #999999;
+						background-color: #E2E2E2;
+					}
+				}
+				
+			}
+			.cell:last-child{
+				border-bottom: none;
+			}
+		}
+	}
+	
+
+</style>