Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/Lexus-media

src/components/Footerbanner.vue

@@ -1,57 +1,57 @@
-<template>
-<div class="footer_banner">
-    <div class="img">
-        <img src="" alt="">
-    </div>
-    <div class="footer_link">
-        <span >版权所有:2014-2016</span>
-        <span>
-            <a href="#">四维卓越信息咨询（北京）有限责任公司</a>
-        </span>
-        <span> | </span>
-        <span>
-            <a href="#">法律公告</a>
-        </span>
-        <span> | </span>
-        <span>
-            <a href="#">商业信息保护说明</a>
-        </span>
-        <span> | </span>
-        <span>
-            <a href="#">技术支持邮箱：lexus-dsms@siweizhuoyue.com</a>
-        </span>
-    </div>
-</div>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style scoped lang="less">
-.footer_banner{
-    width: 1190px;
-    height: 40px;
-    margin: 0 auto;
-    margin-top: 20px;
-    background-color: #eee;
-    border-top: 1px solid #ccc;
-    font-size: 12px;
-    display: flex;
-    img{
-        width: 151px;
-        height: 23px;
-        margin-top: 4px;
-    }
-    .footer_link{
-        margin-top: 8px;
-        margin-left: 10px;
-        a{
-            text-decoration: none;
-            &:hover{
-                color: #0056a0;
-            }
-        }
-    }
-}
-</style>
+<template>
+<div class="footer_banner">
+    <div class="img">
+        <img src="../img/footer-icon.png" alt="">
+    </div>
+    <div class="footer_link">
+        <span >版权所有:2014-2016</span>
+        <span>
+            <a href="#">四维卓越信息咨询（北京）有限责任公司</a>
+        </span>
+        <span> | </span>
+        <span>
+            <a href="#">法律公告</a>
+        </span>
+        <span> | </span>
+        <span>
+            <a href="#">商业信息保护说明</a>
+        </span>
+        <span> | </span>
+        <span>
+            <a href="#">技术支持邮箱：lexus-dsms@siweizhuoyue.com</a>
+        </span>
+    </div>
+</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style scoped lang="less">
+.footer_banner{
+    width: 1190px;
+    height: 40px;
+    margin: 0 auto;
+    margin-top: 20px;
+    background-color: #eee;
+    border-top: 1px solid #ccc;
+    font-size: 12px;
+    display: flex;
+    img{
+        width: 151px;
+        height: 23px;
+        margin-top: 4px;
+    }
+    .footer_link{
+        margin-top: 8px;
+        margin-left: 10px;
+        a{
+            text-decoration: none;
+            &:hover{
+                color: #0056a0;
+            }
+        }
+    }
+}
+</style>

src/components/RouterBanner.vue

@@ -46,7 +46,7 @@ export default {
   props: {
     isManufacturer: {
       type: String,
-      default: 'distributor'
+      default: 'manufacturer'
     }
   },
   data() {

src/views/data/InforList.vue

@@ -13,19 +13,19 @@
       <div class="sortBox">
         <div class="sort_inside">
           <span>是否下载</span>
-          <select name="" id="">
+          <select name="" id="isDownload">
             <option value="">不限</option>
             <option value="">是</option>
             <option value="">否</option>
           </select>
           <span>是否反馈</span>
-          <select name="" id="">
+          <select name="" id="isReturn">
             <option value="">不限</option>
             <option value="">是</option>
             <option value="">否</option>
           </select>
           <span>排序</span>
-          <select name="" id="">
+          <select name="" id="timeSort">
             <option value="">时间降序</option>
             <option value="">时间升序</option>
           </select>
@@ -44,7 +44,7 @@
         />
       </div>
       <div class="pageD">
-        <Tablepage
+        <TablePage
           :totalPage="totalPage"
           :currentPage="currentPage"
           @change_page="changePage"
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-import Tablepage from "../../components/TablePage";
+import TablePage from "../../components/TablePage";
 import UpLoadTable from "../../components/Table";
 export default {
   props: {
@@ -66,7 +66,7 @@ export default {
     },
   },
   components: {
-    Tablepage,
+    TablePage,
     UpLoadTable,
   },
   data() {
@@ -220,7 +220,8 @@ export default {
       });
     },
   },
-  mounted: {},
+  mounted() {
+  }
 };
 </script>