Compare commits

..

No commits in common. "3f61e9e2e99fdbd5011f2bb09db1093b2a4ac343" and "cffd287924ea23b792a1e7c18bdd4fede6fc8c70" have entirely different histories.

11 changed files with 200 additions and 363 deletions

View File

@ -1,4 +1,23 @@
<template /> <template>
<view
v-show="show"
class="loading-box"
:style="{
'background-color': backColor
}"
@click="dismiss"
>
<image
class="rotateKey"
src="@/static/images/loading-svg.png"
/>
<view class="loading">
<text class="loading-text">
{{ text }}
</text>
</view>
</view>
</template>
<script> <script>
export default { export default {

View File

@ -1,130 +0,0 @@
<template>
<uni-nav-bar
:title="title"
:fixed="fixed"
:left-icon="leftIcon"
:right-icon="rightIcon"
:right-text="rightText"
:leftText="leftText"
:leftWidth="leftWidth"
:rightWidth="rightWidth"
:border="border"
:status-bar="true"
:class="title ? '' : 'uni-navbar-hide-title'"
:background-color="backgroudColor"
:color="color"
@clickLeft="clickLeftHandler"
@clickRight="clickRightHandler"
>
<template slot="left">
<slot name="left"></slot>
</template>
<template slot="default">
<slot name="default"></slot>
</template>
<template slot="right">
<slot name="right"></slot>
</template>
</uni-nav-bar>
</template>
<script>
/**
* 导航栏
* @description 这里也是一个组件描述r
* @日期 2021-5-28 16:30:56
* @property {String} type = [button|input|...值域] 这里是属性描述
* @event {Function} tap 这是是事件描述
* @example https://ext.dcloud.net.cn/plugin?id=52
*/
export default {
name: 'GNavbar',
props: {
leftExitMP: {
type: Boolean,
default: false
},
title: {
type: String,
default: ''
},
leftText: {
type: String,
default: ''
},
leftIcon: {
type: String,
default: 'arrowleft'
},
rightIcon: {
type: String,
default: ''
},
rightText: {
type: String,
default: ''
},
fixed: {
type: Boolean,
default: true
},
border: {
type: Boolean,
default: false
},
customLeftFn: {
type: Boolean,
default: false
},
backgroudColor: {
type: String,
default: '#fff'
},
leftWidth: {
type: Number | String,
default: '120rpx'
},
rightWidth: {
type: Number | String,
default: '120rpx'
},
color: {
type: String,
default: ''
}
},
data() {
return { routerLength: [] };
},
created() {
this.routerLength = getCurrentPages().length;
},
methods: {
clickLeftHandler() {
if (this.customLeftFn) {
this.$emit('clickLeft');
} else {
// #ifdef H5
if (window.history.length > 1) {
window.history.back();
} else {
window.location.href = '/pages/live/index';
}
// #endif
// #ifndef H5
uni.navigateBack();
// #endif
}
},
/**
* @description 右边按钮的事件
* @日期 2021-5-31 14:23:17
* @params {String} 参数描述
*/
clickRightHandler() {
this.$emit('clickRight');
}
}
};
</script>

View File

@ -65,7 +65,7 @@
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"backgroundColor": "#fff", "backgroundColor": "#fff",
"navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
@ -77,8 +77,8 @@
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"backgroundColor": "#fff", "backgroundColor": "#fff",
"disableScroll": true "disableScroll": true,
"navigationStyle": "custom"
} }
}, },
@ -133,20 +133,20 @@
"list": [{ "list": [{
"text": "短剧", "text": "短剧",
"pagePath": "pages/playlet/index", "pagePath": "pages/playlet/index",
"iconPath": "static/tabbar/playlet_off.png", "iconPath": "/static/tabbar/playlet_off.png",
"selectedIconPath": "static/tabbar/playlet_on.png" "selectedIconPath": "/static/tabbar/playlet_on.png"
}, },
{ {
"text": "发现", "text": "发现",
"pagePath": "pages/discover/index", "pagePath": "pages/discover/index",
"iconPath": "static/tabbar/discover_off.png", "iconPath": "/static/tabbar/discover_off.png",
"selectedIconPath": "static/tabbar/discover_on.png" "selectedIconPath": "/static/tabbar/discover_on.png"
}, },
{ {
"text": "我的", "text": "我的",
"pagePath": "pages/my/index/index", "pagePath": "pages/my/index/index",
"iconPath": "static/tabbar/my_off.png", "iconPath": "/static/tabbar/my_off.png",
"selectedIconPath": "static/tabbar/my_on.png" "selectedIconPath": "/static/tabbar/my_on.png"
} }
] ]
}, },

View File

@ -1,40 +1,17 @@
<template> <template>
<view style="height: 100vh;"> <view class="flex-1">
<view <GLoading />
:style="{ <scroll-view
background: `linear-gradient(93deg, rgba(255, 220, 230,1) 45%, rgba(255, 238, 195, 1))`
}"
>
<GNavbar
left-width="200rpx"
backgroud-color="transparent"
:custom-left-fn="true"
>
<view
slot="left"
class="flex-row flex-center"
>
<text
class="fs-40"
style="color: #1a1a1a;font-weight: bold;"
>
某某短剧
</text>
</view>
</GNavbar>
</view>
<GList
class="flex-1" class="flex-1"
style="z-index: 999;" style="z-index: 999;"
scroll-y="true" scroll-y="true"
lower-threshold="300" lower-threshold="30"
@scrolltolower="scrollLower" @scrolltolower="scrollLower"
> >
<view style="position: relative;"> <view style="position: relative;">
<view class="body-bg" /> <view class="body-bg" />
<view <view class=" px-20 py-20">
class=" px-20 py-20"
>
<!-- <view class="high mb-20"> <!-- <view class="high mb-20">
<view class="high-title mb-24"> <view class="high-title mb-24">
<text class="high-title-text"> <text class="high-title-text">
@ -148,13 +125,13 @@
</text> </text>
</view> </view>
</view> </view>
<u-loadmore :status="status" />
</view> </view>
<u-loadmore :status="status" />
<!-- #ifndef H5 -->
<u-gap height="80" />
<!-- #endif -->
</view> </view>
<!-- #ifndef H5 --> </scroll-view>
<u-gap height="160" />
<!-- #endif -->
</GList>
</view> </view>
</template> </template>
@ -310,9 +287,9 @@ export default {
} }
.body-bg { .body-bg {
position: absolute; position: absolute;
top: -4rpx; top: 0;
width: 750rpx; width: 750rpx;
z-index: 2rpx;
height: 434rpx; height: 434rpx;
background: url('https://diyyhdapi.qinjiu8.com/backImg.png'); background: url('https://diyyhdapi.qinjiu8.com/backImg.png');
background-size: 100% 100%; background-size: 100% 100%;

View File

@ -1,5 +1,5 @@
<template> <template>
<view style="height:100vh;"> <view class="flex-1">
<GList class="flex-1"> <GList class="flex-1">
<GLoading /> <GLoading />
<view <view

View File

@ -1,39 +1,15 @@
<template> <template>
<view <view
class="flex-1"
style=";height:100vh;" style="position: relative;"
> >
<view <GLoading />
:style="{ <view class="body-bg" />
background: `linear-gradient(93deg, rgba(255, 220, 230,1) 45%, rgba(255, 238, 195, 1))`
}"
>
<GNavbar
left-width="200rpx"
backgroud-color="transparent"
:custom-left-fn="true"
>
<view
slot="left"
class="flex-row flex-center"
>
<text
class="fs-40"
style="color: #1a1a1a;font-weight: bold;"
>
某某短剧
</text>
</view>
</GNavbar>
</view>
<view <view
class="flex-1" class="flex-1"
style="position: relative" style="position: absolute;z-index: 9999;"
> >
<view class="body-bg" />
<view <view
style="z-index: 99;"
class="px-28 flex-row pt-48 " class="px-28 flex-row pt-48 "
@click="getUserInfo" @click="getUserInfo"
> >
@ -74,10 +50,7 @@
</text> </text>
</view> </view>
</view> </view>
<view <view class="userInfo mt-48 px-30 flex-row mb-20">
class="userInfo mt-48 px-30 flex-row mb-20"
style="z-index: 99;"
>
<view <view
class="flex-row flex-1 " class="flex-row flex-1 "
style="align-items: center;" style="align-items: center;"
@ -384,7 +357,7 @@ export default {
} }
.body-bg { .body-bg {
position: absolute; position: absolute;
top: -4rpx; top: 2rpx;
width: 750rpx; width: 750rpx;
z-index: 0; z-index: 0;
height: 434rpx; height: 434rpx;

View File

@ -1,63 +1,66 @@
<template> <template>
<view sytle="height:100%;background: #fff;"> <GList
<GList class="flex-1"
v-if="dataList.length !== 0" style="background: #F3F4F6;"
style="background: #F3F4F6;height: 100vh;" >
<GLoading />
<view
v-if="dataList.length !==0"
class="px-30 py-28"
> >
<view class="px-30 py-28"> <view
v-for="(item, index) in dataList"
:key="index"
class="pay-item mb-24"
>
<view <view
v-for="(item, index) in dataList" class="pay-item-header flex-center"
:key="index" :class="{ status: item.status === 0 }"
class="pay-item mb-24"
> >
<text class="pay-item-header-text">
充值{{ item.money || 0 }}{{
item.status === 1 ? '已支付' : '未支付'
}}
</text>
</view>
<view class="pay-item-bottom">
<view <view
class="pay-item-header flex-center" class="flex-row mb-20 mt-8"
:class="{ status: item.status === 0 }" style="justify-content: space-between;"
> >
<text class="pay-item-header-text"> <text class="pay-item-bottom-left">
充值{{ item.money || 0 }}{{ 订单号码
item.status === 1 ? '已支付' : '未支付' </text>
}} <text class="pay-item-bottom-right">
{{ item.out_trade_no }}
</text> </text>
</view> </view>
<view class="pay-item-bottom"> <view
<view class="flex-row"
class="flex-row mb-20 mt-8" style="justify-content: space-between;"
style="justify-content: space-between;" >
> <text class="pay-item-bottom-left">
<text class="pay-item-bottom-left"> 下单时间
订单号码 </text>
</text> <text class="pay-item-bottom-right">
<text class="pay-item-bottom-right"> {{ item.create_time }}
{{ item.out_trade_no }} </text>
</text>
</view>
<view
class="flex-row"
style="justify-content: space-between;"
>
<text class="pay-item-bottom-left">
下单时间
</text>
<text class="pay-item-bottom-right">
{{ item.create_time }}
</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</GList> </view>
<view <view
v-else v-else
class="flex-1 flex-center" class="flex-1 flex-center"
style="height: 100%;background-color: #ffffff;" style="height: 100%;background-color: #ffffff;"
> >
<GNoData <GNoData
image="pay-noData" image="pay-noData"
text="暂无充值记录~" text="暂无充值记录~"
/> />
</view> </view>
</view> </GList>
</template> </template>
<script> <script>

View File

@ -69,7 +69,7 @@
</view> </view>
<!-- #ifndef H5 --> <!-- #ifndef H5 -->
<u-gap height="160" /> <u-gap height="80" />
<!-- #endif --> <!-- #endif -->
</GList> </GList>
</template> </template>

View File

@ -141,7 +141,7 @@
</view> </view>
<GFooter /> <GFooter />
<!-- #ifndef H5 --> <!-- #ifndef H5 -->
<u-gap height="160" /> <u-gap height="80" />
<!-- #endif --> <!-- #endif -->
</view> </view>
</GList> </GList>

View File

@ -1,87 +1,81 @@
<template> <template>
<view :style="`height:100vh`"> <view class="flex-1">
<view <GLoading />
:style="{
background: `linear-gradient(93deg, rgba(255, 220, 230, ${
swiperIndex === 0 ? backOpacityOne : backOpacity
}) 45%, rgba(255, 238, 195, ${
swiperIndex === 0 ? backOpacityOne : backOpacity
}))`
}"
>
<GNavbar
left-width="200rpx"
backgroud-color="transparent"
:custom-left-fn="true"
>
<view slot="left" class="flex-row flex-center">
<text
class="fs-40"
style="color: #1a1a1a;font-weight: bold;"
>
某某短剧
</text>
</view>
</GNavbar>
<view class="header_tabs flex-row px-20">
<view class="">
<u-tabs
:list="tabList"
:inactive-style="{
fontSize: '34rpx',
color: '#666666',
fontWeight: 500
}"
:current="swiperIndex"
:active-style="{
color: '#1A1A1A',
fontSize: '40rpx',
fontWeight: 'bold'
}"
:item-style="{
'padding-left': 0,
'padding-right': '50rpx'
}"
line-height="0"
@click="tabsClick"
/>
</view>
<view class="search" @click="navSearch">
<view
class="search-view flex-row"
style="align-items: center;"
>
<u-icon name="/static/icon/search.png" size="24rpx" />
<text class="search-text"> 寻找你喜欢的短剧 </text>
</view>
</view>
</view>
</view>
<view class="flex-1">
<swiper
class="flex-1"
:current="swiperIndex"
@change="swiperChange"
>
<swiper-item>
<Pursue
ref="Pursue"
:tab-index="swiperIndex"
@signIn="signIn"
/>
</swiper-item>
<swiper-item>
<Recommend
ref="Recommend"
:tab-index="swiperIndex"
@opacity="opacity"
/>
</swiper-item>
</swiper>
<GSignMadel ref="GSignMadel" /> <view
</view> class="header_tabs flex-row px-20"
</view> :style="{
background: `linear-gradient(93deg, rgba(255, 220, 230, ${
swiperIndex === 0 ? backOpacityOne : backOpacity
}) 45%, rgba(255, 238, 195, ${
swiperIndex === 0 ? backOpacityOne : backOpacity
}))`
}"
>
<view class="">
<u-tabs
:list="tabList"
:inactive-style="{
fontSize: '34rpx',
color: '#666666',
fontWeight: 500
}"
:current="swiperIndex"
:active-style="{
color: '#1A1A1A',
fontSize: '40rpx',
fontWeight: 'bold'
}"
:item-style="{
'padding-left':0,
'padding-right':'50rpx'
}"
line-height="0"
@click="tabsClick"
/>
</view>
<view
class="search"
@click="navSearch"
>
<view
class="search-view flex-row"
style="align-items: center;"
>
<u-icon
name="/static/icon/search.png"
size="24rpx"
/>
<text class="search-text">
寻找你喜欢的短剧
</text>
</view>
</view>
</view>
<swiper
class="flex-1"
:current="swiperIndex"
@change="swiperChange"
>
<swiper-item>
<Pursue
ref="Pursue"
:tab-index="swiperIndex"
@signIn="signIn"
/>
</swiper-item>
<swiper-item>
<Recommend
ref="Recommend"
:tab-index="swiperIndex"
@opacity="opacity"
/>
</swiper-item>
</swiper>
<GSignMadel ref="GSignMadel" />
</view>
</template> </template>
<script> <script>
@ -102,11 +96,10 @@ export default {
} }
], ],
keyword: '', keyword: '',
swiperIndex: 1, swiperIndex:1,
backOpacity: 1, backOpacity: 1,
backOpacityOne: 0, backOpacityOne: 0,
time: null, time: null
statusBarHeight:''
}; };
}, },
computed: { computed: {
@ -115,35 +108,39 @@ export default {
} }
}, },
onShow() { onShow() {
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight * 2 + 'rpx';
setTimeout(() => { setTimeout(() => {
this.$showLoading(false); this.$showLoading(false);
}, 1000); }, 1000);
if (this.swiperIndex === 1) { if(this.swiperIndex === 1){
setTimeout(() => { setTimeout(()=>{
this.$refs.Recommend.getList(); this.$refs.Recommend.getList();
}, 500); },500);
} else { } else {
setTimeout(() => { setTimeout(()=>{
this.$refs.Pursue.getList(); this.$refs.Pursue.getList();
}, 500); },500);
} }
}, },
onLoad() { onLoad() {
// const uid = uni.getStorageSync('uid') || ''; const uid = uni.getStorageSync('uid')|| '';
// if (!uid) { if(!uid){
// uni.login({ uni.login({
// success: function(loginRes) { success: function(loginRes) {
// reg({ reg({
// code: loginRes.code code:loginRes.code
// }).then(res => { }).then(res=>{
// }); uni.setStorageSync('uid', res.uid );
// }
// });
// }
uni.setStorageSync('uid', 3); });
}
});
}
}, },
methods: { methods: {
swiperChange(e) { swiperChange(e) {
@ -188,6 +185,7 @@ export default {
} }
.header_tabs { .header_tabs {
z-index: 999;
height: 90rpx; height: 90rpx;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;

View File

@ -1,11 +1,10 @@
<template> <template>
<view <view
style="background-color: #000000;height:100vh;" class="flex-1"
style="background-color: #000000;"
> >
<GLoading :back-color="'#000'" /> <GLoading :back-color="'#000'" />
<swiper <swiper
:duration="500" :duration="500"
vertical vertical
class="flex-1" class="flex-1"
@ -17,6 +16,7 @@
v-for="(item, index) in videoList" v-for="(item, index) in videoList"
:key="index" :key="index"
class="flex-1" class="flex-1"
@touchmove.stop="stopTouchMove"
> >
<!-- 视频 --> <!-- 视频 -->
<video <video
@ -31,13 +31,10 @@
:src="item.video_url" :src="item.video_url"
:play-strategy="1" :play-strategy="1"
:show-fullscreen-btn="false" :show-fullscreen-btn="false"
@touchStart="touchStart"
@touchEnd="touchEnd"
@play="videoPlay" @play="videoPlay"
/> />
</swiper-item> </swiper-item>
</swiper> </swiper>
<view <view
v-if="watchInfo.order" v-if="watchInfo.order"
class="jishu1" class="jishu1"