Ver código fonte

Merge remote-tracking branch 'origin/麦塔' into 麦塔

wangguoyu 5 anos atrás
pai
commit
f411645009
85 arquivos alterados com 298 adições e 359 exclusões
  1. 13 12
      public/index.html
  2. 12 6
      src/App.vue
  3. 2 2
      src/assets/css/base/utils.scss
  4. 66 7
      src/assets/css/cus-client/cus-client-common.scss
  5. 35 33
      src/assets/css/cus-client/cus-client-page.scss
  6. 3 3
      src/assets/css/mixin/mixin.scss
  7. 3 0
      src/assets/images/client/component/breadcrumb-icon.svg
  8. 0 0
      src/assets/images/client/component/nav-logo.svg
  9. 0 0
      src/assets/images/client/component/nav-phone.svg
  10. 0 0
      src/assets/images/client/index/index-banner-background.png
  11. 0 0
      src/assets/images/client/index/index-banner-circular.png
  12. 0 0
      src/assets/images/client/index/index-banner-img.png
  13. 0 0
      src/assets/images/client/index/index-banner-pie.png
  14. 0 0
      src/assets/images/client/index/index-banner-screen.png
  15. 0 0
      src/assets/images/client/index/index-banner-tel.png
  16. 0 0
      src/assets/images/client/index/index-cert-img1.jpg
  17. 0 0
      src/assets/images/client/index/index-cert-img2.jpg
  18. 0 0
      src/assets/images/client/index/index-cert-img3.jpg
  19. 0 0
      src/assets/images/client/index/index-cert-img4.jpg
  20. 0 0
      src/assets/images/client/index/index-cert-img5.jpg
  21. 0 0
      src/assets/images/client/index/index-cert-img6.jpg
  22. 0 0
      src/assets/images/client/index/index-cert-img7.jpg
  23. 0 0
      src/assets/images/client/index/index-cert-img8.jpg
  24. 0 0
      src/assets/images/client/index/index-chose-operate-icon.png
  25. 0 0
      src/assets/images/client/index/index-chose-operate.png
  26. 0 0
      src/assets/images/client/index/index-chose-service-icon.png
  27. 0 0
      src/assets/images/client/index/index-chose-service.png
  28. 0 0
      src/assets/images/client/index/index-chose-system-icon.png
  29. 0 0
      src/assets/images/client/index/index-chose-system.png
  30. 0 0
      src/assets/images/client/index/index-chose-tech-icon.png
  31. 0 0
      src/assets/images/client/index/index-chose-tech.png
  32. 0 0
      src/assets/images/client/index/index-customer-img1.png
  33. 0 0
      src/assets/images/client/index/index-customer-img10.png
  34. 0 0
      src/assets/images/client/index/index-customer-img11.png
  35. 0 0
      src/assets/images/client/index/index-customer-img12.png
  36. 0 0
      src/assets/images/client/index/index-customer-img13.png
  37. 0 0
      src/assets/images/client/index/index-customer-img14.png
  38. 0 0
      src/assets/images/client/index/index-customer-img15.png
  39. 0 0
      src/assets/images/client/index/index-customer-img16.png
  40. 0 0
      src/assets/images/client/index/index-customer-img17.png
  41. 0 0
      src/assets/images/client/index/index-customer-img18.png
  42. 0 0
      src/assets/images/client/index/index-customer-img19.png
  43. 0 0
      src/assets/images/client/index/index-customer-img2.png
  44. 0 0
      src/assets/images/client/index/index-customer-img20.png
  45. 0 0
      src/assets/images/client/index/index-customer-img3.png
  46. 0 0
      src/assets/images/client/index/index-customer-img4.png
  47. 0 0
      src/assets/images/client/index/index-customer-img5.png
  48. 0 0
      src/assets/images/client/index/index-customer-img6.png
  49. 0 0
      src/assets/images/client/index/index-customer-img7.png
  50. 0 0
      src/assets/images/client/index/index-customer-img8.png
  51. 0 0
      src/assets/images/client/index/index-customer-img9.png
  52. 0 0
      src/assets/images/client/index/index-demand-img1.png
  53. 0 0
      src/assets/images/client/index/index-demand-img10.png
  54. 0 0
      src/assets/images/client/index/index-demand-img11.png
  55. 0 0
      src/assets/images/client/index/index-demand-img12.png
  56. 0 0
      src/assets/images/client/index/index-demand-img2.png
  57. 0 0
      src/assets/images/client/index/index-demand-img3.png
  58. 0 0
      src/assets/images/client/index/index-demand-img4.png
  59. 0 0
      src/assets/images/client/index/index-demand-img5.png
  60. 0 0
      src/assets/images/client/index/index-demand-img6.png
  61. 0 0
      src/assets/images/client/index/index-demand-img7.png
  62. 0 0
      src/assets/images/client/index/index-demand-img8.png
  63. 0 0
      src/assets/images/client/index/index-demand-img9.png
  64. 0 0
      src/assets/images/client/index/index-products-kaoshi-icon.png
  65. 0 0
      src/assets/images/client/index/index-products-kaoshi.png
  66. 0 0
      src/assets/images/client/index/index-products-kejian-icon.png
  67. 0 0
      src/assets/images/client/index/index-products-kejian.png
  68. 0 0
      src/assets/images/client/index/index-products-peixun-icon.png
  69. 0 0
      src/assets/images/client/index/index-products-peixun.png
  70. 13 0
      src/assets/images/client/industry/industry-details-time.svg
  71. 12 0
      src/assets/images/client/industry/industry-details-visits.svg
  72. 1 3
      src/components/client/common/Cframe.vue
  73. 1 74
      src/components/client/common/MtaBreadcrumb.vue
  74. 2 2
      src/components/client/common/footer.vue
  75. 2 2
      src/components/client/common/header.vue
  76. 4 28
      src/router.js
  77. 63 132
      src/views/client/Index.vue
  78. 5 2
      src/views/client/aboutUs.vue
  79. 9 1
      src/views/client/newsInforDetails.vue
  80. 0 0
      src/views/management/XingWenZiXun/XinWenZiXunConfig/components/uploadFile.vue
  81. 15 15
      src/views/management/XingWenZiXun/XinWenZiXunConfig/index.vue
  82. 0 0
      src/views/management/XingWenZiXun/components/Pagination.vue
  83. 0 0
      src/views/management/XingWenZiXun/components/Select.vue
  84. 1 0
      src/views/management/XingWenZiXun/components/Table.vue
  85. 36 37
      src/views/management/XingWenZiXun/index.vue

+ 13 - 12
public/index.html

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+<head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
     <!--<link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">-->
     <!--<link href="<%= BASE_URL %><%= VUE_APP_INDEX_TINY_ICON %>" rel="icon">-->
-    <!--<title><%= VUE_APP_INDEX_TITLE %></title>-->
+    <!-- <title><%= VUE_APP_INDEX_TITLE %></title>-->
 
-    <link rel="stylesheet" href="/external/kityformula/kityformula/assets/styles/base.css">
+    <!--<link rel="stylesheet" href="/external/kityformula/kityformula/assets/styles/base.css">
     <link rel="stylesheet" href="/external/kityformula/kityformula/assets/styles/ui.css">
     <link rel="stylesheet" href="/external/kityformula/kityformula/assets/styles/scrollbar.css">
 
@@ -21,15 +21,16 @@
     <script src="/external/kityformula/kityformula/js/kitygraph.all.js"></script>
     <script src="/external/kityformula/kityformula/js/kity-formula-render.all.js"></script>
     <script src="/external/kityformula/kityformula/js/kity-formula-parser.all.min.js"></script>
-    <script src="/external/kityformula/kityformula/js/kityformula-editor.all.min.js"></script>
+    <script src="/external/kityformula/kityformula/js/kityformula-editor.all.min.js"></script>-->
 
 
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but portal doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
+</head>
+<body>
+<noscript>
+    <strong>We're sorry but portal doesn't work properly without JavaScript enabled. Please enable it to
+            continue.</strong>
+</noscript>
+<div id="app"></div>
+<!-- built files will be auto injected -->
+</body>
 </html>

+ 12 - 6
src/App.vue

@@ -1,29 +1,35 @@
 <template>
     <div id="app">
         <mta-transform>
-            <router-view/>
+            <router-view />
         </mta-transform>
         <st-formula-dialog></st-formula-dialog>
     </div>
 </template>
 
 <script>
-    import MtaTransform    from '@/components/management/Transform';
-    import StFormulaDialog from '@/components/custom/StFormulaDialog';
-    //import globalUploader from '@/components/management/globalUploader/globalUploader.vue';
+    import MtaTransform        from '@/components/management/Transform';
+    import StFormulaDialog     from '@/components/custom/StFormulaDialog';
+    import * as Initialization from '@/utils/initializationConfig';
 
     export default {
         name:       'App',
         components: {
             MtaTransform,
             StFormulaDialog,
-           // globalUploader,
+            // globalUploader,
+        },
+        created() {
+            // 初始化 页面标签meta ico图标
+            Initialization.initializationPageConfig();
         },
     };
 </script>
 <style lang="scss">
+    @import "./assets/css/main/main-z.scss";
+
     #app {
-        font-family: "Helvetica Neue",Helvetica,Arial,"微软雅黑",sans-serif;
+        font-family: "Helvetica Neue", Helvetica, Arial, "微软雅黑", sans-serif;
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         color: #2C3E50;

+ 2 - 2
src/assets/css/base/utils.scss

@@ -158,10 +158,10 @@
 }
 
 /*  网站字体样式  */
-$website-font-size:20;
+$client-font-size:20;
 //传入改变数值及是否加粗
 @mixin setFontStyle($fix, $isBold: false) {
-  font-size: #{$website-font-size + $fix}px;
+  font-size: #{$client-font-size + $fix}px;
   @if $isBold == true {
     font-weight: bold;
   }

+ 66 - 7
src/assets/css/cus-website/cus-website-common.scss → src/assets/css/cus-client/cus-client-common.scss

@@ -11,7 +11,7 @@ body, html, #app {
 ol,ul,dl,dt,dd{list-style:none;margin: 0;padding: 0;}
 
 /* 让标题都自定义, 适应多个系统应用 */
-h1,h2,h3,h4,h5,h6,p{font-size:100%;font-weight:normal;margin: 0;}
+h1,h2,h3,h4,h5,h6,p{font-weight:normal;margin: 0;}
 
 /* 外边距 */
 .m5{margin:5px;}
@@ -104,12 +104,13 @@ h1,h2,h3,h4,h5,h6,p{font-size:100%;font-weight:normal;margin: 0;}
 /************************ 网站公共class样式 author: TX  date:2020-07-30 **********************/
 
 /*  网站主体部分 */
-.website-container{width: 1200px;margin: 0 auto;}
+.client-container{width: 1200px;margin: 0 auto;}
 
 /* 网站头部导航栏 */
-.website-head{
+.client-head{
   width: 100%;
   height: 80px;
+  background: #fff;
 
   //头部布局
   .head-layout{display: flex;justify-content: space-between;}
@@ -137,18 +138,46 @@ h1,h2,h3,h4,h5,h6,p{font-size:100%;font-weight:normal;margin: 0;}
     display: flex;
 
     //头部图标
-    a{width: 160px;height: 80px;display: inline-block;background-image: url("~@/assets/images/website/component/" + "nav-logo.svg");background-repeat: no-repeat;background-position: center;}
+    a{width: 160px;height: 80px;display: inline-block;background-image: url("~@/assets/images/client/component/" + "nav-logo.svg");background-repeat: no-repeat;background-position: center;}
   }
 
   //头部右侧区域
   .head-right{
-      i{width: 19px;height: 24px;display:inline-block;background-image: url("~@/assets/images/website/component/" + "nav-phone.svg");margin-right: 8px;vertical-align: middle;}
+      i{width: 19px;height: 24px;display:inline-block;background-image: url("~@/assets/images/client/component/" + "nav-phone.svg");margin-right: 8px;vertical-align: middle;}
       span{@include setFontStyle(-2);line-height: 80px;color: rgba(0,0,0,0.85);}
   }
 }
 
+/* 网站头部导栏 - 面包屑 */
+.client-breadcrumb-box {
+  width: 1200px;
+  font-size: 16px;
+  margin: 24px auto;
+  .st-breadcrumb{
+    margin-left: 24px;
+    a:last-child{
+      .breadcrumb-div::after{display: none;}
+    }
+  }
+  .st-breadcrumb-item {display: inline-block;vertical-align: middle;color: #4a73fd;text-decoration: none;}
+  .st-breadcrumb-item:hover {cursor: pointer;}
+  .st-breadcrumb-item:after {width: 11px;height: 16px;content: '';display: inline-block;padding: 0 16px;vertical-align: middle;zoom:0.8;-moz-transform:scale(0.8,0.8);
+    background-image: url("~@/assets/images/client/component/" + "breadcrumb-icon.svg");background-repeat: no-repeat;background-position: center;}
+  .breadcrumb-div{display: inline-block;vertical-align: middle;}
+  .st-breadcrumb-item-last {display: inline-block;text-decoration: none;color: #333;vertical-align: middle;}
+  .st-breadcrumb-item-last:hover {cursor: default;}
+  // IE11兼容写法
+  @media all and (-ms-high-contrast:none) {
+    *::-ms-backdrop, .st-breadcrumb-item-last { margin-left: -10px;}
+  }
+  // IE10兼容写法
+  @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+    .st-breadcrumb-item-last { margin-left: -10px;}
+  }
+}
+
 /* 网站底部footer */
-.website-footer{
+.client-footer{
   background: #1E2534;
   //footer内容区域
   .contact-box{
@@ -175,7 +204,7 @@ h1,h2,h3,h4,h5,h6,p{font-size:100%;font-weight:normal;margin: 0;}
     border-right: 0;
     border-left: 0;
     padding: 32px 0;
-    h4{@include setFontStyle(-4);color: #FFF;float: left;margin-right: 48px;}
+    h4{@include setFontStyle(-4);color: #FFF;float: left;margin-right: 48px;line-height: 22px;}
     .link-a-box{
       margin-left: 114px;
       line-height: 22px;
@@ -185,4 +214,34 @@ h1,h2,h3,h4,h5,h6,p{font-size:100%;font-weight:normal;margin: 0;}
   }
   //底部版权
   h5{@include setFontStyle(-8);color: #B8B8B8;text-align: center;padding: 16px 0 24px;}
+}
+
+/* 网站通用详情页布局 */
+.client-details-page{
+  background: #f9faff;
+  width: 100%;
+  .client-details-wrap{
+    width: 1200px;
+    margin: 24px auto;
+    padding: 32px;
+    box-sizing: border-box;
+    background: #FFFFFF;
+    border-radius: 8px;
+    min-height: calc(100vh - 170px);
+    >h1{@include setFontStyle(0);color: rgba(0,0,0,0.85);margin-bottom: 16px;text-align: center}
+    p{
+      margin-bottom: 24px;
+      i{width: 20px;height: 20px;display: inline-block;margin-right: 14px;vertical-align: middle;background-image: url("~@/assets/images/client/industry/" + "industry-details-time.svg");}
+      i[type="visits"]{background-image: url("~@/assets/images/client/industry/" + "industry-details-visits.svg");}
+      span{@include setFontStyle(-6);display:inline-block;color: #666;margin-right: 60px;vertical-align: middle;}
+    }
+    .client-content-box{
+      line-height: 24px;
+      color: rgba(0,0,0,0.64);
+      @include setFontStyle(-6);
+      p{line-height: 22px;}
+      img{max-width: 100%;}
+      h1,h2,h3,h4,h5,h6,p{margin-bottom: 10px;}
+    }
+  }
 }

+ 35 - 33
src/assets/css/cus-website/cus-website-page.scss → src/assets/css/cus-client/cus-client-page.scss

@@ -1,15 +1,15 @@
 @import "../base/utils";
-@import "cus-website-common";
+@import "cus-client-common";
 
-@mixin setWebsitePage() {
+@mixin setClientPage() {
   /********  describe: 网站首页  author: TX  date:2020-07-30  ********/
-  .website-index-page{
+  .client-index-page{
      width: 100%;
     /* 网站banner */
-    .website-banner{
+    .client-banner{
       width: 100%;
       height: 480px;
-      background-image: url("~@/assets/images/website/index/" + "index-banner-background.png");
+      background-image: url("~@/assets/images/client/index/" + "index-banner-background.png");
       background-position-x: center;
       .banner-left{
         width:500px;
@@ -22,12 +22,12 @@
         height: 432px;
         float: right;
         margin-top: 48px;
-        background-image: url("~@/assets/images/website/index/" + "index-banner-img.png");
+        background-image: url("~@/assets/images/client/index/" + "index-banner-img.png");
         position: relative;
           .banner-tel-box{
             width: 284px;
             height: 328px;
-            background-image: url("~@/assets/images/website/index/" + "index-banner-tel.png");
+            background-image: url("~@/assets/images/client/index/" + "index-banner-tel.png");
             position: absolute;
             top: -10px;
             left: 140px;
@@ -47,7 +47,7 @@
             position: absolute;
             top: 86px;
             right: 62px;
-            background-image: url("~@/assets/images/website/index/" + "index-banner-pie.png");
+            background-image: url("~@/assets/images/client/index/" + "index-banner-pie.png");
             animation: 5s webPie ease infinite;-webkit-animation: 5s webPie ease infinite;-moz-animation: 5s webPie ease infinite;-o-animation: 5s webPie ease infinite;
             }
             //饼图动画效果
@@ -102,7 +102,7 @@
     }
 
     /* 网站标题 */
-    .website-index-title{ @include setFontStyle(14);color: rgba(0,0,0,0.85);letter-spacing: 0;padding-top: 80px;text-align: center;}
+    .client-index-title{ @include setFontStyle(14);color: rgba(0,0,0,0.85);letter-spacing: 0;padding-top: 80px;text-align: center;}
 
     /* 产品和服务 */
     .products-services-box{
@@ -138,24 +138,24 @@
           .products-services-img{
             width: 148px;
             margin-left: -74px;
-            background-image: url("~@/assets/images/website/index/" + "index-products-kaoshi.png");
-            i{width:57px;height:41px;top: 28px;left: 50px;background-image: url("~@/assets/images/website/index/" + "index-products-kaoshi-icon.png");animation: 3s servicesImgUpDown linear infinite;}
+            background-image: url("~@/assets/images/client/index/" + "index-products-kaoshi.png");
+            i{width:57px;height:41px;top: 28px;left: 50px;background-image: url("~@/assets/images/client/index/" + "index-products-kaoshi-icon.png");animation: 3s servicesImgUpDown linear infinite;}
           }
         }
         li:nth-child(2){
           .products-services-img{
             width: 138px;
             margin-left: -69px;
-            background-image: url("~@/assets/images/website/index/" + "index-products-peixun.png");
-            i{width:31px;height:45px;top: 28px;left: 60px;background-image: url("~@/assets/images/website/index/" + "index-products-peixun-icon.png");animation: 3s servicesImgUpDown linear infinite;}
+            background-image: url("~@/assets/images/client/index/" + "index-products-peixun.png");
+            i{width:31px;height:45px;top: 28px;left: 60px;background-image: url("~@/assets/images/client/index/" + "index-products-peixun-icon.png");animation: 3s servicesImgUpDown linear infinite;}
           }
         }
         li:nth-child(3){
           .products-services-img{
             width: 155px;
             margin-left: -77px;
-            background-image: url("~@/assets/images/website/index/" + "index-products-kejian.png");
-            i{width:48px;height:48px;top: 35px;left: 45px;background-image: url("~@/assets/images/website/index/" + "index-products-kejian-icon.png");transform:rotate(0);animation: 4s servicesImgRotate linear infinite;}
+            background-image: url("~@/assets/images/client/index/" + "index-products-kejian.png");
+            i{width:48px;height:48px;top: 35px;left: 45px;background-image: url("~@/assets/images/client/index/" + "index-products-kejian-icon.png");transform:rotate(0);animation: 4s servicesImgRotate linear infinite;}
           }
         }
         //小图标动画效果
@@ -182,7 +182,7 @@
     }
 
     /* 行业学习需求 */
-    .website-demand-box{
+    .client-demand-box{
       background: #F9FAFF;
       padding-bottom: 80px;
       // 行业ul
@@ -209,7 +209,7 @@
     }
 
     /* 超过10万家客户的信任之选 */
-    .website-customer-box{
+    .client-customer-box{
       .customer-img-box{
         margin: 40px 0 80px;
         li{
@@ -224,10 +224,10 @@
     }
 
     /* 我们始终专注教育系统研发更懂用户需求 */
-    .website-cert-box{
+    .client-cert-box{
       background: #F9FAFF;
       padding-bottom: 80px;
-      .website-index-title{padding-bottom: 8px;}
+      .client-index-title{padding-bottom: 8px;}
       .cert-img-box{
         display: flex;
         justify-content: space-between;
@@ -241,7 +241,7 @@
     }
 
     /* 为什么选择我们 */
-    .website-chose-box{
+    .client-chose-box{
       padding-bottom: 80px;
       .chose-img-box{
         li{
@@ -251,20 +251,20 @@
           h2{@include setFontStyle(2);text-align: center;color: rgba(0,0,0,0.85);}
         }
         li:nth-child(1){
-          div{background-image: url("~@/assets/images/website/index/" + "index-chose-service.png");}
-          i{background-image: url("~@/assets/images/website/index/" + "index-chose-service-icon.png");animation: 3s choseImgUpDown1 linear infinite;}
+          div{background-image: url("~@/assets/images/client/index/" + "index-chose-service.png");}
+          i{background-image: url("~@/assets/images/client/index/" + "index-chose-service-icon.png");animation: 3s choseImgUpDown1 linear infinite;}
         }
         li:nth-child(2){
-          div{background-image: url("~@/assets/images/website/index/" + "index-chose-system.png");}
-          i{background-image: url("~@/assets/images/website/index/" + "index-chose-system-icon.png");top: 30px;left: 55px;animation: 3s choseImgUpDown2 linear infinite;}
+          div{background-image: url("~@/assets/images/client/index/" + "index-chose-system.png");}
+          i{background-image: url("~@/assets/images/client/index/" + "index-chose-system-icon.png");top: 30px;left: 55px;animation: 3s choseImgUpDown2 linear infinite;}
         }
         li:nth-child(3){
-          div{background-image: url("~@/assets/images/website/index/" + "index-chose-tech.png");}
-          i{background-image: url("~@/assets/images/website/index/" + "index-chose-tech-icon.png");animation: 3s choseImgUpDown1 linear infinite;}
+          div{background-image: url("~@/assets/images/client/index/" + "index-chose-tech.png");}
+          i{background-image: url("~@/assets/images/client/index/" + "index-chose-tech-icon.png");animation: 3s choseImgUpDown1 linear infinite;}
         }
         li:nth-child(4){
-          div{background-image: url("~@/assets/images/website/index/" + "index-chose-operate.png");}
-          i{background-image: url("~@/assets/images/website/index/" + "index-chose-operate-icon.png");top: 50px;animation: 3s choseImgUpDown3 linear infinite;}
+          div{background-image: url("~@/assets/images/client/index/" + "index-chose-operate.png");}
+          i{background-image: url("~@/assets/images/client/index/" + "index-chose-operate-icon.png");top: 50px;animation: 3s choseImgUpDown3 linear infinite;}
         }
         li:hover{
           div{box-shadow: 0 3px 9px rgba(43, 92, 253,0.25);transform: translateY(-10px);cursor: pointer;}
@@ -287,7 +287,7 @@
     }
 
     /* 行业资讯 */
-    .website-industry-information{
+    .client-industry-information{
       background: #F9FAFF;
       padding-bottom: 80px;
       // 轮播组件
@@ -301,7 +301,7 @@
       .el-carousel__item{
         background: #FFFFFF;
         border-radius: 8px;
-        .website-img-box{
+        .client-img-box{
           width: 25%;
           height: 360px;
           background-repeat: no-repeat;
@@ -310,7 +310,7 @@
           transition: 0.3s;
           float: left;
         }
-        .website-content-box{
+        .client-content-box{
           margin-left: 25%;
           padding:32px;
           height: inherit;
@@ -325,8 +325,8 @@
       .el-carousel__item.is-active{
         height: 350px;
         box-shadow: 0 4px 8px 0 rgba(214, 214, 214, 0.76);
-        .website-img-box{width: 50%;}
-        .website-content-box{
+        .client-img-box{width: 50%;}
+        .client-content-box{
           margin-left: 50%;
         }
       }
@@ -334,5 +334,7 @@
       .el-carousel__indicators{display: none}
     }
   }
+
+  /********  describe: 网站行业资讯详情页  author: TX  date:2020-08-06  ********/
 }
 

+ 3 - 3
src/assets/css/mixin/mixin.scss

@@ -3,11 +3,11 @@
  * @Description 【注意】 此scss为全局最高样式应位于所有scss文件下
  */
 @import "../cus-element/cus-elementui";
-@import "../cus-website/cus-website-common.scss";
-@import "../cus-website/cus-website-page.scss";
+@import "../cus-client/cus-client-common";
+@import "../cus-client/cus-client-page";
 
 @mixin setStyle($project, $type) {
 
   @include setFontElement();//饿了么样式
-  @include setWebsitePage();//网站页面样式
+  @include setClientPage();//网站页面样式
 }

+ 3 - 0
src/assets/images/client/component/breadcrumb-icon.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="16" viewBox="0 0 11 16">
+  <path fill="#262626" d="M10.0666453,14.2701708 C10.3485831,14.5209428 10.4632134,14.8956965 10.3659636,15.2487133 C10.2687137,15.6017301 9.97493004,15.877303 9.59884679,15.9682787 C9.22276355,16.0592544 8.82372782,15.9512766 8.5568999,15.6863313 L1.11449307,8.69869742 C0.913215672,8.51126252 0.8,8.25611819 0.8,7.98995169 C0.8,7.7237852 0.913215672,7.46864086 1.11449307,7.28120597 L8.5568999,0.29357208 C8.97380457,-0.0978573642 9.6497406,-0.0978573595 10.0666453,0.293572091 C10.4835499,0.685001541 10.4835499,1.31963407 10.0666453,1.71106353 L3.36847914,7.99061717 L10.0666453,14.2688399 L10.0666453,14.2701708 Z" opacity=".8" transform="matrix(-1 0 0 1 11 0)"/>
+</svg>

+ 0 - 0
src/assets/images/website/component/nav-logo.svg → src/assets/images/client/component/nav-logo.svg


+ 0 - 0
src/assets/images/website/component/nav-phone.svg → src/assets/images/client/component/nav-phone.svg


+ 0 - 0
src/assets/images/website/index/index-banner-background.png → src/assets/images/client/index/index-banner-background.png


+ 0 - 0
src/assets/images/website/index/index-banner-circular.png → src/assets/images/client/index/index-banner-circular.png


+ 0 - 0
src/assets/images/website/index/index-banner-img.png → src/assets/images/client/index/index-banner-img.png


+ 0 - 0
src/assets/images/website/index/index-banner-pie.png → src/assets/images/client/index/index-banner-pie.png


+ 0 - 0
src/assets/images/website/index/index-banner-screen.png → src/assets/images/client/index/index-banner-screen.png


+ 0 - 0
src/assets/images/website/index/index-banner-tel.png → src/assets/images/client/index/index-banner-tel.png


+ 0 - 0
src/assets/images/website/index/index-cert-img1.jpg → src/assets/images/client/index/index-cert-img1.jpg


+ 0 - 0
src/assets/images/website/index/index-cert-img2.jpg → src/assets/images/client/index/index-cert-img2.jpg


+ 0 - 0
src/assets/images/website/index/index-cert-img3.jpg → src/assets/images/client/index/index-cert-img3.jpg


+ 0 - 0
src/assets/images/website/index/index-cert-img4.jpg → src/assets/images/client/index/index-cert-img4.jpg


+ 0 - 0
src/assets/images/website/index/index-cert-img5.jpg → src/assets/images/client/index/index-cert-img5.jpg


+ 0 - 0
src/assets/images/website/index/index-cert-img6.jpg → src/assets/images/client/index/index-cert-img6.jpg


+ 0 - 0
src/assets/images/website/index/index-cert-img7.jpg → src/assets/images/client/index/index-cert-img7.jpg


+ 0 - 0
src/assets/images/website/index/index-cert-img8.jpg → src/assets/images/client/index/index-cert-img8.jpg


+ 0 - 0
src/assets/images/website/index/index-chose-operate-icon.png → src/assets/images/client/index/index-chose-operate-icon.png


+ 0 - 0
src/assets/images/website/index/index-chose-operate.png → src/assets/images/client/index/index-chose-operate.png


+ 0 - 0
src/assets/images/website/index/index-chose-service-icon.png → src/assets/images/client/index/index-chose-service-icon.png


+ 0 - 0
src/assets/images/website/index/index-chose-service.png → src/assets/images/client/index/index-chose-service.png


+ 0 - 0
src/assets/images/website/index/index-chose-system-icon.png → src/assets/images/client/index/index-chose-system-icon.png


+ 0 - 0
src/assets/images/website/index/index-chose-system.png → src/assets/images/client/index/index-chose-system.png


+ 0 - 0
src/assets/images/website/index/index-chose-tech-icon.png → src/assets/images/client/index/index-chose-tech-icon.png


+ 0 - 0
src/assets/images/website/index/index-chose-tech.png → src/assets/images/client/index/index-chose-tech.png


+ 0 - 0
src/assets/images/website/index/index-customer-img1.png → src/assets/images/client/index/index-customer-img1.png


+ 0 - 0
src/assets/images/website/index/index-customer-img10.png → src/assets/images/client/index/index-customer-img10.png


+ 0 - 0
src/assets/images/website/index/index-customer-img11.png → src/assets/images/client/index/index-customer-img11.png


+ 0 - 0
src/assets/images/website/index/index-customer-img12.png → src/assets/images/client/index/index-customer-img12.png


+ 0 - 0
src/assets/images/website/index/index-customer-img13.png → src/assets/images/client/index/index-customer-img13.png


+ 0 - 0
src/assets/images/website/index/index-customer-img14.png → src/assets/images/client/index/index-customer-img14.png


+ 0 - 0
src/assets/images/website/index/index-customer-img15.png → src/assets/images/client/index/index-customer-img15.png


+ 0 - 0
src/assets/images/website/index/index-customer-img16.png → src/assets/images/client/index/index-customer-img16.png


+ 0 - 0
src/assets/images/website/index/index-customer-img17.png → src/assets/images/client/index/index-customer-img17.png


+ 0 - 0
src/assets/images/website/index/index-customer-img18.png → src/assets/images/client/index/index-customer-img18.png


+ 0 - 0
src/assets/images/website/index/index-customer-img19.png → src/assets/images/client/index/index-customer-img19.png


+ 0 - 0
src/assets/images/website/index/index-customer-img2.png → src/assets/images/client/index/index-customer-img2.png


+ 0 - 0
src/assets/images/website/index/index-customer-img20.png → src/assets/images/client/index/index-customer-img20.png


+ 0 - 0
src/assets/images/website/index/index-customer-img3.png → src/assets/images/client/index/index-customer-img3.png


+ 0 - 0
src/assets/images/website/index/index-customer-img4.png → src/assets/images/client/index/index-customer-img4.png


+ 0 - 0
src/assets/images/website/index/index-customer-img5.png → src/assets/images/client/index/index-customer-img5.png


+ 0 - 0
src/assets/images/website/index/index-customer-img6.png → src/assets/images/client/index/index-customer-img6.png


+ 0 - 0
src/assets/images/website/index/index-customer-img7.png → src/assets/images/client/index/index-customer-img7.png


+ 0 - 0
src/assets/images/website/index/index-customer-img8.png → src/assets/images/client/index/index-customer-img8.png


+ 0 - 0
src/assets/images/website/index/index-customer-img9.png → src/assets/images/client/index/index-customer-img9.png


+ 0 - 0
src/assets/images/website/index/index-demand-img1.png → src/assets/images/client/index/index-demand-img1.png


+ 0 - 0
src/assets/images/website/index/index-demand-img10.png → src/assets/images/client/index/index-demand-img10.png


+ 0 - 0
src/assets/images/website/index/index-demand-img11.png → src/assets/images/client/index/index-demand-img11.png


+ 0 - 0
src/assets/images/website/index/index-demand-img12.png → src/assets/images/client/index/index-demand-img12.png


+ 0 - 0
src/assets/images/website/index/index-demand-img2.png → src/assets/images/client/index/index-demand-img2.png


+ 0 - 0
src/assets/images/website/index/index-demand-img3.png → src/assets/images/client/index/index-demand-img3.png


+ 0 - 0
src/assets/images/website/index/index-demand-img4.png → src/assets/images/client/index/index-demand-img4.png


+ 0 - 0
src/assets/images/website/index/index-demand-img5.png → src/assets/images/client/index/index-demand-img5.png


+ 0 - 0
src/assets/images/website/index/index-demand-img6.png → src/assets/images/client/index/index-demand-img6.png


+ 0 - 0
src/assets/images/website/index/index-demand-img7.png → src/assets/images/client/index/index-demand-img7.png


+ 0 - 0
src/assets/images/website/index/index-demand-img8.png → src/assets/images/client/index/index-demand-img8.png


+ 0 - 0
src/assets/images/website/index/index-demand-img9.png → src/assets/images/client/index/index-demand-img9.png


+ 0 - 0
src/assets/images/website/index/index-products-kaoshi-icon.png → src/assets/images/client/index/index-products-kaoshi-icon.png


+ 0 - 0
src/assets/images/website/index/index-products-kaoshi.png → src/assets/images/client/index/index-products-kaoshi.png


+ 0 - 0
src/assets/images/website/index/index-products-kejian-icon.png → src/assets/images/client/index/index-products-kejian-icon.png


+ 0 - 0
src/assets/images/website/index/index-products-kejian.png → src/assets/images/client/index/index-products-kejian.png


+ 0 - 0
src/assets/images/website/index/index-products-peixun-icon.png → src/assets/images/client/index/index-products-peixun-icon.png


+ 0 - 0
src/assets/images/website/index/index-products-peixun.png → src/assets/images/client/index/index-products-peixun.png


+ 13 - 0
src/assets/images/client/industry/industry-details-time.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>时间</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="新闻资讯" transform="translate(-841.000000, -593.000000)">
+            <g id="时间" transform="translate(841.000000, 593.000000)">
+                <circle id="椭圆形" fill="#E8ECFF" cx="10" cy="10" r="10"></circle>
+                <rect id="矩形" fill="#7998FF" transform="translate(10.284521, 7.530476) rotate(14.000000) translate(-10.284521, -7.530476) " x="9.28452088" y="3.5304764" width="2" height="8" rx="1"></rect>
+                <rect id="矩形备份" fill="#4A73FD" transform="translate(12.500000, 10.500000) rotate(90.000000) translate(-12.500000, -10.500000) " x="11.5" y="6.5" width="2" height="8" rx="1"></rect>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/images/client/industry/industry-details-visits.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>观看</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="新闻资讯" transform="translate(-1002.000000, -593.000000)">
+            <g id="观看" transform="translate(1002.000000, 593.000000)">
+                <path d="M10,15 C13.6818983,15 17.0152317,13.3333333 20,10 C17.0152317,6.66666667 13.6818983,5 10,5 C6.31810167,5 2.98476833,6.66666667 0,10 C2.98476833,13.3333333 6.31810167,15 10,15 Z" id="椭圆形" fill="#E8ECFF"></path>
+                <path d="M10,15 C11.6568542,15 13,13.8659932 13,10 C13,6.13400675 11.6568542,5 10,5 C8.34314575,5 7,6.13400675 7,10 C7,13.8659932 8.34314575,15 10,15 Z" id="椭圆形" fill="#4A73FD"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 1 - 3
src/components/client/common/Cframe.vue

@@ -3,10 +3,8 @@
         <!-- header -->
         <mta-header></mta-header>
         <!-- main -->
-        <el-container class="mta-home-box">
-            <div class="mta-home-box-c">
+        <el-container class="mta-home-box-c">
                 <router-view/>
-            </div>
         </el-container>
         <mta-footer></mta-footer>
     </el-container>

+ 1 - 74
src/components/client/common/MtaBreadcrumb.vue

@@ -1,14 +1,12 @@
 <template>
-    <div class="c-breadcrumb-box">
+    <div class="client-breadcrumb-box">
         <div class="st-breadcrumb">
-            <i class="breadcrumb-icon-box"></i>
             <router-link :to="item.path" :class="!item.last ? 'st-breadcrumb-item' : 'st-breadcrumb-item-last'"
                          v-for="item in nodes"
                          :key="item.path">
                 <div v-text="item.display" class="breadcrumb-div"></div>
             </router-link>
         </div>
-        <div style="clear: both;"></div>
     </div>
 </template>
 
@@ -189,74 +187,3 @@
         watch:   {},
     };
 </script>
-<style lang="scss">
-    .c-breadcrumb-box {
-        font-size: 14px;
-        margin-bottom: 32px;
-        margin-left: 30px;
-        .st-breadcrumb{
-            display: flex;
-            align-items: baseline;
-            a:last-child{
-                .breadcrumb-div::after{
-                    display: none;
-                }
-            }
-        }
-        .breadcrumb-icon-box{
-            width: 14px;
-            height: 14px;
-            background: blue;
-          /*  background-image: url("../../../assets/images/icons/breadcrumb-icon-home.svg");*/
-            margin-right: 8px;
-        }
-        .st-breadcrumb-item {
-            font-size: 14px;
-            float: left;
-            color: #666;
-            text-decoration: none;
-        }
-        .breadcrumb-div{
-            display: flex;
-        }
-        .breadcrumb-div::after {
-            content: ' ';
-            width: 7px;
-            height: 16px;
-            display: inline-block;
-            background: red;
-         /*   background-image: url("../../../assets/images/icons/breadcrumb-icon.svg");*/
-            padding: 0 8px;
-            background-repeat: no-repeat;
-            background-position: center;
-        }
-
-        .st-breadcrumb-item:hover {
-            color: #2C98F2;
-            cursor: pointer;
-        }
-
-        .st-breadcrumb-item-last {
-            float: left;
-            text-decoration: none;
-            color: #333;
-        }
-
-        @media screen and (max-width: 1600px) {
-            margin-bottom: 24px;
-            margin-left: 20px;
-        }
-        @media screen and (max-width: 1440px) {
-            font-size: 13px;
-            margin-bottom: 16px;
-            .st-breadcrumb-item {
-                font-size: 13px;
-            }
-            .breadcrumb-div::after {
-                height: 14px;
-            }
-        }
-    }
-
-
-</style>

+ 2 - 2
src/components/client/common/footer.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="website-footer">
-        <div class="website-container">
+    <div class="client-footer">
+        <div class="client-container">
             <div class="contact-box">
                 <div class="contact-left-box">
                     <dl>

+ 2 - 2
src/components/client/common/header.vue

@@ -1,6 +1,6 @@
 <template>
-    <nav class="website-head">
-        <div class="website-container head-layout">
+    <nav class="client-head">
+        <div class="client-container head-layout">
             <div class="head-left">
                 <a></a>
                 <el-menu

+ 4 - 28
src/router.js

@@ -152,14 +152,14 @@ const router = new Router({
                                               },
                                               isAdminMenu: true,
                                               component: () => {
-                                                  return import(/* webpackChunkName: "HangYeZiXun" */ './views/management/HangYeZiXun/index.vue');
+                                                  return import(/* webpackChunkName: "HangYeZiXun" */ './views/management/XingWenZiXun/index.vue');
                                               },
                                           },
                                           {
                                               path: '/news/config',
                                               name: 'newsConfig',
                                               component: () => {
-                                                  return import(/* webpackChunkName: "HangYeZiXun" */ './views/management/HangYeZiXun/HangYeZiXunConfig/index.vue');
+                                                  return import(/* webpackChunkName: "HangYeZiXun" */ './views/management/XingWenZiXun/XinWenZiXunConfig/index.vue');
                                               },
                                           },
                                           {
@@ -191,33 +191,9 @@ const router = new Router({
                               ],
                           });
 
-function dispatchScss(path) {
-    if (!path) {
-        return;
-    }
-    if (path.indexOf('/a/') > -1) {
-        require('@/assets/css/main/main-a.scss');
-    } else if (path.indexOf('/c/') > -1) {
-        require('@/assets/css/main/main-c.scss');
-    } else {
-        require('@/assets/css/main/main-z.scss');
-    }
-}
-
-
 router.beforeEach((to, from, next) => {
-    dispatchScss(to.fullPath);
-    getAuth();
-    getGuide();
-    // getTenantCode();
-    getSystemConfig();
-    if (getSystemConfig()) {
-        document.title = getSystemConfig().logoText; //  describe: 更改title(刷新问题待优化) author: Wgy date:2019-12-04
-    }
-    //个人头像
-    getUserIcon();
-    shitiStatusControl(to);
-    saveHistoryPaths(to, from, next);
+    // FIXME 标题 待确认
+    document.title = to.meta.title ? '麦塔': '麦塔';
     next();
 });
 

+ 63 - 132
src/views/client/Index.vue

@@ -1,31 +1,11 @@
 <template>
-    <div class="website-index-page">
+    <div class="client-index-page">
         <!-- 首页导航栏 -->
         <mta-header></mta-header>
-   <!--     <nav class="website-head">
-            <div class="website-container head-layout">
-                <div class="head-left">
-                    <a></a>
-                    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal"
-                             @select="handleSelect">
-                        <el-menu-item index="首页">首页</el-menu-item>
-                        <el-menu-item index="考试平台">考试平台</el-menu-item>
-                        <el-menu-item index="培训平台">培训平台</el-menu-item>
-                        <el-menu-item index="课程开发">课程开发</el-menu-item>
-                        <el-menu-item index="新闻资讯">新闻资讯</el-menu-item>
-                        <el-menu-item index="帮助中心">帮助中心</el-menu-item>
-                        <el-menu-item index="关于我们">关于我们</el-menu-item>
-                    </el-menu>
-                </div>
-                <div class="head-right">
-                    <i></i><span>4000-522-130</span>
-                </div>
-            </div>
-        </nav>-->
 
         <!-- 首页banner栏 -->
-        <div class="website-banner">
-            <div class="website-container">
+        <div class="client-banner">
+            <div class="client-container">
                 <!--  banner左侧区域 -->
                 <div class="banner-left">
                     <h1>让知识更有价值</h1>
@@ -49,9 +29,9 @@
         </div>
 
         <!-- 产品和服务 -->
-        <div class="website-products-services">
-            <div class="website-container">
-                <h1 class="website-index-title">产品和服务</h1>
+        <div class="client-products-services">
+            <div class="client-container">
+                <h1 class="client-index-title">产品和服务</h1>
                 <ul class="products-services-box">
                     <li>
                         <div class="products-services-img"><i></i></div>
@@ -82,9 +62,9 @@
         </div>
 
         <!-- 行业学习需求 -->
-        <div class="website-demand-box">
-            <div class="website-container">
-                <h1 class="website-index-title">满足不同行业学习需求</h1>
+        <div class="client-demand-box">
+            <div class="client-container">
+                <h1 class="client-index-title">满足不同行业学习需求</h1>
                 <ul class="industry-box">
                     <li><img :src="demandImg1" alt="政府机构"><div><h2>政府机构</h2><p>提高行政服务人员的综合素质和能力的提升,党建知识的考核等</p><a>了解更多</a></div></li>
                     <li><img :src="demandImg2" alt="医药卫生"><div><h2>医药卫生</h2><p>应对种类繁多的专业医疗资格考试,“三基、三严”考试,辅助人才队伍建设</p><a>了解更多</a></div></li>
@@ -103,9 +83,9 @@
         </div>
 
         <!-- 超过10万家客户的信任之选 -->
-        <div class="website-customer-box">
-            <div class="website-container">
-                <h1 class="website-index-title">超过10万家客户的信任之选</h1>
+        <div class="client-customer-box">
+            <div class="client-container">
+                <h1 class="client-index-title">超过10万家客户的信任之选</h1>
                 <ul class="customer-img-box">
                     <li><img :src="customerImg1" alt="中国人民银行"></li>
                     <li><img :src="customerImg2" alt="汇丰"></li>
@@ -132,9 +112,9 @@
         </div>
 
         <!-- 我们始终专注教育系统研发更懂用户需求 -->
-        <div class="website-cert-box">
-            <div class="website-container">
-                <h1 class="website-index-title">我们始终专注教育系统研发更懂用户需求</h1>
+        <div class="client-cert-box">
+            <div class="client-container">
+                <h1 class="client-index-title">我们始终专注教育系统研发更懂用户需求</h1>
                 <div class="cert-img-box">
                     <span><img :src="certImg1" alt="栋科考试管理系统"></span>
                     <span><img :src="certImg2" alt="栋科精品课程管理系统"></span>
@@ -152,9 +132,9 @@
         </div>
 
         <!-- 为什么选择我们 -->
-        <div class="website-chose-box">
-            <div class="website-container">
-                <h1 class="website-index-title">为什么选择我们</h1>
+        <div class="client-chose-box">
+            <div class="client-container">
+                <h1 class="client-index-title">为什么选择我们</h1>
                 <ul class="chose-img-box">
                     <li><div><i></i></div><h2>专业的顾问服务</h2></li>
                     <li><div><i></i></div><h2>完善的培训体系</h2></li>
@@ -165,12 +145,12 @@
         </div>
 
         <!-- 行业资讯 -->
-        <div class="website-industry-information">
-            <h1 class="website-index-title">行业资讯</h1>
+        <div class="client-industry-information">
+            <h1 class="client-index-title">行业资讯</h1>
             <el-carousel :interval="200000" type="card" :autoplay="false" arrow="always">
                 <el-carousel-item v-for="(item,index) in topCarousels" :key="index">
-                    <div class="website-img-box" :style="{backgroundImage: 'url(' + item.pic + ')'}"></div>
-                    <div class="website-content-box"><h1>{{item.title}}</h1>
+                    <div class="client-img-box" :style="{backgroundImage: 'url(' + item.pic + ')'}"></div>
+                    <div class="client-content-box"><h1>{{item.title}}</h1>
                         <p>{{item.intro}}</p><a @click="checkInfo(item)">了解详情</a></div>
                 </el-carousel-item>
             </el-carousel>
@@ -178,55 +158,6 @@
 
         <!-- 底部footer -->
         <mta-footer></mta-footer>
-      <!--  <div class="website-footer">
-            <div class="website-container">
-                <div class="contact-box">
-                    <div class="contact-left-box">
-                        <dl>
-                            <dt>产品服务</dt>
-                            <dd>考试平台</dd>
-                            <dd>培训平台</dd>
-                            <dd>课程开发</dd>
-                        </dl>
-                        <dl>
-                            <dt>关于栋科</dt>
-                            <dd>公司简介</dd>
-                            <dd>加入栋科</dd>
-                            <dd>联系我们</dd>
-                        </dl>
-                        <dl>
-                            <dt>帮助中心</dt>
-                            <dd>说明文档</dd>
-                            <dd>应用下载</dd>
-                        </dl>
-                        <dl>
-                            <dt>法律声明</dt>
-                            <dd>服务条款</dd>
-                            <dd>隐私声明</dd>
-                            <dd>知识维权</dd>
-                        </dl>
-                        <dl>
-                            <dt>关注我们</dt>
-                            <dd>微信公众号</dd>
-                            <dd>新浪微博</dd>
-                        </dl>
-                    </div>
-                    <div class="contact-right-box">
-                        <h3>400-052-2130</h3>
-                        <p>周一至周日9:00-18:00</p>
-                        <p>(仅收市话费)</p>
-                        <a>联系客服</a>
-                    </div>
-                </div>
-                <div class="link-box">
-                    <h4>友情链接</h4>
-                    <div class="link-a-box">
-                        <a>物流软件</a><a>免费erp管理系统</a><a>物流软件</a><a>免费erp管理系统</a><a>物流软件</a><a>免费erp管理系统</a><a>物流软件</a><a>免费erp管理系统</a><a>物流软件</a><a>新零售系统</a><a>物流软件</a><a>新零售系统</a><a>物流软件</a><a>新零售系统</a><a>物流软件</a><a>新零售系统</a><a>物流软件</a><a>新零售系统</a><a>物流软件</a><a>新零售系统</a>
-                    </div>
-                </div>
-                <h5>Copyright © 2019 llisoft.com All rights reserved 大连栋科软件工程有限公司 版权所有 辽ICP备09022904号-19</h5>
-            </div>
-        </div>-->
 
     </div>
 </template>
@@ -241,49 +172,49 @@
         data() {
             return {
                 // 需求img
-                bannerTelImg:  require(`@/assets/images/website/index/index-banner-screen.png`),
-                demandImg1:    require(`@/assets/images/website/index/index-demand-img1.png`),
-                demandImg2:    require(`@/assets/images/website/index/index-demand-img2.png`),
-                demandImg3:    require(`@/assets/images/website/index/index-demand-img3.png`),
-                demandImg4:    require(`@/assets/images/website/index/index-demand-img4.png`),
-                demandImg5:    require(`@/assets/images/website/index/index-demand-img5.png`),
-                demandImg6:    require(`@/assets/images/website/index/index-demand-img6.png`),
-                demandImg7:    require(`@/assets/images/website/index/index-demand-img7.png`),
-                demandImg8:    require(`@/assets/images/website/index/index-demand-img8.png`),
-                demandImg9:    require(`@/assets/images/website/index/index-demand-img9.png`),
-                demandImg10:   require(`@/assets/images/website/index/index-demand-img10.png`),
-                demandImg11:   require(`@/assets/images/website/index/index-demand-img11.png`),
-                demandImg12:   require(`@/assets/images/website/index/index-demand-img12.png`),
+                bannerTelImg:  require(`@/assets/images/client/index/index-banner-screen.png`),
+                demandImg1:    require(`@/assets/images/client/index/index-demand-img1.png`),
+                demandImg2:    require(`@/assets/images/client/index/index-demand-img2.png`),
+                demandImg3:    require(`@/assets/images/client/index/index-demand-img3.png`),
+                demandImg4:    require(`@/assets/images/client/index/index-demand-img4.png`),
+                demandImg5:    require(`@/assets/images/client/index/index-demand-img5.png`),
+                demandImg6:    require(`@/assets/images/client/index/index-demand-img6.png`),
+                demandImg7:    require(`@/assets/images/client/index/index-demand-img7.png`),
+                demandImg8:    require(`@/assets/images/client/index/index-demand-img8.png`),
+                demandImg9:    require(`@/assets/images/client/index/index-demand-img9.png`),
+                demandImg10:   require(`@/assets/images/client/index/index-demand-img10.png`),
+                demandImg11:   require(`@/assets/images/client/index/index-demand-img11.png`),
+                demandImg12:   require(`@/assets/images/client/index/index-demand-img12.png`),
                 // 客户logo
-                customerImg1:  require(`@/assets/images/website/index/index-customer-img1.png`),
-                customerImg2:  require(`@/assets/images/website/index/index-customer-img2.png`),
-                customerImg3:  require(`@/assets/images/website/index/index-customer-img3.png`),
-                customerImg4:  require(`@/assets/images/website/index/index-customer-img4.png`),
-                customerImg5:  require(`@/assets/images/website/index/index-customer-img5.png`),
-                customerImg6:  require(`@/assets/images/website/index/index-customer-img6.png`),
-                customerImg7:  require(`@/assets/images/website/index/index-customer-img7.png`),
-                customerImg8:  require(`@/assets/images/website/index/index-customer-img8.png`),
-                customerImg9:  require(`@/assets/images/website/index/index-customer-img9.png`),
-                customerImg10: require(`@/assets/images/website/index/index-customer-img10.png`),
-                customerImg11: require(`@/assets/images/website/index/index-customer-img11.png`),
-                customerImg12: require(`@/assets/images/website/index/index-customer-img12.png`),
-                customerImg13: require(`@/assets/images/website/index/index-customer-img13.png`),
-                customerImg14: require(`@/assets/images/website/index/index-customer-img14.png`),
-                customerImg15: require(`@/assets/images/website/index/index-customer-img15.png`),
-                customerImg16: require(`@/assets/images/website/index/index-customer-img16.png`),
-                customerImg17: require(`@/assets/images/website/index/index-customer-img17.png`),
-                customerImg18: require(`@/assets/images/website/index/index-customer-img18.png`),
-                customerImg19: require(`@/assets/images/website/index/index-customer-img19.png`),
-                customerImg20: require(`@/assets/images/website/index/index-customer-img20.png`),
+                customerImg1:  require(`@/assets/images/client/index/index-customer-img1.png`),
+                customerImg2:  require(`@/assets/images/client/index/index-customer-img2.png`),
+                customerImg3:  require(`@/assets/images/client/index/index-customer-img3.png`),
+                customerImg4:  require(`@/assets/images/client/index/index-customer-img4.png`),
+                customerImg5:  require(`@/assets/images/client/index/index-customer-img5.png`),
+                customerImg6:  require(`@/assets/images/client/index/index-customer-img6.png`),
+                customerImg7:  require(`@/assets/images/client/index/index-customer-img7.png`),
+                customerImg8:  require(`@/assets/images/client/index/index-customer-img8.png`),
+                customerImg9:  require(`@/assets/images/client/index/index-customer-img9.png`),
+                customerImg10: require(`@/assets/images/client/index/index-customer-img10.png`),
+                customerImg11: require(`@/assets/images/client/index/index-customer-img11.png`),
+                customerImg12: require(`@/assets/images/client/index/index-customer-img12.png`),
+                customerImg13: require(`@/assets/images/client/index/index-customer-img13.png`),
+                customerImg14: require(`@/assets/images/client/index/index-customer-img14.png`),
+                customerImg15: require(`@/assets/images/client/index/index-customer-img15.png`),
+                customerImg16: require(`@/assets/images/client/index/index-customer-img16.png`),
+                customerImg17: require(`@/assets/images/client/index/index-customer-img17.png`),
+                customerImg18: require(`@/assets/images/client/index/index-customer-img18.png`),
+                customerImg19: require(`@/assets/images/client/index/index-customer-img19.png`),
+                customerImg20: require(`@/assets/images/client/index/index-customer-img20.png`),
                 //证书图片
-                certImg1:      require(`@/assets/images/website/index/index-cert-img1.jpg`),
-                certImg2:      require(`@/assets/images/website/index/index-cert-img2.jpg`),
-                certImg3:      require(`@/assets/images/website/index/index-cert-img3.jpg`),
-                certImg4:      require(`@/assets/images/website/index/index-cert-img4.jpg`),
-                certImg5:      require(`@/assets/images/website/index/index-cert-img5.jpg`),
-                certImg6:      require(`@/assets/images/website/index/index-cert-img6.jpg`),
-                certImg7:      require(`@/assets/images/website/index/index-cert-img7.jpg`),
-                certImg8:      require(`@/assets/images/website/index/index-cert-img8.jpg`),
+                certImg1:      require(`@/assets/images/client/index/index-cert-img1.jpg`),
+                certImg2:      require(`@/assets/images/client/index/index-cert-img2.jpg`),
+                certImg3:      require(`@/assets/images/client/index/index-cert-img3.jpg`),
+                certImg4:      require(`@/assets/images/client/index/index-cert-img4.jpg`),
+                certImg5:      require(`@/assets/images/client/index/index-cert-img5.jpg`),
+                certImg6:      require(`@/assets/images/client/index/index-cert-img6.jpg`),
+                certImg7:      require(`@/assets/images/client/index/index-cert-img7.jpg`),
+                certImg8:      require(`@/assets/images/client/index/index-cert-img8.jpg`),
                 activeIndex:   '首页',
                 topCarousels:  [],
             };

+ 5 - 2
src/views/client/aboutUs.vue

@@ -1,11 +1,14 @@
 <template>
-
+    <div class="client-aboutUs-page">
+        <!-- 首页banner栏 -->
+        <div class="aboutUs-banner"></div>
+    </div>
 </template>
 
 <script>
     import MtaBreadcrumb    from '@/components/client/common/MtaBreadcrumb.vue';
     export default {
-        name:       'courseDev',
+        name:       'aboutUs',
         props:      {
         },
         data() {

+ 9 - 1
src/views/client/newsInforDetails.vue

@@ -1,5 +1,13 @@
 <template>
-
+    <div class="client-details-page">
+        <MtaBreadcrumb></MtaBreadcrumb>
+        <!--网站行业资讯详情页-->
+        <div class="client-details-wrap">
+            <h1>{{infoData.title}}</h1>
+            <p><i></i><span>{{infoData.startTime}}</span><i type="visits"></i><span>{{infoData.visits}}</span></p>
+            <div class="client-content-box">{{infoData.content}}</div>
+        </div>
+    </div>
 </template>
 
 <script>

+ 0 - 0
src/views/management/HangYeZiXun/HangYeZiXunConfig/components/uploadFile.vue → src/views/management/XingWenZiXun/XinWenZiXunConfig/components/uploadFile.vue


+ 15 - 15
src/views/management/HangYeZiXun/HangYeZiXunConfig/index.vue → src/views/management/XingWenZiXun/XinWenZiXunConfig/index.vue

@@ -1,11 +1,11 @@
 <template>
-    <div class="admin-HangYeZiXunConfig">
+    <div class="admin-NewsConfig">
         <!--    按钮组合    -->
         <div class="my-Config-top">
             <el-button size="mini" type="primary" @click="back">返回</el-button>
         </div>
         <div class="my-Config-content">
-            <el-form :model="configData" :rules="configRules" ref="HangYeZiXun" label-width="110px"
+            <el-form :model="configData" :rules="configRules" ref="News" label-width="110px"
                      class="my-Config-content-form">
                 <el-form-item label="标题:" prop="title">
                     <el-input :maxlength="9" v-model="configData.title" placeholder="请输入标题"></el-input>
@@ -56,11 +56,11 @@
             <el-button
                     v-if="queryData && queryData.code === 'add'"
                     type="primary"
-                    @click="handleAdd('HangYeZiXun')"
+                    @click="handleAdd('News')"
             >新增
             </el-button>
             <div v-else>
-                <el-button type="primary" @click="handleSave('HangYeZiXun')">保存</el-button>
+                <el-button type="primary" @click="handleSave('News')">保存</el-button>
                 <el-button type="primary" @click="back">关闭</el-button>
             </div>
 
@@ -85,7 +85,7 @@
     let selectServiceData = Vue.observable(selectData);
 
     export default {
-        name:       'HangYeZiXunConfig',
+        name:       'NewsConfig',
         components: {
             uploadFile,
             MtaStQuillEditor,
@@ -157,7 +157,7 @@
             handleSave(formName) {
                 this.$refs[formName].validate((valid) => {
                     if (valid) {
-                        this.saveAddHangYeZiXun();
+                        this.saveAddNews();
                     } else {
                         return false;
                     }
@@ -166,7 +166,7 @@
             handleAdd(formName) {
                 this.$refs[formName].validate((valid) => {
                     if (valid) {
-                        this.addAddHangYeZiXun();
+                        this.addAddNews();
                     } else {
                         return false;
                     }
@@ -206,10 +206,10 @@
                     loading.close();
                 }
             },
-            async addAddHangYeZiXun() {
+            async addAddNews() {
                 const loading = this.$loading({ background: 'rgba(0, 0, 0, 0.7)' });
                 try {
-                    const res = await this.handleAddHangYeZiXun();
+                    const res = await this.handleAddNews();
                     loading.close();
                     if (res.code === 0 && res.data) {
                         this.$message.success('新增成功');
@@ -219,10 +219,10 @@
                     loading.close();
                 }
             },
-            async saveAddHangYeZiXun() {
+            async saveAddNews() {
                 const loading = this.$loading({ background: 'rgba(0, 0, 0, 0.7)' });
                 try {
-                    const res = await this.handleSaveHangYeZiXun();
+                    const res = await this.handleSaveNews();
                     loading.close();
                     if (res.code === 0 && res.data) {
                         this.$message.success('保存成功');
@@ -235,11 +235,11 @@
             getOptions() {
                 return Object.assign({}, this.configData, { userId: this.userId });
             },
-            handleAddHangYeZiXun() {
+            handleAddNews() {
                 const opt = this.getOptions();
                 return HYZXService.getNewsAdd(opt);
             },
-            handleSaveHangYeZiXun() {
+            handleSaveNews() {
                 const opt = this.getOptions();
                 const newOpt = Object.assign(opt, { iiId: this.queryData.iiId });
                 return HYZXService.getNewsUpdate(newOpt);
@@ -259,7 +259,7 @@
             clearPageData() {
                 selectServiceData.options = [];
                 selectServiceData.newsClassifyId = null;
-                this.$refs.HangYeZiXun.resetFields();
+                this.$refs.News.resetFields();
                 this.$refs.editorQuill.setContent('');
             },
         },
@@ -282,7 +282,7 @@
 </script>
 
 <style lang="scss" scoped>
-    .admin-HangYeZiXunConfig {
+    .admin-NewsConfig {
         padding: 20px;
 
         .my-Config-top {

+ 0 - 0
src/views/management/HangYeZiXun/components/Pagination.vue → src/views/management/XingWenZiXun/components/Pagination.vue


+ 0 - 0
src/views/management/HangYeZiXun/components/Select.vue → src/views/management/XingWenZiXun/components/Select.vue


+ 1 - 0
src/views/management/HangYeZiXun/components/Table.vue → src/views/management/XingWenZiXun/components/Table.vue

@@ -33,6 +33,7 @@
                 <el-image
                         style="width: 200px;height: 200px"
                         :src="scope.row.pic"
+                        :lazy="true"
                         :preview-src-list="scope.row.pic ? [scope.row.pic]: []"
                         fit="contain"></el-image>
             </template>

+ 36 - 37
src/views/management/HangYeZiXun/index.vue → src/views/management/XingWenZiXun/index.vue

@@ -1,33 +1,31 @@
 <template>
-    <div class="admin-hangyezixun-page">
-        <div class="admin-hangyexuzhi">
-            <div class="top">
-                <div>
-                    <mySelect
-                            label="name"
-                            id="newsClassifyId"
-                            placeholder="请选择新闻分类"
-                    ></mySelect>
-                    <el-button class="btn-search" size="mini" type="primary" @click="handleSearch">查询</el-button>
-                </div>
-                <div>
-                    <el-button size="mini" type="primary" @click="handleAddHangYeZiXun">新增</el-button>
-                    <el-button size="mini" type="primary" @click="handleDeleteHangYeZiXun">删除
-                    </el-button>
-                </div>
+    <div class="admin-News">
+        <div class="top">
+            <div>
+                <mySelect
+                        label="name"
+                        id="newsClassifyId"
+                        placeholder="请选择新闻分类"
+                ></mySelect>
+                <el-button class="btn-search" size="mini" type="primary" @click="handleSearch">查询</el-button>
+            </div>
+            <div>
+                <el-button size="mini" type="primary" @click="handleAddNews">新增</el-button>
+                <el-button size="mini" type="primary" @click="handleDeleteNews">删除
+                </el-button>
             </div>
-            <myTable
-                    @editor="handleEditor"
-                    @delete="handleDelete"
-                    @select-change="handleSelectChange"
-            />
-            <myPagination
-                    class="my-Pagination"
-                    :pageSizes="defaultPageSizes"
-                    @size-change="handleSizeChange"
-                    @current-page="handleCurrentPage"
-            />
         </div>
+        <myTable
+                @editor="handleEditor"
+                @delete="handleDelete"
+                @select-change="handleSelectChange"
+        />
+        <myPagination
+                class="my-Pagination"
+                :pageSizes="defaultPageSizes"
+                @size-change="handleSizeChange"
+                @current-page="handleCurrentPage"
+        />
     </div>
 </template>
 
@@ -99,7 +97,7 @@
         methods:    {
 
             handleSearch() {
-                this.getHangYeZiXunData();
+                this.getNewsData();
             },
             handleEditor(data) {
                 this.curIiId = data.iiId;
@@ -109,23 +107,23 @@
                 const opt = {
                     iiIds: [data.iiId],
                 };
-                this.getHangYeZiXunDelete(opt);
+                this.getNewsDelete(opt);
             },
             handleSelectChange(data) {
                 this.tableSelectData = data;
             },
-            handleAddHangYeZiXun() {
+            handleAddNews() {
                 this.changePage(CHANGEPAGECODE.add);
             },
             handleSizeChange(size) {
                 paginationServiceData.size = size;
-                this.getHangYeZiXunData();
+                this.getNewsData();
             },
             handleCurrentPage(page) {
                 paginationServiceData.page = page;
-                this.getHangYeZiXunData();
+                this.getNewsData();
             },
-            async handleDeleteHangYeZiXun() {
+            async handleDeleteNews() {
                 if (!this.tableSelectData.length) {
                     this.$message.warning('请选择至少一条需要删除的数据');
                     return;
@@ -172,7 +170,7 @@
                 }
             },
             // 获取 数据
-            async getHangYeZiXunData() {
+            async getNewsData() {
                 const opt = this.getOption();
                 const loading = this.$loading({ background: 'rgba(0, 0, 0, 0.7)' });
 
@@ -188,7 +186,7 @@
                 }
             },
             // 删除
-            async getHangYeZiXunDelete(opt) {
+            async getNewsDelete(opt) {
                 const loading = this.$loading({ background: 'rgba(0, 0, 0, 0.7)' });
                 try {
                     const res = await HYZXApi.getNewsDelete(opt);
@@ -237,7 +235,7 @@
                 paginationServiceData.page = 1;
                 paginationServiceData.size = 10;
                 paginationServiceData.total = 0;
-            }
+            },
         },
         created() {
             this.initPageService();
@@ -250,7 +248,8 @@
 </script>
 
 <style lang="scss" scoped>
-    .admin-hangyexuzhi {
+
+    .admin-News {
         padding: 20px;
 
         .top {