czg_team
/
video_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
GaoHao 2024-12-18 17:34:53 +08:00
parent 71f0e2215c 66e9d9a460
commit c401d2695d
19 changed files with 607 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hbuilderx/launch.json
View File

@ -18,7 +18,7 @@
"type" : "uniCloud" "type" : "uniCloud"
}, },
{ {
"playground" : "standard", "playground" : "custom",
"type" : "uni-app:app-android" "type" : "uni-app:app-android"
} }
] ]

38
components/pop-ling-qu.vue
View File

@ -23,9 +23,7 @@
</template> </template>
</view> </view>
<!-- <view class="u-flex u-row-center btn-box">
<view class="btn" @click="lingqu">立即领取</view>
</view> -->
<view class="u-flex close u-row-center"> <view class="u-flex close u-row-center">
<u-icon name="close-circle" :size="54" @click="close" color="#fff"></u-icon> <u-icon name="close-circle" :size="54" @click="close" color="#fff"></u-icon>
</view> </view>
@ -49,30 +47,8 @@
this.result = data this.result = data
this.show = true this.show = true
}, },
lingqu() {
const {
orderId,
id
} = this.result
this.$Request.postJson('app/discSpinning/receive', this.result).then(res => {
this.result = ''
console.log(res)
if (res.code == 0) {
uni.showToast({
title: '领取成功',
icon: 'none'
})
this.$emit('success')
this.close()
} else {
uni.showToast({
title: '领取失败',
icon: 'none'
})
}
})
},
close() { close() {
console.log('抽奖弹窗关闭');
this.show = false this.show = false
if(!this.result){ if(!this.result){
return return
@ -85,8 +61,14 @@
this.result = '' this.result = ''
console.log(res) console.log(res)
if (res.code == 0) { if (res.code == 0) {
this.$emit('close') console.log('抽奖领取成功');
this.close() const key=res.data==0?'isBindAliPay':undefined
this.$emit('close',key)
if(key&&key=='isBindAliPay'){
uni.navigateTo({
url:'/me/invite/zhifubao'
})
}
} else { } else {
} }
}) })

6
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "斯耀短剧", "name" : "斯耀短剧",
"appid" : "__UNI__E0B05B1", "appid" : "__UNI__E0B05B1",
"description" : "", "description" : "",
"versionName" : "1.0.6", "versionName" : "1.0.7",
"versionCode" : 106, "versionCode" : 107,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
@ -14,7 +14,7 @@
}, },
"usingComponents" : true, "usingComponents" : true,
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion" : 6, "compilerVersion" : 7,
"splashscreen" : { "splashscreen" : {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender" : true,
"waiting" : true, "waiting" : true,

17
me/choujiang/choujiang.vue
View File

@ -1,5 +1,8 @@
<template> <template>
<view class="almost-lottery min-page"> <view class="almost-lottery min-page">
<u-navbar title="" back-icon-color="#fff" :background="background" immersive :border-bottom="false"
title-color="#fff"></u-navbar>
<!-- head --> <!-- head -->
<view class="almost-lottery__head"> <view class="almost-lottery__head">
<view class="btn-group u-flex u-row-between"> <view class="btn-group u-flex u-row-between">
@ -75,7 +78,7 @@
</template> --> </template> -->
</view> </view>
</view> </view>
<ling-qu ref="refLingqu" @close="lingquClose"></ling-qu> <ling-qu ref="refLingqu" @close="lingquClose" ></ling-qu>
</view> </view>
</template> </template>
@ -93,6 +96,9 @@
}, },
data() { data() {
return { return {
background:{
background:'transparent'
},
//红包余额 //红包余额
totalMoney:0, totalMoney:0,
//抽奖结果 //抽奖结果
@ -150,6 +156,15 @@
} }
}, },
methods: { methods: {
lingquClose(key){
console.log('lingquClose');
console.log(key);
if(key&&key=='isBindAliPay'){
uni.navigateTo({
url:'/me/invite/zhifubao'
})
}
},
toRed(){ toRed(){
uni.navigateTo({ uni.navigateTo({
url: '/me/invite/cashDetail' url: '/me/invite/cashDetail'

99
me/detail/detail.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<view> <view>
<swiper @longpress="openBs()" :style="{height:winHeight}" :circular="true" class="swipers" @change="change" <swiper @longpress="openBs()" :style="{height:winHeight}" :circular="true" class="swipers" @change="change"
:current="current" :vertical="true" :indicator-dots="false" :autoplay="false" :interval="0" :duration="1"> :current="current" :vertical="true" :indicator-dots="false" :autoplay="false" :interval="0" :duration="1">
<swiper-item class="swipers-item" v-for="(item,index) in swiperList" :key="item.courseDetailsId"> <swiper-item class="swipers-item" v-for="(item,index) in swiperList" :key="item.courseDetailsId">
@ -155,7 +156,7 @@
<!-- #endif --> <!-- #endif -->
<!-- #ifdef MP-KUAISHOU --> <!-- #ifdef MP-KUAISHOU -->
<uv-popup @maskClick="maskClick" :closeable="true" ref="popupBsss" mode="bottom" custom-style="height: 800rpx;" <uv-popup @maskClick="maskClick" :closeable="true" ref="popupBsss" mode="bottom" custom-style="height: 800rpx;"
:safe-area="false" bgColor="#202020"> :safe-area="true" bgColor="#202020">
<view class="list"> <view class="list">
<view class="list-title flex align-center"> <view class="list-title flex align-center">
{{title}} {{title}}
@ -186,10 +187,10 @@
<!-- #endif --> <!-- #endif -->
<!-- 购买视频 --> <!-- 购买视频 -->
<u-popup :closeable="true" :custom-style="customStyle" :safe-area-inset-bottom="false" close-icon="close" <u-popup :closeable="true" :custom-style="customStyle" :safe-area-inset-bottom="true" close-icon="close"
close-icon-size="30" close-icon-color="#333333" :mask-custom-style="maskCustomStyle" v-model="showPay" close-icon-size="30" close-icon-color="#333333" :mask-custom-style="maskCustomStyle" v-model="showPay"
border-radius="24" mode="bottom"> border-radius="24" mode="bottom">
<view class="list"> <view class="list" :style="listStyle">
<view class="list-title flex align-center"> <view class="list-title flex align-center">
<!-- <u-icon name="lock" class="list-title-icon" color="#efbb6b" size="40"></u-icon> --> <!-- <u-icon name="lock" class="list-title-icon" color="#efbb6b" size="40"></u-icon> -->
当前视频 没有播放权限 当前视频 没有播放权限
@ -305,6 +306,10 @@
var videoAd = null; var videoAd = null;
// #endif // #endif
import {
returnIsSafari
} from '@/utils/app.js'
export default { export default {
components: { components: {
tkiQrcode, tkiQrcode,
@ -312,6 +317,7 @@
}, },
data() { data() {
return { return {
isSafari: returnIsSafari(),
//记录未购买视频索引 //记录未购买视频索引
noBuyVideoIndex: null, noBuyVideoIndex: null,
//奖品列表 //奖品列表
@ -452,6 +458,14 @@
} }
}, },
computed: { computed: {
listStyle() {
// if (this.isSafari) {
// return {
// 'min-height': '540rpx'
// }
// }
return ''
},
//当前视频是否可以看广告解锁 //当前视频是否可以看广告解锁
advertising() { advertising() {
return this.videoList.length > 0 ? this.videoList[this.current].advertising == 1 : false return this.videoList.length > 0 ? this.videoList[this.current].advertising == 1 : false
@ -462,6 +476,7 @@
}, },
// 移动视频信息的样式 // 移动视频信息的样式
tabBarStyle() { tabBarStyle() {
let style = { let style = {
// 滑块在页面渲染后第一次滑动时，无需动画效果 // 滑块在页面渲染后第一次滑动时，无需动画效果
'transition-duration': `${1}s`, 'transition-duration': `${1}s`,
@ -503,6 +518,7 @@
// #endif // #endif
}, },
onLoad(e) { onLoad(e) {
//在苹果系统微信小程序是否开启支付 //在苹果系统微信小程序是否开启支付
this.isWxIosPay = uni.getStorageSync('isWxIosPay') this.isWxIosPay = uni.getStorageSync('isWxIosPay')
@ -703,6 +719,7 @@
// #endif // #endif
this.isVips = uni.getStorageSync('isVips') ? uni.getStorageSync('isVips') : '否' this.isVips = uni.getStorageSync('isVips') ? uni.getStorageSync('isVips') : '否'
if (this.courseId) { if (this.courseId) {
console.log('has this.courseId getDataList()');
this.getDataList(this.courseId, this.courseDetailsId); this.getDataList(this.courseId, this.courseDetailsId);
} }
this.$Request.getT('app/course/getRedEnvelopeTips').then(res => { this.$Request.getT('app/course/getRedEnvelopeTips').then(res => {
@ -729,6 +746,21 @@
// #ifndef MP-WEIXIN || MP-KUAISHOU // #ifndef MP-WEIXIN || MP-KUAISHOU
this.meunTop = 37 this.meunTop = 37
// #endif // #endif
// const windowResizeCallback = (res) => {
// console.log('变化后的窗口宽度=' + res.size.windowWidth)
// console.log('变化后的窗口高度=' + res.size.windowHeight)
// this.onResize(res)
// setTimeout(()=>{
// this.onResize(res)
// },500)
// }
// uni.onWindowResize(windowResizeCallback)
// #ifdef H5
// #endif
}, },
watch: { watch: {
//监听当前播放的集数 //监听当前播放的集数
@ -737,7 +769,9 @@
}, },
showControls(val) { showControls(val) {
//在没有播放视频权限的时候控制中心不隐藏 //在没有播放视频权限的时候控制中心不隐藏
if (!this.videoList[this.current].videoUrl) { const nowVideo = this.videoList[this.current]
const videoUrl = nowVideo ? nowVideo.videoUrl : ''
if (!videoUrl) {
this.showControls = true this.showControls = true
this.$forceUpdate() this.$forceUpdate()
} }
@ -757,15 +791,28 @@
// #ifdef H5 // #ifdef H5
let el = document.querySelector('.uni-video-bar'); let el = document.querySelector('.uni-video-bar');
console.log(el, '2222222') console.log(el, '2222222')
if (el) {
if (val) { if (val) {
el.style = 'display:block !important;'; el.style = 'display:block !important;';
} else { } else {
el.style = 'display:none !important;'; el.style = 'display:none !important;';
} }
}
// #endif // #endif
}, },
}, },
methods: { methods: {
onResize(res) {
const sysInfo = uni.getSystemInfoSync()
//获取可是区域高度
const winHeight = sysInfo.windowHeight
if (winHeight && winHeight > 0) {
this.winHeight = winHeight + 'px'
} else {
this.winHeight = '100vh'
}
},
/** /**
* 获取金币比例 * 获取金币比例
*/ */
@ -1232,7 +1279,6 @@
// data.h5Url 跳转地址 // data.h5Url 跳转地址
this.showMoney = false //显示充值弹窗 this.showMoney = false //显示充值弹窗
uni.setStorageSync('noBuyVideoIndex', this.current) uni.setStorageSync('noBuyVideoIndex', this.current)
this.noBuyVideoIndex = this.current
// this.payOrder(this.ordersId, this.payMoney) // this.payOrder(this.ordersId, this.payMoney)
// #ifdef APP // #ifdef APP
uni.navigateTo({ uni.navigateTo({
@ -1579,6 +1625,24 @@
} }
} }
console.log('到达判断抽奖');
// if (this.noBuyVideoIndex != null ) {
console.log(this.noBuyVideoIndex);
console.log(this.videoList);
if (this.noBuyVideoIndex !== null && this.noBuyVideoIndex !==
undefined && this.noBuyVideoIndex !== '') {
console.log('获取转盘抽奖次数')
this.$Request.getT('app/discSpinning/drawCount').then(res => {
console.log('转盘抽奖次数', res.count)
if (res.count >= 1) {
uni.navigateTo({
url: '/me/choujiang/choujiang'
})
} else {}
})
uni.removeStorageSync('noBuyVideoIndex')
this.noBuyVideoIndex = null
}
let numIdCurr = this.videoList[0].courseDetailsId let numIdCurr = this.videoList[0].courseDetailsId
this.videoContextId = 'myVideo' + numIdCurr this.videoContextId = 'myVideo' + numIdCurr
this.$forceUpdate() this.$forceUpdate()
@ -1592,25 +1656,8 @@
this.countPrice = this.videoList[this.current].price this.countPrice = this.videoList[this.current].price
this.showPay = true this.showPay = true
this.noBuyVideoIndex = this.current this.noBuyVideoIndex = this.current
} else {
console.log('到达判断抽奖');
// if (this.noBuyVideoIndex != null ) {
console.log(this.noBuyVideoIndex);
if (this.noBuyVideoIndex !== null && this.noBuyVideoIndex !==
undefined && this.noBuyVideoIndex !== '' && this.videoList[this
.noBuyVideoIndex].videoUrl) {
this.$Request.getT('app/discSpinning/drawCount').then(res => {
console.log('转盘抽奖次数')
if (res.count >= 1) {
uni.navigateTo({
url: '/me/choujiang/choujiang'
})
} else {}
})
uni.removeStorageSync('noBuyVideoIndex')
this.noBuyVideoIndex = null
}
} }
}) })
@ -1854,6 +1901,10 @@
background-color: #000; background-color: #000;
} }
::v-deep .u-drawer-content {
// position: fixed;
}
.videoListCurr { .videoListCurr {
background-color: #ff7581 !important; background-color: #ff7581 !important;
color: #ffffff !important; color: #ffffff !important;
@ -2015,6 +2066,8 @@
.swipers { .swipers {
width: 100%; width: 100%;
box-sizing: border-box;
overflow: hidden;
.swipers-item { .swipers-item {
width: 100%; width: 100%;

142
me/invite/cashDetail.vue
View File

@ -13,13 +13,16 @@
v-if="shouxufei">（注：提现手续费为{{shouxufei * 100}}%）</text> --> v-if="shouxufei">（注：提现手续费为{{shouxufei * 100}}%）</text> -->
</view> </view>
</view> </view>
<view style="display: flex;flex-direction: row;padding: 20upx;justify-content: space-between;align-items: center;"> <view
style="display: flex;flex-direction: row;padding: 20upx;justify-content: space-between;align-items: center;">
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<view style="font-size: 40upx;color: #333333;">¥</view> <view style="font-size: 40upx;color: #333333;">¥</view>
<input type="number" v-model="money" placeholder="请输入金额" <input type="number" v-model="money" placeholder="请输入金额"
style="font-size: 40upx;color: #333333;text-align: left;margin-left: 10upx;width: 80%;" /> style="font-size: 40upx;color: #333333;text-align: left;margin-left: 10upx;width: 80%;" />
</view> </view>
<view @click="money = mayMoney" style="font-size: 30rpx;color: #333333;background: #ff7581;color: white;border-radius: 10rpx;padding: 7rpx 15rpx;flex-shrink: 0;">全部</view> <view @click="money = mayMoney"
style="font-size: 30rpx;color: #333333;background: #ff7581;color: white;border-radius: 10rpx;padding: 7rpx 15rpx;flex-shrink: 0;">
全部</view>
</view> </view>
<view style="background: #E6E6E6;width: 100%;height: 1upx;"></view> <view style="background: #E6E6E6;width: 100%;height: 1upx;"></view>
@ -43,15 +46,52 @@
</view> </view>
<view style="display: flex;width: 100%;justify-content: center;"> <view style="display: flex;width: 100%;justify-content: center;">
<view style="color: grey;padding-bottom: 30px;padding-top: 20upx;width: 33%;" @click="goZhifuBao">提现账号 <view class="u-flex-1" style="color: grey;padding-bottom: 30px;padding-top: 20upx;" @click="goZhifuBao">提现账号
</view> </view>
<view style="color: grey;padding-bottom: 30px;padding-top: 20upx;width: 33%;" @click="goqianbao">红包明细 <view class="u-flex-1" style="color: grey;padding-bottom: 30px;padding-top: 20upx;" @click="goqianbao">红包明细
</view> </view>
<view style="color: grey;padding-bottom: 30px;padding-top: 20upx;width: 33%;" @click="gojilu">提现记录 <!-- <view style="color: grey;padding-bottom: 30px;padding-top: 20upx;width: 33%;" @click="gojilu">提现记录
</view> -->
</view>
<view style="text-align: left" class="money-list u-p-b-30">
<view v-if="list.length" v-for="(item, index) in list" :key="index" class="item">
<view>
<view style="margin-bottom: 8upx;text-align: right;">
<text style="margin-bottom: 8upx;color: green" v-if="item.state==1"> 提现成功</text>
<text style="margin-bottom: 8upx;color: green" v-if="item.state==0"> 提现中</text>
<text style="margin-bottom: 8upx;color: #FD6416" v-if="item.state==-1||item.state==2"> 提现失败</text>
</view>
<view style="color: #999999;font-size: 28upx;">
<view style="margin-bottom: 8upx"> 收款人账号：{{item.zhifubao}}</view>
<view style="margin-bottom: 8upx"> 收款人姓名：{{item.zhifubaoName}}</view>
<view style="margin-bottom: 8upx"> 发起时间：{{item.createAt}}</view>
<view style="margin-bottom: 8upx" v-if="item.state==1">成功时间 {{item.outAt}}</view>
<view style="margin-bottom: 8upx;color: #FD6416" v-if="item.state==-1||item.state==2">失败原因：{{item.refund}}
</view>
<view style="margin-bottom: 8upx;text-align: right;">
<!-- 提现金额： -->
<text style="color: #FD6416;font-size: 32upx;font-weight: 600"> ￥{{item.money}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="page-box" v-if="!list.length">
<view class="centre">
<image src="../../static/images/learn/none.png" mode=""></image>
<view class="tips">
暂无记录
</view>
</view>
</view>
</view>
</view>
</view>
</template> </template>
<script> <script>
@ -86,25 +126,59 @@
userId: '', userId: '',
zhifubao: '', zhifubao: '',
zhifubaoName: '', zhifubaoName: '',
list: [],
page: 1,
limit: 10,
totalCount: 0,
}; };
}, },
onLoad() { onLoad() {
this.getshouxufei(); this.getshouxufei();
this.getMoneyDetail();
}, },
onShow() { onShow() {
this.token = uni.getStorageSync('token') this.token = uni.getStorageSync('token')
this.userId = uni.getStorageSync('userId') this.userId = uni.getStorageSync('userId')
this.zhifubao = uni.getStorageSync('zhiFuBao') this.zhifubao = uni.getStorageSync('zhiFuBao')
this.zhifubaoName = uni.getStorageSync('zhiFuBaoName') this.zhifubaoName = uni.getStorageSync('zhiFuBaoName')
this.getcashMoney() this.getcashMoney()
}, },
onReachBottom: function() {
if (this.page * this.limit < this.totalCount) {
this.page = this.page + 1;
this.getMoneyDetail();
}
},
onPullDownRefresh: function() {
this.page = 1;
// that.list = []
this.getMoneyDetail();
},
onNavigationBarButtonTap() { onNavigationBarButtonTap() {
// this.list(); // this.list();
}, },
methods: { methods: {
getMoneyDetail() {
let that = this;
let token = uni.getStorageSync('token')
console.log(1);
if (token) {
//可以提现金额查询预估收入查询
let data = {
page: this.page,
limit: this.limit
}
this.$Request.getT('app/cash/selectPayDetails', data).then(res => {
this.totalCount = res.data.totalCount;
if (res.data.list.length > 0) {
this.list = [...this.list, ...res.data.list];
}
})
}
},
//获取收取费 //获取收取费
getshouxufei() { getshouxufei() {
this.$u.get('app/common/type/152').then(res => { this.$u.get('app/common/type/152').then(res => {
@ -142,7 +216,7 @@
// }) // })
this.$Request.getT('app/moneyDetails/selectUserMoney').then(res => { this.$Request.getT('app/moneyDetails/selectUserMoney').then(res => {
if (res.code == 0) { if (res.code == 0) {
this.mayMoney = res.data.amount||0 this.mayMoney = res.data.amount || 0
} }
}) })
}, },
@ -158,11 +232,6 @@
url: '/me/invite/moneyList?moneyType=1&viewType=2' url: '/me/invite/moneyList?moneyType=1&viewType=2'
}); });
}, },
list() {
// uni.navigateTo({
// url: '/me/invite/cashList'
// })
},
goZhifuBao() { goZhifuBao() {
uni.navigateTo({ uni.navigateTo({
url: '/me/invite/zhifubao' url: '/me/invite/zhifubao'
@ -239,6 +308,7 @@
if (e.confirm) { if (e.confirm) {
// that.money = money // that.money = money
that.getMoney(); that.getMoney();
that.getMoneyDetail();
} }
} }
}); });
@ -252,6 +322,7 @@
if (e.confirm) { if (e.confirm) {
// that.money = money // that.money = money
that.getMoney(); that.getMoney();
that.getMoneyDetail();
} }
} }
}); });
@ -389,4 +460,49 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
.money-list{
.item {
background: white;
padding: 32rpx;
margin: 32rpx;
font-size: 28rpx;
box-shadow: 7px 9px 34px rgba(0, 0, 0, 0.1);
border-radius: 16upx;
}
.item:first-child{
margin-top: 0;
}
}
.centre {
text-align: center;
padding: 200rpx 0;
font-size: 32rpx;
box-sizing: border-box;
image {
width: 360rpx;
height: 360rpx;
// margin-bottom: 20rpx;
margin: 0 auto 20rpx;
// border: 1px dotted #000000;
}
.tips {
font-size: 34rpx;
color: #999999;
margin-top: 20rpx;
}
.btn {
margin: 80rpx auto;
width: 600rpx;
border-radius: 32rpx;
line-height: 90rpx;
color: #ffffff;
font-size: 34rpx;
background: #ff7581;
}
}
</style> </style>

2
me/invite/index.vue
View File

@ -107,7 +107,7 @@
<text class="margin-left-sm">{{item.userName}}</text> <text class="margin-left-sm">{{item.userName}}</text>
</view> </view>
<view style="width: 160rpx;" class="u-flex u-row-right font-bold"> <view style="width: 160rpx;" class="u-flex u-row-right font-bold">
<text class=" text-red" v-if="item.money>0">已签到</text> <text class=" text-red" v-if="item.recordNum>0">已签到</text>
<text class=" color-999" v-else>未签到</text> <text class=" color-999" v-else>未签到</text>
</view> </view>
</view> </view>

3
me/invite/inviteDet.vue
View File

@ -98,7 +98,8 @@
getInviter() { getInviter() {
let data = { let data = {
page: this.page, page: this.page,
limit: this.limit limit: this.limit,
userType:1
} }
this.$u.api.inviter(data).then(res => { this.$u.api.inviter(data).then(res => {
if (res.code == 0) { if (res.code == 0) {

10
me/invite/zhifubao.vue
View File

@ -78,7 +78,8 @@
} else { } else {
this.$u.post('app/user/updateUser?zhiFuBao=' + zhiFuBao + '&zhiFuBaoName=' + zhiFuBaoName).then( this.$u.post('app/user/updateUser?zhiFuBao=' + zhiFuBao + '&zhiFuBaoName=' + zhiFuBaoName).then(
res => { res => {
// console.log(res); console.log(res);
if(res.code==0){
uni.setStorageSync('zhiFuBao', zhiFuBao) uni.setStorageSync('zhiFuBao', zhiFuBao)
uni.setStorageSync('zhiFuBaoName', zhiFuBaoName) uni.setStorageSync('zhiFuBaoName', zhiFuBaoName)
uni.showToast({ uni.showToast({
@ -90,6 +91,13 @@
}, 1000) }, 1000)
} }
}) })
}else{
uni.showToast({
title:res.msg||'修改失败',
icon:'none'
})
}
}); });

26
me/setting/mimi.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<view style="font-size: 14px;line-height: 26px;padding: 32upx;" class="home1 "> <view style="font-size: 14px;line-height: 26px;padding: 32upx;" class="home1 ">
<view style="font-size: 28upx;" v-html="content"></view> <view style="font-size: 28upx;" v-html="content"></view>
<view class="btn-box u-flex u-row-center"> <view class="btn-box u-flex u-row-center" v-if="!isLogin">
<view class="btn" @click="back">我已知晓</view> <view class="btn cancel" @click="cancel">拒绝</view>
<view class="btn" @click="back">同意</view>
</view> </view>
</view> </view>
</template> </template>
@ -11,13 +12,23 @@
export default { export default {
data() { data() {
return { return {
content: '' content: '',
isLogin:false
} }
}, },
onLoad() { onLoad() {
this.getGuize(); this.getGuize();
this.isLogin=uni.getStorageSync('token')?true:false
}, },
methods: { methods: {
cancel(){
// #ifdef H5
uni.navigateBack()
// #endif
// #ifdef APP
plus.runtime.quit();
// #endif
},
back(){ back(){
uni.navigateBack() uni.navigateBack()
}, },
@ -41,9 +52,14 @@
text-align: center; text-align: center;
} }
.btn-box{ .btn-box{
padding: 30rpx 230rpx; gap: 20px;
padding: 30rpx 130rpx;
} }
page { .cancel{
background-color: #eee;
color: #999;
}
page{
/* background: #1c1b20; */ /* background: #1c1b20; */
} }
</style> </style>

24
me/setting/xieyi.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<view style="line-height: 26px;padding: 32upx;" class="home1 "> <view style="line-height: 26px;padding: 32upx;" class="home1 ">
<view style="font-size: 28upx;" v-html="content"></view> <view style="font-size: 28upx;" v-html="content"></view>
<view class="btn-box u-flex u-row-center"> <view class="btn-box u-flex u-row-center" v-if="!isLogin">
<view class="btn" @click="back">我已知晓</view> <view class="btn cancel" @click="cancel">拒绝</view>
<view class="btn" @click="back">同意</view>
</view> </view>
</view> </view>
</template> </template>
@ -11,13 +12,23 @@
export default { export default {
data() { data() {
return { return {
content:'' content:'',
isLogin:false
} }
}, },
onLoad() { onLoad() {
this.getGuize(); this.getGuize();
this.isLogin=uni.getStorageSync('token')?true:false
}, },
methods: { methods: {
cancel(){
// #ifdef H5
uni.navigateBack()
// #endif
// #ifdef APP
plus.runtime.quit();
// #endif
},
back(){ back(){
uni.navigateBack() uni.navigateBack()
}, },
@ -47,7 +58,12 @@
text-align: center; text-align: center;
} }
.btn-box{ .btn-box{
padding: 30rpx 230rpx; gap: 20px;
padding: 30rpx 130rpx;
}
.cancel{
background-color: #eee;
color: #999;
} }
page{ page{
/* background: #1c1b20; */ /* background: #1c1b20; */

3
pages.json
View File

@ -606,7 +606,8 @@
{ {
"path": "choujiang/choujiang", "path": "choujiang/choujiang",
"style": { "style": {
"navigationBarTitleText": "抽奖" "navigationBarTitleText": "抽奖",
"navigationStyle": "custom"
} }
}, },
{ {

20
pages/chasingDrama/chasingDrama.vue
View File

@ -195,7 +195,7 @@
myVideo() { myVideo() {
let data = { let data = {
page: 1, page: 1,
limit: 2, limit: 6,
classify: 1, //1收藏 2点赞 3历史记录 classify: 1, //1收藏 2点赞 3历史记录
} }
this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => { this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => {
@ -208,7 +208,7 @@
newLook() { newLook() {
let data = { let data = {
page: 1, page: 1,
limit: 2, limit: 6,
classify: 3, //1收藏 2点赞 3历史记录 classify: 3, //1收藏 2点赞 3历史记录
} }
this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => { this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => {
@ -321,24 +321,32 @@
} }
} }
.zuijin-box.justify-between{
justify-content: flex-start;
}
.zuijin { .zuijin {
width: 100%; width: 100%;
margin-top: 26rpx; margin-top: 26rpx;
.zuijin-box { .zuijin-box {
width: 686rpx; width: 700rpx;
height: 100%; height: 100%;
flex-wrap: wrap;
} }
.zuijin-box-item { .zuijin-box-item {
width: calc((686rpx - 20rpx) / 2); width: calc((700rpx - 40rpx) / 3);
height: 100%; height: 100%;
margin-bottom: 30rpx;
margin-right: calc(40rpx / 2);
}
.zuijin-box-item:nth-of-type(3n){
margin-right: 0;
} }
.zuijin-box-item-img { .zuijin-box-item-img {
width: 100%; width: 100%;
// height: 204rpx;
height: 204rpx; height: 204rpx;
border-radius: 24rpx 24rpx 0 0; border-radius: 24rpx 24rpx 0 0;
position: relative; position: relative;

122
pages/index/index.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<view style="padding-bottom: 20rpx;"> <view style="padding-bottom: 20rpx;">
<template v-if="showSearch">
<!-- 自定义导航栏（带搜索） --> <!-- 自定义导航栏（带搜索） -->
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<u-navbar :background="background" height="60" :is-back="false" :title="title" :border-bottom="false"> <u-navbar :background="background" height="60" :is-back="false" :title="title" :border-bottom="false">
@ -16,7 +17,8 @@
<!-- #endif --> <!-- #endif -->
<view class="nvavBar-box" :style="{height:barHeight>0?barHeight+'px':'70rpx'}"> <view class="nvavBar-box" :style="{height:barHeight>0?barHeight+'px':'70rpx'}">
<!-- #ifdef H5 || APP --> <!-- #ifdef H5 || APP -->
<view @click.stop="goSearch" class="nvavBar-boxs flex align-center" style="width: 100%;"> <view @click.stop="goSearch" class="nvavBar-boxs flex align-center"
style="width: 100%;">
<u-search placeholder-color="#cccccc" disabled search-icon-color="#ff7581" <u-search placeholder-color="#cccccc" disabled search-icon-color="#ff7581"
:show-action="false" placeholder="今日正在热播" v-model="keyword"></u-search> :show-action="false" placeholder="今日正在热播" v-model="keyword"></u-search>
</view> </view>
@ -32,7 +34,8 @@
</view> </view>
</view> </view>
</u-navbar> </u-navbar>
<view class="bgColorTop"> </template>
<view class="bgColorTop " :class="{'top-zhanwei':!showSearch}">
<!-- <view v-if="homeTypeSel != '否'" class="topTabs flex align-center justify-center"> <!-- <view v-if="homeTypeSel != '否'" class="topTabs flex align-center justify-center">
<view class="topTabs-box"> <view class="topTabs-box">
<scroll-view class="topTabs-box-H" scroll-x="true"> <scroll-view class="topTabs-box-H" scroll-x="true">
@ -46,8 +49,8 @@
<!-- 轮播图 --> <!-- 轮播图 -->
<view v-if="TabCur == 0" class="swipers flex align-center justify-center"> <view v-if="TabCur == 0" class="swipers flex align-center justify-center">
<view class="swipers-box"> <view class="swipers-box">
<swiper class="swipers-box" :indicator-dots="false" :autoplay="true" interval="5000" <swiper class="swipers-box" :indicator-dots="false" :autoplay="true" interval="5000" duration="500"
duration="500" :circular="true"> :circular="true">
<swiper-item class="swipers-box" v-for="(item,index) in swiperList" :key='index' <swiper-item class="swipers-box" v-for="(item,index) in swiperList" :key='index'
@tap="goPage(item)"> @tap="goPage(item)">
<image :src="item.imageUrl" mode="aspectFill" style="width: 100%;height:100%;"></image> <image :src="item.imageUrl" mode="aspectFill" style="width: 100%;height:100%;"></image>
@ -61,8 +64,8 @@
<view class="gg flex align-center justify-center" v-if="noticeList.length>0"> <view class="gg flex align-center justify-center" v-if="noticeList.length>0">
<view class="gg-box flex align-center justify-between"> <view class="gg-box flex align-center justify-between">
<image src="../../static/images/index/ggIcon.png" mode=""></image> <image src="../../static/images/index/ggIcon.png" mode=""></image>
<swiper :autoplay="true" :vertical="true" :interval="4000" :circular="true" <swiper :autoplay="true" :vertical="true" :interval="4000" :circular="true" :indicator-dots="false"
:indicator-dots="false" class="gg-box-swiper"> class="gg-box-swiper">
<block v-for="(item, index) in noticeList"> <block v-for="(item, index) in noticeList">
<swiper-item @tap='goMsg(item.url)'> <swiper-item @tap='goMsg(item.url)'>
<view class="gg-box-swiper-t">{{item.title}}</view> <view class="gg-box-swiper-t">{{item.title}}</view>
@ -75,12 +78,12 @@
<view class="centers"> <view class="centers">
<view class="centers-cistrict flex align-center justify-center" v-if="gridList.length > 0"> <view class="centers-cistrict flex align-center justify-center" v-if="gridList.length > 0">
<view class="centers-cistrict-box"> <view class="centers-cistrict-box">
<swiper :indicator-dots="false" class="centers-cistrict-boxs" :autoplay="false" <swiper :indicator-dots="false" class="centers-cistrict-boxs" :autoplay="false" :interval="3000"
:interval="3000" :duration="300"> :duration="300">
<swiper-item v-for="(item,index) in gridList" :key="index"> <swiper-item v-for="(item,index) in gridList" :key="index">
<view class="swiper-item flex align-center justify-between"> <view class="swiper-item flex align-center justify-between">
<view class="swiper-item-s" @click="goGridList(ite)" <view class="swiper-item-s" @click="goGridList(ite)" v-for="(ite,ind) in item.child"
v-for="(ite,ind) in item.child" :key="ind"> :key="ind">
<view class="swiper-item-s-img"> <view class="swiper-item-s-img">
<image :src="ite.imageUrl" mode="aspectFill"></image> <image :src="ite.imageUrl" mode="aspectFill"></image>
</view> </view>
@ -182,8 +185,8 @@
<!-- 追剧悬浮 --> <!-- 追剧悬浮 -->
<!-- <drag-button v-if="shodrag && shodrags" @clickClose="clickClose" :videoInfo="videoInfo" :isDock="true" <!-- <drag-button v-if="shodrag && shodrags" @clickClose="clickClose" :videoInfo="videoInfo" :isDock="true"
:existTabBar="true" @btnClick="btnClick" /> --> :existTabBar="true" @btnClick="btnClick" /> -->
<u-image @click="goMsg('/me/choujiang/choujiang')" :src="`../../static/images/draw/draw.gif`" <u-image @click="goMsg('/me/choujiang/choujiang')" :src="`../../static/red-pack-new.gif`"
style="width: 150rpx;height: 150rpx;position: fixed;right: 30rpx;bottom: 180rpx;"></u-image> style="width: 200rpx;height: 200rpx;position: fixed;right: 30rpx;bottom: 180rpx;"></u-image>
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<div v-if="isWeixin" <div v-if="isWeixin"
style="width: 100%;height: 100%;position: fixed;top: 0;z-index: 999;background: url('../../static/images/open_guide.png') no-repeat center bottom / cover;"> style="width: 100%;height: 100%;position: fixed;top: 0;z-index: 999;background: url('../../static/images/open_guide.png') no-repeat center bottom / cover;">
@ -198,6 +201,9 @@
</template> </template>
<script> <script>
import {
returnIsSafari
} from '@/utils/app.js'
import empty from '../../components/empty.vue' import empty from '../../components/empty.vue'
import videoList from '../../components/videoList/videoList.vue' import videoList from '../../components/videoList/videoList.vue'
import recommendVideo from '../../components/recommendVideo/recommendVideo.vue' import recommendVideo from '../../components/recommendVideo/recommendVideo.vue'
@ -213,6 +219,7 @@
}, },
data() { data() {
return { return {
showSearch: false,
showzls: true, showzls: true,
shodrags: true, shodrags: true,
shodrag: false, //是否显示拖拽悬浮 shodrag: false, //是否显示拖拽悬浮
@ -252,6 +259,7 @@
draw: Math.floor((Math.random() * 12) + 1), draw: Math.floor((Math.random() * 12) + 1),
isWeixin: false, isWeixin: false,
isIos: true, isIos: true,
scrollTop: 0,
}; };
}, },
onShareAppMessage(res) { onShareAppMessage(res) {
@ -270,6 +278,10 @@
imageUrl: this.bgImg imageUrl: this.bgImg
} }
}, },
onPageScroll(e) {
console.log(e);
this.scrollTop = e.scrollTop
},
onLoad(options) { onLoad(options) {
// barWidth // barWidth
// #ifdef MP-WEIXIN || MP-TOUTIAO || MP-KUAISHOU // #ifdef MP-WEIXIN || MP-TOUTIAO || MP-KUAISHOU
@ -335,7 +347,7 @@
} }
}) })
} }
let u = navigator?navigator.userAgent:''; let u = navigator ? navigator.userAgent : '';
if (u.toLowerCase().indexOf('micromessenger') !== -1) { if (u.toLowerCase().indexOf('micromessenger') !== -1) {
this.isWeixin = true this.isWeixin = true
@ -504,13 +516,79 @@
}) })
} }
}, },
pageScrollTo(time = 100) {
uni.pageScrollTo({
scrollTop: this.scrollTop - 50,
duration: time,
complete() {
}
})
},
//查看视频 //查看视频
seVideo(item) { seVideo(item) {
const time = 100;
// #ifdef H5
if (returnIsSafari()) {
this.pageScrollTo(time)
setTimeout(() => {
uni.navigateTo({
url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item
.courseDetailsId +
'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
.dyEpisodeId
})
}, time)
} else {
uni.navigateTo({ uni.navigateTo({
url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId + url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item '&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
.dyEpisodeId .dyEpisodeId
}) })
}
// #endif
// #ifndef H5
uni.navigateTo({
url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
.dyEpisodeId
})
// #endif
},
//点击回调
posterSuccess(item) {
const time = 100;
// #ifdef H5
if (returnIsSafari()) {
this.pageScrollTo(time)
setTimeout(() => {
uni.navigateTo({
url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item
.courseDetailsId +
'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
.dyEpisodeId
})
}, 100)
} else {
uni.navigateTo({
url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
.dyEpisodeId
})
}
// #endif
// #ifndef H5
uni.navigateTo({
url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
.dyEpisodeId
})
// #endif
}, },
//获取推荐视频 //获取推荐视频
getrecomVideo(sort) { getrecomVideo(sort) {
@ -629,14 +707,7 @@
} }
}); });
}, },
//点击回调
posterSuccess(item) {
uni.navigateTo({
url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
.dyEpisodeId
})
},
// 获取资源列表 // 获取资源列表
getCourseList() { getCourseList() {
let typeId = ''; let typeId = '';
@ -1196,6 +1267,15 @@
line-height: 1.6; line-height: 1.6;
} }
.top-zhanwei {
/* #ifdef H5 */
padding-top: 32rpx;
/* #endif */
/* #ifndef H5 */
padding-top: 44px;
/* #endif */
}
.contentview .des .link { .contentview .des .link {
color: #5074FF; color: #5074FF;
text-decoration: underline; text-decoration: underline;

8
pages/login/login.vue
View File

@ -305,8 +305,14 @@
title: '登录成功', title: '登录成功',
icon: 'none' icon: 'none'
}) })
const arr= getCurrentPages()
if(arr.length<=1){
return uni.reLaunch({
url:'/pages/index/index'
})
}
uni.navigateBack({ uni.navigateBack({
delta: 2 delta: arr.length<=2?1:2
}) })
} else { } else {
uni.hideLoading(); uni.hideLoading();

12
pages/me/index.vue
View File

@ -184,7 +184,7 @@
观看历史 观看历史
</view> </view>
</view> </view>
<!-- <view v-if="rate>0" class="tool-box-content-item flex align-center justify-center flex-wrap" <view v-if="rate>0" class="tool-box-content-item flex align-center justify-center flex-wrap"
@click="goNav('/me/invite/inviteDet')"> @click="goNav('/me/invite/inviteDet')">
<view class="tool-box-content-item-img"> <view class="tool-box-content-item-img">
<image src="../../static/images/me/vtd.png" mode=""></image> <image src="../../static/images/me/vtd.png" mode=""></image>
@ -192,7 +192,7 @@
<view class="tool-box-content-item-txt"> <view class="tool-box-content-item-txt">
我的团队 我的团队
</view> </view>
</view> --> </view>
<view class="tool-box-content-item flex align-center justify-center flex-wrap" @click="goMsg()"> <view class="tool-box-content-item flex align-center justify-center flex-wrap" @click="goMsg()">
<view class="tool-box-content-item-img"> <view class="tool-box-content-item-img">
<image src="../../static/images/me/vkf.png" mode=""></image> <image src="../../static/images/me/vkf.png" mode=""></image>
@ -288,6 +288,7 @@
showCard: false, showCard: false,
numCount: 0, numCount: 0,
rate: 0, rate: 0,
twoRate:0,
kmPaySel: '否', kmPaySel: '否',
isWxIosPay: true, //微信下是否显示支付功能 isWxIosPay: true, //微信下是否显示支付功能
userInfo: {}, userInfo: {},
@ -315,11 +316,8 @@
this.userName = res.data.userName this.userName = res.data.userName
this.avatar = res.data.avatar this.avatar = res.data.avatar
this.invitationCode = res.data.invitationCode this.invitationCode = res.data.invitationCode
if (res.data.rate) { this.rate = res.data.rate||0
this.rate = (Number(res.data.rate) * 100).toFixed(0) this.twoRate = res.data.twoRate||0
} else {
this.rate = 0
}
} }
}) })

BIN
static/red-pack-new.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 MiB

BIN
static/red-pack.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 MiB

12
utils/app.js
View File

@ -19,3 +19,15 @@ export function isIos(){
} }
return isIOS return isIOS
} }
export function returnIsSafari() {
let res = uni.getSystemInfoSync();
var ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('applewebkit') > -1 && ua.indexOf('mobile') > -1 && ua.indexOf('safari') > -1 &&
ua.indexOf('linux') === -1 && ua.indexOf('android') === -1 && ua.indexOf('chrome') === -1 &&
ua.indexOf('ios') === -1 && ua.indexOf('browser') === -1) {
return true;
} else {
return false;
}
}