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

src/assets/css/cus-website/cus-website-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;}
@@ -110,6 +110,7 @@ h1,h2,h3,h4,h5,h6,p{font-size:100%;font-weight:normal;margin: 0;}
 .website-head{
   width: 100%;
   height: 80px;
+  background: #fff;
 
   //头部布局
   .head-layout{display: flex;justify-content: space-between;}
@@ -147,6 +148,34 @@ h1,h2,h3,h4,h5,h6,p{font-size:100%;font-weight:normal;margin: 0;}
   }
 }
 
+/* 网站头部导栏 - 面包屑 */
+.website-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/website/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{
   background: #1E2534;
@@ -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;}
+}
+
+/* 网站通用详情页布局 */
+.website-details-page{
+  background: #f9faff;
+  width: 100%;
+  .website-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/website/industry/" + "industry-details-time.svg");}
+      i[type="visits"]{background-image: url("~@/assets/images/website/industry/" + "industry-details-visits.svg");}
+      span{@include setFontStyle(-6);display:inline-block;color: #666;margin-right: 60px;vertical-align: middle;}
+    }
+    .website-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;}
+    }
+  }
 }

src/assets/css/cus-website/cus-website-page.scss

@@ -334,5 +334,7 @@
       .el-carousel__indicators{display: none}
     }
   }
+
+  /********  describe: 网站行业资讯详情页  author: TX  date:2020-08-06  ********/
 }
 

src/assets/images/website/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>

src/assets/images/website/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>

src/assets/images/website/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>

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>

src/components/client/common/MtaBreadcrumb.vue

@@ -1,14 +1,12 @@
 <template>
-    <div class="c-breadcrumb-box">
+    <div class="website-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>

src/components/client/common/footer.vue

@@ -42,9 +42,7 @@
             <div class="link-box">
                 <h4>友情链接</h4>
                 <div class="link-a-box">
-                    <div v-for="(item,index) in LinksData">
-                        <a @click="goToPage(item)">{{item.name}}</a>
-                    </div>
+                    <a v-for="(item,index) in linksData" :key="index" @click="goToPage(item)">{{item.name}}</a>
                <!--     <a>物流软件</a>
                     <a>免费erp管理系统</a>
                     <a>物流软件</a>
@@ -85,7 +83,7 @@
         },
         data() {
             return {
-                LinksData:[]
+                linksData:[]
             };
         },
         watch:   {
@@ -96,7 +94,8 @@
                 homeLinksList().then(res=>{
                        if(res.code===0){
                            console.log(res.data.data);
-                           this.linksData = res.data.data||[]
+                           this.linksData = res.data.data
+                           console.log(this.linksData);
                        }
                 })
             },

src/router.js

@@ -38,16 +38,16 @@ const router = new Router({
                                       children:  [
                                           {
                                               name:      '考试平台',
-                                              path:      'examPlatform',
+                                              path:      'https://www.mtavip.com/examsystem',
                                               meta:      {
                                                   parentPath: 'croot',
                                                   breadcrumb: {
                                                       display: '考试平台',
                                                   },
                                               },
-                                              component: () => {
-                                                  return import(/* webpackChunkName: "index" */ './views/client/examPlatform.vue');
-                                              },
+                                             /* component: () => {
+                                                  return import(/!* webpackChunkName: "index" *!/ './views/client/examPlatform.vue');
+                                              },*/
                                           },
                                           {
                                               name:      '培训平台',

src/views/client/Index.vue

@@ -2,26 +2,6 @@
     <div class="website-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">
@@ -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>

src/views/client/newsInforDetails.vue

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