Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

 Conflicts:

	src/main.js

	src/views/index.vue

src/main.js

@@ -12,9 +12,9 @@ import store from './store/'
 import './permission' // permission control
 
 import { getDicts } from "@/utils/data";
-
-//全局方法挂载
-Vue.prototype.getDicts = getDicts;
+//
+// //全局方法挂载
+Vue.prototype.getDicts = getDicts
 
 // Vant 引用
 import Vant from 'vant';

src/views/index.vue

@@ -7,7 +7,7 @@
       <van-col span="22" style="line-height: 29px;font-size: 20px;">农村产权交易平台</van-col>
     </van-row>
     <van-swipe class="my-swipe" :autoplay="3000" height="180" indicator-color="white">
-      <van-swipe-item v-for="item in bannerList" :key="item.id">
+      <van-swipe-item v-for="(item,index) in bannerList" :key="index">
         <van-image :src="item.img" height="180" />
         <p class="bannerTit">{{item.title}}</p>
       </van-swipe-item>