Merge branch 'master' of http://git.liuniu946.com/hwq/tianliPc

package-lock.json

@@ -18398,9 +18398,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.15.2",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.2.tgz",
-      "integrity": "sha512-S66VvOt1AR698uzxAnJeajnIPI1eIzlkKXHx2F2v94PAs/8JuyRcLOUGy100mJHIIaSkRlxVOtI+As2XTB8Oew==",
+      "version": "2.15.5",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
+      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",

package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "axios": "^0.21.1",
     "core-js": "^2.6.5",
-    "element-ui": "^2.15.2",
+    "element-ui": "^2.15.5",
     "vue": "^2.6.10",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "^3.0.3",

src/components/navBar/NavBar.vue

@@ -74,7 +74,7 @@ export default {
 .top-bar {
   max-width: 1920px;
   min-width: 1080px;
-  height: 140px;
+  // height: 140px;
   margin: 0 auto;
   padding: 15px;
   display: flex;
@@ -85,7 +85,6 @@ export default {
   font-weight: bold;
   color: #000000;
   letter-spacing:3px;
-  margin-bottom: 24px;
   align-items:center;
   .img {
 	  width: 200px;

src/components/swiper/swiper.vue

@@ -1,50 +1,61 @@
 <template>
 	<div class="home-swiper">
-		<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 class="imgBox" :autoplay="false" v-if="swiperList">
+			<el-carousel-item class="imgList" v-for="(item, index) in swiperList" :key="index"><el-image :src="item" alt="" class="swiper-img" /></el-carousel-item>
 		</el-carousel>
 	</div>
 </template>
 
 <script>
-import {  loadIndexs } from '@/api/index.js';
+import { loadIndexs } from '@/api/index.js';
 export default {
-	data(){
+	data() {
 		return {
-			swiperList:[]
-		}
+			swiperList: []
+		};
 	},
 	created() {
-		this.getSwiperList()
+		this.getSwiperList();
 	},
-	methods:{
+	methods: {
 		getSwiperList() {
-			let obj = this
+			let obj = this;
+			console.log(obj);
 			loadIndexs().then(res => {
-				let list = res.data.list.map( item => {
-					return item.image_input[0]
-				})
-				obj.swiperList= list
-			})
-		},
+				obj.swiperList = res.data.loop.split(',').map(e => {
+					return obj.$store.state.www + e;
+				});
+			});
+		}
 	}
-}
+};
 </script>
 
 <style lang="scss">
+.imgBox {
+	.is-active {
+		.el-carousel__button {
+			background-color: #0165b5 !important;
+		}
+	}
+}
 .home-swiper {
 	max-width: 1920px;
 	min-width: 1080px;
-	height: 484px;
-	// background: pink;
-	margin: -20px auto 24px;
-	el-carousel {
-		max-width: 1920px;
-		min-width: 1200px;
-		el-carousel-item {
-			max-width: 1920px;
-			min-width: 1200px;
-			height: 484px;
+	position: relative;
+	padding-top: 40.37%;
+	.imgBox {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		left: 0;
+		.imgList {
+			width: 100%;
+			height: 100%;
+		}
+		.el-carousel__container {
+			height: 100%;
 		}
 	}
 	.swiper-img {

src/router/index.js

@@ -1,18 +1,7 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 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();
-  // }
-  return routerPush.call(this, location).catch(error => error)
-}
-
 Vue.use(Router)
-
-
 const ter =  new Router({
   // mode: 'history',
   base: process.env.BASE_URL,

src/store.js

@@ -5,8 +5,8 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
-	  www:""
-	// www: "http://tianli.liuniu946.com"
+	  // www:""
+	www: "http://tianli.liuniu946.com"
   },
   mutations: {
 

src/utils/request.js

@@ -1,9 +1,5 @@
 import axios from 'axios'
 import router from '../router.js'
-// import {
-// 	MessageBox,
-// 	Toast
-// } from 'mint-ui'
 import {
 	Message
 } from 'element-ui'
@@ -45,10 +41,10 @@ service.interceptors.response.use(
 	response => {
 		const res = response.data
 		// 解析字符串为数字
-		res.errcode = parseInt(res.status);
+		res.errcode = parseInt(res.code);
 		res.message = res.msg;
 		// console.log(typeof res.errcode);
-		if (res.errcode !== 200) {
+		if (res.errcode !== 1) {
 			if (res.errcode === 1001) {
 				if (res.message.includes('您已经登录') || res.message.includes('您已经注册')) {
 					router.push('/');