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

common/httpRequest.js

@@ -41,7 +41,9 @@ module.exports = {
 			title: '用户信息失效，请重新登录！',
 			icon: 'none'
 		})
-
+		uni.navigateTo({
+			url: "/pages/login/login"
+		})
 	},
 	post: function(url, data, header) {
 		let that = this;

me/detail/detail.nvue

@@ -140,11 +140,16 @@
 						<text class="list-title-lss">
 							当前视频 没有播放权限
 						</text>
+						
 					</view>
+					
 					<view class="list-title-r" @click="closePay()">
 						<image class="list-title-rs" src="../../static/images/me/closeIconss.png" mode=""></image>
 					</view>
 				</view>
+				<text class="" style="font-size: 24rpx;color: #999;padding: 0 34rpx;margin: 20rpx 0; auto;text-align: left;width: 100%;">
+					{{getRedEnvelopeTips}}
+				</text>
 				<view class="pay-content">
 					<!-- <view class="pay-content-item" @click="payVideo(1)" v-if="zhengbu === '是'">
 						<image class="pay-content-item-icon" src="../../static/images/me/rmIcon.png" mode=""></image>
@@ -384,7 +389,8 @@
 				},
 				isShowVideo: '',
 				noBuyVideoIndex:null,
-				playFlag: false
+				playFlag: false,
+				getRedEnvelopeTips: ''
 			};
 		},
 		onUnload() {
@@ -476,6 +482,12 @@
 			if(this.courseId){
 				this.getDataList(this.courseId, this.courseDetailsId);
 			}
+			httpsRequest.getT('app/course/getRedEnvelopeTips').then(res => {
+				console.log(res)
+				if (res.code == 0) {
+					this.getRedEnvelopeTips= res.data
+				}
+			})
 		},
 		onLoad(e) {
 			//是开启整部购买

me/detail/detail.vue

@@ -194,9 +194,7 @@
 					<!-- <u-icon name="lock" class="list-title-icon" color="#efbb6b" size="40"></u-icon> -->
 					当前视频 没有播放权限
 				</view>
-				<view class="" style="font-size: 24rpx;color: #999;padding: 0 34rpx;margin-bottom: 20rpx;">
+				<view class="" style="font-size: 24rpx;color: #999;padding: 0 34rpx;margin-bottom: 20rpx;">{{getRedEnvelopeTips}}</view>
-					每日前三次付款均可获取抽奖机会抽奖保底抽中等额现金红包当前为第x次付款
-				</view>
 				
 				<!-- <view class="list-item" v-if="zhengbu === '是' && isWxIosPay == true">
 					<view class="list-item-box flex align-center justify-center" @click="payVideo(1)">
@@ -431,6 +429,7 @@
 				countPrice: 0, //单集价格
 				isWxIosPay: true,
 				playFlag: false,
+				getRedEnvelopeTips: ''
 			};
 		},
 		onShareAppMessage(res) {
@@ -682,6 +681,11 @@
 			if(this.courseId){
 				this.getDataList(this.courseId, this.courseDetailsId);
 			}
+			this.$Request.getT('app/course/getRedEnvelopeTips').then(res => {
+				if (res.code == 0) {
+					this.getRedEnvelopeTips= res.data
+				}
+			})
 
 			// uni.$on('back', (data) => {
 			// 	if (data.flag == true) {

me/detail/detailIOS.nvue

@@ -143,6 +143,9 @@
 						<image class="list-title-rs" src="../../static/images/me/closeIconss.png" mode=""></image>
 					</view>
 				</view>
+				<text class="" style="font-size: 24rpx;color: #999;padding: 0 34rpx;margin: 20rpx 0; auto;text-align: left;width: 100%;">
+					{{getRedEnvelopeTips}}
+				</text>
 				<view class="pay-content">
 					<!-- <view class="pay-content-item" @click="payVideo(1)" v-if="zhengbu === '是'">
 						<image class="pay-content-item-icon" src="../../static/images/me/rmIcon.png" mode=""></image>
@@ -361,6 +364,7 @@
 				iosPayId: '',
 				isCollect: false,
 				playFlag: false,
+				getRedEnvelopeTips: ''
 
 			};
 		},
@@ -465,6 +469,11 @@
 				this.getDataList(this.courseId, this.courseDetailsId);
 
 			}
+			httpsRequest.getT('app/course/getRedEnvelopeTips').then(res => {
+				if (res.code == 0) {
+					this.getRedEnvelopeTips= res.data
+				}
+			})
 		},
 		onLoad(e) {
 			let that = this

pages/index/index.vue

@@ -175,7 +175,7 @@
 			<!-- 追剧悬浮 -->
 			<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`" 
+			<u-image @click="goMsg('/me/choujiang/choujiang')" :src="`../../static/images/draw/draw.gif`" 
 				style="width: 110rpx;height: 110rpx;position: fixed;right: 30rpx;bottom: 180rpx;"
 			></u-image>
 	</view>

pages/task/index.vue

@@ -47,24 +47,24 @@
 					backgroundImage: 'linear-gradient(to right, #FFE5EA 0%, #E4F5FB 49%, #FFF0EE 100%)'
 				},
 				cellList: [
-					{
+					// {
-						title: '分享奖励', type: 1, url: '/me/invite/index', rewardImg: '../../static/images/me/task_icon3.png', rewardDetail: '奖励888金币', detail: '分享好友即可获得', buttonTitle:'立即分享'
+					// 	title: '分享奖励', type: 1, url: '/me/invite/index', rewardImg: '../../static/images/me/task_icon3.png', rewardDetail: '奖励888金币', detail: '分享好友即可获得', buttonTitle:'立即分享'
-					},
+					// },
-					{
+					// {
-						title: '每日签到奖励', type: 2, url: '/pages/index/index', rewardImg: '../../static/images/me/task_icon3.png', rewardDetail: '奖励8898金币', detail: '每日付款满3笔即可获得', buttonTitle:'立即看剧'
+					// 	title: '每日签到奖励', type: 2, url: '/pages/index/index', rewardImg: '../../static/images/me/task_icon3.png', rewardDetail: '奖励8898金币', detail: '每日付款满3笔即可获得', buttonTitle:'立即看剧'
-					},
+					// },
-					{
+					// {
-						title: '每周打卡奖励', type: 3, url: '/me/invite/index', rewardImg: '', rewardDetail: '', detail: '签到满7天即可获得丰富好礼', buttonTitle:'剩余23次'
+					// 	title: '每周打卡奖励', type: 3, url: '/me/invite/index', rewardImg: '', rewardDetail: '', detail: '签到满7天即可获得丰富好礼', buttonTitle:'剩余23次'
-					},
+					// },
-					{
+					// {
-						title: '每月打卡奖励1', type: 4, url: '/me/invite/index', rewardImg: '', rewardDetail: '', detail: '当月签到满21天获得丰富好礼', buttonTitle:'剩余233次'
+					// 	title: '每月打卡奖励1', type: 4, url: '/me/invite/index', rewardImg: '', rewardDetail: '', detail: '当月签到满21天获得丰富好礼', buttonTitle:'剩余233次'
-					},
+					// },
-					{
+					// {
-						title: '每月打卡奖励2', type: 5, url: '/me/invite/index', rewardImg: '../../static/images/me/task_icon4.png', rewardDetail: '奖励金币', detail: '当月签到满21天即可免费领取', buttonTitle:'立即领取'
+					// 	title: '每月打卡奖励2', type: 5, url: '/me/invite/index', rewardImg: '../../static/images/me/task_icon4.png', rewardDetail: '奖励金币', detail: '当月签到满21天即可免费领取', buttonTitle:'立即领取'
-					},
+					// },
-					{
+					// {
-						title: '观看视频奖励', type: 6, url: '/me/invite/index', rewardImg: '../../static/images/me/task_icon3.png', rewardDetail: '奖励金币', detail: '观看完整视频即可获得奖励', buttonTitle:'观看视频'
+					// 	title: '观看视频奖励', type: 6, url: '/me/invite/index', rewardImg: '../../static/images/me/task_icon3.png', rewardDetail: '奖励金币', detail: '观看完整视频即可获得奖励', buttonTitle:'观看视频'
-					},
+					// },
 				]	
 			}
 		},