浏览代码

Merge branch '大连交通技师学院' of https://gogs.mtavip.com/wangguoyu/uniProject into 大连交通技师学院

tanxue 2 月之前
父节点
当前提交
59d62750cf

+ 1 - 1
pages/xydtXueyuanfengcai/xydtXueyuanfengcai.vue

@@ -11,7 +11,7 @@
 					<icon class="breadcrumb-jt"></icon>
 					<view class="breadcrumb-active">学院风采</view>
 				</view>
-				<MtaScrollViewVue :refreshFn="getList">
+				<MtaScrollViewVue :refreshFn="getList" :size="20">
 					<template v-slot="{ list }">
 						<view class="video-item-box" v-for="item in list" :key="item.id" @click="handleClick(item)">
 							<!-- 图 -->

+ 55 - 29
pages/xydtXueyuanfengcaiInfo/xydtXueyuanfengcaiInfo.vue

@@ -9,7 +9,7 @@
 				<view class="dljt-breadcrumb-box">
 					<view class="breadcrumb-text" @click="handleGo('shouye')">首页</view>
 					<icon class="breadcrumb-jt"></icon>
-					<view class="breadcrumb-text" >校园动态</view>
+					<view class="breadcrumb-text">校园动态</view>
 					<icon class="breadcrumb-jt"></icon>
 					<view class="breadcrumb-text" @click="handleGo('xyfc')">学院风采</view>
 					<icon class="breadcrumb-jt"></icon>
@@ -21,8 +21,21 @@
 					<!-- 时间 -->
 					<view class="detail-data">{{formatDate.join('-') }}</view>
 					<!-- 富文本 -->
-					<MtaMpHtml class="dljt-editor-box" :content="data.info.content" ></MtaMpHtml>
-					
+					<MtaMpHtml class="dljt-editor-box" :content="data.info.content"></MtaMpHtml>
+					<!-- 其他 -->
+					<view v-if="data.info.otherList && data.info.otherList.length">
+						<view class="video-item-box" v-for="item in data.info.otherList" :key="item.id"
+							@click="handleClick(item)">
+							<!-- 图 -->
+							<image :src="item.cover"></image>
+							<!-- 内容 -->
+							<view class="video-mask-box">
+								<view class="video-data">[{{formatDateToYearMonthDay(item.createTime).join('-')}}]
+								</view>
+								<view class="video-title">{{item.title}}</view>
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -36,27 +49,31 @@
 		ref,
 		reactive,
 		computed,
-    onMounted,
-    onUnmounted
+		onMounted,
+		onUnmounted
 	} from "vue";
 	import {
 		onLoad
 	} from "@dcloudio/uni-app"
 	import * as httpApi from "@/api/common.js"
-	import {formatDateToYearMonthDay } from "@/utils/common.js"
-  import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
-  import MtaFooter from "@/components/MtaFooter.vue"
+	import {
+		formatDateToYearMonthDay
+	} from "@/utils/common.js"
+	import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
+	import MtaPDFVue from "@/components/MtaPDF.vue";
+	import MtaFooter from "@/components/MtaFooter.vue"
+
+
 	const data = reactive({
 		info: null,
 		id: null
 	})
 	const formatDate = computed(() => {
-      if (data.info && data.info.createTime) {
-		return formatDateToYearMonthDay(data.info.createTime)
-      }
-        return []
-    })
+		if (data.info && data.info.createTime) {
+			return formatDateToYearMonthDay(data.info.createTime)
+		}
+		return []
+	})
 
 
 	onLoad(({
@@ -66,25 +83,34 @@
 		pageInit();
 	})
 
-  
-  function handleGo(code) {
-	  if (code == 'shouye') {
-		  uni.navigateTo({
-		  	url: '/pages/index/index'
-		  })
-	  }
-	  if (code == 'xyfc') {
-		  uni.navigateTo({
-		  	url: '/pages/xydtXueyuanfengcai/xydtXueyuanfengcai'
-		  })
-	  }
-  }
+	function handleClick(item) {
+		uni.navigateTo({
+			url: `/pages/xydtXueyuanfengcaiInfo/xydtXueyuanfengcaiInfo?id=${item.id}`
+		})
+	}
+
+
+	function handleGo(code) {
+		if (code == 'shouye') {
+			uni.navigateTo({
+				url: '/pages/index/index'
+			})
+		}
+		if (code == 'xyfc') {
+			uni.navigateTo({
+				url: '/pages/xydtXueyuanfengcai/xydtXueyuanfengcai'
+			})
+		}
+	}
 
 	function handleDownFile() {
 		window.location.href = pdfUrl;
 	}
+
 	function pageInit() {
-		httpApi.getDongtaiXueyuanFengcaiInfo({id:data.id}).then(res => {
+		httpApi.getDongtaiXueyuanFengcaiInfo({
+			id: data.id
+		}).then(res => {
 			data.info = res.data;
 		})
 	}
@@ -92,4 +118,4 @@
 
 <style>
 
-</style>
+</style>

+ 1 - 1
pages/xygkXiaoyuanfengguang/xygkXiaoyuanfengguang.vue

@@ -11,7 +11,7 @@
 					<icon class="breadcrumb-jt"></icon>
 					<view class="breadcrumb-active">校园风光</view>
 				</view>
-				<MtaScrollViewVue :refreshFn="getList">
+				<MtaScrollViewVue :refreshFn="getList" :size="20">
 					<template v-slot="{ list }">
 						<view class="video-item-box" v-for="item in list" :key="item.id" @click="handleClick(item)">
 							<!-- 图 -->

+ 1 - 1
pages/zsjyYouxiubiyesheng/zsjyYouxiubiyesheng.vue

@@ -11,7 +11,7 @@
 					<icon class="breadcrumb-jt"></icon>
 					<view class="breadcrumb-active">优秀毕业生</view>
 				</view>
-				<MtaScrollViewVue :refreshFn="getList">
+				<MtaScrollViewVue :refreshFn="getList" :size="20">
 					<template v-slot="{ list }">
 						<view class="video-item-box" v-for="item in list" :key="item.id" @click="handleClick(item)">
 							<!-- 图 -->