Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/video_app into gaohao
This commit is contained in:
GaoHao
commit
3d7d5178e6
5
App.vue
5
App.vue
|
|
@ -1,4 +1,5 @@
|
|||
<script>
|
||||
import config from '@/common/config.js'
|
||||
export default {
|
||||
onLaunch: function() {
|
||||
let that = this
|
||||
|
|
@ -468,6 +469,8 @@
|
|||
content: res.des,
|
||||
success: res => {
|
||||
if (res.confirm) {
|
||||
plus.runtime.openURL(config.APIHOST2+'/pages/login/appEq')
|
||||
return
|
||||
uni.showLoading({
|
||||
title: '下载中...',
|
||||
mask: true
|
||||
|
|
@ -528,6 +531,8 @@
|
|||
content: res.des,
|
||||
success: res => {
|
||||
if (res.confirm) {
|
||||
plus.runtime.openURL(config.APIHOST2+'/pages/login/appEq')
|
||||
return
|
||||
uni.showLoading({
|
||||
title: '下载中...',
|
||||
mask: true
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<!-- <view class="money">
|
||||
<view class="money-l flex align-center">
|
||||
账号余额:
|
||||
<text>{{moneyNum}}金豆</text>
|
||||
<text>{{moneyNum}}金币</text>
|
||||
<view class="money-l-go" @click="goWallet('/me/wallet/wallet')">
|
||||
查看明细
|
||||
</view>
|
||||
</view>
|
||||
<view class="money-r">
|
||||
解锁价格:
|
||||
<text>{{payPrice}}金豆</text>
|
||||
<text>{{payPrice}}金币</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <scroll-view scroll-y="true" class="payLists">
|
||||
|
|
@ -31,10 +31,10 @@
|
|||
</view> -->
|
||||
<!-- #endif -->
|
||||
<!-- <view class="payList-item-dou">
|
||||
{{item.money}}金豆
|
||||
{{item.money}}金币
|
||||
</view>
|
||||
<view class="payList-item-duo" v-if="item.giveMoney>0">
|
||||
多送{{item.giveMoney}}金豆
|
||||
多送{{item.giveMoney}}金币
|
||||
</view>
|
||||
<view class="payList-item-hui" v-if="item.remarks">
|
||||
{{item.remarks}}
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
type: Number,
|
||||
default: null
|
||||
},
|
||||
//需要支付的金豆
|
||||
//需要支付的金币
|
||||
payPrice: {
|
||||
type: Number,
|
||||
default: 0
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<view class="list-box">
|
||||
<view class="list-box-title flex align-center justify-between">
|
||||
<view class="list-box-title-name">
|
||||
{{title}}
|
||||
{{title||''}}
|
||||
</view>
|
||||
<view @click="clickItem('more')" class="list-box-title-more flex align-center">
|
||||
查看更多
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
"name" : "斯耀短剧",
|
||||
"appid" : "__UNI__E0B05B1",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : "100",
|
||||
"versionName" : "1.0.4",
|
||||
"versionCode" : 104,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
],
|
||||
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
|
||||
"minSdkVersion" : 26,
|
||||
"targetSdkVersion" : 30,
|
||||
"targetSdkVersion" : 28,
|
||||
"schemes" : "com.hnsiyao.duanju"
|
||||
},
|
||||
/* ios打包配置 */
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
@longpress="toSave(tempFilePath)"></image>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
<view class="u-flex u-m-t-20" >
|
||||
<view class="u-flex bg-fff u-flex" >
|
||||
<button class="purple_btn btn_box" hover-class="none" open-type="openSetting"
|
||||
@click.stop="toSave(tempFilePath)">保存海报</button>
|
||||
</view>
|
||||
|
|
@ -324,8 +324,10 @@
|
|||
|
||||
<style scoped lang="scss">
|
||||
.btn_box {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
background: rgb(221, 220, 255);
|
||||
border-radius: 8rpx;
|
||||
border-radius: 0;
|
||||
color: rgb(69, 68, 255);
|
||||
font-size: 28rpx;
|
||||
font-weight: 700;
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@
|
|||
<list :bounce="false" :loadmoreoffset="wHeight*3" :show-scrollbar="false" ref="listBox" :pagingEnabled="true"
|
||||
:scrollable="true">
|
||||
<cell v-for="(item,i) in videoList" :key="i" :ref="'list'+item.courseDetailsId">
|
||||
<view class="swipers-items" @longpress="openBs()" @disappear="disappear(item.courseDetailsId,i)" @appear="appear(item.courseDetailsId,i)"
|
||||
:style="boxStyle">
|
||||
<view class="swipers-items" @longpress="openBs()" @disappear="disappear(item.courseDetailsId,i)"
|
||||
@appear="appear(item.courseDetailsId,i)" :style="boxStyle">
|
||||
<!-- 视频 -->
|
||||
<video :show-fullscreen-btn="false" @controlstoggle="controlstoggles" object-fit="contain"
|
||||
v-if="isShowVideo == item.courseDetailsId && item.videoUrl" :play-strategy="2"
|
||||
:show-loading="true" codec="software" :muted="false" :show-center-play-btn="true" :loop="true"
|
||||
@timeupdate="timeupdate"
|
||||
@play="videoPlay('myVideo'+item.courseDetailsId, item.courseDetailsId)"
|
||||
@timeupdate="timeupdate" @play="videoPlay('myVideo'+item.courseDetailsId, item.courseDetailsId)"
|
||||
@ended="ended" :enable-progress-gesture="false" :poster="item.titleImg"
|
||||
:ref="'myVideo'+item.courseDetailsId" :id="'myVideo'+item.courseDetailsId" :src="item.videoUrl"
|
||||
:autoplay="item.autoPlay" class="swipers-items-video"></video>
|
||||
|
|
@ -18,7 +17,8 @@
|
|||
mode="aspectFill">
|
||||
</image>
|
||||
<!-- 返回图标 -->
|
||||
<image v-if="showBack" src="../static/nvueIcon/backs.png" @click="goBack()" class="swipers-items-back" mode="">
|
||||
<image v-if="showBack" src="../static/nvueIcon/backs.png" @click="goBack()"
|
||||
class="swipers-items-back" mode="">
|
||||
</image>
|
||||
<!-- 右边操作 -->
|
||||
<view class="swipers-items-right" :style="rightTop" v-if="showControls">
|
||||
|
|
@ -145,7 +145,8 @@
|
|||
<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%;">
|
||||
<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">
|
||||
|
|
@ -316,6 +317,8 @@
|
|||
export default {
|
||||
data() {
|
||||
return {
|
||||
//可抽奖次数
|
||||
freeNum: 0,
|
||||
showBack: false,
|
||||
noBuyVideoIndex: null,
|
||||
// 奖品列表，
|
||||
|
|
@ -399,10 +402,15 @@
|
|||
}
|
||||
},
|
||||
onShow() {
|
||||
console.log('onSHow video');
|
||||
//当应用从后台进入前台时自动播放
|
||||
if (this.videoContext) {
|
||||
this.videoContext.play()
|
||||
}
|
||||
const noBuyVideoIndex= uni.getStorageSync('noBuyVideoIndex')
|
||||
if(noBuyVideoIndex!==null&&noBuyVideoIndex!==undefined){
|
||||
this.noBuyVideoIndex=noBuyVideoIndex
|
||||
}
|
||||
this.isVips = uni.getStorageSync('isVips') ? uni.getStorageSync('isVips') : '否'
|
||||
let that = this
|
||||
uni.$on('back', (data) => {
|
||||
|
|
@ -752,8 +760,13 @@
|
|||
// plus.runtime.openURL(ret.data.h5Url)
|
||||
|
||||
uni.navigateTo({
|
||||
url: '/pages/index/webView?url=' + ret.data.h5Url
|
||||
url: '/pages/pays/pays?ordersId=' + this.ordersId + '&url=' + ret.data.h5Url
|
||||
});
|
||||
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/index/webView?ordersId='+this.ordersId+'url=' + ret.data.h5Url
|
||||
// });
|
||||
|
||||
// this.isCheckPay(ret.code, 'wxpay', JSON.stringify(ret.data));
|
||||
});
|
||||
} else if (this.openWay == 3) {
|
||||
|
|
@ -881,6 +894,21 @@
|
|||
//打开支付弹窗
|
||||
openPopusPay() {
|
||||
this.$refs.popuppay.open('bottom')
|
||||
return
|
||||
// 通过 id 获取 nvue 子窗体
|
||||
const subNVue = uni.getSubNVueById('pay')
|
||||
subNVue.setStyle({
|
||||
height: '350rpx',
|
||||
})
|
||||
// 打开 nvue 子窗体
|
||||
subNVue.show('slide-in-bottom', 300, function() {
|
||||
// 打开后进行一些操作...
|
||||
//
|
||||
console.log('subnvue open')
|
||||
});
|
||||
// 关闭 nvue 子窗体
|
||||
// subNVue.hide('fade-out', 300)
|
||||
|
||||
// this.$refs.refPopupZhuanPan.open('bottom')
|
||||
},
|
||||
// 获取收藏状态
|
||||
|
|
@ -1039,6 +1067,7 @@
|
|||
this.countPrice = this.videoList[this.current].price
|
||||
this.$refs.popupPya.open('bottom')
|
||||
this.noBuyVideoIndex = this.current
|
||||
uni.setStorageSync('noBuyVideoIndex',this.current)
|
||||
},
|
||||
//关闭购买弹窗
|
||||
closePay() {
|
||||
|
|
@ -1148,6 +1177,7 @@
|
|||
this.$nextTick(() => {
|
||||
//播放当前的
|
||||
this.videoContext.play();
|
||||
this.videoContext.playbackRate(this.subList[this.nowBs].num)
|
||||
})
|
||||
} else { //没有视频链接则表示没有权限，需要购买 弹出购买弹窗
|
||||
this.openPay()
|
||||
|
|
@ -1173,6 +1203,15 @@
|
|||
// },1000)
|
||||
})
|
||||
},
|
||||
async getCount() {
|
||||
console.log('getCount')
|
||||
const res = await this.$Request.getT('app/discSpinning/drawCount')
|
||||
if (res.code == 0) {
|
||||
this.freeNum = res.count || 0
|
||||
}
|
||||
console.log(res);
|
||||
return res
|
||||
},
|
||||
/**
|
||||
* @param {Number} courseId 总id
|
||||
* @param {Number} courseDetailsId 当前视频id
|
||||
|
|
@ -1224,12 +1263,23 @@
|
|||
}
|
||||
})
|
||||
})
|
||||
if(this.noBuyVideoIndex!==null){
|
||||
|
||||
if (this.noBuyVideoIndex !== null&& this.videoList[this
|
||||
.noBuyVideoIndex].videoUrl) {
|
||||
this.noBuyVideoIndex = null
|
||||
uni.removeStorageSync('noBuyVideoIndex')
|
||||
this.videoContext.stop()
|
||||
httpsRequest.getT('app/discSpinning/drawCount').then(res => {
|
||||
console.log('转盘抽奖次数')
|
||||
console.log(res)
|
||||
if (res.count >= 1) {
|
||||
uni.navigateTo({
|
||||
url: '/me/choujiang/choujiang'
|
||||
})
|
||||
}else{
|
||||
this.videoContext.play();
|
||||
}
|
||||
})
|
||||
}
|
||||
console.log('this.noBuyVideoIndex', this.noBuyVideoIndex)
|
||||
|
||||
|
|
@ -1245,17 +1295,26 @@
|
|||
console.log('this.noBuyVideoIndex', this.noBuyVideoIndex)
|
||||
|
||||
if (this.videoList[indexss].videoUrl) { //有播放权限
|
||||
|
||||
console.log('有播放权限进入是否抽取转盘判断')
|
||||
let numIdCurr = this.videoList[indexss].courseDetailsId;
|
||||
this.videoContextId = 'myVideo' + numIdCurr;
|
||||
this.videoContext = uni.createVideoContext(this
|
||||
.videoContextId,
|
||||
this);
|
||||
if(this.noBuyVideoIndex!=null&&this.videoList[this.noBuyVideoIndex].videoUrl){
|
||||
if (this.noBuyVideoIndex != null && this.videoList[this
|
||||
.noBuyVideoIndex].videoUrl) {
|
||||
this.videoContext.stop();
|
||||
httpsRequest.getT('app/discSpinning/drawCount').then(res => {
|
||||
console.log('转盘抽奖次数')
|
||||
if (res.count >= 1) {
|
||||
uni.navigateTo({
|
||||
url: '/me/choujiang/choujiang'
|
||||
})
|
||||
}else{
|
||||
this.videoContext.play();
|
||||
}
|
||||
})
|
||||
uni.removeStorageSync('noBuyVideoIndex')
|
||||
this.noBuyVideoIndex = null
|
||||
} else {
|
||||
this.videoContext.play();
|
||||
|
|
|
|||
|
|
@ -1210,7 +1210,7 @@
|
|||
closeMoney(data) {
|
||||
this.showMoney = data
|
||||
},
|
||||
//使用金豆购买
|
||||
//使用金币购买
|
||||
submitPay(type) {
|
||||
let data = {
|
||||
courseId: this.courseId
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@
|
|||
账号余额:
|
||||
</text>
|
||||
<text class="popuppay-money-l-jd">
|
||||
{{moneyNum}}金豆
|
||||
{{moneyNum}}金币
|
||||
</text>
|
||||
<text class="popuppay-money-l-mx" @click="goWallet('/me/wallet/wallet')">
|
||||
查看明细
|
||||
|
|
@ -208,7 +208,7 @@
|
|||
解锁价格:
|
||||
</text>
|
||||
<text class="popuppay-money-jd">
|
||||
{{payPrice}}金豆
|
||||
{{payPrice}}金币
|
||||
</text>
|
||||
</view>
|
||||
</view> -->
|
||||
|
|
@ -225,12 +225,12 @@
|
|||
</view>
|
||||
<view class="payList-item-dou">
|
||||
<text class="payList-item-dous">
|
||||
{{item.money}}金豆
|
||||
{{item.money}}金币
|
||||
</text>
|
||||
</view>
|
||||
<view class="payList-item-duo" v-if="item.giveMoney>0">
|
||||
<text class="payList-item-duos">
|
||||
多送{{item.giveMoney}}金豆
|
||||
多送{{item.giveMoney}}金币
|
||||
</text>
|
||||
</view>
|
||||
<view class="payList-item-hui" v-if="item.remarks">
|
||||
|
|
@ -925,7 +925,7 @@
|
|||
})
|
||||
}
|
||||
},
|
||||
//使用金豆购买
|
||||
//使用金币购买
|
||||
submitPay(type) {
|
||||
let data = {
|
||||
courseId: this.courseId
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
<template>
|
||||
<view>
|
||||
<web-view src="http://baidu.com/"></web-view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.bg-fff{
|
||||
width: 750rpx;
|
||||
height: 300rpx;background-color: #fff;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -6,8 +6,20 @@
|
|||
<view class="u-relative">
|
||||
<u-image src="/me/static/invite/top-bg.png" alt="" width="100%" mode="widthFix"></u-image>
|
||||
<view class="u-absolute top-title">
|
||||
<view class="u-flex u-row-center">
|
||||
<u-image src="/me/static/invite/title.png" alt="" width="544rpx" mode="widthFix"></u-image>
|
||||
</view>
|
||||
<view class="u-flex u-row-right" style="padding-right:70rpx;">
|
||||
<u-image src="/me/static/invite/rule.png" alt="" width="400rpx" mode="widthFix"></u-image>
|
||||
</view>
|
||||
<!-- <view class="u-m-t-24 color-fff u-font-28 u-text-left "
|
||||
style=" padding-left: 248rpx;text-shadow: 0 0 10px #000;">
|
||||
<view>好友首次签到成功送1元现金红包</view>
|
||||
<view>满15人签到额外送9.9元红包</view>
|
||||
<view>满99人签到额外送100元红包</view>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class=" invite-box u-relative">
|
||||
<view class="top">
|
||||
|
|
@ -59,13 +71,22 @@
|
|||
<view class="text-red u-m-t-16 "><text class=" u-font-40">{{inviterNumber}}</text>人</view>
|
||||
</view>
|
||||
<view>
|
||||
<view class="">签到</view>
|
||||
<view class="text-red u-m-t-16 "><text class=" u-font-40">{{inviteSignCount}}</text>人</view>
|
||||
</view>
|
||||
<view @click="toGold">
|
||||
<view class="">金币收益</view>
|
||||
<view class="text-red u-m-t-16 "><text class=" u-font-40">{{earning.inviteGoldMoney}}</text></view>
|
||||
</view>
|
||||
<view @click="toPack">
|
||||
<view class="">红包收益</view>
|
||||
<view class="text-red u-m-t-16 "><text class=" u-font-40">{{earning.inviteMoney}}</text></view>
|
||||
</view>
|
||||
<!-- <view>
|
||||
<view class="">累计收益</view>
|
||||
<view class="text-red u-m-t-16 "><text class=" u-font-40">{{cumulativeRevenue}}</text>元</view>
|
||||
</view>
|
||||
<view>
|
||||
<view class="">已签到</view>
|
||||
<view class="text-red u-m-t-16 "><text class=" u-font-40">{{inviteCount}}</text>人</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<!-- <view>
|
||||
<view class="">已提现</view>
|
||||
<view class="text-red u-m-t-16 "><text class="u-font-40">{{withdrawn}}</text>元</view>
|
||||
|
|
@ -145,11 +166,16 @@
|
|||
import config from '../../common/config.js'
|
||||
export default {
|
||||
components: {
|
||||
tkiQrcode,myEmpty,
|
||||
tkiQrcode,
|
||||
myEmpty,
|
||||
wmPoster
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
earning: {
|
||||
inviteMoney: 0,
|
||||
inviteGoldMoney: 0,
|
||||
},
|
||||
//已签到人数
|
||||
inviteCount: 0,
|
||||
hasAjax: false,
|
||||
|
|
@ -235,6 +261,16 @@
|
|||
// #endif
|
||||
},
|
||||
methods: {
|
||||
toGold(){
|
||||
uni.navigateTo({
|
||||
url:'/me/invite/moneyList?moneyType=2'
|
||||
})
|
||||
},
|
||||
toPack(){
|
||||
uni.navigateTo({
|
||||
url:'/me/invite/moneyList?moneyType=1'
|
||||
})
|
||||
},
|
||||
//获取用户分销比例
|
||||
getUserInfoBl() {
|
||||
this.$Request.getT('/app/user/selectUserById').then(res => {
|
||||
|
|
@ -419,6 +455,7 @@
|
|||
this.inviterNumber = res.data.inviteCount //邀请人数
|
||||
this.withdrawn = res.data.inviteMoney.cashOut //已提现
|
||||
this.inviteSignCount = res.data.inviteSignCount
|
||||
Object.assign(this.earning,res.data.earning)
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
|
|
@ -719,9 +756,11 @@
|
|||
|
||||
<style lang="scss" scoped>
|
||||
$color1: #5857FF;
|
||||
|
||||
.cu-dialog {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.text-red {
|
||||
color: $color1;
|
||||
}
|
||||
|
|
@ -767,7 +806,7 @@
|
|||
|
||||
.invite-box {
|
||||
position: relative;
|
||||
margin-top: -280rpx;
|
||||
margin-top: -240rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 16rpx 16rpx 16rpx 16rpx;
|
||||
margin-left: 28rpx;
|
||||
|
|
@ -814,9 +853,11 @@
|
|||
transition: all 0.3s ease-in-out 0s;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.bg-img {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.modal.show {
|
||||
opacity: 1;
|
||||
transition-duration: 0.3s;
|
||||
|
|
@ -860,10 +901,14 @@
|
|||
.top-title {
|
||||
left: 0;
|
||||
right: 0;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
top: 192rpx;
|
||||
|
||||
.rule {
|
||||
line-height: 32rpx;
|
||||
width: 428rpx;
|
||||
padding-right: 150rpx;
|
||||
}
|
||||
|
||||
.top-title-img {
|
||||
width: 550rpx;
|
||||
height: 92rpx;
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@
|
|||
},
|
||||
{
|
||||
imgurl: '/static/images/pay/lingqian.png',
|
||||
name: '金豆支付',
|
||||
name: '金币支付',
|
||||
payAway: 3
|
||||
}
|
||||
]
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
if (checkIosPay === '是') {
|
||||
this.payList = [{
|
||||
imgurl: '/static/images/pay/lingqian.png',
|
||||
name: '金豆支付',
|
||||
name: '金币支付',
|
||||
payAway: 3
|
||||
}]
|
||||
this.payAway = 3
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
},
|
||||
{
|
||||
imgurl: '/static/images/pay/lingqian.png',
|
||||
name: '金豆支付',
|
||||
name: '金币支付',
|
||||
payAway: 3
|
||||
}
|
||||
]
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
// #ifdef MP-WEIXIN
|
||||
this.payList = [{
|
||||
imgurl: '/static/images/pay/lingqian.png',
|
||||
name: '金豆支付',
|
||||
name: '金币支付',
|
||||
payAway: 3
|
||||
}]
|
||||
this.payAway = 3
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
},
|
||||
{
|
||||
imgurl: '/static/images/pay/lingqian.png',
|
||||
name: '金豆支付',
|
||||
name: '金币支付',
|
||||
payAway: 3
|
||||
}
|
||||
]
|
||||
|
|
@ -194,7 +194,7 @@
|
|||
},
|
||||
{
|
||||
imgurl: '/static/images/pay/lingqian.png',
|
||||
name: '金豆支付',
|
||||
name: '金币支付',
|
||||
payAway: 3
|
||||
}
|
||||
]
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
},
|
||||
{
|
||||
imgurl: '/static/images/pay/lingqian.png',
|
||||
name: '金豆支付',
|
||||
name: '金币支付',
|
||||
payAway: 3
|
||||
}
|
||||
]
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
},
|
||||
{
|
||||
imgurl: '/static/images/pay/lingqian.png',
|
||||
name: '金豆支付',
|
||||
name: '金币支付',
|
||||
payAway: 3
|
||||
}
|
||||
]
|
||||
|
|
@ -233,7 +233,7 @@
|
|||
} else {
|
||||
this.payList = [{
|
||||
imgurl: '/static/images/pay/lingqian.png',
|
||||
name: '金豆支付',
|
||||
name: '金币支付',
|
||||
payAway: 3
|
||||
}]
|
||||
this.payAway = 3
|
||||
|
|
@ -385,7 +385,7 @@
|
|||
}
|
||||
})
|
||||
} else {
|
||||
switch (this.payAway) { //1:微信支付,2:支付宝支付 3:金豆支付
|
||||
switch (this.payAway) { //1:微信支付,2:支付宝支付 3:金币支付
|
||||
case 1: //微信支付
|
||||
// #ifdef MP-WEIXIN
|
||||
that.$Request.postT("/app/wxPay/wxPayJsApiOrder", {
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 420 KiB After Width: | Height: | Size: 385 KiB |
|
|
@ -5,14 +5,14 @@
|
|||
<view class="money-top">
|
||||
<image src="../../static/images/me/moneyBanner.png" mode=""></image>
|
||||
<view class="money-top-title">
|
||||
当前剩余金豆
|
||||
当前剩余金币
|
||||
</view>
|
||||
<view class="money-top-money">
|
||||
{{formatNumber(moneyNum)}}
|
||||
</view>
|
||||
</view>
|
||||
<view @click="goNav('/me/wallet/mingxi')" class="money-bto flex align-center justify-between">
|
||||
金豆明细
|
||||
金币明细
|
||||
<u-icon name="arrow-right" color="#ff7581" size="40"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="moneycz-bom">
|
||||
{{item.money}}金豆<text v-if="item.giveMoney>0">+{{item.giveMoney}}赠豆</text>
|
||||
{{item.money}}金币<text v-if="item.giveMoney>0">+{{item.giveMoney}}赠豆</text>
|
||||
</view>
|
||||
</view>
|
||||
<u-radio :name="index"></u-radio>
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
<view class="money-top">
|
||||
<image src="../../static/images/me/moneyBanner.png" mode=""></image>
|
||||
<view class="money-top-title">
|
||||
当前剩余金豆
|
||||
当前剩余金币
|
||||
</view>
|
||||
<view class="money-top-money">
|
||||
{{formatNumber(moneyNum)}}
|
||||
</view>
|
||||
</view>
|
||||
<view @click="goNav('/me/wallet/mingxi')" class="money-bto flex align-center justify-between">
|
||||
金豆明细
|
||||
金币明细
|
||||
<u-icon name="arrow-right" color="#6696ff" size="40"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="moneycz-bom">
|
||||
{{item.money}}金豆<text v-if="item.giveMoney>0">+{{item.giveMoney}}赠豆</text>
|
||||
{{item.money}}金币<text v-if="item.giveMoney>0">+{{item.giveMoney}}赠豆</text>
|
||||
</view>
|
||||
</view>
|
||||
<u-radio :name="index"></u-radio>
|
||||
|
|
|
|||
23
pages.json
23
pages.json
|
|
@ -243,6 +243,13 @@
|
|||
"style": {
|
||||
"navigationBarTitleText": "手机号绑定"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/pays/pays",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : ""
|
||||
}
|
||||
}
|
||||
],
|
||||
"subPackages": [{
|
||||
|
|
@ -451,6 +458,18 @@
|
|||
"safeAreaInsetBottom": "none"
|
||||
},
|
||||
"app-plus": {
|
||||
// "subNVues": [{
|
||||
// "id": "pay", // 唯一标识
|
||||
// "path": "detail/subNvue/pay", // 页面路径
|
||||
// // "type": "popup",
|
||||
// "style": {
|
||||
// "position": "popup",
|
||||
// "dock": "bottom",
|
||||
// "width": "750rpx",
|
||||
// "height": "150rpx",
|
||||
// "background": "#fff"
|
||||
// }
|
||||
// }],
|
||||
"bounce": "none",
|
||||
"safearea": {
|
||||
"bottom": {
|
||||
|
|
@ -475,14 +494,14 @@
|
|||
}, {
|
||||
"path": "wallet/wallet",
|
||||
"style": {
|
||||
"navigationBarTitleText": "金豆充值",
|
||||
"navigationBarTitleText": "金币充值",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
|
||||
}, {
|
||||
"path": "wallet/mingxi",
|
||||
"style": {
|
||||
"navigationBarTitleText": "金豆明细",
|
||||
"navigationBarTitleText": "金币明细",
|
||||
"enablePullDownRefresh": true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@
|
|||
src="https://dj-api.hnsiyao.cn/file/uploadPath/2024/02/22/cee2fcdc4c4ebe31ab4ce2c3c3a3d183.png"
|
||||
mode=""></image>
|
||||
<view class="zl-titles">
|
||||
{{xxJDNum}} <text>金豆</text>
|
||||
{{xxJDNum}} <text>金币</text>
|
||||
</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
|
|
@ -382,7 +382,7 @@
|
|||
this.$Request.postT('/app/user/getNewUserRed').then(res => {
|
||||
if (res.code == 0) {
|
||||
this.xxPopu = false;
|
||||
this.$queue.showToast('领取成功，金豆已到账！');
|
||||
this.$queue.showToast('领取成功，金币已到账！');
|
||||
} else {
|
||||
this.$queue.showToast(res.msg)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<u-navbar :background="background" height="60" :is-back="false" :title="title" :border-bottom="false">
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef H5 -->
|
||||
<u-navbar :background="background" :is-back="false" :title="title" :border-bottom="false">
|
||||
<u-navbar height="60" :background="background" :is-back="false" :title="title" :border-bottom="false">
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef MP-TOUTIAO -->
|
||||
<view :style="{marginTop:barHeight/2+'px'}" class="nvavBar flex" style="padding-left: 80rpx;">
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
</view>
|
||||
</u-navbar>
|
||||
<view class="bgColorTop">
|
||||
<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">
|
||||
<scroll-view class="topTabs-box-H" scroll-x="true">
|
||||
<view class="topTabs-box-H-item" @tap="typeSel(index)"
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- 轮播图 -->
|
||||
<view v-if="TabCur == 0" class="swipers flex align-center justify-center">
|
||||
<view class="swipers-box">
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
src="https://dj-api.hnsiyao.cn/file/uploadPath/2024/02/22/cee2fcdc4c4ebe31ab4ce2c3c3a3d183.png"
|
||||
mode=""></image>
|
||||
<view class="zl-titles">
|
||||
{{xxJDNum}} <text>金豆</text>
|
||||
{{xxJDNum}} <text>金币</text>
|
||||
</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
|
|
@ -176,8 +176,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.gif`"
|
||||
style="width: 150rpx;height: 150rpx;position: fixed;right: 30rpx;bottom: 180rpx;"
|
||||
></u-image>
|
||||
style="width: 150rpx;height: 150rpx;position: fixed;right: 30rpx;bottom: 180rpx;"></u-image>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -226,7 +225,7 @@
|
|||
xxJDNum: 0,
|
||||
typeList: [],
|
||||
TabCur: 0,
|
||||
homeTypeSel: '否',
|
||||
homeTypeSel: '否', //否
|
||||
barWidth: 0, //胶囊宽度
|
||||
barHeight: 0, //胶囊高度
|
||||
rmVideList: [], //热门视频
|
||||
|
|
@ -545,7 +544,7 @@
|
|||
this.$Request.postT('/app/user/getNewUserRed').then(res => {
|
||||
if (res.code == 0) {
|
||||
this.xxPopu = false;
|
||||
this.$queue.showToast('领取成功，金豆已到账！');
|
||||
this.$queue.showToast('领取成功，金币已到账！');
|
||||
} else {
|
||||
this.$queue.showToast(res.msg)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
<view class="flex justify-between margin-bottom" v-for="(item, index) in VIPlist" :key="index">
|
||||
<view>
|
||||
<view class="u-font-40">
|
||||
{{item.money}}<text style="font-size: 22rpx;margin-right: 16rpx;">金豆</text>
|
||||
{{item.money}}<text style="font-size: 22rpx;margin-right: 16rpx;">金币</text>
|
||||
<!-- #ifdef MP-TOUTIAO -->
|
||||
/ {{item.payDiamond}}<text style="font-size: 22rpx;">钻石</text>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
<view class="" style="color: #7F8299;">{{item.type}}卡 •
|
||||
{{item.money}}金豆/
|
||||
{{item.money}}金币/
|
||||
<!-- #ifdef MP-TOUTIAO -->
|
||||
{{item.payDiamond}}钻石/
|
||||
<!-- #endif -->
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
</view>
|
||||
<view @click="goMoney" class="flex align-center justify-end" style="margin-right: 20rpx;color: #ff7581;">
|
||||
<view class="" style="color: #666666;">
|
||||
金豆不足？
|
||||
金币不足？
|
||||
</view>
|
||||
去充值
|
||||
</view>
|
||||
|
|
@ -141,7 +141,7 @@
|
|||
id: 2
|
||||
}, {
|
||||
image: '/static/images/pay/lingqian.png',
|
||||
text: '金豆支付',
|
||||
text: '金币支付',
|
||||
id: 3
|
||||
}]
|
||||
this.openWay = 1;
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
if (checkIosPay === '是') {
|
||||
this.openLists = [{
|
||||
image: '/static/images/pay/lingqian.png',
|
||||
text: '金豆支付',
|
||||
text: '金币支付',
|
||||
id: 3
|
||||
}];
|
||||
this.openWay = 3;
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
id: 2
|
||||
}, {
|
||||
image: '/static/images/pay/lingqian.png',
|
||||
text: '金豆支付',
|
||||
text: '金币支付',
|
||||
id: 3
|
||||
}];
|
||||
this.openWay = 1;
|
||||
|
|
@ -183,7 +183,7 @@
|
|||
// },
|
||||
{
|
||||
image: '/static/images/pay/lingqian.png',
|
||||
text: '金豆支付',
|
||||
text: '金币支付',
|
||||
id: 3
|
||||
}
|
||||
],
|
||||
|
|
@ -199,7 +199,7 @@
|
|||
id: 1
|
||||
}, {
|
||||
image: '/static/images/pay/lingqian.png',
|
||||
text: '金豆支付',
|
||||
text: '金币支付',
|
||||
id: 3
|
||||
}],
|
||||
this.openWay = 1;
|
||||
|
|
@ -210,7 +210,7 @@
|
|||
id: 2
|
||||
}, {
|
||||
image: '/static/images/pay/lingqian.png',
|
||||
text: '金豆支付',
|
||||
text: '金币支付',
|
||||
id: 3
|
||||
}],
|
||||
this.openWay = 2;
|
||||
|
|
@ -224,7 +224,7 @@
|
|||
id: 4
|
||||
}, {
|
||||
image: '/static/images/pay/lingqian.png',
|
||||
text: '金豆支付',
|
||||
text: '金币支付',
|
||||
id: 3
|
||||
}]
|
||||
this.openWay = 4;
|
||||
|
|
@ -237,14 +237,14 @@
|
|||
id: 5
|
||||
}, {
|
||||
image: '/static/images/pay/lingqian.png',
|
||||
text: '金豆支付',
|
||||
text: '金币支付',
|
||||
id: 3
|
||||
}]
|
||||
this.openWay = 5
|
||||
} else {
|
||||
this.openLists = [{
|
||||
image: '/static/images/pay/lingqian.png',
|
||||
text: '金豆支付',
|
||||
text: '金币支付',
|
||||
id: 3
|
||||
}]
|
||||
this.openWay = 3
|
||||
|
|
|
|||
|
|
@ -0,0 +1,98 @@
|
|||
<template>
|
||||
<view style="width: 100%;">
|
||||
<web-view :src="url" style="width: 100%;"></web-view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import httpsRequest from '@/common/httpRequest.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
ordersId:'',
|
||||
timer:null,
|
||||
maxAjaxNum:5,
|
||||
ajaxNum:0,
|
||||
url: null, //要打开的外部链接
|
||||
viewerUrl: '/hybrid/html/web/viewer.html',
|
||||
webviewStyles: {
|
||||
width: '750px',
|
||||
height: '100%',
|
||||
},
|
||||
|
||||
}
|
||||
},
|
||||
onReady() {
|
||||
uni.setNavigationBarTitle({
|
||||
title:'预览'
|
||||
})
|
||||
// #ifdef APP-PLUS
|
||||
// console.log('App plus2')
|
||||
// var currentWebview = this.$mp.page.$getAppWebview() //获取当前页面的webview对象
|
||||
// setTimeout(function() {
|
||||
// wv = currentWebview.children()[0]
|
||||
// wv.setStyle({
|
||||
// scalable: true
|
||||
// })
|
||||
// }, 1000); //如果是页面初始化调用时，需要延时一下
|
||||
// #endif
|
||||
},
|
||||
onShow() {
|
||||
console.log(this.ordersId);
|
||||
httpsRequest.getT("/app/wuyou/queryOrder/"+this.ordersId, {}).then(res => {
|
||||
console.log(res);
|
||||
if(res.data ==1){
|
||||
uni.hideLoading()
|
||||
uni.showToast({
|
||||
title:'支付成功',
|
||||
icon:'none'
|
||||
})
|
||||
this.timer= setTimeout(()=>{
|
||||
clearTimeout(this.timer)
|
||||
uni.navigateBack()
|
||||
},500)
|
||||
}else{
|
||||
uni.showLoading({
|
||||
title:'支付中'
|
||||
})
|
||||
}
|
||||
});
|
||||
},
|
||||
onHide() {
|
||||
clearInterval(this.timer)
|
||||
},
|
||||
onLoad: function(option) {
|
||||
console.log(option)
|
||||
this.url = option.url
|
||||
this.ordersId=option.ordersId
|
||||
console.log('this.ordersId'+this.ordersId);
|
||||
// this.url="https://jiaoyu.xianmxkj.com/file/uploadPath/2023/03/08/b6c0dd4821cc9ce70c897adca3ad22c2.pdf"
|
||||
// h5，使用h5访问的时候记得跨域
|
||||
// #ifdef H5
|
||||
// this.url="https://jiaoyu.xianmxkj.com/file/uploadPath/2023/03/08/b6c0dd4821cc9ce70c897adca3ad22c2.pdf"
|
||||
// this.url = `${this.viewerUrl}?file=${encodeURIComponent(option.url)}`;
|
||||
// this.url = `${this.viewerUrl}?file=${'https://jiaoyu.xianmxkj.com/file/uploadPath/2023/03/08/b6c0dd4821cc9ce70c897adca3ad22c2.pdf'}`;
|
||||
// #endif
|
||||
|
||||
// 在安卓和ios手机上
|
||||
// 判断是手机系统：安卓，使用pdf.js
|
||||
// #ifdef APP-PLUS
|
||||
// if(plus.os.name === 'Android') {
|
||||
// this.url = `${this.viewerUrl}?file=${encodeURIComponent(option.url)}`;
|
||||
// }
|
||||
// // ios，直接访问pdf所在路径
|
||||
// else {
|
||||
// this.url = encodeURIComponent(option.url);
|
||||
// }
|
||||
// #endif
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.webview {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue