Browse Source

完成跳转页面后视频支持上下滑动并且支持分页功能

c4az6 4 years ago
parent
commit
778752d1c1
54 changed files with 1531 additions and 592 deletions
  1. 3 10
      api/ajax.js
  2. 8 3
      components/public-videoList/public-videoList.vue
  3. 2 2
      components/video-player/video-player.vue
  4. 4 0
      pages.json
  5. 2 1
      pages/home/home.vue
  6. 21 13
      pages/myLike/myLike.vue
  7. 0 4
      pages/shortVideo/shortVideo.vue
  8. 369 0
      pages/videoPlayer/videoPlayer.vue
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/colorui/components/cu-custom.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/doctor-info/doctor-info.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/menu-button/menu-button.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/public-videoList/public-videoList.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/review/review.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/video-player/video-player.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/doctorDetail/doctorDetail.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAttention/myAttention.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myLike/myLike.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myVideos/myVideos.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shortVideo/shortVideo.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/uploadFile/uploadFile.js.map
  26. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/videoPlayer/videoPlayer.js.map
  27. 2 2
      unpackage/dist/dev/mp-weixin/app.json
  28. 92 92
      unpackage/dist/dev/mp-weixin/colorui/components/cu-custom.js
  29. 1 1
      unpackage/dist/dev/mp-weixin/common/main.js
  30. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  31. 180 187
      unpackage/dist/dev/mp-weixin/common/vendor.js
  32. 14 14
      unpackage/dist/dev/mp-weixin/components/doctor-info/doctor-info.js
  33. 15 15
      unpackage/dist/dev/mp-weixin/components/menu-button/menu-button.js
  34. 51 28
      unpackage/dist/dev/mp-weixin/components/public-videoList/public-videoList.js
  35. 1 1
      unpackage/dist/dev/mp-weixin/components/public-videoList/public-videoList.wxml
  36. 15 15
      unpackage/dist/dev/mp-weixin/components/review/review.js
  37. 14 14
      unpackage/dist/dev/mp-weixin/components/video-player/video-player.js
  38. 1 1
      unpackage/dist/dev/mp-weixin/components/video-player/video-player.wxml
  39. 17 17
      unpackage/dist/dev/mp-weixin/pages/doctorDetail/doctorDetail.js
  40. 1 1
      unpackage/dist/dev/mp-weixin/pages/home/home.wxml
  41. 1 0
      unpackage/dist/dev/mp-weixin/pages/home/home.wxss
  42. 16 16
      unpackage/dist/dev/mp-weixin/pages/myAttention/myAttention.js
  43. 37 29
      unpackage/dist/dev/mp-weixin/pages/myLike/myLike.js
  44. 17 17
      unpackage/dist/dev/mp-weixin/pages/myVideos/myVideos.js
  45. 17 17
      unpackage/dist/dev/mp-weixin/pages/search/search.js
  46. 17 21
      unpackage/dist/dev/mp-weixin/pages/shortVideo/shortVideo.js
  47. 18 18
      unpackage/dist/dev/mp-weixin/pages/uploadFile/uploadFile.js
  48. 454 0
      unpackage/dist/dev/mp-weixin/pages/videoPlayer/videoPlayer.js
  49. 9 0
      unpackage/dist/dev/mp-weixin/pages/videoPlayer/videoPlayer.json
  50. 1 0
      unpackage/dist/dev/mp-weixin/pages/videoPlayer/videoPlayer.wxml
  51. 92 0
      unpackage/dist/dev/mp-weixin/pages/videoPlayer/videoPlayer.wxss
  52. 12 12
      unpackage/dist/dev/mp-weixin/pages/webview/webview.js
  53. 0 22
      unpackage/dist/dev/mp-weixin/project.config.json
  54. 7 0
      unpackage/dist/dev/mp-weixin/sitemap75.json

+ 3 - 10
api/ajax.js

@@ -32,18 +32,11 @@ export const ajax = function({
 				success(res) {
 					if (res.data.resultMsg==='token不能为空' || res.data.resultCode === 401) {
 						// 没有登录或者token过期情况
-						uni.showToast({
-							title: '请先进行登录',
-							icon: "none",
-							duration: 2000
-						})
 						uni.removeStorageSync('user_info')
 						getApp().globalData.userInfo = {};
-						setTimeout(_=>{
-							uni.switchTab({
-								url: '/pages/home/home'
-							})
-						},2000)
+						uni.switchTab({
+							url: '/pages/home/home'
+						})
 					}else {
 						resolve(res.data)
 					}

+ 8 - 3
components/public-videoList/public-videoList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="content-wrap"  v-if="videoList.length!==0">
-			<view class="public-card flex-col" v-for="item in videoList" :key="item" @tap="handleVideoClick(item.id)">
+			<view class="public-card flex-col" v-for="(item, index) in videoList" :key="item.videoUrl" @tap="handleVideoClick(item.id, videoList.findIndex(k=>k.videoUrl === item.videoUrl), videoList)">
 				<view class="img-cover">
 					<image class="video-cover" :src="item.coverPhoto"  mode="aspectFill"></image>
 					<view class="icon-wrap" v-if="isShowPlayIcon">
@@ -73,8 +73,13 @@
 		},
 		methods: {
 			// 监听视频点击事件
-			handleVideoClick(e){
-				this.$emit('onVideoClick', e)
+			handleVideoClick(id, index, list){
+				console.log(index)
+				let currentPageIndex = Math.floor(index / 5) + 1
+				let currentVideoIndex = index % 5
+				let currentVideoList = list.slice((currentPageIndex - 1) * 5, (currentPageIndex * 5))
+				debugger
+				this.$emit('onVideoClick', currentPageIndex, currentVideoIndex, currentVideoList)
 			},
 			// 监听删除按钮点击事件
 			handleDeleteVideo() {

+ 2 - 2
components/video-player/video-player.vue

@@ -11,14 +11,14 @@
 	:id="`video_${videoUrl}`" 
 	:ref="`video_${videoUrl}`"
 	:show-progress="false"
-	:muted="true"
+	:muted="false"
 	:show-fullscreen-btn="false"
 	:show-center-play-btn="true"
 	:enable-progress-gesture="true"
 	:enable-play-gesture="true"
 	:vslide-gesture="true"
 	:vslide-gesture-in-fullscreen="true"
-	:show-play-btn="false"
+	:show-play-btn="true"
 	@timeupdate="onTimeupdate"
   class="video"></video>
 

+ 4 - 0
pages.json

@@ -4,6 +4,10 @@
 			"path": "pages/home/home",
 			"style": {}
 		},
+		{
+			"path": "pages/videoPlayer/videoPlayer",
+			"style": {}
+		},
 		{
 			"path": "pages/webview/webview",
 			"style": {}

+ 2 - 1
pages/home/home.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="home">
-		<cu-custom class="lj-navbar" bgColor="bg-white" :isBack="true">
+		<cu-custom class="lj-navbar" bgColor="bg-white" :isBack="false">
 			<block slot="content">个人中心</block>
 		</cu-custom>
 		
@@ -277,6 +277,7 @@
 
 			.public-card {
 				padding: 0 20rpx;
+				min-height: 100rpx;
 				.left {
 					align-items: center;
 				}

+ 21 - 13
pages/myLike/myLike.vue

@@ -8,7 +8,7 @@
 		<scroll-view class="content-wrap" :scroll-y="true" @scrolltolower="lower" enable-flex>
 			<publicVideoList :videoList="videoList" @onLower="handleLower" @onVideoClick="handleVideoClick"  isShowDoctorName></publicVideoList>
 		</scroll-view>
-
+		
 	</view>
 </template>
 
@@ -24,24 +24,31 @@
 		},
 		data() {
 			return {
+				hasMore: true,		// 是否还有更多数据
 				videoList: [], // 视频列表
 				payload: { // 请求视频列表参数
 					pageIndex: 1,
 					pageSize: 5
-				}
+				},
+				videoTotal: 0
 			};
 		},
 		methods: {
 			// 监听视频点击事件
-			handleVideoClick(e){
-				console.log(e)
+			handleVideoClick(currentPageIndex, currentVideoIndex, videoList){
+				// 通过getApp()传参
+				getApp().globalData.videoListJumpParams = {currentPageIndex,currentVideoIndex,videoList, source:'myLike', videoTotal: this.videoTotal}
+				console.log("getApp全局数据: ", getApp().globalData)
+				uni.redirectTo({
+					url: '/pages/videoPlayer/videoPlayer'
+				})
 			},
 			// 获取视频列表数据
 			async getList() {
 				const response = await reqGetMyLikeList(this.payload)
 				uni.hideLoading()
-				console.log("get video list response: ", response)
 				if (response.isSuccess && response.resultCode === 200) {
+					this.videoTotal = response.pager.totalItemCount
 					if (response.pager.totalItemCount > this.videoList.length) {
 						this.videoList = [...this.videoList, ...response.resultObject]
 						this.payload.pageIndex++
@@ -50,6 +57,7 @@
 							title: '没有更多数据了...',
 							icon: 'none'
 						})
+						this.hasMore = false
 					}
 				} else {
 					uni.showToast({
@@ -60,16 +68,16 @@
 			},
 			// 触底事件
 			lower(e) {
-				uni.showLoading({
-					title: '加载中...',
-					mask: true
-				})
-				this.getList()
+				if(this.hasMore) {
+					uni.showLoading({
+						title: '加载中...',
+						mask: true
+					})
+					this.getList()
+				}
+
 			}
 		},
-		onLoad() {
-			console.log(111)
-		},
 		onShow() {
 			this.getList()
 		}

+ 0 - 4
pages/shortVideo/shortVideo.vue

@@ -65,8 +65,6 @@
 				},
 				videoTotal: 0, // 短视频总数
 				currentIndex: 0, // 当前短视频的索引
-				// touchTime: new Date().getTime(), // 判断是否双击变量
-				// doubleLike: false, // 是否已经双击点赞了
 			}
 		},
 		methods: {
@@ -186,8 +184,6 @@
 			},
 			// 点击暂停或播放视频
 			handleTap(index) {
-				this.touchTime = new Date().getTime()
-				console.log("单几暂停")
 				this.videoList[index].play ? this.videoList[index].play = false : this.videoList[index].play = true;
 			},
 

+ 369 - 0
pages/videoPlayer/videoPlayer.vue

@@ -0,0 +1,369 @@
+<template>
+	<view class="shortVideo">
+		<!-- 导航部分 -->
+		<cu-custom class="lj-navbar" bgColor="" :isBack="true" :isSearch="true" @searchEmit="handleSearch">
+			<block slot="content">优医视频</block>
+		</cu-custom>
+
+		<swiper class="swiper" :vertical="true" :current="currentIndex" @change="handleSwiperChange">
+			<swiper-item v-for="(item, index) in videoList" :key="index" class="swiper-item">
+				<!-- 自定义视频播放组件 -->
+				<view class="video-wrapper">
+					<videoPlayer :videoUrl="item.videoUrl" :play="item.play" @tap.native="handleTap(index)" @onTimeupdate="handleTimeupdate"></videoPlayer>
+					<menuButton class="lj-menu-button" :videoList="videoList[currentIndex]" @onStart="handleStart" @onShare="handleShare"
+					 @onShowComment="handleShowComment" @onAddAttention="handleAddAttention" @jumpToDoctorDetail="handleJumpDoctorDetail"></menuButton>
+					<doctorInfo class="doctorInfo-wrap" :videoList="item"></doctorInfo>
+				</view>
+			</swiper-item>
+		</swiper>
+		<!-- 评论组件 -->
+				<ljReview @close="closeReview" :show="showReview" :videoList="videoList[currentIndex]" :commentList="commentList"
+				 :pager="commentTotal"> </ljReview>
+	</view>
+</template>
+
+<script>
+	import cuCustom from '@/colorui/components/cu-custom.vue'
+	import videoPlayer from '@/components/video-player/video-player.vue'
+	import menuButton from '@/components/menu-button/menu-button.vue'
+	import doctorInfo from '@/components/doctor-info/doctor-info.vue'
+	import ljReview from '@/components/review/review.vue'
+	import {
+		reqGetVideoList,
+		reqLikeVideo,
+		reqCancelLikeVideo,
+		reqCancelAttentionDoctor,
+		reqAddVideoPlayerCount,
+		reqAttentionDoctor,
+		reqGetVideoListHasToken,
+		reqGetCommentList
+	} from '../../api/index.js'
+	
+import {reqGetMyLikeList} from '../../api/home.js'
+	
+	
+	export default {
+		name: "videoPlayer",
+		components: {
+			cuCustom,
+			videoPlayer,
+			menuButton,
+			doctorInfo,
+			ljReview
+		},
+		data() {
+			return {
+				prePageIndex: 0,		// 上一页分页值
+				nextPageIndex: 0,		// 下一页分页值
+				currentVideoIndex: 0,// 当前视频索引值
+				source: "",					//  页面来源
+				commentTotal: 0,		// 评论总数量
+				commentParams: {
+					pageIndex: 1,
+					pageSize: 10,
+					id: ''	// 视频id
+				},
+				commentList: [],	// 评论列表
+				showReview: false, // 是否显示评论组件
+				videoList: [], // 短视频数据
+				videoParams: { // 短视频请求参数
+					pageIndex: 1, // 页码
+					pageSize: 5, // 每页显示记录数
+					id: "" // 搜索关键字
+				},
+				videoTotal: 0, // 短视频总数
+				currentIndex: 0, // 当前短视频的索引
+			}
+		},
+		methods: {
+			// 根据页面跳转来源调用对应的接口函数
+			switchVaild(){
+				switch(this.source){
+					case "myLike":
+						this.getVideoList(reqGetMyLikeList)
+				}
+			},
+			
+			// 获取视频列表数据
+			async getVideoList(fn){
+				if(this.videoList.length >= this.videoTotal){
+					uni.showToast({
+						title: '没有更多数据了',
+						icon: 'none'
+					})
+					return
+				}
+				const response = await fn(this.videoParams)
+				if(response.isSuccess && response.resultCode === 200) {
+					response.resultObject.forEach(item=>item.play=false)
+					if(this.currentIndex <= 0 && this.prePageIndex > 0) {
+						this.currentIndex = response.resultObject.length
+						// 加载上一页视频数据
+						this.videoList = [...response.resultObject, ...this.videoList]
+						this.prePageIndex--
+						return
+					}
+					// 加载下一页视频数据
+					this.videoList = [...this.videoList, ...response.resultObject]
+					this.nextPageIndex++
+				}
+
+
+			},
+			
+			// 视频进度变化的处理函数
+			handleTimeupdate(currentTime) {
+				try{
+					currentTime = parseInt(currentTime)
+					if (currentTime === 10) {
+						// 添加防抖
+						clearTimeout(this.TimeId)
+						this.TimeId = setTimeout(async _ => {
+							const res = await reqAddVideoPlayerCount({
+								id: this.videoList[this.currentIndex].id
+							})
+						}, 2000)
+					}
+				}catch(e){
+				}
+			},
+
+			// 跳转医生详情页面
+			handleJumpDoctorDetail(id) {
+				uni.navigateTo({
+					url: `/pages/doctorDetail/doctorDetail?DoctorId=${id}`
+				})
+			},
+
+			// 关注医生
+			async handleAddAttention(id) {
+				try {
+					if (this.videoList[this.currentIndex].isFollow) return
+					const res = await reqAttentionDoctor({
+						id
+					})
+					if (res.isSuccess) {
+						this.videoList[this.currentIndex].isFollow = this.videoList[this.currentIndex].isFollow ? false : true;
+						uni.showToast({
+							title: "关注成功",
+							icon: 'success'
+						})
+					} else {
+						uni.showToast({
+							title: '服务器异常,关注失败!',
+							icon: "none"
+						})
+					}
+				} catch (e) {
+				}
+			},
+
+			// 监听评论按钮点击事件
+			async handleShowComment() {
+				this.commentParams.id = this.videoList[this.currentIndex].id
+				const response = await reqGetCommentList(this.commentParams)
+				if(response.isSuccess && response.resultCode === 200 ){
+					this.commentList = response.resultObject
+					this.commentTotal = response.pager.totalItemCount
+				}
+				this.showReview = true
+			},
+			
+			// 监听关闭评论按钮点击事件
+			closeReview(e){
+				this.videoList[this.currentIndex].commentFrequency = e.commentCount
+				this.showReview = false
+			},
+			
+			// 分享处理函数
+			handleShare() {
+				uni.showToast({
+					title: "分享",
+					icon: "none"
+				})
+			},
+			
+			// 点赞处理函数
+			async handleStart() {
+				try {
+					if (this.videoList[this.currentIndex].isLike) {
+						// 已经点赞了,取消点赞
+						const response = await reqCancelLikeVideo({
+							id: this.videoList[this.currentIndex].id
+						})
+						if (response.isSuccess && response.resultCode === 200) {
+							this.videoList[this.currentIndex].isLike = false
+							this.videoList[this.currentIndex].likeFrequency--;
+						} else {
+							uni.showToast({
+								title: response.resultMsg,
+								icon: 'none'
+							})
+						}
+					} else {
+						// 没有点过赞,进行点赞行为
+						const response = await reqLikeVideo({
+							id: this.videoList[this.currentIndex].id
+						})
+						if (response.isSuccess && response.resultCode === 200) {
+							this.videoList[this.currentIndex].isLike = true
+							this.videoList[this.currentIndex].likeFrequency++;
+						} else {
+							uni.showToast({
+								title: '服务器异常,点赞失败!',
+								icon: 'none'
+							})
+						}
+					}
+				} catch (e) {
+				}
+
+			},
+			
+			// 点击暂停或播放视频
+			handleTap(index) {
+				this.videoList[index].play ? this.videoList[index].play = false : this.videoList[index].play = true;
+			},
+
+			// 视频切换后的处理函数
+			handleSwiperChange(e) {
+				let videoIndex = e.target.current
+				if(videoIndex < this.currentIndex) {
+					// pre operation
+					console.log("上滑操作...")
+					if(videoIndex === 0) {
+						// 第一个视频
+						this.videoParams.pageIndex = this.prePageIndex
+						this.switchVaild()
+					}
+					
+				}else if (videoIndex > this.currentIndex) {
+					// next operation
+					console.log("下滑操作...")
+					if(videoIndex === this.videoList.length-1) {
+						// 最后一个视频
+						this.videoParams.pageIndex = this.nextPageIndex
+						this.switchVaild()
+					}
+				}
+				this.currentIndex = e.target.current
+				// 暂停其他视频,播放当前视频
+				this.videoList.forEach(item => item.play = false)
+				this.videoList[this.currentIndex].play = true;
+			},
+
+			// 跳转搜索页面
+			handleSearch() {
+				uni.navigateTo({
+					url: '/pages/search/search',
+				})
+			}
+		},
+		
+		onShow() {
+			let videoListJumpParams = getApp().globalData.videoListJumpParams
+			this.source = videoListJumpParams.source
+			this.prePageIndex = videoListJumpParams.currentPageIndex - 1
+			this.nextPageIndex = videoListJumpParams.currentPageIndex + 1
+			this.currentVideoIndex = videoListJumpParams.currentVideoIndex
+			console.log("prePageIndex: ", this.prePageIndex)
+			console.log("nextPageIndex: ", this.nextPageIndex)
+			console.log("currentVideoIndex: ", this.currentVideoIndex)
+			this.videoTotal = videoListJumpParams.videoTotal
+			this.videoList = videoListJumpParams.videoList.map(item=>{
+				return {
+					...item,
+					play: false
+				}
+			})
+			// $nextTick经典应用,不加你试试:)
+			this.$nextTick(_=>{
+				this.videoList[this.currentVideoIndex].play = true
+			})
+			this.currentIndex = this.currentVideoIndex
+			this.commentParams.pageIndex = 1
+			// 获取视频搜索页面用户输入的搜索关键词
+			this.videoParams.id = videoListJumpParams.userKey
+		}
+	}
+</script>
+
+<style lang="less">
+	/* #ifndef APP-PLUS */
+	page {
+		width: 100%;
+		min-height: 100%;
+		display: flex;
+	}
+
+	/* #endif */
+
+	.shortVideo {
+		flex: 1;
+		width: 750rpx;
+		background-color: #000;
+	}
+
+	.swiper {
+		flex: 1;
+		height: 100%;
+		background-color: transparent;
+	}
+
+	.swiper-item {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		flex-shrink: 0;
+		flex-grow: 0;
+		flex-basis: auto;
+		align-items: stretch;
+		align-content: flex-start;
+
+		.video-wrapper {
+			display: flex;
+			justify-content: center;
+			height: 100vh;
+		}
+	}
+
+	.video {
+		position: relative;
+		flex: 1;
+		/* #ifndef APP-PLUS */
+		width: 100%;
+		/* #endif */
+	}
+
+	.lj-navbar {
+		position: fixed;
+		z-index: 99;
+
+		.cu-bar {
+			flex-direction: row;
+			color: #fff;
+		}
+
+		.cu-bar .action:first-child {
+			margin-left: 50rpx;
+		}
+	}
+
+	/* 菜单部分 */
+	.lj-menu-button {
+		position: absolute;
+		right: 20rpx;
+		bottom: 260rpx;
+		z-index: 999;
+	}
+
+	/* 医生信息部分 */
+	.doctorInfo-wrap {
+		position: absolute;
+		width: 562rpx;
+		height: 186rpx;
+		color: #fff;
+		bottom: 80rpx;
+		left: 30rpx;
+	}
+</style>

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/colorui/components/cu-custom.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/doctor-info/doctor-info.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/menu-button/menu-button.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/public-videoList/public-videoList.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/review/review.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/video-player/video-player.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/doctorDetail/doctorDetail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAttention/myAttention.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myLike/myLike.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myVideos/myVideos.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shortVideo/shortVideo.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/uploadFile/uploadFile.js.map


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/videoPlayer/videoPlayer.js.map


+ 2 - 2
unpackage/dist/dev/mp-weixin/app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/home/home",
+    "pages/videoPlayer/videoPlayer",
     "pages/webview/webview",
     "pages/search/search",
     "pages/uploadFile/uploadFile",
@@ -37,6 +38,5 @@
   },
   "usingComponents": {
     "cu-custom": "/colorui/components/cu-custom"
-  },
-  "sitemapLocation": "sitemap60.json"
+  }
 }

File diff suppressed because it is too large
+ 92 - 92
unpackage/dist/dev/mp-weixin/colorui/components/cu-custom.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/common/main.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -104,11 +104,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/public-videoList/public-videoList":1,"components/doctor-info/doctor-info":1,"components/menu-button/menu-button":1,"components/review/review":1,"components/video-player/video-player":1};
+/******/ 		var cssChunks = {"components/doctor-info/doctor-info":1,"components/menu-button/menu-button":1,"components/review/review":1,"components/video-player/video-player":1,"components/public-videoList/public-videoList":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"colorui/components/cu-custom":"colorui/components/cu-custom","components/public-videoList/public-videoList":"components/public-videoList/public-videoList","components/doctor-info/doctor-info":"components/doctor-info/doctor-info","components/menu-button/menu-button":"components/menu-button/menu-button","components/review/review":"components/review/review","components/video-player/video-player":"components/video-player/video-player"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"colorui/components/cu-custom":"colorui/components/cu-custom","components/doctor-info/doctor-info":"components/doctor-info/doctor-info","components/menu-button/menu-button":"components/menu-button/menu-button","components/review/review":"components/review/review","components/video-player/video-player":"components/video-player/video-player","components/public-videoList/public-videoList":"components/public-videoList/public-videoList"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

File diff suppressed because it is too large
+ 180 - 187
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/doctor-info/doctor-info.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/menu-button/menu-button.js


File diff suppressed because it is too large
+ 51 - 28
unpackage/dist/dev/mp-weixin/components/public-videoList/public-videoList.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/components/public-videoList/public-videoList.wxml


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/review/review.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/video-player/video-player.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/components/video-player/video-player.wxml


File diff suppressed because it is too large
+ 17 - 17
unpackage/dist/dev/mp-weixin/pages/doctorDetail/doctorDetail.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.wxml


+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/home/home.wxss

@@ -82,6 +82,7 @@
 }
 .home .content .public-card {
   padding: 0 20rpx;
+  min-height: 100rpx;
 }
 .home .content .public-card .left {
   -webkit-box-align: center;

File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/myAttention/myAttention.js


File diff suppressed because it is too large
+ 37 - 29
unpackage/dist/dev/mp-weixin/pages/myLike/myLike.js


File diff suppressed because it is too large
+ 17 - 17
unpackage/dist/dev/mp-weixin/pages/myVideos/myVideos.js


File diff suppressed because it is too large
+ 17 - 17
unpackage/dist/dev/mp-weixin/pages/search/search.js


File diff suppressed because it is too large
+ 17 - 21
unpackage/dist/dev/mp-weixin/pages/shortVideo/shortVideo.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/pages/uploadFile/uploadFile.js


File diff suppressed because it is too large
+ 454 - 0
unpackage/dist/dev/mp-weixin/pages/videoPlayer/videoPlayer.js


+ 9 - 0
unpackage/dist/dev/mp-weixin/pages/videoPlayer/videoPlayer.json

@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "cu-custom": "/colorui/components/cu-custom",
+    "video-player": "/components/video-player/video-player",
+    "menu-button": "/components/menu-button/menu-button",
+    "doctor-info": "/components/doctor-info/doctor-info",
+    "lj-review": "/components/review/review"
+  }
+}

File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/videoPlayer/videoPlayer.wxml


+ 92 - 0
unpackage/dist/dev/mp-weixin/pages/videoPlayer/videoPlayer.wxss

@@ -0,0 +1,92 @@
+page {
+  width: 100%;
+  min-height: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+.shortVideo {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  width: 750rpx;
+  background-color: #000;
+}
+.swiper {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  height: 100%;
+  background-color: transparent;
+}
+.swiper-item {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: column;
+          flex-direction: column;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  -webkit-flex-shrink: 0;
+          flex-shrink: 0;
+  -webkit-box-flex: 0;
+  -webkit-flex-grow: 0;
+          flex-grow: 0;
+  -webkit-flex-basis: auto;
+          flex-basis: auto;
+  -webkit-box-align: stretch;
+  -webkit-align-items: stretch;
+          align-items: stretch;
+  -webkit-align-content: flex-start;
+          align-content: flex-start;
+}
+.swiper-item .video-wrapper {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+          justify-content: center;
+  height: 100vh;
+}
+.video {
+  position: relative;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  width: 100%;
+}
+.lj-navbar {
+  position: fixed;
+  z-index: 99;
+}
+.lj-navbar .cu-bar {
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: row;
+          flex-direction: row;
+  color: #fff;
+}
+.lj-navbar .cu-bar .action:first-child {
+  margin-left: 50rpx;
+}
+/* 菜单部分 */
+.lj-menu-button {
+  position: absolute;
+  right: 20rpx;
+  bottom: 260rpx;
+  z-index: 999;
+}
+/* 医生信息部分 */
+.doctorInfo-wrap {
+  position: absolute;
+  width: 562rpx;
+  height: 186rpx;
+  color: #fff;
+  bottom: 80rpx;
+  left: 30rpx;
+}
+

File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/pages/webview/webview.js


+ 0 - 22
unpackage/dist/dev/mp-weixin/project.config.json

@@ -11,8 +11,6 @@
 	"libVersion": "",
 	"appid": "wx16d19a8b8df3fb06",
 	"projectname": "lj_ue_wx_mini_program",
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
 	"condition": {
 		"search": {
 			"current": -1,
@@ -43,26 +41,6 @@
 					"pathName": "pages/myLike/myLike",
 					"query": "",
 					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "我的关注",
-					"pathName": "pages/myAttention/myAttention",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "我的喜欢",
-					"pathName": "pages/myLike/myLike",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "搜索页面",
-					"pathName": "pages/search/search",
-					"scene": null
 				}
 			]
 		}

+ 7 - 0
unpackage/dist/dev/mp-weixin/sitemap75.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}