change leftNav

package.json

@@ -4,7 +4,8 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
+    "build": "vue-cli-service build",
+	"dev": "npm run serve"
   },
   "dependencies": {
     "axios": "^0.21.1",

src/assets/css/reset.css

@@ -43,4 +43,7 @@ table {
 }
 a {
 	text-decoration:none;
+}
+strong {
+	font-weight: bold;
 }

src/components/leftNav/LeftNav.vue

@@ -2,7 +2,7 @@
 	<div class="wrapper">
 		<div class="left-nav" :style="{height: navHeight}">
 			<div class="nav-title">善行共参与</div>
-			<div class="nav-item" v-for="item in navList" :key="item.id" :class="{'action': currentUrl === item.path}" @click="navTo(item.path)">
+			<div class="nav-item" v-for="item in navList" :key="item.id" :class="{'action': currentUrl.indexOf(item.path) !== -1 }" @click="navTo(item.path)">
 				<div class="item-name">
 					{{item.name}}
 				</div>
@@ -94,6 +94,15 @@
 					case '/publicity/detail':
 						title = '信息公示'
 						break
+					case '/regulations/detail':
+						title = '政策法规'
+						break
+					case '/regulations/list':
+						title = '政策法规'
+						break
+					case '/regulations':
+						title = '政策法规'
+						break
 				     default:
 				        title = ''
 				}
@@ -107,7 +116,6 @@
 		},
 		methods: {
 			navTo(path) {
-				console.log(path)
 				let currentUrl = this.$route.path
 				if(currentUrl === path){
 					return
@@ -118,7 +126,6 @@
 			changeClik(index) {
 				this.currentIndex = index
 				this.$router.push('/donation/Hpc?id=' + index)
-				console.log(index)
 			}
 		}
 	}

src/components/navBar/NavBar.vue

@@ -59,7 +59,6 @@ export default {
 		  if(currentUrl === url) {
 			  return 
 		  }else {
-			  console.log(url,currentUrl)
 			 this.currentIndex = index
 			 this.$router.push(url) 
 		  }

src/components/pageBottom/PageBottom.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="view-bottom">
 		<div class="bqsy">版权所有：Copyright©2016-2019  版权所有　版权所有 荆州市红十字会</div>
-		<div class="address">地址：荆州市XXXXXXXX ICP备19012901号-1</div>
+		<div class="address">地址：荆州市荆州区荆东路18号 ICP备19012901号-1</div>
 	</div>
 </template>
 

src/request/api.js

@@ -1,7 +1,7 @@
 import request from "./request.js"
 
 
-// 获取轮播图
+// 获取首页数据
 export function loadIndexs(data) {
 	return request({
 		url: '/api/index',
@@ -10,6 +10,15 @@ export function loadIndexs(data) {
 	});
 }
 
+// 获取轮播图数据
+export function banner(data) {
+	return request({
+		url: '/api/article/list/9',
+		method: 'get',
+		params: data
+	});
+}
+
 // 获取科普文章列表
 export function splist(data) {
 	return request({
@@ -34,7 +43,14 @@ export function openList(data) {
 		params: data
 	});
 }
-
+//获取政策法规文章列表
+export function regulationList(data) {
+	return request({
+		url: '/api/article/list/10',
+		method: 'get',
+		params: data
+	});
+}
 // 获取文章详情
 export function details(data,id) {
 	return request({

src/request/request.js

@@ -1,18 +1,86 @@
-// import Axios from 'axios'
-
-// export function request(config){
-//   const instance = new Axios.create({
-//     baseURL:'http://127.0.0.1:8888/api/private/v1/',
-//     timeout:5000
-//   })
-
-//   return instance(config)
 import axios from 'axios'
-
-// 创建一个axios实例
+import router from '../router.js'
+// import {
+// 	MessageBox,
+// 	Toast
+// } from 'mint-ui'
+import {
+	Message
+} from 'element-ui'
+import store from '../store.js'
+// create an axios instance
 const service = axios.create({
-    baseURL: "http://jz.red.igxys.com",
-    timeout: 60000
-  });
+	baseURL: store.state.www, // url = base url + request url
+	// withCredentials: true, // send cookies when cross-domain requests
+	timeout: 5000 // request timeout
+})
+
+// request interceptor
+service.interceptors.request.use(
+	config => {
+		// do something before request is sent
+		// let each request carry token
+		// ['X-Token'] is a custom headers key
+		// please modify it according to the actual situation
+		// config.headers['X-Token'] = getToken()
+		// if(config.method=='get'){
+		// 	if(!config.params){
+		// 		config.params={};
+		// 	}
+		// 	config.params.token = getToken();
+		// }
+		// if(config.method=='post'){
+		// 	config.data.token = getToken();
+		// }
+		return config
+	},
+	error => {
+		// do something with request error
+		console.log(error) // for debug
+		return Promise.reject(error)
+	}
+)
 
-  export default service;
+service.interceptors.response.use(
+	response => {
+		const res = response.data
+		// 解析字符串为数字
+		res.errcode = parseInt(res.status);
+		res.message = res.msg;
+		// console.log(typeof res.errcode);
+		if (res.errcode !== 200) {
+			if (res.errcode === 1001) {
+				if (res.message.includes('您已经登录') || res.message.includes('您已经注册')) {
+					router.push('/');
+				}
+			};
+			if (res.errcode === 2000) {
+					let url = res.data.wxurl + '?url=' + encodeURIComponent(window.location.href);
+					window.location.href = url;
+			} else if (res.errcode === 2002) {
+					router.push("/login");
+			} else {
+				// Toast({
+				// 	message: res.message || 'Error',
+				// 	duration: 1 * 1000
+				// })
+				// this.$message.error('错了哦，这是一条错误消息');
+				Message.error(res.message || 'Error')
+			}
+			return Promise.reject(new Error(res.message || 'Error'))
+		} else {
+			// console.log(res);
+			return res
+		}
+	},
+	error => {
+		console.log('err' + error) // for debug
+		// Toast({
+		// 	message: '加载错误请刷新重试！',
+		// 	duration: 1 * 1000
+		// })
+		Message.error('加载错误请刷新重试')
+		return Promise.reject(error)
+	}
+)
+export default service

src/router.js

@@ -17,7 +17,7 @@ Router.prototype.push = function push(location) {
 Vue.use(Router)
 
 export default new Router({
-  mode: 'history',
+  // mode: 'history',
   base: process.env.BASE_URL,
   routes: [
     {
@@ -215,9 +215,36 @@ export default new Router({
 			}
 		]
 	},
-	// {
-	// 	path: '*',
-	// 	redirect: '/home'
-	// }
+	{
+		path: '/regulations',
+		name: 'regulations',
+		component: () => import('./views/Regulations.vue'),
+		meta: {
+			title: '政策法规'
+		},
+		redirect: '/regulations/list',
+		children: [
+			{
+				path: 'list',
+				name: 'regulationsList',
+				component: () => import('./views/regulations/List.vue'),
+				meta: {
+					title: '政策法规'
+				}
+			},
+			{
+				path: 'detail',
+				name: 'regulationsdetail',
+				component: () => import('./views/regulations/Detail.vue'),
+				meta: {
+					title: '政策法规'
+				}
+			}
+		]
+	},
+	{
+		path: '*',
+		redirect: '/home'
+	}
   ]
 })

src/store.js

@@ -5,7 +5,7 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
-
+	www: "http://jz.red.igxys.com"
   },
   mutations: {
 

src/views/About.vue

@@ -29,8 +29,7 @@ export default {
 	methods:{
 		getContent() {
 			details({},34).then(({data}) => {
-				console.log(data.data)
-				this.content = data.data.content
+				this.content = data.content
 			})
 		}
 	}

src/views/Concat.vue

@@ -24,8 +24,7 @@ export default {
 	methods:{
 		getContent() {
 			details({},35).then(({data}) => {
-				console.log(data.data)
-				this.content = data.data.content
+				this.content = data.content
 			})
 		}
 	}

src/views/Home.vue

@@ -1,16 +1,38 @@
 <template>
 	<div class="home">
 		<div class="home-swiper">
-			<el-carousel height="484px" :interval="4000">
-				<el-carousel-item v-for="(item, index) in swiperList" :key="index"><el-image :src="item.pic" alt="" class="swiper-img" lazy/></el-carousel-item>
+			<el-carousel height="484px" :interval="4000" v-if="swiperList">
+				<el-carousel-item v-for="(item, index) in swiperList" :key="index"><el-image :src="item" alt="" class="swiper-img" /></el-carousel-item>
 			</el-carousel>
 		</div>
+		<div class="news-wrapper">
+			<div class="new-pic" @click="navTo('/news/detail?id='+ showNew.id)">
+				<img :src="showNew.img">
+				<div class="title clamp hand">
+					{{showNew.title}}
+				</div>
+			</div>
+			<div class="news">
+				<item-title title="红会新闻" :topath="'/news'"></item-title>
+				<div class="item-wrapper">
+					<div class="new-item hand" v-for="item in redNews" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+						<div class="title clamp ">
+							<span></span>
+							{{ item.title }}
+						</div>
+						<div class="time">{{ item.add_time }}</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		
 		<div class="home-body">
+			
 			<div class="body-left moren">
 				<div class="red-new">
-					<item-title title="红会新闻" :topath="'/news'"></item-title>
+					<item-title title="信息公示" :topath="'/publicity'"></item-title>
 					<div class="item-wrapper">
-						<div class="new-item hand" v-for="item in redNews" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+						<div class="new-item hand" v-for="item in openNews" :key="item.id" @click="navTo('/publicity/detail?id='+ item.id)">
 							<div class="title clamp ">
 								<span></span>
 								{{ item.title }}
@@ -20,9 +42,9 @@
 					</div>
 				</div>
 				<div class="new-open">
-					<item-title title="信息公示" :topath="'/publicity'"></item-title>
+					<item-title title="政策法规" :topath="'/publicity'"></item-title>
 					<div class="item-wrapper">
-						<div class="new-item hand" v-for="item in openNews" :key="item.id" @click="navTo('/publicity/detail?id='+item.id)">
+						<div class="new-item hand" v-for="item in regulationList" :key="item.id" @click="navTo('/regulations/detail?id='+item.id)">
 							<div class="title clamp">
 								<span></span>
 								{{ item.title }}
@@ -74,7 +96,7 @@
 <script>
 import ItemTitle from './homeChild/ItemTitle.vue';
 
-import { loadIndexs, splist, loveList, friendList , newsList, openList } from '../request/api.js';
+import { loadIndexs, splist, loveList, friendList , newsList, openList, banner, regulationList } from '../request/api.js';
 export default {
 	components: {
 		ItemTitle
@@ -128,25 +150,9 @@ export default {
 			spList: [],
 			imgList: [],
 			friendList: [],
-			redNews: [
-				{ id: 1, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 2, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 3, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 4, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 5, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 6, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 7, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 8, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 9, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 }
-			],
-			openNews: [
-				{ id: 1, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 2, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 3, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 4, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 5, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 },
-				{ id: 6, title: '关于《鼓励外商投资产业目录（征求意见稿）》公开征求意见的公告', add_time: 1624084078 }
-			],
+			redNews: [],
+			openNews: [],
+			regulationList: [],
 			moreJxList: [],
 			timer: null
 		};
@@ -163,14 +169,31 @@ export default {
 	computed:{
 		jxList() {
 			return this.moreJxList.slice(0,3)
+		},
+		showNew() {
+			
+			let obj =this
+			if(obj.redNews[0]){
+				let data = {
+					id: obj.redNews[0].id,
+					img: obj.redNews[0].image_input[0],
+					title: obj.redNews[0].title
+					
+				}
+				return data
+			}
+			
+			return {}
 		}
 	},
 	created() {
+		this.getSwiperList()
 		this.getIndex();
 		this.getFirstAidList();
 		this.getJxList();
 		this.getNewsList()
-		this.getOpenList()
+		this.getOpenList(),
+		this.getRegulationList()
 	},
 	methods: {
 		navTo(url) {
@@ -178,11 +201,8 @@ export default {
 		},
 		getIndex() {
 			loadIndexs().then(({ data }) => {
-				console.log(data);
-				this.swiperList = data.data.banner;
-				this.friendList = data.data.friend_link;
-				this.imgList = data.data.picture_list;
-				console.log(this.swiperList);
+				this.friendList = data.friend_link;
+				this.imgList = data.picture_list;
 			});
 		},
 		getFirstAidList() {
@@ -190,7 +210,7 @@ export default {
 				page: 1,
 				limit: 5
 			}).then(({ data }) => {
-				this.spList = data.data.list;
+				this.spList = data.list;
 			});
 		},
 		getJxList() {
@@ -200,7 +220,7 @@ export default {
 				limit: 20
 			};
 			loveList(data).then(res => {
-				obj.moreJxList = res.data.data.list.map(item => {
+				obj.moreJxList = res.data.list.map(item => {
 					if (item.intention === '') {
 						item.intention = '非定向捐款';
 					}
@@ -228,8 +248,7 @@ export default {
 				page: 1,
 				limit: 9
 			}).then(res => {
-				console.log(res.data.data.list,'0000000000')
-				obj.redNews = res.data.data.list
+				obj.redNews = res.data.list
 			})
 		},
 		getOpenList() {
@@ -238,8 +257,25 @@ export default {
 				page: 1,
 				limit: 9
 			}).then(res => {
-				console.log(res.data.data.list,'0000000000')
-				obj.openNews = res.data.data.list
+				obj.openNews = res.data.list
+			})
+		},
+		getSwiperList() {
+			let obj = this
+			banner().then(res => {
+				let list = res.data.list.map( item => {
+					return item.image_input[0]
+				})
+				obj.swiperList= list
+			})
+		},
+		getRegulationList() {
+			let obj = this
+			regulationList({
+				page: 1,
+				limit: 6
+			}).then(res => {
+				obj.regulationList = res.data.list
 			})
 		}
 	}
@@ -264,6 +300,43 @@ export default {
 		height: 100%;
 	}
 }
+.news-wrapper {
+	width: 1200px;
+	display: flex;
+	justify-content: space-between;
+	margin: 24px auto;
+	.new-pic {
+		width: 521px;
+		height: 344px;
+		// background-color: #ffff00;
+		position: relative;
+		img {
+			width: 521px;
+			height: 344px;
+		}
+		.title {
+			width: 481px;
+			height: 55px;
+			padding-left: 20px;
+			padding-right: 20px;
+			background: #262626;
+			opacity: 0.8;
+			line-height: 55px;
+			font-size: 24px;
+			font-family: inpinheiti;
+			font-weight: 400;
+			color: #FFFFFF;
+			position: absolute;
+			bottom: 0;
+		}
+	}
+	.news {
+		width: 659px;
+		height: 344px;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+	}
+}
 .home-body {
 	width: 1200px;
 	margin: 24px auto;
@@ -292,7 +365,17 @@ export default {
 				display: flex;
 				justify-content: space-between;
 				margin-bottom: 17px;
-				
+				&:hover {
+					span {
+						background: red;
+					}
+					.title {
+						color: red;
+					}
+					.time {
+						color: red;
+					}
+				}
 				span {
 					display: inline-block;
 					width: 8px;
@@ -460,4 +543,51 @@ export default {
 		background-color: #d82020 !important;
 	}
 }
+.item-wrapper {
+			padding: 20px 15px 0 13px;
+			
+			.new-item {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 17px;
+				&:hover {
+					span {
+						background: red;
+					}
+					.title {
+						color: red;
+					}
+					.time {
+						color: red;
+					}
+				}
+				span {
+					display: inline-block;
+					width: 8px;
+					height: 8px;
+					background: #d8d8d8;
+					// border-radius: 50%;
+					transform: rotate(45deg);
+					margin-right: 8px;
+					
+				}
+				.title {
+					width: 400px;
+					height: 14px;
+					font-size: 14px;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #101010;
+					// &:hover {
+					// 	color: red;
+					// }
+				}
+				.time {
+					font-size: 14px;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+		}
 </style>

src/views/LoveList.vue

@@ -28,7 +28,6 @@ export default {
 	methods: {
 		//分页页码改变触发事件
 		currentChange(e) {
-			console.log(e);
 			this.page = e
 			this.getLiveList()
 		},
@@ -39,7 +38,7 @@ export default {
 				limit: obj.limit
 			}
 			loveList(data).then( res => {
-				obj.tableData = res.data.data.list.map(item => {
+				obj.tableData = res.data.list.map(item => {
 					if(item.intention === ''){
 						item.intention = '非定向捐款'
 					}
@@ -50,8 +49,7 @@ export default {
 					item.time = Y + '/' + M + '/' + D
 					return item
 				})
-				obj.total = res.data.data.count
-				console.log(obj.tableData)
+				obj.total = res.data.count
 			})
 		}
 	}

src/views/News.vue

@@ -15,7 +15,7 @@
 		},
 		data() {
 			return {
-				navList: [{ index: 0, name: '红色新闻', path: '/news/list' }, { index: 1, name: '信息公示', path: '/publicity/list' }],
+				navList: [{ index: 0, name: '红色新闻', path: '/news' }, { index: 1, name: '信息公示', path: '/publicity' }, {index: 2, name: '政策法规', path: '/regulations'}],
 				// radio: '1'
 			};
 		}

src/views/Publicity.vue

@@ -15,7 +15,7 @@
 		},
 		data() {
 			return {
-				navList: [{ index: 0, name: '红色新闻', path: '/news/list' }, { index: 1, name: '信息公示', path: '/publicity/list' }],
+				navList: [{ index: 0, name: '红色新闻', path: '/news' }, { index: 1, name: '信息公示', path: '/publicity' },{index: 2, name: '政策法规', path: '/regulations'}],
 			};
 		}
 	};

src/views/Regulations.vue

@@ -0,0 +1,26 @@
+<template>
+	<div class="regulations">
+		<left-nav :navList="navList">
+			<router-view></router-view>
+		</left-nav>
+	</div>
+</template>
+
+<script>
+	import LeftNav from '../components/leftNav/LeftNav.vue';
+	
+	export default {
+		components: {
+			LeftNav
+		},
+		data() {
+			return {
+				navList: [{ index: 0, name: '红色新闻', path: '/news' }, { index: 1, name: '信息公示', path: '/publicity' },{index: 2, name: '政策法规', path: '/regulations'}],
+				// radio: '1'
+			};
+		}
+	};
+</script>
+
+<style>
+</style>

src/views/donation/Contribution.vue

@@ -21,8 +21,7 @@
 		methods: {
 			getContent() {
 				details({},25).then(({data}) => {
-					console.log(data.data)
-					this.content = data.data.content
+					this.content = data.content
 				})
 			}
 		}

src/views/donation/Hpc.vue

@@ -23,7 +23,6 @@
 		},
 		watch: {
 			iid(val) {
-				console.log(val)
 				this.getData(val)
 			}
 		},
@@ -40,8 +39,7 @@
 			},
 			getContent(id) {
 				details({},id).then(({data}) => {
-					console.log(data.data)
-					this.content = data.data.content
+					this.content = data.content
 				})
 			}
 		}

src/views/donation/OrganDonation.vue

@@ -19,8 +19,7 @@
 		methods: {
 			getContent() {
 				details({},26).then(({data}) => {
-					console.log(data.data)
-					this.content = data.data.content
+					this.content = data.content
 				})
 			}
 		}

src/views/join/Member.vue

@@ -21,14 +21,16 @@
 		methods: {
 			getContent() {
 				details({},31).then(({data}) => {
-					console.log(data.data)
-					this.content = data.data.content
+					this.content = data.content
 				})
 			}
 		}
 	}
 </script>
 
-<style lang="scss" scoped="">
+<style lang="scss" scoped>
+	/deep/ a{
+		cursor:pointer;
+	}
 </style>
 

src/views/join/Rescue.vue

@@ -21,13 +21,15 @@
 		methods: {
 			getContent() {
 				details({},30).then(({data}) => {
-					console.log(data.data)
-					this.content = data.data.content
+					this.content = data.content
 				})
 			}
 		}
 	}
 </script>
 
-<style lang="scss" scoped="">
+<style lang="scss" scoped>
+	/deep/ a{
+		cursor:pointer;
+	}
 </style>

src/views/join/Train.vue

@@ -21,14 +21,16 @@
 		methods: {
 			getContent() {
 				details({},38).then(({data}) => {
-					console.log(data.data)
-					this.content = data.data.content
+					this.content = data.content
 				})
 			}
 		}
 	}
 </script>
 
-<style lang="scss" scoped="">
+<style lang="scss" scoped>
+	/deep/ a{
+		cursor:pointer;
+	}
 </style>
 

src/views/join/Volunteer.vue

@@ -21,13 +21,15 @@
 		methods: {
 			getContent() {
 				details({},32).then(({data}) => {
-					console.log(data.data)
-					this.content = data.data.content
+					this.content = data.content
 				})
 			}
 		}
 	}
 </script>
 
-<style lang="scss" scoped="">
+<style lang="scss" scoped="">
+	/deep/ a{
+		cursor:pointer;
+	}
 </style>

src/views/news/Detail.vue

@@ -17,22 +17,18 @@
 			}
 		},
 		created() {
-			console.log('ddddddddddddddd')
 			this.getContent()
 		},
 		methods:{
 			getContent() {
 				let obj = this
 				this.idd = this.$route.query.id
-				console.log(this.idd)
 				obj.getDetail()
 			},
 			getDetail() {
 				let obj = this
 				details({},this.idd).then(res => {
-					console.log(res)
-					obj.content = res.data.data.content
-					console.log()
+					obj.content = res.data.content
 				})
 			}
 		}

src/views/news/List.vue

@@ -7,7 +7,7 @@
 			</div>
 			<div class="time">{{ item.add_time }}</div>
 		</div>
-		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15"></el-pagination>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15" hide-on-single-page></el-pagination>
 	</div>
 </template>
 
@@ -39,9 +39,8 @@ export default {
 			this.$router.push(url);
 		},
 		currentChange(e) {
-			console.log(e);
 			this.page = e
-			// this.getList()
+			this.getList()
 		},
 		getList() {
 			let obj = this
@@ -49,8 +48,8 @@ export default {
 				page: obj.page,
 				limit: obj.limit
 			}).then(res => {
-				obj.newList = res.data.data.list
-				obj.total = res.data.data.count
+				obj.newList = res.data.list
+				obj.total = res.data.count
 			})
 		}
 	}

src/views/popularScience/Detail.vue

@@ -22,9 +22,8 @@
 				let id = this.$route.query.id
 				details({},id).then(res => {
 					
-					obj.content = res.data.data.content.replace(/width="420" height="280"/g, 'width="812" height="327"')
-					console.log(obj.content)
-					obj.detail = res.data.data
+					obj.content = res.data.content.replace(/width="420" height="280"/g, 'width="812" height="327"')
+					obj.detail = res.data
 				})
 				
 			}

src/views/popularScience/List.vue

@@ -36,7 +36,6 @@
 			},
 			//分页页码改变触发事件
 			currentChange(e) {
-				console.log(e);
 				this.page = e
 				this.getList()
 			},
@@ -47,11 +46,8 @@
 					limit: this.limit
 				}
 				splist().then(({data}) => {
-					console.log(data.data)
-					// obj.alllist = data.data
-					obj.total = data.data.count
-					obj.tipList = data.data.list
-					console.log(obj.total,'obj.total ++++++++++')
+					obj.total = data.count
+					obj.tipList = data.list
 				})
 			},
 			getList() {
@@ -61,10 +57,7 @@
 					limit: this.limit
 				}
 				splist(data).then(({data}) => {
-					console.log(data.data)
-					obj.tipList = data.data.list
-					// obj.total = data.data.count
-					// console.log(obj.total)
+					obj.tipList = data.list
 				})
 			}
 		}

src/views/publicity/Detail.vue

@@ -17,22 +17,18 @@
 			}
 		},
 		created() {
-			console.log('ddddddddddddddd')
 			this.getContent()
 		},
 		methods:{
 			getContent() {
 				let obj = this
 				this.idd = this.$route.query.id
-				console.log(this.idd)
 				obj.getDetail()
 			},
 			getDetail() {
 				let obj = this
 				details({},this.idd).then(res => {
-					console.log(res)
-					obj.content = res.data.data.content
-					console.log()
+					obj.content = res.data.content
 				})
 			}
 		}

src/views/publicity/List.vue

@@ -7,7 +7,7 @@
 			</div>
 			<div class="time">{{ item.add_time }}</div>
 		</div>
-		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15"></el-pagination>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15" hide-on-single-page></el-pagination>
 	</div>
 </template>
 
@@ -39,9 +39,8 @@ export default {
 			this.$router.push(url);
 		},
 		currentChange(e) {
-			console.log(e);
 			this.page = e
-			// this.getList()
+			this.getList()
 		},
 		getList() {
 			let obj = this
@@ -49,8 +48,8 @@ export default {
 				page: obj.page,
 				limit: obj.limit
 			}).then(res => {
-				obj.newList = res.data.data.list
-				obj.total = res.data.data.count
+				obj.newList = res.data.list
+				obj.total = res.data.count
 			})
 		}
 	}

src/views/regulations/Detail.vue

@@ -0,0 +1,39 @@
+<template>
+	<div class="new-detail">
+		<div id="" v-html="content">
+			
+		</div>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../request/api.js'
+	export default {
+		data() {
+			return {
+				content: '',
+				detail: {},
+				idd:0
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods:{
+			getContent() {
+				let obj = this
+				this.idd = this.$route.query.id
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					obj.content = res.data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

src/views/regulations/List.vue

@@ -0,0 +1,99 @@
+<template>
+	<div class="new-list">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/regulations/detail?id='+ item.id)">
+			<div class="title clamp">
+				<span class="title-icon"></span>
+				{{ item.title }}
+			</div>
+			<div class="time">{{ item.add_time }}</div>
+		</div>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15" hide-on-single-page></el-pagination>
+	</div>
+</template>
+
+<script>
+import { loadIndexs, splist, loveList, friendList , newsList, openList , regulationList } from '../../request/api.js';
+export default {
+	data() {
+		return {
+			newList: [],
+			total: 0,
+			page: 1,
+			limit: 15
+		};
+	},
+	// filters: {
+	// 	time(val) {
+	// 		let date = new Date(val * 1000);
+	// 		let Y = date.getFullYear();
+	// 		let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+	// 		let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+	// 		return Y + '-' + M + '-' + D;
+	// 	}
+	// },
+	created() {
+		this.getList()
+	},
+	methods:{
+		navTo(url) {
+			this.$router.push(url);
+		},
+		currentChange(e) {
+			this.page = e
+			this.getList()
+		},
+		getList() {
+			let obj = this
+			regulationList({
+				page: obj.page,
+				limit: obj.limit
+			}).then(res => {
+				obj.newList = res.data.list
+				obj.total = res.data.count
+			})
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.new-list {
+	// padding: 0px 72px 0 40px;
+	.new-item {
+		display: flex;
+		justify-content: space-between;
+		font-size: 18px;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #666666;
+		height: 40px;
+		border-bottom: 1px solid #E5E5E5;
+		line-height: 40px;
+		&:hover {
+			color: red;
+			.title {
+				.title-icon {
+					border-left-color: red;
+				}
+			}
+		}
+		.title {
+			width: 500px;
+			.title-icon {
+				display: inline-block;
+				width: 0;
+				height: 0;
+				width: 0;
+				height: 0;
+				border-top: 6px solid transparent;
+				border-left: 8px solid #d2d2d2;
+				border-bottom: 6px solid transparent;
+			}
+		}
+	}
+}
+	/deep/ .el-pagination {
+		margin-top: 50px;
+		text-align: center;
+	}
+</style>

vue.config.js

@@ -0,0 +1,18 @@
+'use strict'
+const path = require('path')
+const port = process.env.port || process.env.npm_config_port || 9527 // dev port
+module.exports = {
+  publicPath: '/wap',
+  outputDir: 'dist',
+  indexPath: process.env.NODE_ENV === 'development' ? 'mer.html' : 'index.html',
+  lintOnSave: process.env.NODE_ENV === 'development',
+  productionSourceMap: false,
+  devServer: {
+    port: port,
+    // open: true,
+    overlay: {
+      warnings: false,
+      errors: true
+    }
+  }
+}