From 0f2090552e146799f7b72568ac989fbb5faed61a Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 30 Sep 2024 12:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                            |  1 +
 api/api.js                         | 10 ++++++++++
 components/base/tabbar.vue         | 25 ++++++++++++++++++++++++-
 pages/index/index.vue              | 30 +++++++++++++++++++++---------
 pages/publish/actorDetail.vue      | 31 ++++++++++++++++++++++---------
 pages/publish/actorRelease.vue     | 10 ++++++----
 pages/publish/publishPost.vue      |  9 ++++++---
 pages_mine/publish/addWorks.vue    | 10 ++++++----
 pages_mine/publish/competition.vue |  8 ++++++--
 pages_mine/publish/worksDetail.vue | 17 +++++++++++++----
 store/store.js                     | 26 +++++++++++++++++++-------
 11 files changed, 134 insertions(+), 43 deletions(-)

diff --git a/App.vue b/App.vue
index 42063a3..2f815fe 100644
--- a/App.vue
+++ b/App.vue
@@ -4,6 +4,7 @@
 		},
 		onShow: function() {
 			this.$store.commit('initConfig')
+			// this.$store.commit('getIsVedio')
 		},
 		onHide: function() {
 		}
diff --git a/api/api.js b/api/api.js
index 71a0435..422fc30 100644
--- a/api/api.js
+++ b/api/api.js
@@ -259,11 +259,21 @@ const config = {
 
 	//小程序-登录相关接口
 	
+	// 获取是否可播放视频接口
+	getIsVedio: {
+		url: '/api/login/getIsVedio',
+		method: 'GET',
+	},
 	// 获取隐私政策
 	getPrivacyPolicy: {
 		url: '/api/login/getPrivacyPolicy',
 		method: 'GET',
 	},
+	// 获取配置
+	getConfig: {
+		url: '/api/login/getConfig',
+		method: 'GET',
+	},
 	// 获取发布帖子发布需知
 	getPublishPostNotice: {
 		url: '/api/login/getPublishPostNotice',
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index bf84ad5..db05e2c 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -4,6 +4,7 @@
 		 :class="{item : true, active : select == index}"
 		 v-for="(item, index) in list"
 		 :key="index"
+		 v-if="isVedio || index != 1"
 		 @click="toPath(item, index)">
 			<view class="icon">
 				<image :src="select == index ? 
@@ -18,9 +19,14 @@
 </template>
 
 <script>
+	import { mapGetters, mapState } from 'vuex'
 	export default {
 		name:"tabbar",
 		props : ['select'],
+		computed : {
+			...mapGetters(['isVedio']),
+			...mapState(['configList']),
+		},
 		data() {
 			return {
 				list : [
@@ -40,9 +46,26 @@
 						"pagePath": "/pages/index/center",
 						"title": "我的",
 					}
-				]
+				],
+				inter : null,
 			};
 		},
+		mounted() {
+			this.inter = setInterval(() => {
+				console.log('$forceUpdate', this.isVedio);
+				this.$forceUpdate()
+			}, 500)
+			
+			setTimeout(() => {
+				clearInterval(this.inter)
+				this.inter = null
+			}, 20000)
+		},
+		beforeDestroy() {
+			if(this.inter){
+				clearInterval(this.inter)
+			}
+		},
 		methods : {
 			toPath(item, index){
 				if(index == this.select){
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 89fefce..228e0ef 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -55,14 +55,16 @@
 				
 				<swiper class="swiper-box" 
 				:autoplay="true" 
+				style="height: 360rpx;"
 				:duration="500">
 					<swiper-item v-for="(item, index) in actorList" 
-					style="background-color: #fff;"
+					style="background-color: #fff;height: 360rpx;"
+					@click="toActor(item)"
 					:key="index">
 						<view class="swiper-item">
 							<image
 							class="logo"
-							:src="item.logo" 
+							:src="item.image" 
 							mode="aspectFill" />
 							<view class="swiper-item-content">
 								<view class="left">
@@ -135,8 +137,6 @@
 				total : 0,
 			}
 		},
-		computed : {
-		},
 		//滚动到屏幕底部
 		onReachBottom() {
 			console.log("======首页滑动到底部触发====")
@@ -213,7 +213,12 @@
 						 item.masterpieceId
 					})
 				}
-			}
+			},
+			toActor(item){
+				uni.navigateTo({
+					url: '/pages/publish/actorDetail?id=' + item.id
+				})
+			},
 		}
 	}
 </script>
@@ -293,14 +298,22 @@
 					align-items: center;
 					flex-direction: column;
 					width: 100%;
+					position: relative;
 					image{
 						width: 100%;
-						height: 180rpx;
+						height: 360rpx;
 					}
 					.swiper-item-content{
-						margin-top: 15rpx;
+						position: absolute;
+						bottom: 0;
+						left: 0;
+						z-index: 99;
 						display: flex;
-						width: 80%;
+						background-color: #00000055;
+						color: #fff;
+						padding: 20rpx;
+						width: 100%;
+						box-sizing: border-box;
 						.left{
 							.title{
 								font-weight: 900;
@@ -308,7 +321,6 @@
 							}
 							.info-from{
 								font-size: 26rpx;
-								color: #777;
 								display: flex;
 							}
 						}
diff --git a/pages/publish/actorDetail.vue b/pages/publish/actorDetail.vue
index b2595d4..2072333 100644
--- a/pages/publish/actorDetail.vue
+++ b/pages/publish/actorDetail.vue
@@ -3,15 +3,14 @@
 		<navbar leftClick @leftClick="leftClick" />
 
 		<view class="swipe">
-			<!-- <uv-swiper 
-			:list="item.details.image &&
-			item.details.image.split(',')" 
+			<uv-swiper 
+			:list="vedioList" 
 			indicator 
-			height="420rpx"></uv-swiper> -->
+			height="420rpx"></uv-swiper>
 			
-			<video :src="item.details.isImage[0]"
+			<!-- <video :src="item.details.isImage[0]"
 			style="width: 750rpx;height: 420rpx;"
-			/>
+			/> -->
 		</view>
 
 		<view class="box">
@@ -21,13 +20,13 @@
 					{{ item.details.name }}
 				</view>
 				<view class="price">
-					￥{{ item.details.money }}
+					￥{{ item.details.money }}/天
 				</view>
 				<view class="right">
 					<view class="money30">
 						近30天收益：￥{{ item.dayMoney }}
 					</view>
-					<view class="phone">
+					<view class="phone" v-if="isVedio">
 						<view class=""
 						v-if="item.details.phonePay != 'Y' || item.isPayPhone">
 							联系方式：{{ item.details.phone }}
@@ -63,7 +62,8 @@
 				:detail="item.details"/>
 			</view>
 			
-			<view class="works">
+			<view class="works"
+			v-if="isVedio">
 				<view class="item" 
 				v-for="(t, index) in item.details.isImage"
 				:key="index">
@@ -98,6 +98,7 @@
 <script>
 	import contentControls from '@/components/content/contentControls.vue'
 	import confirmationPopup from '@/components/toast/confirmationPopup.vue'
+	import { mapGetters } from 'vuex'
 	export default {
 		components : {
 			contentControls,
@@ -122,6 +123,14 @@
 			console.log(options)
 			this.id = options.id
 		},
+		computed : {
+			...mapGetters(['isVedio']),
+			vedioList(){
+				return this.isVedio ? 
+				this.item.details.isImage :
+				this.item.details.image
+			},
+		},
 		onShareAppMessage(res) {
 		    return {
 		      title: this.item.details.title,
@@ -158,6 +167,10 @@
 						res.result.details.workName ?
 						res.result.details.workName.split(',') : []
 						
+						res.result.details.image = 
+						res.result.details.image ?
+						res.result.details.image.split(',') : []
+						
 						this.item = res.result
 					}
 				})
diff --git a/pages/publish/actorRelease.vue b/pages/publish/actorRelease.vue
index 97ca291..7b5716f 100644
--- a/pages/publish/actorRelease.vue
+++ b/pages/publish/actorRelease.vue
@@ -103,7 +103,7 @@
 				</view>
 			</view> -->
 			
-			<view class="upTop">
+			<view class="upTop" v-if="isVedio">
 				<view class="title">
 					<uv-icon name="pushpin-fill"></uv-icon>
 					是否置顶
@@ -145,7 +145,7 @@
 				</uv-radio-group>
 			</view>
 
-			<view class="form-item-content">
+			<view class="form-item-content" v-if="isVedio">
 				<view class="label">
 					代表作
 				</view>
@@ -199,6 +199,7 @@
 <script>
 	import submit from '@/components/content/submit.vue'
 	import confirmationPopup from '@/components/toast/confirmationPopup.vue'
+	import { mapGetters } from 'vuex'
 	import {
 		mapState
 	} from 'vuex'
@@ -242,7 +243,8 @@
 					}
 				}
 				return {}
-			}
+			},
+			...mapGetters(['isVedio']),
 		},
 		onShow() {
 			this.indexTopPayList()
@@ -415,7 +417,7 @@
 					return
 				}
 				
-				if(this.fileList.length == 0){
+				if(this.fileList.length == 0 && this.isVedio){
 					return uni.showToast({
 						title: '请上传代表作',
 						icon : 'none'
diff --git a/pages/publish/publishPost.vue b/pages/publish/publishPost.vue
index e9f78da..00d7a04 100644
--- a/pages/publish/publishPost.vue
+++ b/pages/publish/publishPost.vue
@@ -8,7 +8,7 @@
 		<view class="images box">
 			<uv-upload 
 			:fileList="fileList" 
-			:maxCount="5" 
+			:maxCount="4" 
 			multiple 
 			width="150rpx" 
 			height="150rpx"
@@ -30,7 +30,8 @@
 			placeholder="添加正文"></uv-textarea>
 		</view>
 		
-		<view class="upTop">
+		<view class="upTop"
+		v-if="isVedio">
 			<view class="title">
 				<uv-icon name="pushpin-fill"></uv-icon>
 				是否置顶
@@ -123,6 +124,7 @@
 <script>
 	import submit from '@/components/content/submit.vue'
 	import confirmationPopup from '@/components/toast/confirmationPopup.vue'
+	import { mapGetters } from 'vuex'
 	export default {
 		components : {
 			submit,
@@ -153,7 +155,8 @@
 					}
 				}
 				return {}
-			}
+			},
+			...mapGetters(['isVedio']),
 		},
 		onLoad(args) {
 			this.id = args.id
diff --git a/pages_mine/publish/addWorks.vue b/pages_mine/publish/addWorks.vue
index 11a33f4..1442913 100644
--- a/pages_mine/publish/addWorks.vue
+++ b/pages_mine/publish/addWorks.vue
@@ -90,12 +90,12 @@
 				</view>
 			</view> -->
 
-			<view class="form-item-content">
+			<view class="form-item-content" v-if="isVedio">
 				<view class="label">
 					作品
 				</view>
 				<view class="upload">
-					<uv-upload :fileList="fileList" :maxCount="5" multiple accept="video" width="150rpx" height="150rpx"
+					<uv-upload :fileList="fileList" :maxCount="4" multiple accept="video" width="150rpx" height="150rpx"
 						@delete="deleteImage" @afterRead="afterRead" :previewFullImage="true"></uv-upload>
 				</view>
 			</view>
@@ -134,6 +134,7 @@
 <script>
 	import submit from '@/components/content/submit.vue'
 	import confirmationPopup from '@/components/toast/confirmationPopup.vue'
+	import { mapGetters } from 'vuex'
 	import {
 		mapState
 	} from 'vuex'
@@ -167,7 +168,8 @@
 					}
 				}
 				return {}
-			}
+			},
+			...mapGetters(['isVedio']),
 		},
 		onLoad(options) {
 			// this.$route.query的参数
@@ -278,7 +280,7 @@
 					})
 				}
 				
-				if(this.fileList.length == 0){
+				if(this.fileList.length == 0 && this.isVedio){
 					return uni.showToast({
 						title: '请上传作品',
 						icon : 'none'
diff --git a/pages_mine/publish/competition.vue b/pages_mine/publish/competition.vue
index 309a627..ad40126 100644
--- a/pages_mine/publish/competition.vue
+++ b/pages_mine/publish/competition.vue
@@ -47,7 +47,7 @@
 				
 				<view class="item" 
 				v-for="(item, index) in list"
-				@click="$utils.navigateTo('/pages_mine/publish/worksDetail?id=' + item.id)"
+				@click="toUrl(item)"
 				:key="index">
 					<view class="ranking">
 						{{ index + 1 }}
@@ -164,7 +164,11 @@
 						this.total = res.result.total
 					}
 				})
-			}
+			},
+			toUrl(item){
+				this.$utils.navigateTo
+				('/pages_mine/publish/worksDetail?id=' + item.id)
+			},
 		}
 	}
 </script>
diff --git a/pages_mine/publish/worksDetail.vue b/pages_mine/publish/worksDetail.vue
index 8a4b2d2..d34e7bb 100644
--- a/pages_mine/publish/worksDetail.vue
+++ b/pages_mine/publish/worksDetail.vue
@@ -4,8 +4,7 @@
 
 		<view class="swipe">
 			<uv-swiper 
-			:list="item.image &&
-			item.image.split(',')" 
+			:list="vedioList" 
 			indicator 
 			height="420rpx"></uv-swiper>
 		</view>
@@ -58,7 +57,8 @@
 				<uv-parse :content="item.context"></uv-parse>
 			</view>
 			
-			<view class="works">
+			<view class="works"
+			v-if="isVedio">
 				<view class="item" 
 				v-for="(t, index) in item.vod && item.vod.split(',')"
 				:key="index">
@@ -74,6 +74,7 @@
 
 <script>
 	import contentControls from '@/components/content/contentControls.vue'
+	import { mapGetters } from 'vuex'
 	export default {
 		components : {
 			contentControls
@@ -86,6 +87,14 @@
 				id : 0,
 			}
 		},
+		computed : {
+			...mapGetters(['isVedio']),
+			vedioList(){
+				return this.isVedio ? 
+				this.item.vod && this.item.vod.split(',') :
+				this.item.image && this.item.image.split(',')
+			},
+		},
 		onLoad(options) {
 			// this.$route.query的参数
 			console.log(options)
@@ -110,7 +119,7 @@
 			},
 			getData(id){
 				this.$api('indexGetGetWorkDetail', {
-					id
+					id : this.id
 				}, res => {
 					uni.stopPullDownRefresh()
 					if(res.code == 200){
diff --git a/store/store.js b/store/store.js
index a6c251b..0581faf 100644
--- a/store/store.js
+++ b/store/store.js
@@ -17,17 +17,24 @@ const store = new Vuex.Store({
 			card: '',
 			name: '',
 		},
-		// cartInfo : {},
 	},
-	getters: {},
+	getters: {
+		// 通过报错的方式阻止缓存，这里的报错千万不要修复
+		isVedio(state){
+			return state.configList.open.content == 'Y'
+		},
+	},
 	mutations: {
 		// 初始化配置
 		initConfig(state){
-			// api('getConfig', res => {
-			// 	if(res.code == 200){
-			// 		state.configList = res.result
-			// 	}
-			// })
+			api('getConfig', res => {
+				if(res.code == 200){
+					// state.configList = res.result
+					res.result.forEach(n => {
+						state.configList[n.keyValue] = n
+					})
+				}
+			})
 			let config = ['getPrivacyPolicy', 'getUserAgreement', 'getPublishPostNotice']
 			config.forEach(k => {
 				api(k, res => {
@@ -37,6 +44,11 @@ const store = new Vuex.Store({
 				})
 			})
 		},
+		getIsVedio(state){
+			api('getIsVedio', res => {
+				state.configList.isVedio = res.result
+			})
+		},
 		login(state){
 			uni.showLoading({
 				title: '登录中...'