From bd8167724c16c9c18e9605deceaa11ba037ba238 Mon Sep 17 00:00:00 2001
From: xcw <xcw@dxtc.com>
Date: Wed, 22 Feb 2023 10:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/swipers/swiper-pu.vue       |   7 +-
 jsFile/requst.js                       |   2 +
 pages/tabbar/my/my.vue                 |   3 +
 pages/tabbar/pagehome/pagehome.vue     |   2 +
 pagesA/my-extend/my-extend.vue         |   8 --
 pagesA/my-share/my-share.vue           | 144 +++++++++++++++++++------
 pagesA/my-watch/my-watch.vue           |  32 ++++--
 pagesB/course-detail/course-detail.vue |   2 +-
 pagesB/course-list/course-list.vue     |   4 +-
 pagesB/play-video/play-video.nvue      |   2 +-
 10 files changed, 153 insertions(+), 53 deletions(-)

diff --git a/components/swipers/swiper-pu.vue b/components/swipers/swiper-pu.vue
index 4343190..b19b1ac 100644
--- a/components/swipers/swiper-pu.vue
+++ b/components/swipers/swiper-pu.vue
@@ -120,10 +120,15 @@
 					})
 				}
 			},
+			
 			// 切换后获取当前索引
 			changeBanner(e){
 				this.bcurrent = e.detail.current;//当前的指示点下标
-				let videoIndex = e.detail.current;
+				let videoIndex = e.detail.current - 1;
+				if(videoIndex <= 0) {
+					videoIndex = 0;
+				}
+				console.log(videoIndex)
 				//切换时要把视频暂停
 				uni.createVideoContext("video" + (videoIndex),this).pause()
 			},
diff --git a/jsFile/requst.js b/jsFile/requst.js
index 855b669..1273eb6 100644
--- a/jsFile/requst.js
+++ b/jsFile/requst.js
@@ -44,6 +44,8 @@ const checkError = (e) => {
 				switch (Number(e.data.code)) {
 					case 500:
 					case 4000:// 参数错误
+					case 4001:// 参数错误
+					case 4002:// 参数错误
 					case 4003:// 参数错误
 					case 4004:// 记录不存在
 					case 5000:// xxx错误
diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index 830aaa4..1742cc7 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -109,6 +109,9 @@
 				if(index==8){
 					list[8] = ['/pagesA/my-extend/my-extend','/pagesB/second-level/second-level?level=1','/pagesB/second-level/second-level?level=2' ][this.userInfo.position]
 				}
+				if(index==9){
+					list[9] = ['/pagesA/my-share/my-share','/pagesB/second-level/second-level?level=1','/pagesB/second-level/second-level?level=2' ][this.userInfo.position]
+				}
 				uni.navigateTo({
 					url:list[index]
 				})
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index 953e0a1..92f2731 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -98,6 +98,7 @@
 			this.$store.commit('setAutoplay',true);
 			// 判断视频是否隐藏
 			this.isVideoEv();
+			console.log(op,'aaaaa')
 		},
 		onHide() {
 			// 关闭banner图自动轮播
@@ -112,6 +113,7 @@
 		　　return shareObj;
 		},
 		onLoad(op) {
+			
 			// 解码一：unescape("http%3A//www.baidu.com%3Fname%3Dzhang@xiao@jie%26order%3D1")；
 			// 解码二：decodeURIComponent("http%3A%2F%2Fwww.baidu.com%3Fname%3Dzhang%40xiao%40jie%26order%3D1")
 			if(op.q!=undefined){
diff --git a/pagesA/my-extend/my-extend.vue b/pagesA/my-extend/my-extend.vue
index 166a9b6..724ea01 100644
--- a/pagesA/my-extend/my-extend.vue
+++ b/pagesA/my-extend/my-extend.vue
@@ -12,14 +12,6 @@
 				
 				
 				<view class="bacf pad-zy20 boxshow2 posi-sticky" :style="{top:newtop+'px'}">
-					<view class="disjcac pad-sx30 bbot">
-						<view v-if="personCode" class="">
-							<image :src="personCode" mode="aspectFill" style="width: 124px;height: 124px;" lazy-load></image>
-						</view>
-						<view class="" v-else>
-							<yz-qr @update:qrPath="getPath" ref="qrPath" :text="textstr" :size="124" :colorDark="'#000000'" :colorLight="'#FFFFFF'"></yz-qr>
-						</view>
-					</view>
 					<view class="disjbac pad-sx20 pad-zy10">
 						<view class="fon22 col26">推广获取积分</view>
 						<view class="fon26 bold col-e42417">{{scoreInfo || 0}}</view>
diff --git a/pagesA/my-share/my-share.vue b/pagesA/my-share/my-share.vue
index da24400..f5b4590 100644
--- a/pagesA/my-share/my-share.vue
+++ b/pagesA/my-share/my-share.vue
@@ -1,8 +1,10 @@
 <template>
 	<view>
-		<status-container titlet="我的分享" returnc="#FFFFFF"></status-container>
+		<status-container titlet="我的分享" returnc="#FFFFFF">
+			
+		</status-container>
 		<!-- 分享图 -->
-		<image :src="shareImg" mode="widthFix" lazy-load></image>
+		<image :src="shareImg" mode="widthFix" lazy-load class="qrIamge"></image>
 		<!-- 底部按钮 -->
 		<view class="bottom-btn"> 
 			<view @tap="downloadImgEv">下载图片</view>
@@ -25,45 +27,115 @@
 			}
 		},
 		onLoad() {
-			uni.showToast({
-				title:'正在生成推广码',
-				icon:'loading',
-				duration:10000
-			})
-			// 生成推广码
-			createPoster({introducer:wx.getStorageSync('introducer')}).then(res=>{
-				this.shareImg = res.data.path;
-				uni.hideLoading();
-			}).catch(err=>{
-				uni.hideLoading();
-				uni.showToast({
-					title:'生成失败',
-					icon:'none',
-					position:'bottom'
-				})
-				setTimeout(()=>{
-					uni.navigateBack({delta:1})
-				},1000)
-			})
+			this.qrCode();
 		},
+		
 		methods: {
-			// 下载图片
+			// 生成二维码
+			qrCode() {
+				uni.showLoading({
+					title:'正在生成推广码',
+					icon:'loading',
+					duration:5000
+				})
+				
+				// 生成推广码
+				this.$requst.get('/api/user/personal-poster').then(res=>{
+					if(res.code==0){
+						this.shareImg = res.data.poster;
+						uni.hideLoading();
+					}
+				}).catch(err=>{
+					uni.hideLoading();
+					uni.showToast({
+						title:'生成失败',
+						icon:'none',
+						position:'bottom'
+					})
+					setTimeout(()=>{
+						uni.navigateBack({delta:1})
+					},1000)
+				})
+			},
+			
+			//保存相册
 			downloadImgEv(){
-				uni.downloadFile({
-					url: this.shareImg,
-					success: (res) => {
+				uni.getSetting({//获取用户的当前设置
+					success:(res)=> {
+						if(res.authSetting['scope.writePhotosAlbum']){//验证用户是否授权可以访问相册
+							this.saveImageToPhotosAlbum();
+						}else{
+							uni.authorize({//如果没有授权，向用户发起请求
+								scope: 'scope.writePhotosAlbum',
+								success:()=> {
+									this.saveImageToPhotosAlbum();
+								},
+								fail:()=>{
+									uni.showModal({
+										content:'检测到您没打开保存图片的权限，是否去设置打开？',
+											confirmText: "确认",
+											cancelText:'取消',
+											success: (res) => {
+												if(res.confirm){
+													uni.openSetting({
+														success: (res) => {
+															console.log(res);
+															// this.getLocation();
+														}
+													})
+												}else{
+													console.log('取消');
+													return false;
+												}
+											}
+									})
+									setTimeout(()=>{
+										uni.openSetting({//调起客户端小程序设置界面,让用户开启访问相册
+											success:(res2)=> {
+												// console.log(res2.authSetting)
+											}
+										});
+									},3000);
+								}
+							})
+						}
+					}
+				})
+
+			},
+			saveImageToPhotosAlbum(){
+				let base64=this.shareImg.replace(/^data:image\/\w+;base64,/, "");//去掉data:image/png;base64,
+				let filePath=wx.env.USER_DATA_PATH + '/hym_pay_qrcode.png';
+				uni.getFileSystemManager().writeFile({
+					filePath:filePath ,  //创建一个临时文件名
+					data: base64,    //写入的文本或二进制数据
+					encoding: 'base64',  //写入当前文件的字符编码
+					success: res => {
 						uni.saveImageToPhotosAlbum({
-							filePath: res.tempFilePath,
-							success: ()=> {
-								console.log('save success');
+							filePath: filePath,
+							success: function(res2) {
+								uni.showToast({
+									title:'保存成功',
+									icon:'success',
+									duration:2000
+								})
 							},
-							fail: () => {
-								uni.showToast({title:'保存失败',icon:'error'})
+							fail: function(err) {
+								uni.showToast({
+									title:'保存失败',
+									icon:'error',
+									duration:2000
+								})
 							}
-						});
+						})
+					},
+					fail: err => {
+						//console.log(err)
 					}
 				})
 			}
+
+			
 		}
 	}
 </script>
@@ -77,7 +149,7 @@
 		bottom: 0;
 		left: 0;
 		right: 0;
-		padding: 20rpx;
+		padding:20rpx 20rpx;
 		display: flex;
 		justify-content: flex-end;
 		box-shadow: 0rpx -3rpx 20rpx rgba(0,0,0,.05);
@@ -89,4 +161,10 @@
 		border-radius: 80rpx;
 		font-size: 36rpx;
 	}
+	
+	.qrIamge {
+		width: 90%;
+		display: block;
+		margin: -120rpx auto 0;
+	}
 </style>
diff --git a/pagesA/my-watch/my-watch.vue b/pagesA/my-watch/my-watch.vue
index 495569d..1fc13c4 100644
--- a/pagesA/my-watch/my-watch.vue
+++ b/pagesA/my-watch/my-watch.vue
@@ -4,15 +4,15 @@
 			<view slot="content" style="margin-top: -20rpx;">
 				<view class="pad-zy30 bacf pad-x30" v-if="total">
 					<view class="pad-sx30 disac fon24 bbot" v-for="(item,index) in dataList" :key="index">
-						<image class="flexs" :src="item.cover" mode="aspectFill" style="width: 228rpx;height: 160rpx;"></image>
+						<image class="flexs" :src="hostapi + item.course_video_cover" mode="aspectFill" style="width: 228rpx;height: 160rpx;"></image>
 						<view class="disjbac fc width100 mar-z20" style="height: 160rpx;">
 							<view class="fon26 col26 width100">
-								<view class="clips2">{{item.name}}</view>
-								<view class="fon20 mar-s10" style="color: #7f7f7f;">{{item.created_at}}</view>
+								<view class="clips2">{{item.course_video_title}}</view>
+								<view class="fon20 mar-s10" style="color: #7f7f7f;">{{item.course_video_summary}}</view>
 							</view>
 							<view class="disjbac width100">
-								<view class="fon24">￥{{item.price}}</view>
-								<view @tap="$toolAll.tools.goPage(`/pagesB/course-detail/course-detail?id=${item.spu_id}`)" class="disjcac fon22 radius26" style="width: 144rpx;height: 52rpx;color: #f37717;border: 2rpx solid #f37717;">点击学习</view>
+								<view class="fon24"></view>
+								<view @tap="getVideoInfo(item.course_video_id)" class="disjcac fon22 radius26" style="width: 144rpx;height: 52rpx;color: #f37717;border: 2rpx solid #f37717;">点击查看</view>
 							</view>
 						</view>
 					</view>
@@ -40,10 +40,12 @@
 				size:20,
 				total:0,
 				noMore:false,
-				loading:false
+				loading:false,
+				hostapi:'',// 域名
 			}
 		},
 		onLoad() {
+			this.hostapi = getApp().globalData.hostapi;
 			// 获取课程列表
 			this.getCouresList();
 		},
@@ -61,7 +63,7 @@
 					page:this.page,
 					size:this.size
 				}
-				this.$requst.get('/api/course/course-browse-records',params).then(res=>{
+				this.$requst.post('/api/course/course-browse-records',params).then(res=>{
 					this.total = res.data.total;
 					if(this.page==1){this.dataList=[];}
 					this.dataList = [...this.dataList,...res.data.list];
@@ -72,6 +74,22 @@
 				})
 			},
 			
+			getVideoInfo(id) {
+				this.$requst.post('/api/course/get-course-video-info',{course_video_id:id}).then(res=>{
+					console.log(res.code,'课程视频')
+					if(res.code == 0) {
+						uni.navigateTo({
+							url:`/pagesB/course-video/course-video?id=${id}`
+						})
+					}else {
+						uni.showToast({
+							title: res.msg,//标题 必填
+							icon: 'error',//图标
+						})
+					}
+					
+				})
+			}
 		}
 	}
 </script>
diff --git a/pagesB/course-detail/course-detail.vue b/pagesB/course-detail/course-detail.vue
index 60e9b6a..bcd8888 100644
--- a/pagesB/course-detail/course-detail.vue
+++ b/pagesB/course-detail/course-detail.vue
@@ -6,7 +6,6 @@
 					<view class="fon32 tcenter pad-s50">{{couresDetail.name}}</view>
 					<view class="pad30 posir disjcac">
 						<image :src="couresDetail.cover" style="height: 388rpx;" mode="aspectFill" class="width100" lazy-load></image>
-						<image v-if="couresDetail.video.includes('.mp4')" @tap="playVideo" class="posia" src="/static/tabbar/icon-play.png" mode="" style="width: 70rpx;height: 70rpx;" lazy-load></image>
 					</view>
 					<view class="mar-zy30 bbot pad-x10">
 						<span class="fon28 bold posir pad-x10">
@@ -169,6 +168,7 @@
 					url:`/pagesB/course-detail/course-detail?id=${id}&category_id=${this.classId}`
 				})
 			},
+			
 			// 播放视频
 			playVideo(){
 				if(this.couresDetail.type=="video_number"){
diff --git a/pagesB/course-list/course-list.vue b/pagesB/course-list/course-list.vue
index 2a6d714..693dd19 100644
--- a/pagesB/course-list/course-list.vue
+++ b/pagesB/course-list/course-list.vue
@@ -65,7 +65,7 @@
 					size:this.size,
 					course_id:this.course_id,
 				}
-				this.$requst.get('/api/course/get-course-video',params).then(res=>{
+				this.$requst.post('/api/course/get-course-video',params).then(res=>{
 					this.total = res.data.list;
 					if(this.page==1){this.dataList=[];}
 					this.dataList = [...this.dataList,...res.data.list];
@@ -78,7 +78,7 @@
 			
 			
 			getVideoInfo(id) {
-				this.$requst.get('/api/course/get-course-video-info',{course_video_id:id}).then(res=>{
+				this.$requst.post('/api/course/get-course-video-info',{course_video_id:id}).then(res=>{
 					console.log(res.code,'课程视频')
 					if(res.code == 0) {
 						uni.navigateTo({
diff --git a/pagesB/play-video/play-video.nvue b/pagesB/play-video/play-video.nvue
index a766d30..c854426 100644
--- a/pagesB/play-video/play-video.nvue
+++ b/pagesB/play-video/play-video.nvue
@@ -65,7 +65,7 @@
 			let course_video_id = this.videoList[this.currentIndex].course_video_id;
 			let params = {
 				course_video_id:course_video_id,
-				duration:this.currentTime,
+				duration:parseInt(this.currentTime),
 			}
 			this.$requst.get('/api/course/create-browse-records',params).then(res=>{
 				if(res.code == 0) {