Prechádzať zdrojové kódy

代码完善+对接

ming 1 rok pred
rodič
commit
7449decf0a
9 zmenil súbory, kde vykonal 413 pridanie a 378 odobranie
  1. 63 41
      about/index.html
  2. 23 8
      assets/css/style.css
  3. 211 45
      assets/js/commonVue.js
  4. 3 2
      index.html
  5. 31 57
      news/index.html
  6. 10 17
      news/read.html
  7. 1 1
      news/trade/index.html
  8. 66 203
      product/index.html
  9. 5 4
      solution/index.html

+ 63 - 41
about/index.html

@@ -35,26 +35,35 @@
         <!--====== HEADER START ======-->
         <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 class="mainmenu-area container d-flex align-items-center justify-content-center">
+                    <div class="logo">
+                        <a href="/index.html"><img src="../assets/img/logo-white.png" alt="uskylogo"></a>
+                    </div>
+                    <div class="d-flex align-items-center ">
+                        <nav class="main-menu">
+                           
+                            <div class="menu-items">
+                                <ul v-if="columnList" >
+                                    <li  v-for="item in columnList" :key="item.id"  :class="
+                                    currentPath==item.sname? 'active':''" >
+                                        <a :href="item.sname">{{item.categoryName}}</a>
+                                        <ul class="submenu" >
+                                            <li v-if="item.children" v-for="aa in item.children" :key="aa.id"><a :href="`${item.sname}?id=${aa.id}`"> <span style="font-weight:bold;margin-right:10px">·</span>   {{aa.sname}}</a></li>
+                                        </ul>
+                                    </li>
+                                  
+                                </ul>
+                            </div>
+                        </nav>
+                        <div class="apply-expre" >申请体验</div>
                     </div>
                 </div>
-                <div id="headerNav"></div>
                 <div>
                     <div class="mobile-menu"></div>
                 </div>
             </div>
         </header>
+        <!--====== HEADER END ======-->
 
         <!--====== COMMON BREADCRUMB START ======-->
         <section class="common-bradcrumb-section inner-banner">
@@ -199,8 +208,45 @@
         </section>
         <!--====== SUB COMPANY END======-->
 
-        <!--====== FOOTER PART START ======-->
-        <div id="footer"></div>
+         <!--====== FOOTER PART START ======-->
+         <footer>
+            <!-- widgets -->
+            <div class="footer-widget-area">
+                <div class="container">
+                    <div class="row footerOne">
+                        <div class="col-lg-2 col-md-6 col-sm-6 footerWidth">
+                            <div class="copyrigt-or-code d-flex flex-column align-items-center ">
+                                <img width="130 " height="130 " src="https://aiot.usky.cn/uskyq/assets/img/qr_code.png">
+                                <span style="text-align: left;color:#fff;margin-top:10px ">微信公众号</span>
+                            </div>
+                        </div>
+                        <div class="footerNone" style="width:15% !important;" v-for="item in columnList" :key="item.id">
+                            <div class="widget nav-widget d-flex justify-content-center ">
+                                <div >
+                                    <h5 class="widget-title"><a href="/solution/index.html">{{item.categoryName}}</a></h5>
+                                    <ul>
+                                        <li  v-if="item.children"  v-for="r in item.children" :key="r.id">
+                                            <a :href="`${item.sname}?id=${r.id}`"> {{r.sname}}</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- copyright -->
+            <div class="copy-right-area ">
+                <div class="container ">
+                    <div class="row copyrigt-text ">
+                        <div class="col-lg-12 ">
+                            <p>Copyright © 2001- 2022 Usky. All Rights Reserved. 永天股份 版权所有</p>
+                            <p>增值电信业务经营许可证(IDC、ISP)编号B2-20080010</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </footer>
         <!--====== FOOTER PART END ======-->
     </div>
 
@@ -219,10 +265,10 @@
     <script src="../assets/js/settinginfo.js"></script>
     <!--====== Vue js======-->
     <script src="../assets/js/vue.min.js"></script>
+    <script src="../assets/js/commonVue.js"></script>
 
     <script language="javascript">
         $(function() {
-            $('#footer').load("../footer.html");
             $(".menu-items ul li").hover(function() {
                 $(".erMenu>div").html("")
                 $(this).addClass("menuactive").siblings().removeClass("menuactive");
@@ -248,7 +294,6 @@
             }, function() {
                 $(".erMenu").fadeOut()
             })
-            $('#headerNav').load("../headerNav.html");
         })
 
         setTimeout(() => {
@@ -275,30 +320,7 @@
             };
         }, 1000)
     </script>
-    <script>
-        var app = new Vue({
-            el: '#app',
-            data: {
-                array: []
-            },
-            computed: {},
-            methods: {
-
-            },
-            mounted: function() {
-                var _this = this;
-                $.ajax({
-                    type: 'POST',
-                    dataType: 'json',
-                    url: window.FQDN + 'Aboutus/index',
-                }).done(function(arr) {
-                    // console.log(arr)
-                    _this.array = arr;
-                }).fail(function(err) {});
-            }
-        })
-    </script>
-
+  
 
 </body>
 

+ 23 - 8
assets/css/style.css

@@ -766,7 +766,7 @@
             }
             .mainmenu-area  .logo{
                 position:absolute;
-                left:-20px;
+                left:-60px;
             }
              .mainmenu-area  .logo img {
                 max-width: 125px;
@@ -793,7 +793,7 @@
             
             header .mainmenu-area .main-menu .menu-items ul li {
                 display: inline-block;
-                margin: 0px 50px;
+                margin: 0px 100px 0 0;
                 position: static;
                 cursor: pointer;
             }
@@ -883,7 +883,8 @@
                 left: 0;
     text-align: center;
                 top: 120%;
-                width: 80%;
+                width: 100%;
+                /* margin-left:10%; */
                 /* background-color: #fff; */
                 opacity: 0;
                 visibility: hidden;
@@ -900,7 +901,7 @@
                 display: inline-block;
                 margin: 0;
                 text-align: center;
-                width:20%;
+                width:15%;
             }
             
             header .mainmenu-area .main-menu .menu-items ul li .submenu>li a {
@@ -1109,14 +1110,28 @@
                 }
             }
             
+            
+            
+            header.header-two .mainmenu-area .main-menu {
+                grid-column-gap: 90px;
+            }
+            header .mainmenu-area .apply-expre {
+                margin:0 0px 0 80px;
+                color:#409EFF;
+                border: 1px solid #409EFF;
+                border-radius: 17px;
+                padding:4px 20px;
+                font-size:18px;
+                cursor:pointer
+            }
+
             @media (max-width: 575px) {
                 header.header-two .mainmenu-area {
                     margin-top: 0;
                 }
-            }
-            
-            header.header-two .mainmenu-area .main-menu {
-                grid-column-gap: 90px;
+                header .mainmenu-area .apply-expre {
+                    display:none
+                }
             }
             
             @media only screen and (min-width: 1200px) and (max-width: 1599px) {

+ 211 - 45
assets/js/commonVue.js

@@ -26,16 +26,16 @@ var app = new Vue({
     //公共
     id: null,
     columnList:[],
-    bbb:'',
+    currentPath:'',
+    articalArray: [], //详情数组
+    columnTypes: [], //栏目类型
 
     //首页
     homeList: [],
     status: false,
 
-    //解决方案
-    array: [], //解决方案旧
-    solutionArray: [], //解决方案详情数据
-    solutionTypes: [], //解决方案类型
+    //解决方案旧
+    array: [], 
 
 
     // 新聞
@@ -47,12 +47,28 @@ var app = new Vue({
     totalPageSzie: 4,
     loading: true,
 
-    //新闻详情
+    //新闻详情
     articleInfo: {},
     previousInfo: {},
     nextInfo: {},
     relativeArr: [],
-    ariticle_id: 0
+    ariticle_id: 0,
+
+
+    // 产品服务旧
+    viweState: false,
+
+    getProductType: [],
+    getProductList: [],
+    details: {},
+
+    tabs: 0,
+    tabsId: '',
+    banner: undefined,
+    item: undefined
+
+
+    
     
 
 
@@ -60,7 +76,6 @@ var app = new Vue({
   },
   computed: {
     // 新闻详情旧
-
     isNews: function() {
       return (this.articleInfo.type == 1);
     },
@@ -74,9 +89,9 @@ var app = new Vue({
 
   },
   created: function () {
-    this.ariticle_id = this.getQueryVariable('id')
-    this.title = this.getQueryVariable('title')?this.getQueryVariable('title'):''
-    alert(this.title)
+    this.ariticle_id = this.getQuery('id')
+    // this.title = this.getQuery('title')?this.getQuery('title'):''
+    this.title = this.getQuery('title')?this.getQuery('title'):''
 
   },
   mounted: function () {
@@ -84,14 +99,23 @@ var app = new Vue({
 
     this.getColumnData()
 
-     
-
-      
-
-      
-
+    this.getProductTypeAjax()
+    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])
+            }
+            if (window.location.search.indexOf("id") > -1) {
+                this.getList(this.getString('id')[2])
+            }
+        } else {
+            this.getList()
+                                  }
+                        }
 
-    
 
 
   },
@@ -106,7 +130,7 @@ var app = new Vue({
       }).done(function (res) {
 
         _this.columnList=res.data;
-        _this.bbb=window.location.pathname
+        _this.currentPath=window.location.pathname
 
         for (let i = 0; i < res.data.length; i++) {
           // console.log(res.data[i].sname)
@@ -128,6 +152,8 @@ var app = new Vue({
 
           if (res.data[i].categoryName == '新闻动态'&& window.location.pathname=='/news/read.html') {
 
+            _this.currentPath='/news/index.html'  //新闻详情时栏目高亮
+
             console.log(res.data[i].categoryName)
             //新闻详情旧
               jQuery.ajax({
@@ -155,13 +181,25 @@ var app = new Vue({
 
               }).fail(function(err) {});
           }
+          if (res.data[i].categoryName == '关于永天'&& window.location.pathname.indexOf('about')>-1) {
+            //关于永天旧
+              $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: window.FQDN + 'Aboutus/index',
+            }).done(function(arr) {
+                // console.log(arr)
+                _this.array = arr;
+            }).fail(function(err) {});
+
+          }
 
 
           if (res.data[i].children.length > 0) {
             if (res.data[i].categoryName == '解决方案'&& window.location.pathname.indexOf('solution')>-1) {
-              _this.solutionTypes = res.data[i].children
-              _this.id = _this.getQueryVariable('id') ? _this.getQueryVariable('id') : _this.solutionTypes[0].id;
-              _this.getArticalData(_this.id ? _this.id : _this.solutionTypes[0].id)
+              _this.columnTypes = res.data[i].children
+              _this.id = _this.getQuery('id') ? _this.getQuery('id') : _this.columnTypes[0].id;
+              _this.getArticalData(_this.id ? _this.id : _this.columnTypes[0].id)
 
               //解决方案旧
               $.ajax({
@@ -175,13 +213,11 @@ var app = new Vue({
                 _this.array = arr;
                 console.log(_this.array)
               }).fail(function (err) {});
-
-
             }
             if (res.data[i].categoryName == '新闻动态'&& window.location.pathname.indexOf('news')>-1) {
-              _this.solutionTypes = res.data[i].children
-              _this.id = _this.getQueryVariable('id') ? _this.getQueryVariable('id') : _this.solutionTypes[0].id;
-              _this.getArticalData(_this.id ? _this.id : _this.solutionTypes[0].id)
+              _this.columnTypes = res.data[i].children
+              _this.id = _this.getQuery('id') ? _this.getQuery('id') : _this.columnTypes[0].id;
+              _this.getArticalData(_this.id ? _this.id : _this.columnTypes[0].id)
             }
           }
         }
@@ -201,10 +237,11 @@ var app = new Vue({
           title:_this.title
         }
       }).done(function (res) {
-        var aa = res.data.records
+        var aa = res.data.records;
+        
         aa.sort(_this.compare("lmtitle"))
         _this.loading = false;
-        _this.solutionArray = aa;
+        _this.articalArray = aa;
         _this.totalPageSzie = res.data.total
         _this.totalPageNum = Math.ceil(res.data.total / res.data.size);
         console.log(aa)
@@ -222,17 +259,128 @@ var app = new Vue({
     },
 
 
+    // 产品服务旧
+    getString(key) {
+          //  获取地址栏的参数
+          var url = window.location.search;
+          //正则表达式筛选
+          var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+          //匹配参数
+          var result = url.substr(1).match(reg);
+          return result
+      },
+      /** 获取分类 */
+      getList(id) {
+          let _this = this
+          _this.tabs = id
+          _this.tabsId = id
+          let path = JSON.parse(localStorage.getItem("item")).sname
+          let data = JSON.parse(localStorage.getItem("item")).children
+
+          for (let i = 0; i < data.length; i++) {
+              if (id == data[i].id) {
+                  var li = $(`
+                          <a class="active" href=?id=${data[i].id}>
+                              ${data[i].categoryName}
+                          </a>
+                      
+                  `)
+                  $('.tabs_selected a').siblings().removeClass('active')
+                  $('#' + id).addClass('active')
+              } else {
+                  var li = $(`
+                      <a href=?id=${data[i].id}>${data[i].categoryName}</a>
+                  `)
+              }
+              // $(".grid-filter>ul").append(li)
+          }
+          if (!id) {
+              let li = $(`<a class="active" href="index.html">全部</a>`)
+              $(".grid-filter>ul").prepend(li)
+              _this.getListData(_this.tabsId, 1, _this.one_page_size)
+          } else {
+              let li = $(`<a href="index.html">全部</a>`)
+              _this.getListData(id, 1, _this.one_page_size)
+              $(".grid-filter>ul").prepend(li)
+          }
+      },
+      /** 获取分类下数据 */
+      getListData(id = undefined, page, size) {
+          let _this = this
+          jQuery.ajax({
+              type: 'get',
+              dataType: 'json',
+              url: window.FQDN2 + 'siteArticle/siteArticleList',
+              data: {
+                  categoryid: id,
+                  pageNum: page,
+                  pageSize: size,
+
+              }
+          }).done(function(res) {
+              _this.getProductList = res.data.records
+              _this.totalPageNum = Math.ceil((res.data.total / res.data.size))
+              _this.totalPageSzie = res.data.total
+              _this.currentPageNum = res.data.current
+              if (res.data.records.length > 0) {
+                  _this.loading = false
+              } else {
+                  _this.loading = true
+              }
+
+          }).fail(function(err) {});
+      },
+      /** 获取数据详情 */
+      productDetails(data) {
+          if (data) {
+              localStorage.setItem("productDetail", JSON.stringify(data))
+              window.location = `?detailId=${data.id}`
+          } else {
+              window.history.go(-1)
+              setTimeout(() => {
+                  localStorage.removeItem("productDetail")
+              }, 1000)
+          }
+
+      },
+      detailsData(id) {
+          let data = JSON.parse(localStorage.getItem("productDetail"))
+          if (data.id == id) {
+              this.details = data
+              this.viweState = true
+          }
+
+      },
+      CloseDetail(){
+          this.viweState=false;
+          window.history.replace(-1)
+          location.replace(location.href);
+      },
+      getProductTypeAjax() {
+          var _this = this;
+          jQuery.ajax({
+              type: 'POST',
+              dataType: 'json',
+              url: window.FQDN2 + 'Product/getProductType',
+          }).done(function(res) {
+                                          _this.getProductType = res
+
+          }).fail(function(err) {});
+      },
+
+    //end
+
+
   //  分页
     oneInnerBox: function(param) {
-      alert(param.title)
-        window.location = "./read.html?id=" + param.id+'&title='+param.title;
+        window.location = "./read.html?id=" + param.categoryid+'&title='+param.title;
         // window.location = "./read.html?id=154"
 
     },
     enterPage: function(res) {
         if (this.goPage >= 1 && this.goPage <= this.totalPageNum) {
             this.currentPageNum = this.goPage
-            this.getArticalData(this.id ? this.id : this.solutionTypes[0].id)
+            this.getArticalData(this.id ? this.id : this.columnTypes[0].id)
         } else {
             this.goPage = 1
             alert('输入页数有误!')
@@ -240,7 +388,7 @@ var app = new Vue({
     },
     currentChange: function(res) {
         this.currentPageNum = res
-        this.getArticalData(this.id ? this.id : this.solutionTypes[0].id)
+        this.getArticalData(this.id ? this.id : this.columnTypes[0].id)
     },
 
 
@@ -253,17 +401,35 @@ var app = new Vue({
       }
     },
 
-    //获取路由参数
-    getQueryVariable: function (variable) {
-      var query = window.location.search.substring(1);
-      var vars = query.split("&");
-      for (var i = 0; i < vars.length; i++) {
-        var pair = vars[i].split("=");
-        if (pair[0] == variable) {
-          return pair[1];
-        }
-      }
-      return (false);
-    }
+    
+    // 获取路由参数
+     getQuery(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return decodeURI(r[2]); return null;
+     },
+
+     //获得年月日时分秒
+        //传入日期//例:2020-10-27T14:36:23
+         timeFormatSeconds(time) {
+          var d = time ? new Date(time) : new Date();
+          var year = d.getFullYear();
+          var month = d.getMonth() + 1;
+          var day = d.getDate();
+          var hours = d.getHours();
+          var min = d.getMinutes();
+          var seconds = d.getSeconds();
+
+          if (month < 10) month = '0' + month;
+          if (day < 10) day = '0' + day;
+          if (hours < 0) hours = '0' + hours;
+          if (min < 10) min = '0' + min;
+          if (seconds < 10) seconds = '0' + seconds;
+
+          return (year + '-' + month + '-' + day + ' ' + hours + ':' + min + ':' + seconds);
+  }
+
+
+
   }
 });

+ 3 - 2
index.html

@@ -125,7 +125,7 @@
                             <div class="menu-items">
                                 <ul v-if="columnList" >
                                     <li  v-for="item in columnList" :key="item.id"  :class="
-                                    bbb==item.sname? 'active':''" >
+                                    currentPath==item.sname? 'active':''" >
                                         <a :href="item.sname">{{item.categoryName}}</a>
                                         <ul class="submenu" >
                                             <li v-if="item.children" v-for="aa in item.children" :key="aa.id"><a :href="`${item.sname}?id=${aa.id}`"> <span style="font-weight:bold;margin-right:10px">·</span>   {{aa.sname}}</a></li>
@@ -135,6 +135,7 @@
                                 </ul>
                             </div>
                         </nav>
+                        <div class="apply-expre" >申请体验</div>
                     </div>
                 </div>
                 <div>
@@ -322,7 +323,7 @@
                                 <span style="text-align: left;color:#fff;margin-top:10px ">微信公众号</span>
                             </div>
                         </div>
-                        <div class="footerNone" style="width:12% !important;" v-for="item in columnList" :key="item.id">
+                        <div class="footerNone" style="width:15% !important;" v-for="item in columnList" :key="item.id">
                             <div class="widget nav-widget d-flex justify-content-center ">
                                 <div >
                                     <h5 class="widget-title"><a href="/solution/index.html">{{item.categoryName}}</a></h5>

+ 31 - 57
news/index.html

@@ -30,7 +30,7 @@
         <!--[if lte IE 9]>
             <p class="browserupgrade">请使用chrome,IE11等现代浏览器,浏览本网站.</p>
         <![endif]-->
-       
+
         <!--====== HEADER START ======-->
         <header class="header-absolute sticky-header">
             <div class="custom-container-one">
@@ -40,20 +40,24 @@
                     </div>
                     <div class="d-flex align-items-center ">
                         <nav class="main-menu">
-                           
+
                             <div class="menu-items">
-                                <ul v-if="columnList" >
-                                    <li  v-for="item in columnList" :key="item.id"  :class="
-                                    bbb==item.sname? 'active':''" >
+                                <ul v-if="columnList">
+                                    <li v-for="item in columnList" :key="item.id" :class="
+                                    currentPath==item.sname? 'active':''">
                                         <a :href="item.sname">{{item.categoryName}}</a>
-                                        <ul class="submenu" >
-                                            <li v-if="item.children" v-for="aa in item.children" :key="aa.id"><a :href="`${item.sname}?id=${aa.id}`"> <span style="font-weight:bold;margin-right:10px">·</span>   {{aa.sname}}</a></li>
+                                        <ul class="submenu">
+                                            <li v-if="item.children" v-for="aa in item.children" :key="aa.id"><a
+                                                    :href="`${item.sname}?id=${aa.id}`"> <span
+                                                        style="font-weight:bold;margin-right:10px">·</span>
+                                                    {{aa.sname}}</a></li>
                                         </ul>
                                     </li>
-                                  
+
                                 </ul>
                             </div>
                         </nav>
+                        <div class="apply-expre">申请体验</div>
                     </div>
                 </div>
                 <div>
@@ -71,10 +75,11 @@
 
         <!-- NEWS TYPE START -->
         <section style=" background:#F7F7F7">
-            <div class="container" >
+            <div class="container">
                 <div class="row newTypeBox">
-                    <div class="col-lg-6 col-md-6 titleOne" v-for="(item,i) in solutionTypes" :class="item.id == id ? 'active' : ''"
-                    @click="facilityClick(i, item)" >{{item.categoryName}}</div>
+                    <div class="col-lg-6 col-md-6 titleOne" v-for="(item,i) in columnTypes"
+                        :class="item.id == id ? 'active' : ''" @click="facilityClick(i, item)">{{item.categoryName}}
+                    </div>
                 </div>
             </div>
         </section>
@@ -83,13 +88,13 @@
         <!--====== NEWS CONTENT START ======-->
         <section class="news-content-section pt-70">
             <div class="container">
-                <div class="col-lg-12 col-md-12 content" >
-                    
+                <div class="col-lg-12 col-md-12 content">
+
                     <ul v-if="!loading">
                         <!-- 新闻列表主题start -->
 
                         <div class="row">
-                            <div class="col-md-4 newItemOne" v-for="item in solutionArray" :key="item.id">
+                            <div class="col-md-4 newItemOne" v-for="item in articalArray" :key="item.id">
                                 <div class="oneInnerBox" @click="oneInnerBox(item)">
                                     <div class="img" v-bind:style="{backgroundImage:'url('+item.image+')'}">
                                     </div>
@@ -103,26 +108,15 @@
 
 
                     <div v-if="!loading" class="page mt-30 mb-30">
-                        <div class="d-flex justify-content-center align-items-end cannot_selected" style="position:relative">
+                        <div class="d-flex justify-content-center align-items-end cannot_selected"
+                            style="position:relative">
                             <div class="page-des align-items-start cannot_selected">共<span> {{
                                     totalPageNum}}</span>页,共<span> {{totalPageSzie}}</span>条信息</div>
 
-
-                            <el-pagination prev-text="上一页" next-text='下一页' :page-size="one_page_size" :current-page="currentPageNum" background layout="prev, pager, next" :total="totalPageSzie" @current-change="currentChange">
+                            <el-pagination prev-text="上一页" next-text='下一页' :page-size="one_page_size"
+                                :current-page="currentPageNum" background layout="prev, pager, next"
+                                :total="totalPageSzie" @current-change="currentChange">
                             </el-pagination>
-
-                            <!-- <a :class="[hasPageTop ? '' : 'disable']" class="previous" @click="toPrevious">上一页</a>
-                            <a v-if="needOmit" :class="[currentPageNum == 1 ? 'active' : '']"
-                                @click="switchPage(1)">1</a>
-                            <span v-if="hasLeftOmit">...</span>
-                            <a v-for="item in middlePageNums" :key="item"
-                                :class="[item == currentPageNum ? 'active': '']"
-                                @click="switchPage(item)">{{item}}</a>
-                            <span v-if="hasRightOmit">...</span>
-                            <a v-if="needOmit" :class="[currentPageNum == totalPageNum? 'active' : '']"
-                                @click="switchPage(totalPageNum)">{{totalPageNum}}</a>
-                            <a :class="[hasPageNext ? '' : 'disable']" @click="toNext" class="next">下一页</a> -->
-
                             <div class="page-des2 align-items-end cannot_selected pc">前往第
                                 <input v-model="goPage" class="previous" @keyup.enter="enterPage" /> 页
                             </div>
@@ -130,7 +124,7 @@
                     </div>
                 </div>
             </div>
-            
+
         </section>
         <!--====== NEWS CONTENT END ======-->
 
@@ -146,12 +140,13 @@
                                 <span style="text-align: left;color:#fff;margin-top:10px ">微信公众号</span>
                             </div>
                         </div>
-                        <div class="footerNone" style="width:12% !important;" v-for="item in columnList" :key="item.id">
+                        <div class="footerNone" style="width:15% !important;" v-for="item in columnList" :key="item.id">
                             <div class="widget nav-widget d-flex justify-content-center ">
-                                <div >
-                                    <h5 class="widget-title"><a href="/solution/index.html">{{item.categoryName}}</a></h5>
+                                <div>
+                                    <h5 class="widget-title"><a href="/solution/index.html">{{item.categoryName}}</a>
+                                    </h5>
                                     <ul>
-                                        <li  v-if="item.children"  v-for="r in item.children" :key="r.id">
+                                        <li v-if="item.children" v-for="r in item.children" :key="r.id">
                                             <a :href="`${item.sname}?id=${r.id}`"> {{r.sname}}</a>
                                         </li>
                                     </ul>
@@ -193,28 +188,7 @@
     <!--====== Vue js======-->
     <script src="../assets/js/commonVue.js "></script>
 
-    <script>
-        //获得年月日时分秒
-        //传入日期//例:2020-10-27T14:36:23
-        var timeFormatSeconds = function(time) {
-		var d = time ? new Date(time) : new Date();
-		var year = d.getFullYear();
-		var month = d.getMonth() + 1;
-		var day = d.getDate();
-		var hours = d.getHours();
-		var min = d.getMinutes();
-		var seconds = d.getSeconds();
-
-		if (month < 10) month = '0' + month;
-		if (day < 10) day = '0' + day;
-		if (hours < 0) hours = '0' + hours;
-		if (min < 10) min = '0' + min;
-		if (seconds < 10) seconds = '0' + seconds;
-
-		return (year + '-' + month + '-' + day + ' ' + hours + ':' + min + ':' + seconds);
-}
-    </script>
-  
+
 </body>
 
 </html>

+ 10 - 17
news/read.html

@@ -46,7 +46,7 @@
                             <div class="menu-items">
                                 <ul v-if="columnList" >
                                     <li  v-for="item in columnList" :key="item.id"  :class="
-                                    bbb==item.sname? 'active':''" >
+                                    currentPath==item.sname? 'active':''" >
                                         <a :href="item.sname">{{item.categoryName}}</a>
                                         <ul class="submenu" >
                                             <li v-if="item.children" v-for="aa in item.children" :key="aa.id"><a :href="`${item.sname}?id=${aa.id}`"> <span style="font-weight:bold;margin-right:10px">·</span>   {{aa.sname}}</a></li>
@@ -56,6 +56,7 @@
                                 </ul>
                             </div>
                         </nav>
+                        <div class="apply-expre" >申请体验</div>
                     </div>
                 </div>
                 <div>
@@ -95,23 +96,17 @@
                         </div>
                         <div v-if="!loading" class="read_content">
                             <div class="section-title text-center both-border mb-20">
-                                <span class="title-tag2">{{articleInfo.title}}</span>
+                                <span class="title-tag2">{{articalArray[0].title}}</span>
                             </div>
                             <div class="new-read-title2">
                                 <div class="row">
-                                    <div class="col-md-3 col-sm-6 col-6 line-one">时间:{{articleInfo.time.split(' ')[0]}}</div>
-                                    <div class="col-md-3 col-sm-6 col-6 line-one">作者:{{articleInfo.publisher}}</div>
-                                    <div class="col-md-3 col-sm-6 col-6  line-one">点击:{{articleInfo.hits}}</div>
-                                    <div class="col-md-3 col-sm-6 col-6 line-one">来源:{{articleInfo.source}}</div>
+                                    <div class="col-md-4 col-sm-6 col-6 line-one">时间:{{timeFormatSeconds(articalArray[0].createdate)}}</div>
+                                    <div class="col-md-4 col-sm-6 col-6 line-one">作者:{{articalArray[0].author}}</div>
+                                    <div class="col-md-4 col-sm-6 col-6  line-one">点击:{{articalArray[0].hits}}</div>
+                                    <!-- <div class="col-md-3 col-sm-6 col-6 line-one">来源:{{articalArray[0].source}}???</div> -->
                                 </div>
-                                <!-- <span style="margin-left:30px"></span>
-                                <span>作者:{{articleInfo.publisher}}</span>
-                                <span>点击:{{articleInfo.publisher}}</span>
-                                <span>来源:{{articleInfo.publisher}}</span> -->
-
-
                             </div>
-                            <div v-html="articleInfo.content" class="new-read-body">
+                            <div v-html="articalArray[0].content" class="new-read-body">
                             </div>
                         </div>
 
@@ -180,7 +175,7 @@
                                 <span style="text-align: left;color:#fff;margin-top:10px ">微信公众号</span>
                             </div>
                         </div>
-                        <div class="footerNone" style="width:12% !important;" v-for="item in columnList" :key="item.id">
+                        <div class="footerNone" style="width:15% !important;" v-for="item in columnList" :key="item.id">
                             <div class="widget nav-widget d-flex justify-content-center ">
                                 <div >
                                     <h5 class="widget-title"><a href="/solution/index.html">{{item.categoryName}}</a></h5>
@@ -211,9 +206,6 @@
 
     </div>
 
-
-
-
     <script src="../assets/js/vendor/modernizr-3.6.0.min.js"></script>
     <script src="../assets/js/vendor/jquery-1.12.4.min.js"></script>
     <!--====== Bootstrap js ======-->
@@ -231,6 +223,7 @@
     <!--====== Vue  js ======-->
     <script src="../assets/js/vue.min.js"></script>
     <script src="../assets/js/commonVue.js "></script>
+
    
 </body>
 

+ 1 - 1
news/trade/index.html

@@ -54,7 +54,7 @@
                         <div class="menu-items" >
                             <ul v-if="columnList" >
                                 <li  v-for="item in columnList" :key="item.id"  :class="
-                                bbb==item.sname? 'active':''" >
+                                currentPath==item.sname? 'active':''" >
                                     <a :href="item.sname">{{item.categoryName}}</a>
                                     <ul class="submenu" >
                                         <li v-if="item.children" v-for="aa in item.children" :key="aa.id"><a href="aa.sname">{{aa.categoryName}}</a></li>

+ 66 - 203
product/index.html

@@ -68,21 +68,29 @@
         <!--====== HEADER START ======-->
         <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="mainmenu-area container d-flex align-items-center justify-content-center">
+                    <div class="logo">
+                        <a href="/index.html"><img src="../assets/img/logo-white.png" alt="uskylogo"></a>
+                    </div>
+                    <div class="d-flex align-items-center ">
+                        <nav class="main-menu">
+                           
+                            <div class="menu-items">
+                                <ul v-if="columnList" >
+                                    <li  v-for="item in columnList" :key="item.id"  :class="
+                                    currentPath==item.sname? 'active':''" >
+                                        <a :href="item.sname">{{item.categoryName}}</a>
+                                        <ul class="submenu" >
+                                            <li v-if="item.children" v-for="aa in item.children" :key="aa.id"><a :href="`${item.sname}?id=${aa.id}`"> <span style="font-weight:bold;margin-right:10px">·</span>   {{aa.sname}}</a></li>
+                                        </ul>
+                                    </li>
+                                  
+                                </ul>
+                            </div>
+                        </nav>
+                        <div class="apply-expre" >申请体验</div>
+                    </div>
                 </div>
-                <div id="headerNav"></div>
                 <div>
                     <div class="mobile-menu"></div>
                 </div>
@@ -114,7 +122,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="row row-tabs grid-isotope pt-30">
+                <div class="row row-tabs grid-isotope pt-30" style="min-height:400px">
                     <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-grid-box">
@@ -135,13 +143,13 @@
                 <div class="news-content-section pt-60">
                     <div class="container">
                         <div class="row newBox">
-                            <div class="col-lg-12 col-md-12 content" id="app">
+                            <div class="col-lg-12 col-md-12 content" >
                                 <div v-if="!loading" class="page mt-30 mb-30">
                                     <div class="d-flex justify-content-center align-items-end cannot_selected" style="position:relative">
                                         <div class="page-des align-items-start cannot_selected">共<span> {{
                                                 totalPageNum}}</span>页,共<span> {{totalPageSzie}}</span>条信息</div>
 
-                                        <el-pagination prev-text="上一页" next-text='下一页' :page-size="one_page_num" :current-page="currentPageNum" background layout="prev, pager, next" :total="totalPageSzie" @current-change="currentChange">
+                                        <el-pagination prev-text="上一页" next-text='下一页' :page-size="one_page_size" :current-page="currentPageNum" background layout="prev, pager, next" :total="totalPageSzie" @current-change="currentChange">
                                         </el-pagination>
 
                                         <div class="page-des2 align-items-end cannot_selected pc">前往第
@@ -176,7 +184,44 @@
         </section>
 
         <!--====== FOOTER PART START ======-->
-        <div id="footer"></div>
+        <footer>
+            <!-- widgets -->
+            <div class="footer-widget-area">
+                <div class="container">
+                    <div class="row footerOne">
+                        <div class="col-lg-2 col-md-6 col-sm-6 footerWidth">
+                            <div class="copyrigt-or-code d-flex flex-column align-items-center ">
+                                <img width="130 " height="130 " src="https://aiot.usky.cn/uskyq/assets/img/qr_code.png">
+                                <span style="text-align: left;color:#fff;margin-top:10px ">微信公众号</span>
+                            </div>
+                        </div>
+                        <div class="footerNone" style="width:15% !important;" v-for="item in columnList" :key="item.id">
+                            <div class="widget nav-widget d-flex justify-content-center ">
+                                <div >
+                                    <h5 class="widget-title"><a href="/solution/index.html">{{item.categoryName}}</a></h5>
+                                    <ul>
+                                        <li  v-if="item.children"  v-for="r in item.children" :key="r.id">
+                                            <a :href="`${item.sname}?id=${r.id}`"> {{r.sname}}</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- copyright -->
+            <div class="copy-right-area ">
+                <div class="container ">
+                    <div class="row copyrigt-text ">
+                        <div class="col-lg-12 ">
+                            <p>Copyright © 2001- 2022 Usky. All Rights Reserved. 永天股份 版权所有</p>
+                            <p>增值电信业务经营许可证(IDC、ISP)编号B2-20080010</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </footer>
         <!--====== FOOTER PART END ======-->
         </div>
 
@@ -226,198 +271,16 @@
                     $(this).addClass("menuactive2").siblings().removeClass("menuactive2");
                 })
 
-                // $.ajax({
-                // type: 'POST',
-                // dataType: 'json',
-                // url: window.FQDN + 'Product/getProductList',
-                // data: {
-                //     product_type_id: res,
-                //     size: _this.one_page_num,
-                //     page: _this.currentPageNum
-                // }
+                
             })
         </script>
         <!--====== Setting Info js=======-->
         <script src="../assets/js/settinginfo.js"></script>
         <!--====== Vue  js ======-->
         <script src="../assets/js/vue.min.js"></script>
+        <script src="../assets/js/commonVue.js"></script>
         <script src="../assets/js/element/index.js"></script>
-        <script>
-            // $(function() {
-            //     $(".active").click(function() {
-            //         alert(111)
-
-            //     })
-            // })
-            var app = new Vue({
-                el: '#app',
-                data: {
-                    cont: 3,
-                    viweState: false,
-
-                    getProductType: [],
-                    getProductList: [],
-                    details: {},
-
-                    goPage: 1,
-                    one_page_num: 12,
-                    currentPageNum: undefined,
-                    totalPageNum: 1,
-                    totalPageSzie: 4,
-                    loading: true,
-
-                    tabs: 0,
-                    tabsId: '',
-                    banner: undefined,
-                    item: undefined
-                },
-                mounted: function() {
-                    console.log('111111111111')
-                    console.log(localStorage.getItem("item"))
-                    // this.getListData('', 1, 12)
-                    this.getProductTypeAjax()
-                    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])
-                            }
-                            if (window.location.search.indexOf("id") > -1) {
-                                this.getList(this.getString('id')[2])
-                            }
-                        } else {
-                            this.getList()
-                                                  }
-                                        }
-                },
-                methods: {
-                    getString(key) {
-                        //  获取地址栏的参数
-                        var url = window.location.search;
-                        //正则表达式筛选
-                        var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
-                        //匹配参数
-                        var result = url.substr(1).match(reg);
-                        return result
-                    },
-                    /** 获取分类 */
-                    getList(id) {
-                        let _this = this
-                        _this.tabs = id
-                        _this.tabsId = id
-                        let path = JSON.parse(localStorage.getItem("item")).sname
-                        let data = JSON.parse(localStorage.getItem("item")).children
-                  
-                        for (let i = 0; i < data.length; i++) {
-                            if (id == data[i].id) {
-                                var li = $(`
-                                        <a class="active" href=?id=${data[i].id}>
-                                            ${data[i].categoryName}
-                                        </a>
-                                    
-                                `)
-                                $('.tabs_selected a').siblings().removeClass('active')
-                                $('#' + id).addClass('active')
-                            } else {
-                                var li = $(`
-                                    <a href=?id=${data[i].id}>${data[i].categoryName}</a>
-                                `)
-                            }
-                            // $(".grid-filter>ul").append(li)
-                        }
-                        if (!id) {
-                            let li = $(`<a class="active" href="index.html">全部</a>`)
-                            $(".grid-filter>ul").prepend(li)
-                            _this.getListData(_this.tabsId, 1, _this.one_page_num)
-                        } else {
-                            let li = $(`<a href="index.html">全部</a>`)
-                            _this.getListData(id, 1, _this.one_page_num)
-                            $(".grid-filter>ul").prepend(li)
-                        }
-                    },
-                    /** 获取分类下数据 */
-                    getListData(id = undefined, page, size) {
-                        let _this = this
-                        jQuery.ajax({
-                            type: 'get',
-                            dataType: 'json',
-                            url: window.FQDN2 + 'siteArticle/siteArticleList',
-                            data: {
-                                categoryid: id,
-                                pageNum: page,
-                                pageSize: size,
-
-                            }
-                        }).done(function(res) {
-                            _this.getProductList = res.data.records
-                            _this.totalPageNum = Math.ceil((res.data.total / res.data.size))
-                            _this.totalPageSzie = res.data.total
-                            _this.currentPageNum = res.data.current
-                            if (res.data.records.length > 0) {
-                                _this.loading = false
-                            } else {
-                                _this.loading = true
-                            }
-
-                        }).fail(function(err) {});
-                    },
-                    /** 获取数据详情 */
-                    productDetails(data) {
-                        if (data) {
-                            localStorage.setItem("productDetail", JSON.stringify(data))
-                            window.location = `?detailId=${data.id}`
-                        } else {
-                            window.history.go(-1)
-                            setTimeout(() => {
-                                localStorage.removeItem("productDetail")
-                            }, 1000)
-                        }
-
-                    },
-                    detailsData(id) {
-                        let data = JSON.parse(localStorage.getItem("productDetail"))
-                        if (data.id == id) {
-                            this.details = data
-                            this.viweState = true
-                        }
-
-                    },
-                    CloseDetail(){
-                        this.viweState=false;
-                        window.history.replace(-1)
-                        location.replace(location.href);
-                    },
-                    getProductTypeAjax() {
-                        var _this = this;
-                        jQuery.ajax({
-                            type: 'POST',
-                            dataType: 'json',
-                            url: window.FQDN2 + 'Product/getProductType',
-                        }).done(function(res) {
-                                                        _this.getProductType = res
-
-                        }).fail(function(err) {});
-                    },
-                    oneInnerBox: function(id) {
-                        window.location = "./read.html?id=" + id
-                    },
-                    enterPage(res) {
-                        if (this.goPage >= 1 && this.goPage <= this.totalPageNum) {
-                            this.currentPageNum = this.goPage
-                            this.getListData(this.tabs, this.goPage, this.one_page_num);
-                        } else {
-                            this.goPage = 1
-                            alert('输入页数有误!')
-                        }
-                    },
-                    currentChange(page) {
-                        this.getListData(this.tabs, page, this.one_page_num);
-                    }
-                }
-            })
-        </script>
+      
 </body>
 
 </html>

+ 5 - 4
solution/index.html

@@ -50,7 +50,7 @@
                             <div class="menu-items">
                                 <ul v-if="columnList" >
                                     <li  v-for="item in columnList" :key="item.id"  :class="
-                                    bbb==item.sname? 'active':''" >
+                                    currentPath==item.sname? 'active':''" >
                                         <a :href="item.sname">{{item.categoryName}}</a>
                                         <ul class="submenu" >
                                             <li v-if="item.children" v-for="aa in item.children" :key="aa.id"><a :href="`${item.sname}?id=${aa.id}`"> <span style="font-weight:bold;margin-right:10px">·</span>   {{aa.sname}}</a></li>
@@ -60,6 +60,7 @@
                                 </ul>
                             </div>
                         </nav>
+                        <div class="apply-expre" >申请体验</div>
                     </div>
                 </div>
                 <div>
@@ -81,7 +82,7 @@
         <!--====== SOLUTION TYPE START ======-->
         <section style="background:#F4F8FD" class="solutionType">
             <div class="container" style="text-align:center">
-                <div class=" solutionTypeOne" v-for="(item,i) in solutionTypes" :class="item.id == id ? 'active' : ''"
+                <div class=" solutionTypeOne" v-for="(item,i) in columnTypes" :class="item.id == id ? 'active' : ''"
                     @click="facilityClick(i, item)">
                     <div style="width:40px;height:40px;;overflow:hidden;margin:0 auto">
                         <img :src="item.imagePath" alt="">
@@ -94,7 +95,7 @@
 
         <!--====== SOLUTION SECTION START ======-->
         <section class="solution-section pt-40">
-            <div class="container pt-40 pt-40" v-for="arr in solutionArray">
+            <div class="container pt-40 pt-40" v-for="arr in articalArray">
                 <div class="section-title both-border mb-20">
                     <span class="title-tag2">{{arr.title}}</span>
                 </div>
@@ -268,7 +269,7 @@
                                 <span style="text-align: left;color:#fff;margin-top:10px ">微信公众号</span>
                             </div>
                         </div>
-                        <div class="footerNone" style="width:12% !important;" v-for="item in columnList" :key="item.id">
+                        <div class="footerNone" style="width:15% !important;" v-for="item in columnList" :key="item.id">
                             <div class="widget nav-widget d-flex justify-content-center ">
                                 <div >
                                     <h5 class="widget-title"><a href="/solution/index.html">{{item.categoryName}}</a></h5>