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

Merge branch 'ios' of e.coding.net:g-cphe0354/duanju/video_app into gyq

Browse Source
This commit is contained in:
gyq
2024-12-23 18:19:05 +08:00
parent a78cc2ecf7 c8f7016f8d
commit ecc0549cfc
18 changed files with 517 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
pages/index/course/courseList.vue
View File

@@ -1,16 +1,16 @@
<template>
<view class="">
<u-sticky :enable="enable">
<view class="search-box">
<u-search bg-color="#f2f2f2" style="width: 100%;" placeholder="搜索更多资源" v-model="keyword"
:show-action="false" :animation="true" @search="getCourseList()"></u-search>
<u-sticky :enable="enableIos">
<view class="search-box-ios">
<u-search bg-color="#f2f2f2" style="width: 100%;" placeholder="搜索更多资源" v-model="keywordIos"
:show-action="false" :animation="true" @search="getCourseListIos()"></u-search>
</view>
</u-sticky>
<view class="swiper flex align-center justify-center">
<view class="swiper-box">
<swiper :indicator-dots="true" class="swiper " :autoplay="true" interval="5000" duration="500"
:circular="true" style="width: 100%;height: 350rpx;">
<swiper-item v-for="(item,index) in swiperList" :key='index' @tap="goPage(item.url)">
<swiper-item v-for="(item,index) in swiperListIos" :key='index' @tap="goPageIos(item.url)">
<image :src="item.imageUrl" mode="scaleToFill"
style="width: 100%;height: 100%;border-radius: 24rpx;"></image>
</swiper-item>
@@ -18,24 +18,11 @@
</view>
</view>
<view class="padding-lr">
<view class="" v-if="courseList.length">
<!-- <view class="vidoList flex align-center justify-between flex-wrap">
<view class="vidoList-item" @click="goCourse(item.courseId,item.courseDetailsId)"
v-for="(item, index) in courseList" :key="index">
<view class="vidoList-item-img">
<image :src="item.titleImg" mode="aspectFill"></image>
</view>
<view class="vidoList-item-title">
{{item.title}}
</view>
</view>
<view class="vidoList-item" style="height: 0;"></view>
<view class="vidoList-item" style="height: 0;"></view>
</view> -->
<videoList @success="posterSuccess" :list="courseList" />
<view class="" v-if="courseListIos.length">
<videoList @success="posterSuccessIos" :list="courseListIos" />
</view>
<empty title="暂无视频" :isShow='false' v-else></empty>
<u-loadmore v-if="courseList.length > 0" :status="status" />
<u-loadmore v-if="courseListIos.length > 0" :status="statusIos" />
</view>
</view>
@@ -51,71 +38,58 @@
},
data() {
return {
enable: true,
status: 'loadmore',
swiperList: [], //轮播图列表
courseList: [], //资源列表
page: 1,
limit: 10,
id: '',
datalist: [{
id: 1,
name: '综合'
}, {
id: 2,
name: '人气'
}, {
id: 3,
name: '价格',
label: '0'
}],
dataIndex: 0,
sort: '',
count: 0,
keyword: '',
isPrice: '', //是否免费 2:免费
enableIos: true,
statusIos: 'loadmore',
swiperListIos: [], //轮播图列表
courseListIos: [], //资源列表
pageIos: 1,
limitIos: 10,
pagesIos: 0,
sortIos: '',
keywordIos: '',
isPriceIos: '', //是否免费 2:免费
}
},
onShow() {
this.enable = true
this.getCourseList()
this.enableIos = true
this.getCourseListIos()
},
onHide() {
this.enable = false
this.enableIos = false
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title
})
this.getBannerList()
this.getBannerListIos()
if (option.sort) {
this.sort = option.sort
this.sortIos = option.sort
}
if (option.isPrice) {
this.isPrice = option.isPrice
this.isPriceIos = option.isPrice
}
},
methods: {
goPage(url) {
goPageIos(url) {
uni.navigateTo({
url: url
})
},
//点击回调
posterSuccess(item) {
posterSuccessIos(item) {
uni.navigateTo({
url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId
})
},
//最新热播
getCourseList() {
getCourseListIos() {
let data = {
limit: this.limit,
page: this.page,
sort: this.sort ? this.sort : '',
title: this.keyword,
limit: this.limitIos,
page: this.pageIos,
sort: this.sortIos ? this.sortIos : '',
title: this.keywordIos,
}
// #ifdef MP-WEIXIN
data.wxShow = 1
@@ -123,24 +97,24 @@
// #ifdef MP-TOUTIAO
data.dyShow = 1
// #endif
if (this.isPrice) {
data.isPrice = this.isPrice
if (this.isPriceIos) {
data.isPrice = this.isPriceIos
}
this.$u.api.courseList(data).then(res => {
if (res.code == 0) {
this.pages = res.data.totalPage
if (this.page < this.pages) {
this.status = 'loadmore'
this.pagesIos = res.data.totalPage
if (this.pageIos < this.pagesIos) {
this.statusIos = 'loadmore'
} else {
this.status = 'nomore'
this.statusIos = 'nomore'
}
// res.data.list.forEach(ret => {
// ret.courseLabel = ret.courseLabel ? ret.courseLabel.split(',') : []
// })
if (this.page == 1) {
this.courseList = res.data.list
if (this.pageIos == 1) {
this.courseListIos = res.data.list
} else {
this.courseList = [...this.courseList, ...res.data.list]
this.courseListIos = [...this.courseListIos, ...res.data.list]
}
} else {
uni.showToast({
@@ -154,14 +128,14 @@
})
},
// 获取轮播图列表
getBannerList() {
getBannerListIos() {
this.$u.api.bannerList({
classify: '1'
}).then(res => {
if (res.code == 0) {
res.data.forEach(d => {
if (d.state == 1) {
this.swiperList.push(d)
this.swiperListIos.push(d)
}
})
@@ -177,25 +151,25 @@
},
onReachBottom: function() {
if (this.page < this.pages) {
this.page += 1
this.status = 'loading'
this.getCourseList()
if (this.pageIos < this.pagesIos) {
this.pageIos += 1
this.statusIos = 'loading'
this.getCourseListIos()
} else {
this.status = 'nomore'
this.statusIos = 'nomore'
}
},
onPullDownRefresh: function() {
this.page = 1;
this.getCourseList()
this.pageIos = 1;
this.getCourseListIos()
},
}
</script>
<style lang="scss" scoped>
.search-box {
.search-box-ios {
width: 100%;
padding: 15upx 2.5%;
display: flex;
@@ -203,42 +177,7 @@
background-color: #ffffff;
}
.vidoList {
width: 100%;
height: auto;
margin-bottom: 20rpx;
.vidoList-item {
width: calc((100% - 40rpx) / 3);
height: 356rpx;
background-color: #FFFFFF;
border-radius: 24rpx;
margin-bottom: 20rpx;
}
.vidoList-item-img {
width: 100%;
height: 280rpx;
border-radius: 24rpx 24rpx 0 0;
image {
width: 100%;
height: 100%;
border-radius: 24rpx 24rpx 0 0;
}
}
.vidoList-item-title {
width: 100%;
text-align: center;
background-color: #FFFFFF;
border-radius: 0 0 24rpx 24rpx;
padding: 20rpx;
overflow: hidden;
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; // 默认不换行；
}
}
.swiper {
width: 100%;

92
pages/index/course/orderDet.vue
View File

@@ -1,44 +1,44 @@
<template>
<view>
<view class="bg-white padding-sm margin flex" style="border-radius: 24rpx;">
<u-image width="200rpx" height="200rpx" border-radius="10rpx" :src="courseList.titleImg">
<u-image width="200rpx" height="200rpx" border-radius="10rpx" :src="courseListIos.titleImg">
</u-image>
<view class="flex flex-direction justify-between margin-left-sm" style="width:420rpx;">
<view class="text-bold text-black margin-top-xs u-line-1 text-lg">{{courseList.title}}
<view class="text-bold text-black margin-top-xs u-line-1 text-lg">{{courseListIos.title}}
</view>
<!-- <view class="text-gray text-26 margin-top">最近在学{{courseList.payNum}}</view> -->
<!-- <view class="text-gray text-26 margin-top">最近在学{{courseListIos.payNum}}</view> -->
<view class="flex justify-between ">
<view class=" text-bold " style="color: #FF8211;">¥<text
style="font-size: 42rpx;">{{courseList.price}}</text></view>
style="font-size: 42rpx;">{{courseListIos.price}}</text></view>
</view>
</view>
</view>
<view class="popup_pay">
<view class="popup_pay_ios">
<view class="text-lg text-bold">支付方式</view>
<view class="flex align-center justify-between" style="height: 100upx;" v-for="(item,index) in openLists"
<view class="flex align-center justify-between" style="height: 100upx;" v-for="(item,index) in openListsIos"
:key='index'>
<image :src="item.image" style="width: 55upx;height: 55upx;border-radius: 50upx;">
</image>
<view style="font-size: 30upx;margin-left: 20upx;width: 70%;">
{{item.text}}
</view>
<radio-group name="openWay" style="margin-left: 45upx;" @tap.stop='selectWay(item)'>
<label class="tui-radio">
<radio color="red" :checked="openWay === item.id ? true : false" />
<radio-group name="openWay" style="margin-left: 45upx;" @tap.stop='selectWayIos(item)'>
<label >
<radio color="red" :checked="openWayIos === item.id ? true : false" />
</label>
</radio-group>
</view>
<!-- <view class="pay_btn" @click="pay()">确认支付</view> -->
<!-- <view class="pay_btn" @click="payIos()">确认支付</view> -->
</view>
<view class="taber">
<view class="taber_ios">
<view class="flex align-center" style="color: #FF8211;">
<text style="color: #333;">实付款：</text>
<view class=" text-bold " style="color: #FF8211;">¥<text
style="font-size: 42rpx;">{{courseList.price}}</text></view>
style="font-size: 42rpx;">{{courseListIos.price}}</text></view>
</view>
<view class="btn" @click="pay">确定并支付</view>
<view class="btn_ios" @click="payIos">确定并支付</view>
</view>
</view>
</template>
@@ -47,17 +47,17 @@
export default {
data() {
return {
courseId: '',
courseList: [],
courseIdIos: '',
courseListIos: [],
openLists: [],
openWay: 1,
flag: true
openListsIos: [],
openWayIos: 1,
flagIos: true
}
},
onLoad(option) {
// #ifdef APP
this.openLists = [{
this.openListsIos = [{
image: '../../../static/images/index/weixin.png',
text: '微信支付',
id: 1
@@ -66,22 +66,22 @@
text: '支付宝',
id: 2
}],
this.openWay = 1;
this.openWayIos = 1;
// #endif
// #ifdef MP-WEIXIN
this.openLists = [{
this.openListsIos = [{
image: '../../../static/images/index/weixin.png',
text: '微信支付',
id: 1
}],
this.openWay = 1;
this.openWayIos = 1;
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') !== -1) {
this.openLists = [{
this.openListsIos = [{
image: '../../../static/images/index/weixin.png',
text: '微信支付',
id: 1
@@ -90,39 +90,39 @@
text: '支付宝',
id: 2
}],
this.openWay = 1;
this.openWayIos = 1;
} else {
this.openLists = [{
this.openListsIos = [{
image: '../../../static/images/index/zhifubao.png',
text: '支付宝',
id: 2
}],
this.openWay = 2;
this.openWayIos = 2;
}
// this.openLists = [{
// this.openListsIos = [{
// image: '../../../static/images/index/zhifubao.png',
// text: '支付宝',
// id: 2
// }],
// this.openWay = 2;
// this.openWayIos = 2;
// #endif
if (option.courseId) {
this.courseId = option.courseId
this.getDataList(this.courseId)
this.courseIdIos = option.courseId
this.getDataListIos(this.courseIdIos)
}
},
methods: {
selectWay(e) {
this.openWay = e.id;
selectWayIos(e) {
this.openWayIos = e.id;
},
// 资源详情
getDataList(id) {
getDataListIos(id) {
let data = {
id
}
this.$u.api.courseDet(data).then(res => {
if (res.code == 0) {
this.courseList = res.data
this.courseListIos = res.data
} else {
uni.showToast({
title: res.msg,
@@ -133,12 +133,12 @@
})
},
pay() {
payIos() {
let that = this
if (that.flag) {
that.flag = false
if (that.flagIos) {
that.flagIos = false
let data = {
courseId: that.courseList.courseId
courseId: that.courseListIos.courseId
}
that.$u.api.courseOrder(data).then(res => {
if (res.code == 0 && res.data.flag == 1) {
@@ -146,12 +146,12 @@
title: '已获取资源',
icon: 'success'
})
that.getDataList(that.courseId);
that.getDataListIos(that.courseIdIos);
} else if (res.code == 0 && res.data.flag == 2) {
uni.showLoading({
title: '支付中...'
})
if (that.openWay == 1) {
if (that.openWayIos == 1) {
// #ifdef MP-WEIXIN
that.$u.post('app/wxPay/wxPayJsApiOrder?orderId=' + res.data.orders.ordersId, {})
.then(
@@ -219,7 +219,7 @@
}
});
// #endif
} else if (that.openWay == 2) {
} else if (that.openWayIos == 2) {
// #ifdef H5
that.$u.post('/app/aliPay/payOrder?orderId=' + res.data.orders.ordersId +
'&classify=2').then(
@@ -261,11 +261,11 @@
icon: 'none',
// duration: 1500
})
// that.getDataList(that.courseId);
// that.getDataListIos(that.courseId);
}
})
setTimeout(() => {
that.flag = true
that.flagIos = true
}, 1500)
}
@@ -364,14 +364,14 @@
background: #F5F5F5;
}
.popup_pay {
.popup_pay_ios {
background: #FFFFFF;
border-radius: 24rpx;
margin: 30rpx 30rpx;
padding: 30rpx 30rpx 20rpx 30rpx;
}
.taber {
.taber_ios {
position: fixed;
bottom: 0;
left: 0;
@@ -384,7 +384,7 @@
justify-content: space-between;
}
.btn {
.btn_ios {
width: 260rpx;
height: 78rpx;
background: #5074FF;

270
pages/index/course/viepsii.vue Normal file
View File

@@ -0,0 +1,270 @@
<template>
<view class="">
<view class="shop-info-wrap">
<view class="info-wrap flex-between">
<view></view>
<text class="shopName">{{ shopInfo.storeInfo.shopName }}</text>
<view class="close" @click="showShopInfo = false">
<u-icon name="close" color="#999999" size="28"></u-icon>
</view>
</view>
<view class="info-wrap-title">商家信息</view>
<view class="row" style="margin-bottom: 20rpx;">
<view class="col">
<text class="l">营业时间：</text>
<text
class="t">{{ (shopInfo.storeInfo.businessStartDay || '——') +'至'+ (shopInfo.storeInfo.businessEndDay || '——') +' '+ (shopInfo.storeInfo.businessTime || '')}}</text>
</view>
<view class="col">
<text class="l">商家地址：</text>
<text class="t">{{ shopInfo.storeInfo.address }}</text>
</view>
<view class="col" @click="makePhoneCall(shopInfo.storeInfo.phone)">
<text class="l">商家电话：</text>
<text class="t">{{ shopInfo.storeInfo.phone }}</text>
</view>
</view>
<view class="info-wrap-title">商家公告</view>
<view class="row">
<view class="col">
<text class="l">公告：</text>
<text class="t">{{ shopInfo.storeInfo.detail }}</text>
</view>
</view>
</view>
<view class="shop_bottom ">
<view class="flex-between">
<view class="price">
<text class="i">￥</text>
<text class="num">{{salePrice}}</text>
<text class="i">/{{specifications.unitSnap}}</text>
</view>
<view class="operation-wrap">
<view class="btn">
<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
<view class="btnClick" @click="shopAdd(specifications,specifications.indexa,specifications.indexb,'-',specifications.tagSnap == null ? '单规格':'')"></view>
</view>
<text class="num">{{amountcartNumber}}</text>
<view class="btn" >
<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
<view class="btnClick" @click="shopAdd(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')"></view>
</view>
</view>
</view>
<view class="shop_skuselect flex-start" v-if="specifications.tagSnap">
<view class="shop_skuselectname">{{skuidname.toString()}}</view>
</view>
<view class="addShopping" :class="(amountcartNumber>0&&isSpec)?'active':''"
@click="addShopping(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
{{skuBtnText}}
</view>
</view>
</view>
</template>
<script>
import videoList from '../../../components/videoList/videoList.vue'
import empty from '@/components/empty.vue'
export default {
components: {
empty,
videoList
},
data() {
return {
}
},
onShow() {
this.enable = true
this.getCourseList()
},
onHide() {
this.enable = false
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title
})
this.getBannerList()
if (option.sort) {
this.sort = option.sort
}
if (option.isPrice) {
this.isPrice = option.isPrice
}
},
methods: {
goPage(url) {
uni.navigateTo({
url: url
})
},
//点击回调
posterSuccess(item) {
uni.navigateTo({
url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId
})
},
//最新热播
getCourseList() {
let data = {
limit: this.limit,
page: this.page,
sort: this.sort ? this.sort : '',
title: this.keyword,
}
// #ifdef MP-WEIXIN
data.wxShow = 1
// #endif
// #ifdef MP-TOUTIAO
data.dyShow = 1
// #endif
if (this.isPrice) {
data.isPrice = this.isPrice
}
this.$u.api.courseList(data).then(res => {
if (res.code == 0) {
this.pages = res.data.totalPage
if (this.page < this.pages) {
this.status = 'loadmore'
} else {
this.status = 'nomore'
}
// res.data.list.forEach(ret => {
// ret.courseLabel = ret.courseLabel ? ret.courseLabel.split(',') : []
// })
if (this.page == 1) {
this.courseList = res.data.list
} else {
this.courseList = [...this.courseList, ...res.data.list]
}
} else {
uni.showToast({
title: res.msg,
duration: 1000,
icon: 'none'
});
}
uni.stopPullDownRefresh();
})
},
// 获取轮播图列表
getBannerList() {
this.$u.api.bannerList({
classify: '1'
}).then(res => {
if (res.code == 0) {
res.data.forEach(d => {
if (d.state == 1) {
this.swiperList.push(d)
}
})
} else {
uni.showToast({
title: res.msg,
duration: 1000,
icon: 'none'
});
}
})
},
},
onReachBottom: function() {
if (this.page < this.pages) {
this.page += 1
this.status = 'loading'
this.getCourseList()
} else {
this.status = 'nomore'
}
},
onPullDownRefresh: function() {
this.page = 1;
this.getCourseList()
},
}
</script>
<style lang="scss" scoped>
.search-box {
width: 100%;
padding: 15upx 2.5%;
display: flex;
justify-content: space-between;
background-color: #ffffff;
}
.vidoList {
width: 100%;
height: auto;
margin-bottom: 20rpx;
.vidoList-item {
width: calc((100% - 40rpx) / 3);
height: 356rpx;
background-color: #FFFFFF;
border-radius: 24rpx;
margin-bottom: 20rpx;
}
.vidoList-item-img {
width: 100%;
height: 280rpx;
border-radius: 24rpx 24rpx 0 0;
image {
width: 100%;
height: 100%;
border-radius: 24rpx 24rpx 0 0;
}
}
.vidoList-item-title {
width: 100%;
text-align: center;
background-color: #FFFFFF;
border-radius: 0 0 24rpx 24rpx;
padding: 20rpx;
overflow: hidden;
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; // 默认不换行；
}
}
.swiper {
width: 100%;
height: auto;
margin-bottom: 10rpx;
margin-top: 10rpx;
.swiper-box {
width: 686rpx;
height: 100%;
}
}
.active {
color: #5074FF;
}
.btn {
width: 150upx;
height: 60upx;
background: #5074FF;
border-radius: 30upx;
color: #FFFFFF;
text-align: center;
line-height: 60rpx;
font-size: 26rpx;
}
</style>