#k@N9xHP0+`QhvRv(KYN0jx@Sb@M
ztdH;$G<|8RQV3zwZQJbw+?-1$HTcX$eqww1?~}oVLj$!pxFN0fYg{+FL^#Mi+_@XIKsMN@CQ?sgtrj(
zQ>w=M+}`9k^RTBn&l_2u@P$v8GE^hTyDh=yI>WkIwiLi`mqG)xuD4rh5bW|D3G=Kz
z8x}tOr>#4qUww3i)Vk@&un`Gf@}lk5QwK9g4Tq&Xq#d@C%OD^4fwh+Xp(h^C3IJ7G
zVJS+&@Z{|nf(Kc@i?;h&k>Ze+!6R?qQ$C^N^XKtGajW~!0T)8cAJTVw&`Z}AiNs!M
zw%T+}7Ub4Gf-)pFr_xGKhLT~y_PE?|%=r!v`A+*%`bCW4(jL9i#&PMdAsC;1HT7eT
zM_?p|Eu~k-mX@a-_Hn2v!3*fgaa1=AKal^D>e0IAQh3WR_Pg^$F~5D|?q6>Jk!`nj
zdkS#wmo$&I^EjV?-3nm{q8BK17@f)F4V*GjU;|D
z2i~Ha*$`9l4H*{f{*;l&h%b($EH7O`)M`8F>^plv
z^WJ5*je2v@GKSeF{bz|bzSmWzC@m7jt$qYF$9*>|!S0_U!^7ksDl8w%>K@}-)dP5st(
zOkK;xB`M&ckKFp4JI^{^_|1h?z(d&E&42JIU<_@5fPTe^m&5=c<%MJwPnS+
zu)LoHv00t%*3n+)3i)e~{m6jIL+V(H4oc+mUFs({z>3RAdABG?K3{JK+zwv)>2UVN
zeXge4H-CD1-emQp7uTRV(dIwky!6ZUEQEIK(LKfypLp%6)x>KL@rp^xY|#z=!d$JA
zM*&9q{&Q{PO@IFTZ;Iyl-pddvRS!oL{nm|UgFWw1&vyL``K)^%bjjF{df#qX_jc$7
z-vT}7h`nm->)!x+{;6qG?!TQh4DyPTs7NlqP#Xzqq1^8r9`RiGGn)oz@x12!X;=9S
znBS|2tfBFl*DxbauCVMNQ)>R&d*SRSW)EJ~d%3Hj&I7k!#Xhxh`#emoVoNN`H1nk9
zv!CSpl41CY(Z7%L3ORr0_azqerJC8P1UgLkaE+6%fTPF#OT{k!k%6U-Cs!TK`kx+5
zMa21ORj9#MclqhjxeZ|qq9;B)v>&!L-Wgl^P6g%MqCXj*f8WfsK)=iIP`Kj8k4?r9
zQCsSPv+?!#@&^gAaEYpv>0DTlOiO*_p+I+u#t};Of>P=z^Zj9e9zDA?o0ZPVdc$_2=fOoO~g;vx5J-&{9C5bv)#69mK)^WJZP6t~5E?T6Jz0^|`
z&XMC(Z237lcJ*#@F1cP%!Fj*XnV37Cen=Ie;1D@$soyYR=B2H#Uo*j~S61Qrh2M}u
z<;+Z*q&wTVlL~YFmdesMbO4b0l`IogJd^A^Ync%QG|TjhaV$KgKqhG-gvc;J%GwJj
z4vL#~T(JCgb!=I<+^c_r?LB$nm(CQ%GuF;t{mGUUbc
z>2`m5--C&LF~?tWth3P?Y6-aE(;~Z#7ay5lg5c(MN{+)PP46zfZPb219K0z*hBQ^G
zrShwIgGT*v*Tw$qoHl%UjrfPrGwae2>)-)D|6V1I!k6BffQT3*$e;Vv7-A4d{p_3VJ1Lq!
zRp{es?=Z=Lq1R_OFV3WwV$wPt?#XecoNCd9Uol+=4RwUEQwZdR)whKml&(vjSISXdw*XcWw{P;tet}bNM=5`Lo
z_}4fVr#iWC2%|5+J#9T;Q5}Veyf)(JJ0_aTA7r*_r*1`?PIK0sX`RJN?bAJld*(Zo
z_#e(p_?xIaioKC^CIq%zWyK
zM2qhSQIB9VFP^~}#*UFO
z>`n!*tMQJC1UFW@y2IE(RdsDg6WsKN(tPqpFMLoIAm{sR^17?f+V~-p3oNZ7lH=8}
zG1NhvZE&e0;nUw5QF7{0p=8h^Oti_>xRrz)-K)wU?Dls}NvzAQOeWvSWzx#6-lIn~
z`C1e5s+Y}m;bOM;K5R0J+163$uDwaw&fE`JBt7Df=r*KW|yrnT?QCGN+$&
zY)C?^mP1|qL|m&n_rNQO-@lA7@#_hEgh0sb((Tn`CzpMW+laPsM?Yxjb(k>lTGz{u
zpfRkHIsvQrR6r~7eF=h#cSTk>Zng2O^i<0UX_TT64R5gc8?s2el-l#SL$000#`doP
zVM~>hP`p_J)-U{MD7sObI`gXe0mI6^DBuk>vnjGolT7WrB2OlMV-857=E}vlh>um9
zd$$@&vt-=W30d?V6zAu%8;tgKw@s_7N#V33e?W=%JvK5p@O`$9)Mx3a4(;hGD4CUA
ziU2*oT&+ncN_`9I11sDWq7;6i+@U*-gQ9bl7peN01M}klxcy_mzo~ob{!n@rFv=sy
z_28l`q0w}1kNpmqMe-|1*>Zo~kL(QOZ+F3f`~KliM^TBb1DGW=-13}nyL!t!2M#=V
zI}p+z+L1g4m;CKKYyaUm+EjmnRZNdSj2);EHJkit)TC&zPT(uXnFLSVY!%!
zD#WZz^&Sj4J@`Y$X;tg5Qti)l{c&r8zIl0>tUykHa6iE$l`_J%-CQq+41<<{_K#nG
z)pERENGOT5>?sjB=liQEavO#(w@-E7P;9VPNFr+UrXYgP_&mdrhB@$?nf%U6p$fqv
zc{6Jc;=Iji*Y&!4g;ETr;!Xb9GXyBw48(tG43NzDG&wJPEE1lQJUWCafIp64O6(2H
zoe>u!@5Sz2jkAdI4hLq7s!auLcOgjV)T?ZpX8h(*%?brQn*4nz(V`$QXbU*jW%Kqy
zJ}(W1=a|%t2MhR;gF_zm!TXVbj!i|KC*ChDnl|@%2m4h{igrd9HxIR8_=#;5@z)%B
zWnMxi7NM#cwCI-iN`4HZa_Pedl(yGAl7?aW!2wJe;_b5zu566Ey{qeC~Z6JQ|KX6*KiduAzF4bA8
zf%qB7|8+O6>VK{4tOG%hgi@MS+{*MJWvL=KshhO4^E^-PG~6>n^}9x-Hvf7tB@##K
zrLePoa%i$<0ycRbki3iPF!&c8YGAwmKl7|&8GbJ_G!pu-)
z*DR6g75L7Qjb_ZhK;$Nza>^~W{a++B52M_8wua$BVunkl`UD5TN7Ko?MV*FMYv@4a
z08%PzOtyH9y6&|cRwQ>QpkMe8tOWzYOb1d2Be*E?&RbPZINNvcq3d-)Uyo38rqeOk
z(0qUq`|0dK-`i?GI&0Ppfla?y4l6aW**l}xIu!2E%Fy6OV`qbacdFig4!4~irpZvw
zw?I0Rw#quSdjsEbLCN(#hSF_A33e(e2>I4oqx7yz^su(4yS!1mDTwh3v~TEvq13PO
zAmROaL_P7mb@Sw+a`z40vRs#%ULaXsJgoS&%wE=FlWd{xHkNeW`l65Dg3_=PRPN5~
zxeTu_qBxg$sq4FGBa4U&SZV(Q#eE6lefAb^1Ozqv%FeP9rT-PNDPWt>EiXV~J1eNW
z`<-jbS(cj99Wn)qmDccD&D6oY5(Jwi0HFPubb(3nym#?~88BG8Rv9}OvigP$lHu92
zS@0_b8u=7{n%C3V3-D@cp!_40Oy|=wQ8MA@8`@VvV)Hbs$@)^2F1r`R&DcQKLf2Ji
z8f9P)MGM9ujE?e_CT?$TE=bWN_{mC!LKQdKrqntBWEtXV0+mv9eiI~W4l7=?`YP0G
zMHe$Qt?~R>MPE7#2yAEuMzI?ZyUd;&Pl7zTwEFk2m18~SqvC4e5YhkbNuCMwMUTCN|hi#P%l<5UQI9K@3S&M{t8@b^@+{d;?<`3T)1PRFvo$@#E8tAiAE7m^Rvdvjh4UCxYrAb
zw*SelpDKGqG#o)rDo_eBxAA|CP~M;y;s|weQiIkzEAWzAw`0cILx}&U${*D^%@9E-P3dcL
PqZ**2WuRHBj>Z2ES(KcL
literal 0
HcmV?d00001
diff --git a/uni.scss b/uni.scss
index 0155abc..a4103af 100644
--- a/uni.scss
+++ b/uni.scss
@@ -77,3 +77,6 @@ $uni-font-size-subtitle: 26px;
$uni-color-paragraph: #3f536e; // 文章段落颜色
$uni-font-size-paragraph: 15px;
@import 'uview-plus/theme.scss';
+
+$my-main-color:#ff7581;
+$my-red-color:#F02C45;
diff --git a/uni_modules/cc-beautyPoster/components/cc-beautyPoster/cc-beautyPoster.vue b/uni_modules/cc-beautyPoster/components/cc-beautyPoster/cc-beautyPoster.vue
index eb70717..754a566 100644
--- a/uni_modules/cc-beautyPoster/components/cc-beautyPoster/cc-beautyPoster.vue
+++ b/uni_modules/cc-beautyPoster/components/cc-beautyPoster/cc-beautyPoster.vue
@@ -4,9 +4,7 @@
-
-
@@ -135,32 +133,32 @@
/**
* 绘制名称
*/
- const setText = (context, fs, color, x, y, c, bold) => {
- context.setFillStyle(color);
- context.setTextAlign('left');
- if (bold) {
- context.font = 'normal bold 20px Arial,sans-serif';
- } else {
- context.font = 'normal 20px Arial,sans-serif';
- }
- context.setFontSize(fs);
- context.fillText(c, x, y);
- context.restore();
- };
- setText(ctx, 14, '#333', 85, 35, this.posterData.name, 'bold');
- setText(ctx, 12, '#999', 85, 58, '为您挑选了一个好礼物');
- ctx.save();
+ // const setText = (context, fs, color, x, y, c, bold) => {
+ // context.setFillStyle(color);
+ // context.setTextAlign('left');
+ // if (bold) {
+ // context.font = 'normal bold 20px Arial,sans-serif';
+ // } else {
+ // context.font = 'normal 20px Arial,sans-serif';
+ // }
+ // context.setFontSize(fs);
+ // context.fillText(c, x, y);
+ // context.restore();
+ // };
+ // setText(ctx, 14, '#333', 85, 35, this.posterData.name, 'bold');
+ // setText(ctx, 12, '#999', 85, 58, '为您挑选了一个好礼物');
+ // ctx.save();
/**
* 绘制头像
*/
- ctx.beginPath();
- let avatar_width = 60; //头像宽度
- let avatar_height = 60; //头像高度
- let avatar_x = 15; //头像的x坐标
- let avatar_y = 15; //头像的y坐标
- let radius = 8 //头像的圆角弧度
- // 绘制圆角头像
- this.setRadius(ctx, avatar_width, avatar_height, avatar_x, avatar_y, radius)
+ // ctx.beginPath();
+ // let avatar_width = 60; //头像宽度
+ // let avatar_height = 60; //头像高度
+ // let avatar_x = 15; //头像的x坐标
+ // let avatar_y = 15; //头像的y坐标
+ // let radius = 8 //头像的圆角弧度
+ // // 绘制圆角头像
+ // this.setRadius(ctx, avatar_width, avatar_height, avatar_x, avatar_y, radius)
// 绘制圆形图片
// this.setCircular(ctx, avatar_width, avatar_height, avatar_x, avatar_y)
@@ -169,7 +167,7 @@
// 绘制商品价格
let pirce = '¥ ' + this.posterData.money
- this.setGoodsPrice(ctx, 20, this.colors, 15, 410, pirce)
+ // this.setGoodsPrice(ctx, 20, this.colors, 15, 410, pirce)
// 绘制商品名称
this.setGoodsName(ctx)
@@ -264,7 +262,7 @@
},
setGoodsImg(ctx) { //绘制中间商品图片
let width = this.windowWidth - 90
- ctx.drawImage(this.posterData.img, 15, 95, width, width);
+ ctx.drawImage(this.posterData.img, 15, 15, width, width);
ctx.save();
},
setGoodsPrice(ctx, fs, color, x, y, c, bold) { //绘制商品价格
From f6d386e793fc8eb1ee863280fcccf019d82744f2 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 9 Jan 2025 17:28:30 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A8=E8=8D=90?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/video/index.js | 16 +-
components/my-video-list/list-item.vue | 98 +++++++--
components/my-video-list/my-video-list.vue | 220 +++++++++++++++------
pages/video/index.nvue | 100 ++++++++++
pages/video/index.vue | 16 --
5 files changed, 348 insertions(+), 102 deletions(-)
create mode 100644 pages/video/index.nvue
delete mode 100644 pages/video/index.vue
diff --git a/api/video/index.js b/api/video/index.js
index 8a45756..77b8b56 100644
--- a/api/video/index.js
+++ b/api/video/index.js
@@ -51,4 +51,18 @@ export function getJinbiBili(data) {
url: 'common/type/914',
data
})
-}
\ No newline at end of file
+}
+
+//获取推荐视频
+export function tuijianVideo(data){
+ const randomNum=5+ Math.ceil(Math.random()*30)
+ return http.request({
+ url: 'course/selectCourseDetailsList',
+ method:'GET',
+ data:{
+ page: 1,
+ limit: 5,
+ randomNum: randomNum
+ }
+ })
+}
diff --git a/components/my-video-list/list-item.vue b/components/my-video-list/list-item.vue
index 7d7cbcd..e1f4d30 100644
--- a/components/my-video-list/list-item.vue
+++ b/components/my-video-list/list-item.vue
@@ -1,16 +1,17 @@
-
+
-
-
+
+
-
+
{{item.courseDetailsName}}
@@ -19,21 +20,31 @@
+
+
+ {{item.courseDetailsName}}
+
+
+
+ 查看更多续集 >
+
+
+
- {{item.goodNum}}
+ {{item.goodNum}}
- 分享
+ 分享
- {{isCollect?'已追':'追剧'}}
+ {{isCollect?'已追':'追剧'}}
@@ -43,17 +54,25 @@
diff --git a/components/my-video-list/my-video-list.vue b/components/my-video-list/my-video-list.vue
index 3471d58..3bceccd 100644
--- a/components/my-video-list/my-video-list.vue
+++ b/components/my-video-list/my-video-list.vue
@@ -1,13 +1,19 @@
-
+
-
+
@@ -17,9 +23,12 @@
-
+
@@ -28,8 +37,13 @@
+
+
+
+
+
-
+
@@ -57,7 +71,7 @@
-
+
@@ -85,7 +99,7 @@
-
+
@@ -125,13 +139,13 @@
-
+
倍速:
- {{item.num}}x
+ {{item.num}}x
@@ -163,6 +177,56 @@
onMounted,
getCurrentInstance
} from 'vue';
+ const props = defineProps({
+ list: {
+ type: Array,
+ default: () => {
+ []
+ }
+ },
+ isCommand:{
+ type:Boolean,
+ default:false
+ },
+ isTabbar:{
+ type:Boolean,
+ default:false
+ },
+ info: {
+ tpye: Object,
+ default: () => {
+ return {
+ collect: 0,
+ current: {},
+ list: [],
+ price: 0,
+ title: ''
+ }
+ }
+ }
+ })
+ const control = reactive({
+ showBack: true,
+ showControls: true
+ })
+
+ const customStyle=computed(()=>{
+ // #ifdef H5
+ return {
+ bottom:props.isTabbar?'50px':'0'
+ }
+ // #endif
+ // #ifndef H5
+ return {}
+ // #endif
+ })
+
+ function controlstoggles(e) {
+ control.showControls = e.detail.show
+ control.showBack = control.showControls
+ console.log(control);
+ }
+
const speeds = reactive({
list: [{
name: '0.5x',
@@ -178,16 +242,35 @@
num: 1.5
}],
active: 1
-
})
- function changeSpeed(index){
- speeds.active=index
+
+ const $mountedComponents={}
+ function itemMounted(index) {
+ // $mountedComponents[index]=true
+ }
+
+ function back() {
+ const arr = getCurrentPages()
+ if (arr.length < 2) {
+ uni.switchTab({
+ url: '/pages/index/index'
+ })
+ return
+ }
+ uni.navigateBack()
+ }
+
+ function changeSpeed(index) {
+ speeds.active = index
uni.showToast({
- title: '已切换' + speeds[index].num + '倍播放',
+ title: '已切换' + speeds.list[index].num + '倍播放',
icon: 'none',
duration: 2000
})
}
+ const playSpeeds = computed(() => {
+ return speeds.list[speeds.active].num
+ })
const instance = getCurrentInstance()
let isAgree = ref(false);
@@ -210,17 +293,24 @@
let cacheIndex = null
- function appear(item, index) {
- console.log(item.courseDetailsName + 'appear');
- cacheIndex = index
+ function appear(isFirst,item, index) {
+ if(isFirst){
+ $mountedComponents[index]=true
+ }
+ if (!initing) {
+ cacheIndex = index
+ }
}
function disappear(item, index) {
- console.log('disappear');
- if (index == nowIndex.value && cacheIndex != null) {
+
+ if (index == nowIndex.value && cacheIndex != null && !initing) {
+ console.log('disappear' + index);
+ console.log('disappear nowIndex' + nowIndex.value);
+ console.log('cacheIndex' + cacheIndex);
nowIndex.value = cacheIndex
- console.log(nowIndex.value);
cacheIndex = null
+ console.log('disappear,nowIndex=' + nowIndex.value);
}
}
@@ -261,15 +351,21 @@
}
//滚动到指定位置
function goListPosition(index) {
- console.log('index');
- console.log(index);
+ console.log('goListPosition:' + index)
const el = refList.value[index]
- domModule.scrollToElement(el, {
- animated: false
- })
- const item = props.list[index]
- setVideoList(item)
- insertHistory()
+ if($mountedComponents[props.list.length-1]){
+ domModule.scrollToElement(el, {
+ animated: false
+ })
+ initing = false;
+ const item = props.list[index]
+ setVideoList(item)
+ insertHistory()
+ }else{
+ setTimeout(()=>{
+ goListPosition(index)
+ },30)
+ }
}
@@ -287,26 +383,7 @@
function popupShow(key = 'show') {
popup[key] = true
}
- const props = defineProps({
- list: {
- type: Array,
- default: () => {
- []
- }
- },
- info: {
- tpye: Object,
- default: () => {
- return {
- collect: 0,
- current: {},
- list: [],
- price: 0,
- title: ''
- }
- }
- }
- })
+
let jinbiBili = ref(0)
let wHeight = ref(0)
@@ -315,14 +392,20 @@
jinbiBili.value = res.value
const sysInfo = uni.getSystemInfoSync()
- wHeight.value = sysInfo.screenHeight
+ wHeight.value = sysInfo.windowHeight
+ // wHeight.value = sysInfo.screenHeight
}
let isCollect = ref(props.info.collect)
watch(() => props.collect, (newval) => {
isCollect.value = newval
})
-
+
+ function toDetail(item,index){
+ uni.navigateTo({
+ url:'/pages/video/detail?courseId='+item.courseId
+ })
+ }
function posterError() {
@@ -359,9 +442,10 @@
setVideoList(props.info.current)
// #endif
// #ifdef APP
- const index = props.list.findIndex(v => v.courseDetailsId == props.info.current.courseDetailsId)
- console.log('index' + index);
- goListPosition(index)
+ nextTick(() => {
+ const index = props.list.findIndex(v => v.courseDetailsId == props.info.current.courseDetailsId)
+ goListPosition(index)
+ })
// #endif
}
}
@@ -413,9 +497,6 @@
}
- function controlstoggles() {
-
- }
function videoPlay(videoId, courseDetailsId) {
@@ -448,6 +529,7 @@
}, 1000)
function swiperChange(e) {
+ console.log('e.detail.current');
console.log(e.detail.current);
current.value = e.detail.current
const item = videoList.value[e.detail.current]
@@ -461,6 +543,7 @@
const lastIndex = listLen - 1
const index = props.list.findIndex(v => v.courseDetailsId == item.courseDetailsId)
nowIndex.value = index
+ console.log('setVideoList nowIndex' + index);
let position = ''
if (index === 0) {
position = 'start'
@@ -468,7 +551,6 @@
if (index === props.list.length - 1) {
position = 'end'
}
- console.log(position);
if (current.value == 0) {
if (position === 'start') {
videoList.value = [item, props.list[index + 1], props.list[lastIndex]]
@@ -498,7 +580,7 @@
}
console.log(videoList.value);
if (!item.videoUrl) {
- // popupShow('pay')
+ popupShow('pay')
}
}
@@ -513,11 +595,12 @@
function waiting() {
}
+ let initing = true
configInit()
onMounted(() => {
- nextTick(() => {
- init()
- })
+ init()
+ // setTimeout(()=>{
+ // },500)
})
watch(() => props.list.length, (newval) => {
// #ifdef H5
@@ -695,6 +778,13 @@
height: 40rpx;
}
+ .back-icon {
+ position: fixed;
+ z-index: 9999;
+ left: 30rpx;
+ top: 100rpx;
+ }
+
.pay-list {
.pay-list-item {
flex-direction: row;
diff --git a/pages/video/index.nvue b/pages/video/index.nvue
new file mode 100644
index 0000000..ca5568e
--- /dev/null
+++ b/pages/video/index.nvue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/video/index.vue b/pages/video/index.vue
deleted file mode 100644
index 1829e9e..0000000
--- a/pages/video/index.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- toDetail
-
-
-
-
-
-
From 6e37df577ad571c3411722e30a2b5635706d943b Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 9 Jan 2025 17:37:14 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=BD=E5=89=A7?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/chasingDrama/index.vue | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/pages/chasingDrama/index.vue b/pages/chasingDrama/index.vue
index 190d722..6a6304b 100644
--- a/pages/chasingDrama/index.vue
+++ b/pages/chasingDrama/index.vue
@@ -7,7 +7,12 @@
更多
-
+
{{ item.courseDetailsName }}
@@ -26,7 +31,12 @@
更多
-
+
@@ -48,6 +58,7 @@
import { reactive } from 'vue';
import { selectByUserId } from '@/api/me/me.js';
import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app';
+import { linkTo } from '@/utils/app.js';
// 获取数据
async function selectByUserIdAjax() {
From a667473da1272d43c9c7b2e8ed3f1915304cabf3 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 9 Jan 2025 17:43:03 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=89=A7=E9=9B=86?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/chasingDrama/index.vue | 4 ++--
pages/me/index.vue | 7 ++++++-
pages/watching_history/watching_history.vue | 4 +++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pages/chasingDrama/index.vue b/pages/chasingDrama/index.vue
index 6a6304b..e7cddd7 100644
--- a/pages/chasingDrama/index.vue
+++ b/pages/chasingDrama/index.vue
@@ -11,7 +11,7 @@
class="item"
v-for="item in data.list1"
:key="item.id"
- @click="linkTo(`/pages/video/detail?courseId=${item.courseId}?courseDetailsId=${item.courseDetailsId}`)"
+ @click="linkTo(`/pages/video/detail?courseId=${item.courseId}&courseDetailsId=${item.courseDetailsId}`)"
>
@@ -35,7 +35,7 @@
class="item"
v-for="item in data.list2"
:key="item.id"
- @click="linkTo(`/pages/video/detail?courseId=${item.courseId}?courseDetailsId=${item.courseDetailsId}`)"
+ @click="linkTo(`/pages/video/detail?courseId=${item.courseId}&courseDetailsId=${item.courseDetailsId}`)"
>
diff --git a/pages/me/index.vue b/pages/me/index.vue
index 644c8d2..bcd64c1 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -54,7 +54,12 @@
-
+
{{ item.title }}
看到{{ item.courseDetailsName }}
diff --git a/pages/watching_history/watching_history.vue b/pages/watching_history/watching_history.vue
index b79f92a..a85ea02 100644
--- a/pages/watching_history/watching_history.vue
+++ b/pages/watching_history/watching_history.vue
@@ -1,7 +1,8 @@
-
+
@@ -27,6 +28,7 @@
From c8589be5b492c35843ee5df465f841c07774e74a Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 9 Jan 2025 17:53:29 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=90=9C=E7=B4=A0=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=EF=BC=8C=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/components/contentlist.vue | 2 +-
pages/index/search/videoList.vue | 276 +++++++++++++------------
2 files changed, 143 insertions(+), 135 deletions(-)
diff --git a/pages/index/components/contentlist.vue b/pages/index/components/contentlist.vue
index f0ed359..b3ea31d 100644
--- a/pages/index/components/contentlist.vue
+++ b/pages/index/components/contentlist.vue
@@ -26,7 +26,7 @@
function seVideo(item) {
uni.navigateTo({
- url:"pages/video/detail?courseId="+item.courseId+"&courseDetailsId="+item.courseDetailsId
+ url:"/pages/video/detail?courseId="+item.courseId+"&courseDetailsId="+item.courseDetailsId
})
}
diff --git a/pages/index/search/videoList.vue b/pages/index/search/videoList.vue
index 34973b3..02b830c 100644
--- a/pages/index/search/videoList.vue
+++ b/pages/index/search/videoList.vue
@@ -54,166 +54,174 @@
\ No newline at end of file
From df3bc23cfca40551a2deeb5a58b88e3132725d11 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 9 Jan 2025 17:57:26 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/video/detail.nvue | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/pages/video/detail.nvue b/pages/video/detail.nvue
index 8d43df7..2bff792 100644
--- a/pages/video/detail.nvue
+++ b/pages/video/detail.nvue
@@ -30,9 +30,19 @@
title: ''
})
async function init() {
- const res = await Api.getVideoDetail(options)
- Object.assign(state, res)
- state.list = res.list
+ try {
+ const res = await Api.getVideoDetail(options)
+ Object.assign(state, res)
+ state.list = res.list
+ } catch (error) {
+ // if(getCurrentPages().length>=2){
+ // uni.navigateBack()
+ // }else{
+ // uni.switchTab({
+ // url:'/pages/index/index'
+ // })
+ // }
+ }
}
function update({index,item}){
state.list[index]=item
From 4a141878f264f0487c86f7b46b895f7f6936d1b1 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 10 Jan 2025 18:24:40 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9B=B4=E6=96=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E5=88=86=E4=BA=AB=E6=B5=B7=E6=8A=A5=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.hbuilderx/launch.json | 6 +-
App.vue | 4 +-
components/cc-poster.vue | 283 ----
components/my-poster/my-poster.vue | 204 +++
components/my-video-list/list-item.vue | 46 +-
components/my-video-list/my-video-list.vue | 135 +-
components/tki-qrcode/qrcode.js | 1206 -----------------
components/tki-qrcode/tki-qrcode.vue | 205 ---
gcanvas/bridge/bridge-weex.js | 241 ++++
gcanvas/context-2d/FillStyleLinearGradient.js | 18 +
gcanvas/context-2d/FillStylePattern.js | 8 +
gcanvas/context-2d/FillStyleRadialGradient.js | 17 +
gcanvas/context-2d/RenderingContext.js | 666 +++++++++
gcanvas/context-webgl/ActiveInfo.js | 11 +
gcanvas/context-webgl/Buffer.js | 21 +
gcanvas/context-webgl/Framebuffer.js | 21 +
gcanvas/context-webgl/GLenum.js | 298 ++++
gcanvas/context-webgl/GLmethod.js | 142 ++
gcanvas/context-webgl/GLtype.js | 23 +
gcanvas/context-webgl/Program.js | 21 +
gcanvas/context-webgl/Renderbuffer.js | 21 +
gcanvas/context-webgl/RenderingContext.js | 1191 ++++++++++++++++
gcanvas/context-webgl/Shader.js | 22 +
.../context-webgl/ShaderPrecisionFormat.js | 11 +
gcanvas/context-webgl/Texture.js | 22 +
gcanvas/context-webgl/UniformLocation.js | 22 +
gcanvas/context-webgl/classUtils.js | 3 +
gcanvas/env/canvas.js | 74 +
gcanvas/env/image.js | 96 ++
gcanvas/env/tool.js | 24 +
gcanvas/index.js | 39 +
manifest.json | 3 +-
pages/video/index.nvue | 11 +-
utils/util.js | 36 +
34 files changed, 3399 insertions(+), 1752 deletions(-)
delete mode 100644 components/cc-poster.vue
create mode 100644 components/my-poster/my-poster.vue
delete mode 100644 components/tki-qrcode/qrcode.js
delete mode 100644 components/tki-qrcode/tki-qrcode.vue
create mode 100644 gcanvas/bridge/bridge-weex.js
create mode 100644 gcanvas/context-2d/FillStyleLinearGradient.js
create mode 100644 gcanvas/context-2d/FillStylePattern.js
create mode 100644 gcanvas/context-2d/FillStyleRadialGradient.js
create mode 100644 gcanvas/context-2d/RenderingContext.js
create mode 100644 gcanvas/context-webgl/ActiveInfo.js
create mode 100644 gcanvas/context-webgl/Buffer.js
create mode 100644 gcanvas/context-webgl/Framebuffer.js
create mode 100644 gcanvas/context-webgl/GLenum.js
create mode 100644 gcanvas/context-webgl/GLmethod.js
create mode 100644 gcanvas/context-webgl/GLtype.js
create mode 100644 gcanvas/context-webgl/Program.js
create mode 100644 gcanvas/context-webgl/Renderbuffer.js
create mode 100644 gcanvas/context-webgl/RenderingContext.js
create mode 100644 gcanvas/context-webgl/Shader.js
create mode 100644 gcanvas/context-webgl/ShaderPrecisionFormat.js
create mode 100644 gcanvas/context-webgl/Texture.js
create mode 100644 gcanvas/context-webgl/UniformLocation.js
create mode 100644 gcanvas/context-webgl/classUtils.js
create mode 100644 gcanvas/env/canvas.js
create mode 100644 gcanvas/env/image.js
create mode 100644 gcanvas/env/tool.js
create mode 100644 gcanvas/index.js
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 8ae452a..15f1188 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,8 +2,12 @@
"version" : "1.0",
"configurations" : [
{
- "playground" : "standard",
+ "playground" : "custom",
"type" : "uni-app:app-android"
+ },
+ {
+ "playground" : "standard",
+ "type" : "uni-app:app-ios"
}
]
}
diff --git a/App.vue b/App.vue
index 01387a1..efea306 100644
--- a/App.vue
+++ b/App.vue
@@ -40,11 +40,11 @@ li {
}
.show {
- display: none !important;
+ display: block;
}
.hidden {
- display: block !important;
+ display: none !important;
}
page,
diff --git a/components/cc-poster.vue b/components/cc-poster.vue
deleted file mode 100644
index 4d39927..0000000
--- a/components/cc-poster.vue
+++ /dev/null
@@ -1,283 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/my-poster/my-poster.vue b/components/my-poster/my-poster.vue
new file mode 100644
index 0000000..1a6c940
--- /dev/null
+++ b/components/my-poster/my-poster.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/my-video-list/list-item.vue b/components/my-video-list/list-item.vue
index e1f4d30..c5c557d 100644
--- a/components/my-video-list/list-item.vue
+++ b/components/my-video-list/list-item.vue
@@ -3,6 +3,7 @@
|