ming 1 год назад
Родитель
Сommit
011cc25b4f
5 измененных файлов с 68 добавлено и 21 удалено
  1. 7 1
      assets/css/style.css
  2. 0 0
      assets/js/vue.min.js
  3. 34 3
      headerNav.html
  4. 23 16
      product/index.html
  5. 4 1
      solution/index.html

+ 7 - 1
assets/css/style.css

@@ -675,6 +675,7 @@
             }
             
             header.header-absolute {
+               
                 position: absolute;
                 left: 0;
                 top: 0;
@@ -785,8 +786,13 @@
             
             header .mainmenu-area .main-menu .menu-items {
                 margin-left: 60px;
+                
+            }
+            @media (min-width: 1200px) {
+                header .mainmenu-area .main-menu .menu-items  {
+                    height:77px;
+                }
             }
-            
             header .mainmenu-area .main-menu .menu-items ul:nth-child(1) {
                 display: flex;
             }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
assets/js/vue.min.js


+ 34 - 3
headerNav.html

@@ -5,8 +5,39 @@
                 <div class="logo">
                     <a href="./index.html"><img src="../assets/img/logo.png" alt="uskylogo"></a>
                 </div>
-                <div class="menu-items">
+                <div class="menu-items" >
                     <ul>
+                        <li></li>
+                        <!-- <li>
+                            <a href="../../index.html">首页</a>
+                        </li>
+                        <li>
+                            <a href="../../solution/index.html?solution_type=1">解决方案</a>
+                            <ul class="submenu">
+                                <li><a href="../../solution/index.html?solution_type=1">智慧安防</a></li>
+                                <li><a href="../../solution/index.html?solution_type=2">智慧消防</a></li>
+                                <li><a href="../../solution/index.html?solution_type=3">智慧建筑能源管理</a></li>
+                                <li><a href="../../solution/index.html?solution_type=4">智慧电力综合管理</a></li>
+                                <li><a href="../../solution/index.html?solution_type=5">智慧园区无人机综合管理</a></li>
+                                <li><a href="../../solution/index.html?solution_type=6">智慧楼宇综合运营</a></li>
+                            </ul>
+                        </li>
+                        <li>
+                            <a href="../../product/index.html">产品服务</a>
+                        </li>
+                        <li>
+                            <a href="../../technology/index.html">技术支撑</a>
+                        </li>
+                        <li class="active">
+                            <a href="../../news/index.html">新闻动态</a>
+                            <ul class="submenu">
+                                <li><a href="../../news/index.html">公司新闻</a></li>
+                                <li><a href="../../news/trade/index.html">行业动态</a></li>
+                            </ul>
+                        </li>
+                        <li>
+                            <a href="../../about/index.html">关于我们</a>
+                        </li> -->
                     </ul>
                 </div>
             </nav>
@@ -34,7 +65,7 @@
                             var ul = $(`<ul class="submenu"></ul>`)
                             for (let a = 0; a < res.data[i].children.length; a++) {
                                 var li2 = $(`<li>
-                                    <a href=${res.data[i].sname}?id=${res.data[i].children[a].id}>${res.data[i].children[a].categoryName}</a>
+                                    <a href=${res.data[i].sname}&id=${res.data[i].children[a].id}>${res.data[i].children[a].categoryName}</a>
                                 </li>`)
                                 ul.append(li2)
                             }
@@ -47,7 +78,7 @@
                             var ul = $(`<ul class="submenu"></ul>`)
                             for (let a = 0; a < res.data[i].children.length; a++) {
                                 var li2 = $(`<li>
-                                    <a href=${res.data[i].sname}?id=${res.data[i].children[a].id}>${res.data[i].children[a].categoryName}</a>
+                                    <a href=${res.data[i].sname}&id=${res.data[i].children[a].id}>${res.data[i].children[a].categoryName}</a>
                                 </li>`)
                                 ul.append(li2)
                             }

+ 23 - 16
product/index.html

@@ -72,18 +72,18 @@
         <header class="header-absolute sticky-header">
             <div class="custom-container-one">
                 <div class="header-top-area">
-                    <div class="container align-items-center">
-                        <!-- <div class="col-md-6 col-sm-7">
-                                <ul class="contact-list">
-                                    <li>
-                                        <a href="javascipt:void();">www.chinausky.com</a>
-                                    </li>
-                                    <li>
-                                        <a href="javascipt:void();">400 633 8668</a>
-                                    </li>
-                                </ul>
-                            </div> -->
-                    </div>
+                    <!-- <div class="container align-items-center">
+                        <div class="col-md-6 col-sm-7">
+                            <ul class="contact-list">
+                                <li>
+                                    <a href="javascipt:void();">www.chinausky.com</a>
+                                </li>
+                                <li>
+                                    <a href="javascipt:void();">400 633 8668</a>
+                                </li>
+                            </ul>
+                        </div>
+                    </div> -->
                 </div>
                 <div id="headerNav"></div>
                 <div>
@@ -120,7 +120,7 @@
                     <div class="col-lg-4 col-sm-6 software" v-for="(list,index) in getProductList" :key="index">
                         <div class="product-grid-box" @click="productDetails(list)">
                             <div class="product-img">
-                                <img :src="list.image" />
+                                <img :src="list.htmlfilepath" />
                             </div>
                             <div class="title">
                                 <span>{{list.title}}</span>
@@ -248,8 +248,13 @@
                     item: undefined
                 },
                 mounted: function() {
+                    console.log('111111111111')
+                    console.log(localStorage.getItem("item"))
+                    this.getListData('', 1, 12)
                     if (JSON.stringify(JSON.parse(localStorage.getItem("item")).children) != "[]") {
                         this.banner = JSON.parse(localStorage.getItem("item")).imagePath
+                        console.log('this.banner')
+                        console.log(this.banner)
                         if (window.location.search) {
                             if (window.location.search.indexOf("detailId") > -1) {
                                 this.detailsData(this.getString('detailId')[2])
@@ -259,8 +264,8 @@
                             }
                         } else {
                             this.getList()
-                        }
-                    }
+                                                  }
+                                        }
                 },
                 methods: {
                     getString(key) {
@@ -279,6 +284,8 @@
                         _this.tabsId = id
                         let path = JSON.parse(localStorage.getItem("item")).sname
                         let data = JSON.parse(localStorage.getItem("item")).children
+                        console.log('data')
+                        console.log(data)
                         for (let i = 0; i < data.length; i++) {
                             if (id == data[i].id) {
                                 var li = $(`
@@ -360,7 +367,7 @@
                             dataType: 'json',
                             url: window.FQDN2 + 'Product/getProductType',
                         }).done(function(res) {
-                            _this.getProductType = res
+                                                        _this.getProductType = res
 
                         }).fail(function(err) {});
                     },

+ 4 - 1
solution/index.html

@@ -225,6 +225,7 @@
                 backBanner: "",
                 solution: [],
                 solution_type: 1,
+                id:null,
                 array: []
             },
             computed: {
@@ -233,6 +234,8 @@
             created: function() {
 
                 this.solution_type = this.getQueryVariable('solution_type')
+                this.id = this.getQueryVariable('id')
+                console.log(this.id)
 
                 this.backBanner = '../assets/img/solution/solution-banner' + this.getQueryVariable('solution_type') + '.jpg'
             },
@@ -246,7 +249,7 @@
                     dataType: 'json',
                     url: window.FQDN + 'Solution/index',
                     data: {
-                        id: this.solution_type
+                        id: this.id
                     }
                 }).done(function(arr) {
                     _this.array = arr;

Некоторые файлы не были показаны из-за большого количества измененных файлов