Browse Source

home 样式修改

2312970463@qq.com 4 years ago
parent
commit
c0dc28da12
5 changed files with 67 additions and 21 deletions
  1. 0 1
      src/App.vue
  2. 27 0
      src/request/api.js
  3. 16 8
      src/request/request.js
  4. 6 10
      src/router.js
  5. 18 2
      src/views/Home.vue

+ 0 - 1
src/App.vue

@@ -4,7 +4,6 @@
 		<img src="@/assets/img/m1.png" >
 	</div>
 	<div>
-		
 	</div>
     <top-logo></top-logo>
     <nav-bar></nav-bar>

+ 27 - 0
src/request/api.js

@@ -1,2 +1,29 @@
 import request from "./request.js"
 
+
+// 获取文章列表
+export function article_list(data) {
+	return request({
+		url: "/article_list",
+		method: "get",
+		params: data
+	});
+}
+
+//获取文章内容
+export function article_info(data, id) {
+	return request({
+		url: "/article_detail/" + id,
+		method: "get",
+		params: data
+	});
+}
+
+//轮播图
+export function loop(data) {
+	return request({
+		url: "/loop",
+		method: "get",
+		params: data
+	});
+}

+ 16 - 8
src/request/request.js

@@ -1,10 +1,18 @@
-import Axios from 'axios'
+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'
 
-export function request(config){
-  const instance = new Axios.create({
-    baseURL:'http://127.0.0.1:8888/api/private/v1/',
-    timeout:5000
-  })
+// 创建一个axios实例
+const service = axios.create({
+    baseURL: "http://ca.liuniu946.com/",
+    timeout: 60000
+  });
 
-  return instance(config)
-}
+  export default service;

+ 6 - 10
src/router.js

@@ -5,11 +5,11 @@ const routerPush = Router.prototype.push
 
 Router.prototype.push = function push(location) {
  
-  if(typeof(location)=="string"){
-    var Separator = "&";
-    if(location.indexOf('?')==-1) { Separator='?'; }
-    location = location + Separator + "random=" + Math.random();
-  }
+  // if(typeof(location)=="string"){
+  //   var Separator = "&";
+  //   if(location.indexOf('?')==-1) { Separator='?'; }
+  //   location = location + Separator + "random=" + Math.random();
+  // }
 
   return routerPush.call(this, location).catch(error => error)
 }
@@ -27,11 +27,7 @@ export default new Router({
     {
       path: '/home',
       name: 'home',
-      // route level code-splitting
-      // this generates a separate chunk (about.[hash].js) for this route
-      // which is lazy-loaded when the route is visited.
-      component: () => import('./views/Home.vue'),
-	  // omponent: () => import('./views/Home.vue'),
+      component: () => import('./views/Home.vue'),
       meta: {
         title: '首页'
       }

+ 18 - 2
src/views/Home.vue

@@ -53,7 +53,7 @@
 			<item-title title="友情链接" isShow="2"></item-title>
 			<div class="friend-list-wrapper">
 				<div class="friend-item" v-for="item in friendList" :key="item.id">
-					<a :href="item.url" class="item-a">{{item.name}}</a>
+					<a :href="item.url" class="item-a" target="_blank">{{item.name}}</a>
 				</div>
 			</div>
 		</div>
@@ -194,7 +194,7 @@ export default {
 	width: 1200px;
 	height: 484px;
 	background: pink;
-	margin: 0 auto;
+	margin: -24px auto 24px;
 	el-carousel {
 		width: 1200px;
 		el-carousel-item {
@@ -378,4 +378,20 @@ export default {
 		}
 	}
 }
+.el-carousel__button {
+	width: 16px;
+	height: 16px;
+	border-radius: 50%;
+}
+
+// .el-carousel__indicator--horizontal {
+// 	.el-carousel__button {
+// 		background-color: rgba(0,0,0,0.9);
+// 	}
+// }
+.is-active {
+	.el-carousel__button {
+		background-color: #D82020 !important;
+	}
+}
 </style>