wangxy před 2 měsíci
rodič
revize
fd24be9de7

+ 316 - 0
api/common.js

@@ -13,6 +13,17 @@ export function getCommonBanners(data = {}) {
 
 
 // 校园概述
+export function getCommonGaikuangDizhiInfo(data = {}) {
+	return request({
+		'url': '/common/gaikuang/dizhi/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
 export function getCommonXinwenYuanxiaoList(data = {}) {
 	return request({
 		'url': '/common/xinwen/yuanxiao/list',
@@ -425,4 +436,309 @@ export function getJiaoyuXiangmuList(data = {}) {
 		data,
 		timeout: 20000
 	})
+}
+
+// 学生园地
+export function getXueshengGongqingList(data = {}) {
+	return request({
+		'url': '​/common​/xuesheng​/gongqing​/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+
+export function getXueshengGongqingInfo(data = {}) {
+	return request({
+		'url': '/common/xuesheng/gongqing/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getXueshengHuodongList(data = {}) {
+	return request({
+		'url': '/common/xuesheng/huodong/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getXueshengHuodongInfo(data = {}) {
+	return request({
+		'url': '/common/xuesheng/huodong/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getXueshengDeyuInfo(data = {}) {
+	return request({
+		'url': '/common/xuesheng/deyu/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getXueshengDeyuList(data = {}) {
+	return request({
+		'url': '/common/xuesheng/deyu/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getXueshengZizhuList(data = {}) {
+	return request({
+		'url': '/common/xuesheng/zizhu/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getXueshengZizhuInfo(data = {}) {
+	return request({
+		'url': '/common/xuesheng/zizhu/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+// 校园动态
+
+export function getDongtaiYuanxiaoXinwenList(data = {}) {
+	return request({
+		'url': '/common/xinwen/yuanxiao/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+
+export function getDongtaiYuanxiaoXinwenInfo(data = {}) {
+	return request({
+		'url': '/common/xinwen/yuanxiao/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getDongtaiXueyuanFengcaiList(data = {}) {
+	return request({
+		'url': '/common/xinwen/fengcai/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getDongtaiXueyuanFengcaiInfo(data = {}) {
+	return request({
+		'url': '/common/xinwen/fengcai/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getDongtaiXiaowuGongkaiList(data = {}) {
+	return request({
+		'url': '/common/xinwen/xiaowu/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getDongtaiXiaowuGongkaiInfo(data = {}) {
+	return request({
+		'url': '/common/xinwen/xiaowu/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getDongtaiTongzhiGonggaoList(data = {}) {
+	return request({
+		'url': '/common/xinwen/tongzhi/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getDongtaiTongzhiGonggaoInfo(data = {}) {
+	return request({
+		'url': '/common/xinwen/tongzhi/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+// 招生就业
+export function getCommonZSJYShengxueInfo(data = {}) {
+	return request({
+		'url': '/common/zhaosheng/shengxue/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+export function getCommonZSJYShengxueList(data = {}) {
+	return request({
+		'url': '/common/zhaosheng/shengxue/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getCommonZSJYZhuanyeList(data = {}) {
+	return request({
+		'url': '/common/zhaosheng/zhuanye/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getCommonZSJYZhuanyeInfo(data = {}) {
+	return request({
+		'url': '/common/zhaosheng/shengxue/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getCommonZSJYYouxiubiyeshengList(data = {}) {
+	return request({
+		'url': '/common/zhaosheng/biye/list',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getCommonZSJYYouxiubiyeshengInfo(data = {}) {
+	return request({
+		'url': '/common/zhaosheng/biye/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getCommonZSJYFengshuxianInfo(data = {}) {
+	return request({
+		'url': '/common/zhaosheng/fenshuxian/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getCommonZSJYBaokaozhinanInfo(data = {}) {
+	return request({
+		'url': '/common/zhaosheng/zhinan/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}
+
+export function getCommonZSJYZhaoshengjianzhangInfo(data = {}) {
+	return request({
+		'url': '/common/zhaosheng/zhinan/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }

+ 116 - 0
components/MtaNavbar/MtaNavbar.vue

@@ -0,0 +1,116 @@
+<template>
+	<uni-nav-bar dark :fixed="true" shadow background-color="#007AFF" status-bar left-icon="left" left-text="返回"
+		title="自定义导航栏" @clickLeft="handleBack">
+		<!-- <image src="/static/logo.png" mode=""></image> -->
+		<view>logo</view>
+		<block slot="right" v-if="hasRight">
+			<uni-icons type="bars" size="30" color="#fff" @click="handleChangeMenu"></uni-icons>
+		</block>
+	</uni-nav-bar>
+
+	<!-- 菜单面板 -->
+	<uni-collapse ref="collapse" accordion v-model="data.activeMenu" v-show="data.showMenu">
+		<uni-collapse-item :title="item.title" v-for="item in data.list" :key="item.title" :name="item.url">
+			<view v-for="cIt in item.children" :key="item.title" @click="handleClick(cIt)">
+				<view class="content">
+					<text class="text" :class="{active: cIt.url.includes(data.activePath)}">{{cIt.title}}</text>
+				</view>
+			</view>
+		</uni-collapse-item>
+	</uni-collapse>
+
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive
+	} from "vue"
+	const showLeft = ref(null)
+	import {
+		onLoad
+	} from "@dcloudio/uni-app"
+
+	const props = defineProps({
+		hasRight: {
+			type: Boolean,
+			default: true
+		}
+	})
+
+	const ani = ref(null)
+
+	const data = reactive({
+		list: [{
+				title: '1',
+				url: '1',
+				children: [{
+					title: '1-1',
+					url: '/pages/dqgzDangjiangongzuo/dqgzDangjiangongzuo'
+				}, {
+					title: '1-2',
+					url: 'http://www.baidu.com',
+					type: 'link'
+				}, {
+					title: '1-3',
+					url: '/pages/index/index'
+				}, {
+					title: '1-4',
+					url: '2'
+				}, ]
+			},
+			{
+				title: '2',
+				url: '3',
+				children: [{
+					title: '2-1',
+					url: '4'
+				}, {
+					title: '2-2',
+					url: '5'
+				}, {
+					title: '2-3',
+					url: '6'
+				}, {
+					title: '2-4',
+					url: '7'
+				}]
+			}
+		],
+		activeMenu: null,
+		activePath: '',
+		showMenu: false,
+	})
+
+	onLoad(() => {
+		const pages = getCurrentPages();
+		data.activePath = pages[pages.length - 1].route;
+		const parentMenu = data.list.find(item => item.children.some(cit => cit.url.includes(data.activePath)));
+		console.log('parentMenu && parentMenu.url', parentMenu && parentMenu.url)
+		data.activeMenu = parentMenu && parentMenu.url;
+	})
+
+	function handleClick(data) {
+		console.log(`菜单:${data.title};路径:${data.url}`);
+		if (data.type == 'link') {
+			window.location.href = data.url;
+			return;
+		}
+		if (data.url) {
+			uni.navigateTo({
+				url: data.url
+			})
+		}
+	}
+
+	function handleChangeMenu() {
+		data.showMenu = !data.showMenu;
+	}
+
+	function handleBack() {
+		uni.navigateBack()
+	}
+</script>
+
+<style>
+</style>

+ 27 - 0
components/MtaTabBar/MtaTabBar.vue

@@ -0,0 +1,27 @@
+<template>
+  <view class="custom-tabbar">
+    <view v-for="(item, index) in tabList" :key="index" @click="switchTab(item)">
+      <image :src="activeIndex === index ? item.selectedIcon : item.icon" />
+      <text :style="{ color: activeIndex === index ? selectedColor : defaultColor }">
+        {{ item.text }}
+      </text>
+    </view>
+  </view>
+</template>
+
+<script setup>
+	const tabList = [{text: '首页',pagePath: '/pages/index/index'}, {text: '我的'}]
+	const props = defineProps({
+		activeIndex: {
+			type: String
+		}
+	})
+	
+	function switchTab(item) {
+		 uni.switchTab({ url: item.pagePath });
+	}
+</script>
+
+<style>
+
+</style>

+ 19 - 15
components/btnMenu.vue

@@ -4,10 +4,10 @@
 
 		<uni-drawer ref="showLeft" mode="left" :width="320">
 			<uni-collapse ref="collapse" accordion v-model="data.activeMenu">
-				<uni-collapse-item :title="item.title" v-for="item in data.list" :key="item.title">
+				<uni-collapse-item :title="item.title" v-for="item in data.list" :key="item.title" :name="item.url">
 					<view v-for="cIt in item.children" :key="item.title" @click="handleClick(cIt)">
 						<view class="content">
-							<text class="text" :class="{active: data.activePath}">{{cIt.title}}</text>
+							<text class="text" :class="{active: cIt.url.includes(data.activePath)}">{{cIt.title}}</text>
 						</view>
 					</view>
 				</uni-collapse-item>
@@ -31,7 +31,7 @@
 	const data = reactive({
 		list: [{
 				title: '1',
-				url: '',
+				url: '1',
 				children: [{
 					title: '1-1',
 					url: '/pages/dqgzDangjiangongzuo/dqgzDangjiangongzuo'
@@ -41,27 +41,27 @@
 					type: 'link'
 				}, {
 					title: '1-3',
-					url: ''
+					url: '/pages/index/index'
 				}, {
 					title: '1-4',
-					url: ''
+					url: '2'
 				}, ]
 			},
 			{
 				title: '2',
-				url: '',
+				url: '3',
 				children: [{
 					title: '2-1',
-					url: ''
+					url: '4'
 				}, {
 					title: '2-2',
-					url: ''
+					url: '5'
 				}, {
 					title: '2-3',
-					url: ''
+					url: '6'
 				}, {
 					title: '2-4',
-					url: ''
+					url: '7'
 				}]
 			}
 		],
@@ -70,9 +70,11 @@
 	})
 	
 	onLoad(() => {
-		data.activePath = getCurrentPages().route;
-		data.activeMenu = data.list.find(item => item.children.some(cit => cit.url == data.activePath));
-		console.log( 'ccc:', data.activeMenu, data.activePath )
+		const pages = getCurrentPages();
+		data.activePath = pages[pages.length - 1].route;
+		const parentMenu = data.list.find(item => item.children.some(cit => cit.url.includes(data.activePath)));
+		console.log('parentMenu && parentMenu.url',parentMenu && parentMenu.url)
+		data.activeMenu = parentMenu && parentMenu.url;
 	})
 
 	
@@ -99,6 +101,8 @@
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.active {
+	color: red
+}
 </style>

+ 13 - 2
pages.json

@@ -3,7 +3,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": "首页",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -377,10 +378,20 @@
 			"selectedIconPath": "static/images/tabbar/select/index-sj.png",
 			"text": "首页"
 		}, {
+			"pagePath": "pages/index/index",
+			"iconPath": "static/images/tabbar/unselect/index-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/index-sj.png",
+			"text": "校园动态"
+		}, {
+			"pagePath": "pages/index/index",
+			"iconPath": "static/images/tabbar/unselect/index-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/index-sj.png",
+			"text": "招生就业"
+		}, {
 			"pagePath": "pages/my/index",
 			"iconPath": "static/images/tabbar/unselect/my-sj.png",
 			"selectedIconPath": "static/images/tabbar/select/my-sj.png",
-			"text": "我的"
+			"text": "联系方式"
 		}]
 	},
 	"globalStyle": {

+ 2 - 2
pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="lli-index-page">
 		
-		<btnMenuVue></btnMenuVue>
+		<MtaNavbar></MtaNavbar>
 		
 		<view class="uni-margin-wrap">
 			<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" :interval="5000">
@@ -35,7 +35,7 @@
 		onLoad
 	} from "@dcloudio/uni-app"
 	import * as httpApi from "@/api/common.js"
-	import btnMenuVue from "@/components/btnMenu.vue";
+	import MtaNavbar from "@/components/MtaNavbar/MtaNavbar.vue";
 	
 	
 	const banners = ref('');

+ 7 - 3
pages/xsydDeyuduiwu/xsydDeyuduiwu.vue

@@ -16,7 +16,10 @@
 	
 	
 	const data = reactive({
-		content: ''
+		page: 1,
+		size: 5,
+		list: [],
+		total: 0
 	})
 	
 	onLoad(() => {
@@ -24,8 +27,9 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getXueshengDeyuList({page: data.page,size: data.size}).then(res => {
+			data.list = res.data.data;
+			data.total = res.data.total;
 		})
 	}
 </script>

+ 6 - 4
pages/xsydDeyuduiwuInfo/xsydDeyuduiwuInfo.vue

@@ -16,16 +16,18 @@
 	
 	
 	const data = reactive({
-		content: ''
+		id: '',
+		info: null
 	})
 	
-	onLoad(() => {
+	onLoad(({id}) => {
 		pageInit();
+		data.id = id;
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getXueshengDeyuInfo({id: data.id}).then(res => {
+			data.info = res.data;
 		})
 	}
 </script>

+ 7 - 3
pages/xsydGongqingtuan/xsydGongqingtuan.vue

@@ -16,7 +16,10 @@
 	
 	
 	const data = reactive({
-		content: ''
+		page: 1,
+		size: 5,
+		list: [],
+		total: 0
 	})
 	
 	onLoad(() => {
@@ -24,8 +27,9 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getXueshengGongqingList({page: data.page,size:data.size}).then(res => {
+			data.list = res.data.data;
+			data.total = res.data.total;
 		})
 	}
 </script>

+ 6 - 4
pages/xsydGongqingtuanInfo/xsydGongqingtuanInfo.vue

@@ -16,16 +16,18 @@
 	
 	
 	const data = reactive({
-		content: ''
+		id: '',
+		info: null
 	})
 	
-	onLoad(() => {
+	onLoad(({id}) => {
+		data.id = id;
 		pageInit();
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getXueshengGongqingInfo({id: data.id}).then(res => {
+			data.info = res.data;
 		})
 	}
 </script>

+ 5 - 2
pages/xsydXueshenghuodong/xsydXueshenghuodong.vue

@@ -16,7 +16,10 @@
 	
 	
 	const data = reactive({
-		content: ''
+		list: '',
+		page: 1,
+		size: 5,
+		total: 0
 	})
 	
 	onLoad(() => {
@@ -24,7 +27,7 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
+		httpApi.getXueshengHuodongList({page: data.page,size: data.size}).then(res => {
 			data.content = res.data.content;
 		})
 	}

+ 4 - 3
pages/xsydXueshenghuodongInfo/xsydXueshenghuodongInfo.vue

@@ -16,7 +16,8 @@
 	
 	
 	const data = reactive({
-		content: ''
+		id: '',
+		info: null
 	})
 	
 	onLoad(() => {
@@ -24,8 +25,8 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getXueshengHuodongInfo({id: data.id}).then(res => {
+			data.info = res.data;
 		})
 	}
 </script>

+ 7 - 3
pages/xsydZizhuguanli/xsydZizhuguanli.vue

@@ -16,7 +16,10 @@
 	
 	
 	const data = reactive({
-		content: ''
+		list: [],
+		total: 0,
+		page: 1,
+		size: 5
 	})
 	
 	onLoad(() => {
@@ -24,8 +27,9 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getXueshengZizhuList({page: data.page,size:data.size}).then(res => {
+			data.list = res.data.data;
+			data.total = res.data.total;
 		})
 	}
 </script>

+ 6 - 4
pages/xsydZizhuguanliInfo/xsydZizhuguanliInfo.vue

@@ -16,16 +16,18 @@
 	
 	
 	const data = reactive({
-		content: ''
+		info: null,
+		id: null
 	})
 	
-	onLoad(() => {
+	onLoad(({id}) => {
+		data.id = id;
 		pageInit();
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getXueshengZizhuInfo({id: data.id}).then(res => {
+			data.info = res.data;
 		})
 	}
 </script>

+ 7 - 3
pages/xydtTongzhigonggao/xydtTongzhigonggao.vue

@@ -16,7 +16,10 @@
 	
 	
 	const data = reactive({
-		content: ''
+		list: [],
+		page: 1,
+		size: 5,
+		total: 0
 	})
 	
 	onLoad(() => {
@@ -24,8 +27,9 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getDongtaiTongzhiGonggaoList({page:data.page,size: data.size}).then(res => {
+			data.list = res.data.data;
+			data.total = res.data.total;
 		})
 	}
 </script>

+ 4 - 3
pages/xydtTongzhigonggaoInfo/xydtTongzhigonggaoInfo.vue

@@ -16,7 +16,8 @@
 	
 	
 	const data = reactive({
-		content: ''
+		id: null,
+		info: null
 	})
 	
 	onLoad(() => {
@@ -24,8 +25,8 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getDongtaiTongzhiGonggaoInfo({id: data.id}).then(res => {
+			data.info = res.data;
 		})
 	}
 </script>

+ 7 - 3
pages/xydtXiaowugongkai/xydtXiaowugongkai.vue

@@ -16,7 +16,10 @@
 	
 	
 	const data = reactive({
-		content: ''
+		page: 1,
+		size: 5,
+		list: [],
+		total: 0
 	})
 	
 	onLoad(() => {
@@ -24,8 +27,9 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getDongtaiXiaowuGongkaiList({page:data.page,size:data.size}).then(res => {
+			data.list = res.data.data;
+			data.total = res.data.total;
 		})
 	}
 </script>

+ 7 - 4
pages/xydtXiaowugongkaiInfo/xydtXiaowugongkaiInfo.vue

@@ -16,16 +16,19 @@
 	
 	
 	const data = reactive({
-		content: ''
+		id: null,
+		list: []
 	})
 	
-	onLoad(() => {
+	onLoad(({id}) => {
+		data.id = id;
 		pageInit();
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getDongtaiTongzhiGonggaoInfo({id:data.id}).then(res => {
+			data.info = res.data;
+	
 		})
 	}
 </script>

+ 7 - 3
pages/xydtXueyuanfengcai/xydtXueyuanfengcai.vue

@@ -16,7 +16,10 @@
 	
 	
 	const data = reactive({
-		content: ''
+		list: [],
+		page: 1,
+		size: 5,
+		total: 0
 	})
 	
 	onLoad(() => {
@@ -24,8 +27,9 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getDongtaiXueyuanFengcaiList({page: data.page,size:data.size}).then(res => {
+			data.list = res.data.data;
+			data.total = res.data.total;
 		})
 	}
 </script>

+ 6 - 4
pages/xydtXueyuanfengcaiInfo/xydtXueyuanfengcaiInfo.vue

@@ -16,16 +16,18 @@
 	
 	
 	const data = reactive({
-		content: ''
+		info: '',
+		id: null,
 	})
 	
-	onLoad(() => {
+	onLoad(({id}) => {
+		data.id = id;
 		pageInit();
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getDongtaiXueyuanFengcaiInfo({id:data.id}).then(res => {
+			data.info = res.data;
 		})
 	}
 </script>

+ 7 - 3
pages/xydtXueyuanxingwen/xydtXueyuanxingwen.vue

@@ -16,7 +16,10 @@
 	
 	
 	const data = reactive({
-		content: ''
+		page: 1,
+		size: 5,
+		list: [],
+		total: 0
 	})
 	
 	onLoad(() => {
@@ -24,8 +27,9 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getDongtaiYuanxiaoXinwenList({page: data.page,size:data.size}).then(res => {
+			data.list = res.data.data;
+			data.total = res.data.total;
 		})
 	}
 </script>

+ 16 - 10
pages/xydtXueyuanxinwenInfo/xydtXueyuanxinwenInfo.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		
+
 	</view>
 </template>
 
@@ -13,23 +13,29 @@
 		onLoad
 	} from "@dcloudio/uni-app"
 	import * as httpApi from "@/api/common.js"
-	
-	
+
+
 	const data = reactive({
-		content: ''
+		id: null,
+		info: null
 	})
-	
-	onLoad(() => {
+
+	onLoad(({
+		id
+	}) => {
+		data.id = id;
 		pageInit();
 	})
-	
+
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getDongtaiYuanxiaoXinwenInfo({
+			id: data.id
+		}).then(res => {
+			data.info = res.data;
 		})
 	}
 </script>
 
 <style>
 
-</style>
+</style>

+ 1 - 1
pages/xygkLianxifangshi/xygkLianxifangshi.vue

@@ -23,7 +23,7 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJianjieInfo().then(res => {
+		httpApi.getCommonGaikuangDizhiInfo().then(res => {
 			data.info = res.data;
 		})
 	}

+ 7 - 3
pages/zsjyShengxue/zsjyShengxue.vue

@@ -16,7 +16,10 @@
 	
 	
 	const data = reactive({
-		content: ''
+		page: 1,
+		size: 5,
+		total: 0,
+		list: []
 	})
 	
 	onLoad(() => {
@@ -24,8 +27,9 @@
 	})
 	
 	function pageInit() {
-		httpApi.getCommonGaikuangJigouShezhiInfo().then(res => {
-			data.content = res.data.content;
+		httpApi.getCommonZSJYShengxueList({page:data.page,size:data.size}).then(res => {
+			data.list = res.data.data;
+			data.total = res.data.total;
 		})
 	}
 </script>