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 ymf

This commit is contained in:
YeMingfei666 2024-12-24 14:36:12 +08:00
parent 252fc8c425 a787c014cb
commit 43722d9b00
5 changed files with 278 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifest.json
View File

@ -85,14 +85,15 @@
},
"oauth" : {
"apple" : {},
"univerify" : {},
"weixin" : {
"appid" : "wxeaffcaea958472d3",
"appsecret" : "32f6f3ce599abff2fa0191a36780c66c",
"UniversalLinks" : "https://maxiong.xianmxkj.com/"
}
},
"ad" : {},
"univerify" : {}
},
"ad" : {
"gdt" : {}
},
"push" : {
"unipush" : {}
}

6
pages/me/index.vue
View File

@ -530,15 +530,15 @@
goMsg() {
let kefu = uni.getStorageSync('kefu'); // 用户端联系方式 1 手机号 2企业微信
let kefuPhone = uni.getStorageSync('kefuPhone');
if (kefu === 1) {
if (kefu == 1) {
uni.navigateTo({
url: '/me/setting/kefu'
})
} else if (kefu === 3) {
} else if (kefu == 3) {
uni.makePhoneCall({
phoneNumber: kefuPhone //仅为示例
});
} else if (kefu === 2) {
} else if (kefu == 2) {
// #ifdef MP-WEIXIN
let that = this
try {

196
pages/task/index.vue
View File

@ -1,14 +1,15 @@
<!-- 任务中心 -->
<template>
<view class="container">
<!-- <u-navbar :background="background" :is-back="false" :title="title" :border-bottom="false"></u-navbar> -->
<view class="task_bg u-absolute">
<image class="task_bg" src="../../static/images/me/task_bg.png"></image>
</view>
<view class="navTitle">
<u-navbar v-if="!isIos" :background="background" :is-back="false" :title="title" :border-bottom="false"></u-navbar>
<view class="navTitle" v-else>
<view></view>
<view class="title">任务大厅</view>
<image @click="goNav({jumpType:1,buttonUrl:'/pages/me/index'})" class="navTitleIcon" src="../../static/images/my.png" ></image>
<image @click="goNav({jumpType:1,buttonUrl:'/pages/me/index'})" class="navTitleIcon"
src="../../static/images/my.png"></image>
</view>
<view class="icon u-relative padding">
<image class="task_icon1 u-relative" src="../../static/images/me/task_icon1.png"></image>
@ -28,11 +29,13 @@
<text class="line"></text>
<view class="signIn-Item"
:class="{active: item.showText == '待签到'||item.showText == '未签到'||item.showText == '已签到'}"
v-for="(item,index) in signInList" :key="index"
>
<image class="signIn_icon" v-if="item.showText == '未签到'" src="../../static/images/signIn_icon2.png" mode="">
<image class="signIn_icon" v-if="item.showText == '已签到'" src="../../static/images/signIn_icon3.png" mode="">
<image class="signIn_icon" v-if="item.showText != '未签到'&&item.showText != '已签到'" src="../../static/images/signIn_icon1.png" mode="">
v-for="(item,index) in signInList" :key="index">
<image class="signIn_icon" v-if="item.showText == '未签到'" src="../../static/images/signIn_icon2.png"
mode="" />
<image class="signIn_icon" v-if="item.showText == '已签到'"
src="../../static/images/signIn_icon3.png" mode="" />
<image class="signIn_icon" v-if="item.showText != '未签到'&&item.showText != '已签到'"
src="../../static/images/signIn_icon1.png" mode="" />
<view class="radius"></view>
<view class="_label">{{item.showText}}</view>
</view>
@ -50,24 +53,38 @@
<view class="content margin-lr padding bg-white u-relative" v-if="list.length">
<view class="cell flex justify-between" v-for="(item,index) in list" :key="index"
v-if="(item.buttonUrl=='/me/invite/index'&&isShowMoneyPay)||item.buttonUrl!='/me/invite/index'"
>
v-if="((item.buttonUrl=='/me/invite/index'&&isShowMoneyPay)||item.buttonUrl!='/me/invite/index')||(isAndroid&&item.title =='观看视频奖励')">
<view class="cell_left flex">
<view class="cell_title flex">
<view class="u-font-28 text-bold title" :style="{alignSelf: item.rewardImg?'center':'flex-start'}">{{ item.title}}</view>
<view class="u-font-28 text-bold title"
:style="{alignSelf: item.rewardImg?'center':'flex-start'}">{{ 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.disabled " class="btn u-font-24 text-bold" :style="{backgroundColor: item.buttonBgColor,color: item.buttonFontColor }" @click="goNav(item)">{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}</view>
<view v-else class="btn u-font-24 text-bold disabled">{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}</view>
<view v-if=" item.disabled " class="btn u-font-24 text-bold"
:style="{backgroundColor: item.buttonBgColor,color: item.buttonFontColor }"
@click="goNav(item)">
{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
</view>
<view v-else class="btn u-font-24 text-bold disabled">
{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
</view>
<!-- <view v-else class="btn u-font-24 text-bold" @click="goNav(item)">{{ item.buttonTitle }}</view> -->
<view v-if=" item.buttonUnderContent && item.buttonUnderUrl " class="u-font-22 tip" @click="goNav({buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title})">{{ item.buttonUnderContent}}</view>
<view v-if=" item.buttonUnderContent && item.buttonUnderUrl " class="u-font-22 tip"
@click="goNav({buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title})">
{{ item.buttonUnderContent}}
</view>
</view>
</view>
<!-- 激励视频广告 -->
<ad-rewarded-video ref="adRewardedVideo" adpid="1531580352" :preload="false" :loadnext="false"
:disabled="true" v-slot:default="{loading, error}" @load="onadload" @close="onadclose"
@error="onaderror">
<view class="ad-error" v-if="error">{{error}}</view>
</ad-rewarded-video>
</view>
</view>
@ -85,31 +102,112 @@
list: [],
checked: false,
signDays: 0,
signInList: [
{ name: '第一天' },
{ name: '第二天' },
{ name: '第三天' },
{ name: '第四天' },
{ name: '第五天' },
{ name: '第六天' },
{ name: '第七天' },
signInList: [{
name: '第一天'
},
{
name: '第二天'
},
{
name: '第三天'
},
{
name: '第四天'
},
{
name: '第五天'
},
{
name: '第六天'
},
{
name: '第七天'
},
],
signInBtn: '点击签到',
isShowMoneyPay: true,
isIos: false,
isLoading: false,
isAndroid: false,
}
},
onShow() {
this.getTaskdata()
this.getsignIn()
this.$Request.getT("app/common/type/919", {}).then(res => {
if (res.code == 0) {
const sysInfo = uni.getSystemInfoSync();
let isIos = sysInfo.platform == 'ios'
this.isIos = /iOS/.test(sysInfo.platform);
// 判断是否是安卓设备
// #ifdef APP
this.isAndroid = sysInfo.platform === 'android'
// #endif
this.isShowMoneyPay = !(res.data.value == '1' && isIos)
}
});
},
async onReady() {
this.isLoading = true;
console.log(1)
// 首次加载广告
setTimeout(() => {
this.$refs.adRewardedVideo.load();
}, 1000)
},
methods: {
showAd() {
console.log(this.isLoading)
if (this.isLoading) {
return
}
this.$refs.adRewardedVideo.show();
},
onadload(e) {
this.isLoading = false;
console.log(2)
console.log('广告数据加载成功');
},
async onadclose(e) {
const detail = e.detail
if (detail && detail.isEnded) {
// 正常播放结束
// /sqx_fast/app/ad/state
let res = await this.$Request.getT('app/ad/state', {
extraKey: 1
})
this.$Request.get('/app/common/type/813').then(res => {
if (res.code == 0 && res.data.value) {
if (res.data.value == '是') {
this.getActivitys()
}
}
})
this.$Request.getT('/app/common/type/921').then(res => {
if (res.code == 0) {
console.log(res)
uni.showToast({
title: '获得'+res.data.value+'分钟免费时长',
icon: 'none'
})
}
})
} else {
// 播放中途退出
}
//this.isLoading = true;
//this.$refs.adRewardedVideo.load();
},
onaderror(e) {
// 广告加载失败
console.log("广告加载失败")
this.isLoading = false;
},
/**
* 获取签到数据
*/
getsignIn() {
this.$Request.getT('app/userSignRecord/getUserSignData', {}).then(res => {
if (res.code == 0) {
@ -132,12 +230,20 @@
}
})
},
/**
* 校验是否为当天
* @param date
*/
isToday(date) {
const today = new Date();
return date.getDate() === today.getDate() // 比较日期
&& date.getMonth() === today.getMonth() // 比较月份
&& date.getFullYear() === today.getFullYear(); // 比较年份
&&
date.getMonth() === today.getMonth() // 比较月份
&&
date.getFullYear() === today.getFullYear(); // 比较年份
},
/**
* 跳转
* @param {Object} item
@ -146,10 +252,12 @@
// jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 ,
// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
// buttonUrl
console.log(item)
if (item.jumpType == 0) {
if (item.buttonTitle.indexOf("领取") != -1) {
this.taskReceive(item.id)
}if (item.buttonTitle.indexOf("观看视频") != -1) {
this.showAd()
} else {
uni.switchTab({
url: "/pages/index/index"
@ -233,11 +341,12 @@
<style lang="scss">
.container {
width: 100%;
background-color: #F3F4F8;
.task_bg {
width: 100% !important;
height: 494rpx !important;
}
.icon {
.icon_title {
color: #000000;
@ -245,17 +354,20 @@
top: -20rpx;
}
.task_icon1 {
width: 74rpx !important;
height: 78rpx !important;
margin-left: 235rpx;
}
.task_icon2 {
width: 126rpx !important;
height: 120rpx !important;
top: -40rpx;
}
}
.navTitle {
width: 100%;
position: relative;
@ -264,17 +376,20 @@
align-items: center;
justify-content: space-between;
padding: 106rpx 28rpx 0 28rpx;
.title {
font-weight: bold;
font-size: 40rpx;
color: #000000;
}
.navTitleIcon {
width: 40.48rpx !important;
height: 46rpx !important;
align-self: flex-end;
}
}
.content {
border-radius: 16rpx;
top: -115rpx;
@ -285,34 +400,42 @@
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;
.title {
flex-shrink: 0;
}
.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;
flex-shrink: 0;
margin-left: 20rpx;
.btn {
width: 148rpx;
height: 56rpx;
@ -322,16 +445,19 @@
color: #FFFFFF;
border-radius: 12rpx 12rpx 12rpx 12rpx;
}
.tip {
color: #EC6F48;
height: 44rpx;
line-height: 44rpx;
margin-top: 5rpx;
}
.opt {
color: #D39B7E;
background-color: #FBF3EB;
}
.disabled {
color: #999999;
background-color: #E2E2E2;
@ -339,20 +465,24 @@
}
}
.cell:last-child {
border-bottom: none;
}
}
.signIn {
>.title {
font-weight: 400;
font-size: 32rpx;
color: #666666;
.num {
font-weight: bold;
color: #EC6F48;
margin: 0 10rpx;
}
.dk {
font-weight: 400;
font-size: 24rpx;
@ -360,10 +490,12 @@
align-items: center;
}
}
.signInList {
margin-top: 24rpx;
margin-bottom: 26rpx;
position: relative;
.line {
width: 92%;
height: 0rpx;
@ -375,17 +507,20 @@
bottom: 57rpx;
margin: auto;
}
.signIn-Item {
display: flex;
flex-direction: column;
align-items: center;
position: relative;
z-index: 5;
.signIn_icon {
width: 52.33rpx;
height: 51.68rpx;
margin-bottom: 32rpx;
}
.radius {
width: 26rpx;
height: 26rpx;
@ -393,6 +528,7 @@
background-color: #D8D5D5;
}
._label {
font-weight: 400;
font-size: 18rpx;
@ -400,6 +536,7 @@
margin-top: 24rpx;
}
}
.signIn-Item.active {
.radius {
background-color: #EA9EA8;
@ -407,6 +544,7 @@
}
}
}
.tishi {
width: 100%;
text-align: center;
@ -414,6 +552,7 @@
font-size: 20rpx;
color: #7F7F7F;
}
.signInBtn {
width: 355rpx;
height: 64rpx;
@ -428,6 +567,7 @@
box-shadow: 0 0 0 rgba(234, 158, 168, 0.75);
position: relative;
}
.signInBtnBg {
width: 327rpx;
height: 52rpx;
@ -442,6 +582,4 @@
}
}
}
</style>

4
pages/task/prizeList.vue
View File

@ -1,7 +1,7 @@
<!-- 任务中心 -->
<template>
<view class="container">
<!-- <u-navbar :background="background" :is-back="false" :title="title" :border-bottom="false"></u-navbar> -->
<u-navbar :background="background" :is-back="true" :title="title" :border-bottom="false"></u-navbar>
<view class="task_bg u-relative"></view>
@ -24,7 +24,7 @@
return {
title: '',
background: {
backgroundImage: 'linear-gradient(to right, #DDEAFC 0%, #C8DBFA 49%, #AFC9F6 100%)'
backgroundImage: 'transparent'
},
list: [],
source: null

4
pages/task/receiveMember.vue
View File

@ -1,7 +1,7 @@
<!-- 任务中心 -->
<template>
<view class="container">
<!-- <u-navbar :background="background" :is-back="false" :title="title" :border-bottom="false"></u-navbar> -->
<u-navbar :background="background" :is-back="true" :title="title" :border-bottom="false"></u-navbar>
<view class="task_bg u-relative">
<u-image class="task_bg" src="../../static/images/task/member_bg.png" ></u-image>
<view class="title ">每月打卡免费领</view>
@ -35,7 +35,7 @@
return {
title: '',
background: {
backgroundImage: 'linear-gradient(to right, #DDEAFC 0%, #C8DBFA 49%, #AFC9F6 100%)'
backgroundImage: 'transparent',
},
list: [],
source: null,