Skip to content

U
uniapp_vedio
Commit 22830e42 authored by jyx's avatar jyx
Browse files
Options

代码优化

parent 92fa688d
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 95 deletions
vedio/components/home/follow.vue
View file @ 22830e42
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
mounted() { mounted() {
uni.getSystemInfo({ uni.getSystemInfo({
success: (res => { success: (res => {
this.clientHeight = res.windowHeight - 42; this.clientHeight = res.windowHeight - 50;
}) })
}); });
}, },
......
vedio/components/home/index.vue
View file @ 22830e42
...@@ -182,8 +182,7 @@ ...@@ -182,8 +182,7 @@
style="width: 30rpx;height: 30rpx;display: flex;align-items: right;margin: 10rpx;" style="width: 30rpx;height: 30rpx;display: flex;align-items: right;margin: 10rpx;"
src="../../static/index/ic_quit_white.png" mode="aspectFill"></image> src="../../static/index/ic_quit_white.png" mode="aspectFill"></image>
<view @click="handleBottomPlay(newRecordBean)" <view @click="handleBottomPlay(newRecordBean)"
style="width: 160rpx;height: 50rpx;line-height: 50rpx;text-align: center;background-color: red;border-radius:30rpx;color: white;font-size: 24rpx;margin-right: 20rpx;"> style="width: 160rpx;height: 50rpx;line-height: 50rpx;text-align: center;background-color: red;border-radius:30rpx;color: white;font-size: 24rpx;margin-right: 20rpx;"> 继续观看
继续观看
</view> </view>
</view> </view>
...@@ -242,7 +241,7 @@ ...@@ -242,7 +241,7 @@
mounted() { mounted() {
uni.getSystemInfo({ uni.getSystemInfo({
success: (res => { success: (res => {
this.clientHeight = res.windowHeight - 42; this.clientHeight = res.windowHeight - 50;
}) })
}); });
// 匹配视频 // 匹配视频
......
vedio/components/home/my.vue
View file @ 22830e42
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
mounted() { mounted() {
uni.getSystemInfo({ uni.getSystemInfo({
success: (res => { success: (res => {
this.clientHeight = res.windowHeight - 42; this.clientHeight = res.windowHeight - 50;
}) })
}); });
}, },
......
vedio/components/player/player.vue
View file @ 22830e42
...@@ -295,6 +295,10 @@ ...@@ -295,6 +295,10 @@
var countDownSeconds = 3 var countDownSeconds = 3
that.countDown = countDownSeconds that.countDown = countDownSeconds
const timer = setInterval(() => { const timer = setInterval(() => {
if (!that.showRewardAdPop) {
clearInterval(timer)
}
if (countDownSeconds > 0) { if (countDownSeconds > 0) {
that.countDown = countDownSeconds that.countDown = countDownSeconds
countDownSeconds-- countDownSeconds--
...@@ -315,6 +319,7 @@ ...@@ -315,6 +319,7 @@
}, },
closeAdPop() { closeAdPop() {
this.showRewardAdPop = false this.showRewardAdPop = false
this.pm.toggleCustomDialog()
}, },
closeAdMorePop() { closeAdMorePop() {
this.showRewardAdMorePop = false this.showRewardAdMorePop = false
......
vedio/pages.json
View file @ 22830e42
...@@ -37,8 +37,10 @@ ...@@ -37,8 +37,10 @@
"root": "pagesC", "root": "pagesC",
"pages": [{ "pages": [{
"path": "ttvideo/ttVideoDetail", "path": "ttvideo/ttVideoDetail",
"usingComponents": { "style": {
"tt-video-player": "ext://industry/video-player" "backgroundColor": "#000000",
"navigationBarBackgroundColor": "#000000",
"navigationBarTextStyle": "#ffffff"
} }
}, { }, {
"path": "playlet/index", "path": "playlet/index",
...@@ -99,9 +101,13 @@ ...@@ -99,9 +101,13 @@
"backgroundColor": "#f5f5f5", "backgroundColor": "#f5f5f5",
"navigationStyle": "default", "navigationStyle": "default",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff",
"app-plus": { "app-plus": {
"bounce": "none", "bounce": "none",
"scrollIndicator": "none" "scrollIndicator": "none"
},
"usingComponents": {
"tt-video-player": "ext://industry/video-player"
} }
}, },
"condition": { //模式配置，仅开发期间生效 "condition": { //模式配置，仅开发期间生效
......
vedio/pages/home.vue
View file @ 22830e42
...@@ -43,8 +43,7 @@ ...@@ -43,8 +43,7 @@
</view> </view>
</view> </view>
<view v-if="showEditBar" class="editBar" <view v-if="showEditBar" class="editBar">
:style="'padding-top:35rpx;padding-bottom:' + bottomSafePadding + 'px;'">
<view class="editItem" @click="!isFullChoice?fullChoice():noChoice()"> <view class="editItem" @click="!isFullChoice?fullChoice():noChoice()">
{{!isFullChoice?'全选':'全不选'}} {{!isFullChoice?'全选':'全不选'}}
</view> </view>
...@@ -194,13 +193,13 @@ ...@@ -194,13 +193,13 @@
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 60rpx; height: 60px;
background: white; background: white;
display: flex; display: flex;
.editItem { .editItem {
height: 60rpx; height: 60px;
line-height: 60rpx; line-height: 60px;
text-align: center; text-align: center;
width: 50%; width: 50%;
} }
...@@ -210,12 +209,12 @@ ...@@ -210,12 +209,12 @@
display: flex; display: flex;
align-items: center; align-items: center;
background-color: white; background-color: white;
height: 42px; height: 50px;
.tab { .tab {
flex: 1; flex: 1;
text-align: center; text-align: center;
font-size: 12px; font-size: 14px;
font-weight: bold; font-weight: bold;
color: black; color: black;
......
vedio/pagesA/vipPay/vipPay.vue
View file @ 22830e42
...@@ -62,17 +62,17 @@ ...@@ -62,17 +62,17 @@
<view v-else style="display: flex;align-items: center;font-size: 40rpx; <view v-else style="display: flex;align-items: center;font-size: 40rpx;
color: #f2b068; color: #f2b068;
font-weight: 700;"> font-weight: 700;">
{{multiply(item.firstPayPrice)}}
<image style="width: 50rpx;height: 50rpx;display: flex;margin-right: 10rpx;" <image style="width: 50rpx;height: 50rpx;display: flex;margin-right: 10rpx;"
src="@/static/ic_zuan.png"> src="@/static/ic_zuan.png">
</image> </image>
+{{multiply(item.firstPayPrice)}}
</view> </view>
<view class="name row" v-if="item.title!=null&&item.title!=''"> <view class="name row" v-if="item.title!=null&&item.title!=''">
{{item.title}} {{item.title}}
</view> </view>
<view class="origin row" v-if="item.remarks!=null&&item.remarks!=''"> <view class="origin row" v-if="item.remarks!=null&&item.remarks!=''&&os=='android'">
{{item.remarks}} {{item.remarks}}
</view> </view>
</view> </view>
...@@ -289,7 +289,8 @@ ...@@ -289,7 +289,8 @@
.yhqRateBalance) + "钻石,已优惠" + .yhqRateBalance) + "钻石,已优惠" +
that.multiply(tempYhq) + "钻石" that.multiply(tempYhq) + "钻石"
} else { } else {
that.btnText = "立即支付" + that.vipList[this.selectedVipIndex].yhqRateBalance + "元,已优惠" + tempYhq + that.btnText = "立即支付" + that.vipList[this.selectedVipIndex].yhqRateBalance + "元,已优惠" +
tempYhq +
"元" "元"
} }
...@@ -305,10 +306,12 @@ ...@@ -305,10 +306,12 @@
let tempYhq = new Decimal(cashStr).sub(new Decimal(that.pointList[this.selectedIndex] let tempYhq = new Decimal(cashStr).sub(new Decimal(that.pointList[this.selectedIndex]
.yhqRateBalance)).toNumber() .yhqRateBalance)).toNumber()
if (that.os == 'ios') { if (that.os == 'ios') {
that.btnText = "立即支付" + that.multiply(that.pointList[this.selectedIndex].yhqRateBalance) + "钻石,已优惠" + that.btnText = "立即支付" + that.multiply(that.pointList[this.selectedIndex].yhqRateBalance) +
"钻石,已优惠" +
that.multiply(tempYhq) + "钻石" that.multiply(tempYhq) + "钻石"
} else { } else {
that.btnText = "立即支付" + that.pointList[this.selectedIndex].yhqRateBalance + "元,已优惠" + tempYhq + "元" that.btnText = "立即支付" + that.pointList[this.selectedIndex].yhqRateBalance + "元,已优惠" + tempYhq +
"元"
} }
} }
...@@ -335,7 +338,8 @@ ...@@ -335,7 +338,8 @@
.yhqRateBalance) + "钻石,已优惠" + .yhqRateBalance) + "钻石,已优惠" +
that.multiply(tempYhq) + "钻石" that.multiply(tempYhq) + "钻石"
} else { } else {
that.btnText = "立即支付" + that.vipList[this.selectedVipIndex].yhqRateBalance + "元,已优惠" + tempYhq + that.btnText = "立即支付" + that.vipList[this.selectedVipIndex].yhqRateBalance + "元,已优惠" +
tempYhq +
"元" "元"
} }
} }
...@@ -350,10 +354,12 @@ ...@@ -350,10 +354,12 @@
let tempYhq = new Decimal(cashStr).sub(new Decimal(that.pointList[this.selectedIndex] let tempYhq = new Decimal(cashStr).sub(new Decimal(that.pointList[this.selectedIndex]
.yhqRateBalance)).toNumber() .yhqRateBalance)).toNumber()
if (that.os == 'ios') { if (that.os == 'ios') {
that.btnText = "立即支付" + that.multiply(that.pointList[this.selectedIndex].yhqRateBalance) + "钻石,已优惠" + that.btnText = "立即支付" + that.multiply(that.pointList[this.selectedIndex].yhqRateBalance) +
"钻石,已优惠" +
that.multiply(tempYhq) + "钻石" that.multiply(tempYhq) + "钻石"
} else { } else {
that.btnText = "立即支付" + that.pointList[this.selectedIndex].yhqRateBalance + "元,已优惠" + tempYhq + "元" that.btnText = "立即支付" + that.pointList[this.selectedIndex].yhqRateBalance + "元,已优惠" + tempYhq +
"元"
} }
} }
...@@ -573,6 +579,7 @@ ...@@ -573,6 +579,7 @@
color: #2c2c2c; color: #2c2c2c;
} }
} }
.text-box { .text-box {
word-break: break-all; word-break: break-all;
margin: 10rpx; margin: 10rpx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment