lilei 1 年之前
父節點
當前提交
90e8f396a7
共有 3 個文件被更改,包括 22 次插入20 次删除
  1. 1 1
      pages/index/index.vue
  2. 15 16
      pages/videos/detail.vue
  3. 6 3
      pages/videos/index.vue

+ 1 - 1
pages/index/index.vue

@@ -466,7 +466,7 @@
 				}
 				// 视频
 				if(row.contentType == 'VIDEO'){
-					uni.navigateTo({url:"/pages/videos/detail?sn="+row.promoActiveSn})
+					uni.navigateTo({url:"/pages/videos/detail?form=banner&&sn="+row.promoActiveSn})
 				}
 				// 链接
 				if(row.contentType == 'LINK'){

+ 15 - 16
pages/videos/detail.vue

@@ -1,9 +1,9 @@
 <template>
-	<view class="content" v-if="detail">
+	<view class="content" v-if="content">
 		<view class="acitve-content">
 			<video autoplay :src="content" controls></video>
 		</view>
-		<view class="titles">{{detail.title}}</view>
+		<view class="titles">{{title}}</view>
 	</view>
 </template>
 
@@ -12,26 +12,25 @@
 	export default {
 		data() {
 			return {
-				detail: null,
-				style: {
-					p: ''
-				},
-				promoActiveSn: null
-			}
-		},
-		computed: {
-			content() {
-				return this.detail && this.detail.content 
+				title: null,
+				content: '',
+				id: null
 			}
 		},
 		onLoad(opts) {
-			this.promoActiveSn = opts.sn
-			this.getDetail()
+			if(opts.form=='videoList'){
+				this.title = opts.title
+				this.content = opts.content
+			}else{
+				this.id = opts.sn
+				this.getDetail()
+			}
 		},
 		methods: {
 			getDetail(){
-				promoTerminalDetail({sn:this.promoActiveSn}).then(res => {
-					this.detail = res.data
+				promoTerminalDetail({sn:this.id}).then(res => {
+					this.title = res.data.name
+					this.content = res.data.content
 					uni.setNavigationBarTitle({
 						title: res.data.name || '活动内容'
 					})

+ 6 - 3
pages/videos/index.vue

@@ -23,8 +23,7 @@
 											<u-icon size="30" color="#fff" name="eye-fill"></u-icon>
 											{{item.viewNum}}
 										</view>
-										<u-image v-if="!item.showVideo" :src="item.imageSet[0]" height="200px" width="100%"></u-image>
-										<video v-else autoplay :src="item.content" style="width: 100%;height: 200px;" controls></video>
+										<u-image :src="item.imageSet[0]" height="200px" width="100%"></u-image>
 									</view>
 									<view class="ellipsis-two">{{item.titile}}</view>
 								</view>
@@ -60,6 +59,7 @@
 				pageSize: 10,
 				list: [],
 				total: 0,
+				videoObj:null
 			}
 		},
 		computed: {
@@ -155,10 +155,13 @@
 			// 详细页
 			viewRow(item){
 				if(item.contentType == 'VIDEO' && !item.showVideo){
-					item.showVideo = true
+					// item.showVideo = true
 					videoDetail({id: item.id}).then(res => {
 						if(res.data){
 							item.viewNum = res.data.viewNum
+							uni.navigateTo({
+								url: "/pages/videos/detail?form=videoList&&title="+item.titile+"&&content="+item.content
+							})
 						}
 					})
 				}