Просмотр исходного кода

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

15724580513 5 лет назад
Родитель
Сommit
42ca1db30c

+ 10 - 2
src/api/login.js

@@ -20,7 +20,7 @@ export function getOrgList(data = {}) {
 //  describe: 【前台】行业资讯 : Client Industry Controlle author: Wgy date:2020-08-05
 export function homeIndustryList(data = {}) {
     return request({
-                       url:    `/home/industry/list`,
+                       url:    `/home/news/carousel`,
                        method: 'post',
                        data,
                    });
@@ -28,7 +28,15 @@ export function homeIndustryList(data = {}) {
 //  describe: 【前台】行业资讯 : Client Industry Controlle author: Wgy date:2020-08-05
 export function homeIndustryInfo(data = {}) {
     return request({
-                       url:    `/home/industry/info`,
+                       url:    `/home/news/info`,
+                       method: 'post',
+                       data,
+                   });
+}
+//  describe:【前台】友情链接 :  author: Wgy date:2020-08-06
+export function homeLinksList(data = {}) {
+    return request({
+                       url:    `/home/links/list`,
                        method: 'post',
                        data,
                    });

+ 48 - 0
src/components/client/common/Cframe.vue

@@ -0,0 +1,48 @@
+<template>
+    <el-container class="mta-Cframe" direction="vertical">
+        <!-- header -->
+        <mta-header></mta-header>
+        <!-- main -->
+        <el-container class="mta-home-box">
+            <div class="mta-home-box-c">
+                <router-view/>
+            </div>
+        </el-container>
+        <mta-footer></mta-footer>
+    </el-container>
+</template>
+<script>
+    import { mapGetters }                            from 'vuex';
+    import MtaHeader                                 from '@/components/client/common/header.vue';
+    import MtaFooter                                 from '@/components/client/common/footer.vue';
+    import { initThemeColor, handleLocalstorgeData } from '@/utils/theme';
+    import * as Initialization                       from '@/utils/initializationConfig';
+
+
+    export default {
+        name:       'cframe',
+        components: {
+            MtaHeader,
+            MtaFooter,
+        },
+        data() {
+            return {
+                // activeNav: '/c/Exam/full'
+            };
+        },
+        computed:   {
+            ...mapGetters(['getAuth', 'getThemeColor']),
+        },
+        methods:    {},
+        created() {
+            initThemeColor();
+            let typeface = handleLocalstorgeData('themeFont', 'data-fontsize', '');
+            handleLocalstorgeData('themeFont', 'data-fontsize', typeface);
+            // 初始化 系统标签logo
+            Initialization.initializationPageConfig();
+        },
+    };
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 86 - 24
src/components/client/common/footer.vue

@@ -1,49 +1,111 @@
 <template>
-    <div class="mta-client-footer">
-        <el-row type="flex">
-            <el-col class="footer-col-wrap">
-                <!--版权所有2019 大连栋科软件工程有限公司-->
-                {{footText}}
-            </el-col>
-        </el-row>
+    <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">
+                    <div v-for="(item,index) in LinksData">
+                        <a @click="goToPage(item)">{{item.name}}</a>
+                    </div>
+               <!--     <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>
 </template>
 
 <script>
     import { mapGetters } from 'vuex'
+    import { homeLinksList } from '@/api/login.js';
     export default {
         name:    'mtaFooter',
         computed: {
-            footText() {
-                let str = 'Copyright © 2019 llisoft.com All rights reserved 大连栋科软件工程有限公司 版权所有 辽ICP备09022904号-19';
-                return this.getReplaceContext && this.getReplaceContext.footText ? this.getReplaceContext.footText : str;
-            },
-            ...mapGetters([
-                              'getReplaceContext'
-                          ])
+
         },
         props:   {
-            activeNav: { // 默认选中的 路径 与组件中的index相互对应
-                type:    String,
-                require: true,
-                default: '0',
-            },
+            activeNav: {},
         },
         data() {
             return {
+                LinksData:[]
             };
         },
         watch:   {
         },
         methods: {
-            /*handleSelect(key, keyPath) {
-                this.$emit('navSelectChange', {
-                    key: key,
-                    keyPath: keyPath
+
+            getLinksData(){
+                homeLinksList().then(res=>{
+                       if(res.code===0){
+                           console.log(res.data.data);
+                           this.linksData = res.data.data||[]
+                       }
                 })
-            }*/
+            },
+            goToPage(item){
+                window.location.href = item.url
+            }
         },
         created() {
+            this.getLinksData()
         }
     };
 </script>

+ 60 - 526
src/components/client/common/header.vue

@@ -1,389 +1,105 @@
 <template>
-    <div class="mta-client-header">
-        <el-row type="flex" class="header-wrap">
-            <el-col class="header-col-wrap">
-                <!-- logo -->
-                <div class="header-col-logo">
-                    <img :src="logoImg" alt="logo">
-                </div>
-                <!-- nav -->
-                <div class="header-col-nav">
-                    <el-menu
-                            :default-active="activeIndex"
-                            class="menu-client-header"
-                            :router="true"
-                            mode="horizontal"
-                            background-color="#1E1D22"
-                            text-color="#fff"
-                            :active-text-color="getThemeColor(0)">
-                        <template v-for="(item,index) in headerArr">
-                            <el-submenu :index="`${item.keyPath}`" v-if="item.children && item.children.length > 0"
-                                        popper-class="mta-menu-two">
-                                <template slot="title">{{item.content}}</template>
-                                <el-menu-item :index="`${child.keyPath}`" v-for="child of item.children"
-                                              :key="child.keyPath">{{child.content}}
-                                </el-menu-item>
-                            </el-submenu>
-                            <el-menu-item :index="`${item.keyPath}`" v-else>
-                                {{item.content}}
+    <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"
+                        :router="true"
+                        mode="horizontal"
+                       >
+                    <template v-for="(item,index) in headerArr">
+                        <el-submenu :index="`${item.keyPath}`" v-if="item.children && item.children.length > 0" popper-class="mta-menu-two">
+                            <template slot="title">{{item.content}}</template>
+                            <el-menu-item :index="`${child.keyPath}`" v-for="child of item.children"
+                                          :key="child.keyPath">{{child.content}}
                             </el-menu-item>
-                        </template>
-                    </el-menu>
-                    <nav>
-                        <ul>
-                            <li>
-                                <el-popover
-                                        popper-class="nav-popover"
-                                        placement="bottom"
-                                        width="160"
-                                        trigger="click"
-                                >
-                                    <ul class="userControl">
-                                        <li>
-                                            <el-button type="text" icon="el-icon-key" @click="changePassword">
-                                                修改密码
-                                            </el-button>
-                                        </li>
-                                        <li v-if="!(getTenantCode === 'admin')">
-                                            <el-button type="text" icon="el-icon-s-order" @click="changeInformation">
-                                                修改资料
-                                            </el-button>
-                                        </li>
-                                        <li>
-                                            <el-button type="text" icon="el-icon-setting" @click="exitSystem">退出系统
-                                            </el-button>
-                                        </li>
-                                    </ul>
-                                    <span class="h-right-img" slot="reference">
-                                  <img :src="headerImg" alt="头像">
-                                  <span></span>
-                                </span>
-                                </el-popover>
-                            </li>
-                        </ul>
-                    </nav>
-                </div>
-            </el-col>
-        </el-row>
-        <el-dialog
-                title="修改密码"
-                :visible.sync="headerPasswordDialog"
-                :close-on-click-modal="false"
-                class="response-small-dialog"
-                @close="closePassDl"
-                center>
-            <el-form :model="HeaderPassChangeDate" status-icon :rules="HeaderPassRules" ref="ruleHeaderForm"
-                     class="demo-ruleForm2" label-width="100px">
-                <el-form-item label="原始密码:" prop="orgPass">
-                    <el-input v-model="HeaderPassChangeDate.orgPass"></el-input>
-                </el-form-item>
-                <el-form-item label="新的密码:" prop="pass">
-                    <el-input type="password" v-model="HeaderPassChangeDate.pass" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="checkPass">
-                    <el-input type="password" v-model="HeaderPassChangeDate.checkPass" autocomplete="off"></el-input>
-                </el-form-item>
-            </el-form>
+                        </el-submenu>
+                        <el-menu-item :index="`${item.keyPath}`" v-else>
+                            {{item.content}}
+                        </el-menu-item>
+                    </template>
+                </el-menu>
 
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="headerPasswordDialog = false">取 消</el-button>
-                <el-button type="primary" @click="saveHeaderPass">确 定</el-button>
-            </span>
-        </el-dialog>
-        <el-dialog
-                title="资料编辑"
-                :visible.sync="editorMessage"
-                :close-on-click-modal="false"
-                @close="ClosePassDl2('editorUserInfo')"
-                class="response-big-dialog"
-                center>
-            <el-form ref="formUserInfor" :rules="formRules3" status-icon :model="userInfoData" label-width="85px">
-                <div class="editorUserWrap">
-                    <div>
-                        <el-form-item label="用户名:" prop="userName">
-                            <el-input v-model="userInfoData.userName"
-                                      @blur="formatDataFun(userInfoData.userName)"></el-input>
-                        </el-form-item>
-                        <el-form-item label="真实姓名:" prop="realName">
-                            <el-input v-model="userInfoData.realName"></el-input>
-                        </el-form-item>
-                        <el-form-item label="出生年月:" prop="birthday">
-                            <el-date-picker
-                                    v-model="userInfoData.birthday"
-                                    type="date"
-                                    :default-value="userInfoData.defaultBirthday"
-                                    format="yyyy-MM-dd"
-                                    value-format="yyyy-MM-dd"
-                                    placeholder="选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="电话号码:" prop="tel">
-                            <el-input v-model="userInfoData.tel"></el-input>
-                        </el-form-item>
-                    </div>
-                    <div>
-                        <el-form-item label="性别:" prop="gender" label-width="90px">
-                            <el-radio-group v-model="userInfoData.gender">
-                                <el-radio border :label="1">男</el-radio>
-                                <el-radio border :label="2">女</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="邮箱:" prop="email" label-width="90px">
-                            <el-input v-model="userInfoData.email"></el-input>
-                        </el-form-item>
-                        <el-form-item label="身份证号:" prop="idcard" label-width="90px">
-                            <el-input v-model="userInfoData.idcard"></el-input>
-                        </el-form-item>
-
-                    </div>
-                    <div>
-                        <!--<mta-upload-al-cloud :imageUrl="imageUrl"
-                                             @uploadFileStart="uploadFileStart"></mta-upload-al-cloud>-->
-                        <upload-file :imageUrl="imageUrl" :showBtnFlag="false"
-                                     @getFileUrl="getImageUrl"></upload-file>
-                        <h5 class="picture-size-h5">(最佳尺寸为65*65像素)</h5>
-                    </div>
-                </div>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-        <el-button @click="cancelSaveUserInfo">取 消</el-button>
-        <el-button type="primary" @click="saveUserInfo">确 定</el-button>
-      </span>
-        </el-dialog>
-    </div>
+            </div>
+            <div class="head-right">
+                <i></i><span>4000-522-130</span>
+            </div>
+        </div>
+    </nav>
 </template>
 
 <script>
-    import { getUploadImg }        from '@/api/AlCloud';
     import MtaUploadAlCloud
                                    from '@/components/management/Layout/UploadAlCloud/UploadAlCloud';
     import axios                   from 'axios';
     import { mapGetters }          from 'vuex';
     import { setAuth, removeAuth } from '@/utils/auth';
-    import {
-        getAdminUserMypass,
-        getClientUserMyUpdate,
-        getClentUserMyInfo,
-        getExitStatus,
-    }                              from '@/api/user';
-    import {
-        setUserIcon,
-        checkUrlIsNotHttpUrl,
-        getTrimData,
-    }                              from '@/utils/common';
+
+    import { setUserIcon, checkUrlIsNotHttpUrl, getTrimData, }                              from '@/utils/common';
     import { initThemeColor }      from '@/utils/theme';
-    import uploadFile              from '@/components/management/Layout/UploadAlCloud/uploadFile';
 
     export default {
         name:       'mtaHeader',
         props:      {
-            activeNav: { // 默认选中的 路径 与组件中的index相互对应
+            activeNav: {
                 type:    String,
                 require: true,
                 default: '0',
             },
         },
         components: {
-            MtaUploadAlCloud,
-            uploadFile,
         },
         data() {
-            const validatePass2 = (rule, value, callback) => {
-                if (value === '') {
-                    callback(new Error('请再次输入密码'));
-                } else if (value !== this.HeaderPassChangeDate.pass) {
-                    callback(new Error('两次输入密码不一致!'));
-                } else {
-                    callback();
-                }
-            };
             return {
                 activeIndex:          this.activeNav,
                 headerArr:            [
                     {
                         content: '首页',
-                        keyPath: '/c/Index',
+                        keyPath: '/index',
                     },
-                    {
-                        content: '首页',
-                        keyPath: '/c/IndexPeixun',
-                    },
-                    {
-                        content:  '课程中心',
+                /*    {
+                        content:  '考试平台',
                         keyPath:  '/c/kecheng/lists',
                         children: [
                             {
-                                content:  '课程列表',
+                                content:  'xxxxxx',
                                 keyPath:  '/c/kecheng/lists',
-                                children: [
-                                    {
-                                        content: '课程',
-                                        keyPath: '/c/kecheng/do',
-                                    },
-                                ],
-                            },
-                        ],
-                    },
-                    {
-                        content:  '考试中心',
-                        keyPath:  '/c/exam/lists',
-                        children: [
-                            {
-                                content:  '考试列表',
-                                keyPath:  '/c/exam/lists',
-                                children: [
-                                    {
-                                        content: '考试',
-                                        keyPath: '/c/exam/do',
-                                    },
-                                ],
-                            },
-                        ],
-                    },
-                    {
-                        content:  '成绩中心',
-                        keyPath:  '/c/score/lists',
-                        children: [
-                            {
-                                content: '个人成绩',
-                                keyPath: '/c/score/lists',
-                            },
-                            {
-                                content: '课程成绩',
-                                keyPath: '/c/score/kechengLists',
-                            },
-                            {
-                                content: '学分统计',
-                                keyPath: '/c/score/credit',
                             },
                         ],
-                    },
+                    },*/
                     {
-                        content:  '自主练习',
-                        keyPath:  '/c/Practice/lists',
-                        children: [
-                            {
-                                content:  '练习列表',
-                                keyPath:  '/c/Practice/lists',
-                                children: [
-                                    {
-                                        content: '练习页面',
-                                        keyPath: '/c/Practice/do',
-                                    },
-                                ],
-                            },
-                        ],
-                    },
-                    /*{
-                        content:  '错题中心',
-                        keyPath:  '/c/cuotiCenter/lists',
-                        children: [
-                            {
-                                content:  '错题列表',
-                                keyPath:  '/c/cuotiCenter/lists',
-                                children: [
-                                    {
-                                        content: '错题页面',
-                                        keyPath: '/c/cuotiCenter/page',
-                                    },
-                                ],
-                            },
-                        ],
+                        content:  '考试平台',
+                        keyPath:  '/c/examPlatform',
+                        children: [],
                     },
                     {
-                        content:  '证书管理',
-                        keyPath:  '/c/cert/lists',
-                        children: [
-                            {
-                                content: '个人证书',
-                                keyPath: '/c/cert/lists',
-                            },
-                        ],
-                    },*/
-                    {
-                        content:  '公告管理',
-                        keyPath:  '/c/notice/lists',
-                        children: [
-                            {
-                                content: '公告中心',
-                                keyPath: '/c/notice/lists',
-                            },
-                        ],
+                        content:  '培训平台',
+                        keyPath:  '/c/peixunPlatform',
+                        children: [],
                     },
                     {
-                        content:  '资源库',
-                        keyPath:  '/c/resource/library',
+                        content:  '课程开发',
+                        keyPath:  '/c/courseDev',
                         children: [],
                     },
                     {
-                        content:  '互动问答',
-                        keyPath:  '/c/QuestionAndAnswer/lists',
+                        content:  '新闻资讯',
+                        keyPath:  '/c/newsInfor',
                         children: [],
                     },
                     {
-                        content:  '个人中心',
-                        keyPath:  '/c/personalCenter/lists',
-                        children: [
-                            {
-                                content: '个人信息',
-                                keyPath: '/c/personalCenter/lists',
-                            },
-                            {
-                                content:  '错题信息',
-                                keyPath:  '/c/cuotiCenter/lists',
-                                children: [
-                                    {
-                                        content: '错题页面',
-                                        keyPath: '/c/cuotiCenter/page',
-                                    },
-                                ],
-                            },
-                            {
-                                content: '证书信息',
-                                keyPath: '/c/cert/lists',
-                            },
-                        ],
+                        content:  '帮助中心',
+                        keyPath:  '/c/helpCenter',
+                        children: [],
+                    }, {
+                        content:  '关于我们',
+                        keyPath:  '/c/aboutUs',
+                        children: [],
                     },
+
                 ],
-                // 密码修改
-                headerPasswordDialog: false,
-                HeaderPassChangeDate: {
-                    orgPass:   '',
-                    pass:      '',
-                    checkPass: '',
-                },
-                HeaderPassRules:      {
-                    orgPass:   [
-                        { message: '请输入原始密码', trigger: 'blur', required: true },
-                    ],
-                    pass:      [
-                        { message: '请输入新密码', trigger: 'blur', required: true },
-                    ],
-                    checkPass: [
-                        { validator: validatePass2, trigger: 'blur', required: true },
-                    ],
-                },
-                /// 个人信息编辑
-                editorMessage:        false,
-                userInfoData:         {
-                    userName:        '',
-                    birthday:        '',
-                    defaultBirthday: '',
-                    email:           '',
-                    gender:          '',
-                    userId:          '',
-                    idcard:          '',
-                    realName:        '',
-                    tel:             '',
-                },
-                formRules3:           {
-                    userName: [
-                        { trigger: 'blur', required: true, message: '请输入用户名' },
-                    ],
-                },
-                imageUrl:             '',
-                headerimgUrl:         require('../../../assets/images/default/user-img.png'),
-                menuFlag:             '',
             };
         },
         watch:      {
@@ -392,151 +108,8 @@
             },
         },
         computed:   {
-            logoImg() {
-                if (this.getReplaceContext === null) {
-                    return;
-                }
-                return this.getReplaceContext.logoImg;
-            },
-            // 个人头像 待定
-            headerImg() {
-                return checkUrlIsNotHttpUrl(this.getReplaceIcon.headImg)
-                       ? this.headerimgUrl
-                       : this.getReplaceIcon.headImg;
-            },
-            // 个人头像 待定
-            ...mapGetters([
-                              'getReplaceContext',
-                              'getTenantCode',
-                              'getReplaceIcon',
-                              'getThemeColor',
-                          ]),
         },
-        methods:    {
-            getImageUrl(data) {
-                this.imageUrl = data;
-            },
-            // ************* 关窗清理 *****************
-            formatDataFun(data) {
-                this.userInfoData.userName = getTrimData(data);
-            },
-            ClosePassDl2() {
-                this.$refs.formUserInfor.resetFields();
-            },
-            // **************  弹窗事件 修改密码 *****************
-            // 密码修改
-            changePassword() {
-                this.headerPasswordDialog = true;
-            },
-            // 确认修改
-            saveHeaderPass() {
-                this.$refs.ruleHeaderForm.validate((valid) => {
-                    if (valid) {
-                        // 请求后台
-                        const options = {
-                            passwordNew: this.HeaderPassChangeDate.pass,
-                            passwordOld: this.HeaderPassChangeDate.orgPass,
-                        };
-
-                        getAdminUserMypass(options)
-                        .then(res => {
-
-                            if (res.code === 0 && res.data) {
-                                this.headerPasswordDialog = false;
-                                this.$message.success('修改成功');
-                            } else {
-                                this.$message.error('修改失败');
-                            }
-                        });
-                    } else {
-                        this.$message.error('请确定验证是否通过');
-                        return false;
-                    }
-                });
-            },
-            // 关闭修改密码
-            closePassDl() {
-                this.$refs.ruleHeaderForm.resetFields();
-            },
-            // *************  弹窗事件 帮助中心 **************
-            openHelpCenter() {
-
-            },
-            // ************** 弹窗事件 编辑信息 ****************
-            // 保存用户信息
-            saveUserInfo() {
-                const option = {
-                    birthday: this.userInfoData.birthday,
-                    email:    this.userInfoData.email,
-                    gender:   this.userInfoData.gender,
-                    icon:     this.imageUrl === undefined ? '' : this.imageUrl,
-                    idcard:   this.userInfoData.idcard,
-                    realName: this.userInfoData.realName,
-                    userId:   this.userInfoData.userId,
-                    userName: this.userInfoData.userName,
-                    tel:      this.userInfoData.tel,
-                };
-                const loading = this.loading();
-                // 请求后台
-                getClientUserMyUpdate(option)
-                .then(res => {
-                    if (res.data) {
-                        this.editorMessage = false;
-                        // 个人头像 待定
-                        const opt = {
-                            headImg: option.icon,
-                        };
-                        setUserIcon(opt);
-                        this.$message.success('修改成功');
-                        loading.close();
-                    }
-                }).catch(err => {
-                    // this.$message.error('请确定验证是否通过');
-                    loading.close();
-                    console.error('错误', err);
-                });
-            },
-            // 取消
-            cancelSaveUserInfo() {
-                this.editorMessage = false;
-            },
-            changeInformation() {
-                getClentUserMyInfo()
-                .then(res => {
-                    const userInfoObj = res.data;
-                    this.userInfoData.userName = userInfoObj.userName;
-                    this.userInfoData.birthday = userInfoObj.birthday === null
-                                                 ? new Date('1991-05-01')
-                                                 : new Date(userInfoObj.birthday);
-                    this.userInfoData.defaultBirthday = new Date(userInfoObj.birthday);
-                    this.imageUrl = userInfoObj.icon;
-                    this.userInfoData.email = userInfoObj.email;
-                    this.userInfoData.gender = userInfoObj.gender;
-                    this.userInfoData.idcard = userInfoObj.idcard;
-                    this.userInfoData.realName = userInfoObj.realName;
-                    this.userInfoData.tel = userInfoObj.tel;
-                    this.userInfoData.userId = userInfoObj.userId;
-                    this.editorMessage = true;
-                }).catch(err => {
-                    console.error('获取用户信息', err);
-                });
-            },
-
-            // ************** 退出 系统 **************************
-            exitSystem() {
-                getExitStatus().then(res => {
-                    if (res.code === 0 && res.data) {
-
-                        this.$router.push({ path: '/c/login' });
-
-                        setAuth();
-                        this.$message.success('系统退出成功');
-                    } else {
-                        this.$message.error('系统退出失败');
-                    }
-                });
-
-            },
+        methods:{
             // ************** 导航状态 ****************************
             activeIndexSync() {
                 const path = this.$route.path;
@@ -559,8 +132,9 @@
                     }
                 }
             },
+
             checkArray() {
-                if (JSON.parse(this.menuFlag) == 1) {
+              /*  if (JSON.parse(this.menuFlag) == 1) {
 
                     for (let i = this.headerArr.length - 1; i >= 0; i--) {
                         if (this.headerArr[i].content == '课程中心') {
@@ -585,55 +159,15 @@
                             this.headerArr.splice(i, 1);
                         }
                     }
-                }
+                }*/
                 this.activeIndexSync();
             },
-            /**
-             * 上传文件
-             */
-            uploadFileStart(params) {
-                if (!params) {
-                    return;
-                }
-                const suffixList = params.file.name.split('.').pop();
-                const options = {
-                    prefix: 'resource/',
-                    suffix: suffixList,
-                };
-                getUploadImg(options).then((res) => {
 
-                    if (res.code === 0) {
-                        // 二进制文件通过forData对象进行传递
-                        const FormDataForAl = new FormData();
-                        const multipartParams = Object.assign({}, res.data, {
-                            Filename:              `images/${params.filename}`,
-                            success_action_status: '200',
-                        });
-                        // 参数数据
-                        FormDataForAl.append('key', multipartParams.key);
-                        FormDataForAl.append('policy', multipartParams.policy);
-                        FormDataForAl.append('signature', multipartParams.signature);
-                        FormDataForAl.append('OSSAccessKeyId', multipartParams.accessid);
-                        FormDataForAl.append('success_action_status', multipartParams.success_action_status);
-                        // OSS要求, file放到最后
-                        FormDataForAl.append('file', params.file);
-
-                        axios.post(multipartParams.uploadUrl, FormDataForAl).then(alRes => {
-                            if (alRes.status === 200) {
-                                this.imageUrl = `${multipartParams.downloadUrl}/${multipartParams.key}`;
-                            }
-                        }).catch(alerr => {
-                            console.error('阿里云错误', alerr);
-                        });
-                    }
-                });
-            },
-        },
+        }
+        ,
         created() {
-            this.menuFlag = window.localStorage.getItem(`tenantFlag_key`);
+            console.log(this.activeIndex);
             this.checkArray();
-            /* activeIndex sync */
-            //this.activeIndexSync();
             initThemeColor();
         },
     };

+ 99 - 24
src/router.js

@@ -19,26 +19,13 @@ const router = new Router({
                                       redirect: '/index',
                                   },
                                   {
-                                      name:      '首页',
+                                      name:      'index',
                                       path:      '/index',
                                       component: () => {
                                           return import(/* webpackChunkName: "index" */ './views/client/Index.vue');
                                       },
                                   },
                                   {
-                                      name:      '课程开发',
-                                      path:      '/courseDev',
-                                      meta:      {
-                                          parentPath: 'croot',
-                                          breadcrumb: {
-                                              display: '课程列表',
-                                          },
-                                      },
-                                      component: () => {
-                                          return import(/* webpackChunkName: "index" */ './views/client/CourseDev.vue');
-                                      },
-                                  },
-                                  {
                                       name:      'Login',
                                       path:      '/login',
                                       component: () => {
@@ -46,18 +33,106 @@ const router = new Router({
                                       },
                                   },
                                   {
-                                      path: '/industryDetails',
-                                      name: 'industryDetails',
-                                      meta:      {
-                                          parentPath: 'croot',
-                                          breadcrumb: {
-                                              display: '行业详情',
+                                      path:'/c',
+                                      component: () => import(/* webpackChunkName: "Cframe" */ './components/client/common/Cframe.vue'),
+                                      children:  [
+                                          {
+                                              name:      '考试平台',
+                                              path:      'examPlatform',
+                                              meta:      {
+                                                  parentPath: 'croot',
+                                                  breadcrumb: {
+                                                      display: '考试平台',
+                                                  },
+                                              },
+                                              component: () => {
+                                                  return import(/* webpackChunkName: "index" */ './views/client/examPlatform.vue');
+                                              },
                                           },
-                                      },
-                                      component: () => {
-                                          return import(/* webpackChunkName: "index" */ './views/client/industryDetails.vue');
-                                      },
+                                          {
+                                              name:      '培训平台',
+                                              path:      'peixunPlatform',
+                                              meta:      {
+                                                  parentPath: 'croot',
+                                                  breadcrumb: {
+                                                      display: '培训平台',
+                                                  },
+                                              },
+                                              component: () => {
+                                                  return import(/* webpackChunkName: "index" */ './views/client/peixunPlatform.vue');
+                                              },
+                                          },
+                                          {
+                                              name:      '课程开发',
+                                              path:      'courseDev',
+                                              meta:      {
+                                                  parentPath: 'croot',
+                                                  breadcrumb: {
+                                                      display: '课程列表',
+                                                  },
+                                              },
+                                              component: () => {
+                                                  return import(/* webpackChunkName: "index" */ './views/client/CourseDev.vue');
+                                              },
+                                          },
+                                          {
+                                              name:      '新闻资讯',
+                                              path:      'newsInfor',
+                                              meta:      {
+                                                  parentPath: 'croot',
+                                                  breadcrumb: {
+                                                      display: '新闻资讯',
+                                                  },
+                                              },
+                                              component: () => {
+                                                  return import(/* webpackChunkName: "index" */ './views/client/newsInfor.vue');
+                                              },
+                                          },
+                                          {
+                                              name:      '帮助中心',
+                                              path:      'helpCenter',
+                                              meta:      {
+                                                  parentPath: 'croot',
+                                                  breadcrumb: {
+                                                      display: '帮助中心',
+                                                  },
+                                              },
+                                              component: () => {
+                                                  return import(/* webpackChunkName: "index" */ './views/client/helpCenter.vue');
+                                              },
+                                          },
+                                          {
+                                              name:      '关于我们',
+                                              path:      'aboutUs',
+                                              meta:      {
+                                                  parentPath: 'croot',
+                                                  breadcrumb: {
+                                                      display: '关于我们',
+                                                  },
+                                              },
+                                              component: () => {
+                                                  return import(/* webpackChunkName: "index" */ './views/client/aboutUs.vue');
+                                              },
+                                          },
+                                          {
+                                              path: 'newsInforDetails',
+                                              name: 'newsInforDetails',
+                                              meta:      {
+                                                  parentPath: 'croot',
+                                                  breadcrumb: {
+                                                      display: '行业详情',
+                                                  },
+                                              },
+                                              component: () => {
+                                                  return import(/* webpackChunkName: "index" */ './views/client/newsInforDetails.vue');
+                                              },
+                                          },
+                                      ],
+
                                   },
+
+
+
                                   {
                                       name:      'admin',
                                       path:      '/admin',

+ 1 - 12
src/views/client/CourseDev.vue

@@ -1,16 +1,5 @@
 <template>
-    <div>
-        <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>
-        <MtaBreadcrumb style="margin-left: 0"></MtaBreadcrumb>
-    </div>
+
 </template>
 
 <script>

+ 13 - 7
src/views/client/Index.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="website-index-page">
         <!-- 首页导航栏 -->
-        <nav class="website-head">
+        <mta-header></mta-header>
+   <!--     <nav class="website-head">
             <div class="website-container head-layout">
                 <div class="head-left">
                     <a></a>
@@ -20,7 +21,7 @@
                     <i></i><span>4000-522-130</span>
                 </div>
             </div>
-        </nav>
+        </nav>-->
 
         <!-- 首页banner栏 -->
         <div class="website-banner">
@@ -176,7 +177,8 @@
         </div>
 
         <!-- 底部footer -->
-        <div class="website-footer">
+        <mta-footer></mta-footer>
+      <!--  <div class="website-footer">
             <div class="website-container">
                 <div class="contact-box">
                     <div class="contact-left-box">
@@ -224,14 +226,15 @@
                 </div>
                 <h5>Copyright © 2019 llisoft.com All rights reserved 大连栋科软件工程有限公司 版权所有 辽ICP备09022904号-19</h5>
             </div>
-        </div>
+        </div>-->
 
     </div>
 </template>
 
 <script>
     import { homeIndustryList } from '@/api/login.js';
-
+    import MtaHeader                                 from '@/components/client/common/header.vue';
+    import MtaFooter                                 from '@/components/client/common/footer.vue';
     export default {
         name:       'index',
         props:      {},
@@ -285,7 +288,10 @@
                 topCarousels:  [],
             };
         },
-        components: {},
+        components: {
+            MtaHeader,
+            MtaFooter,
+        },
         computed:   {},
         methods:    {
             handleSelect(key, keyPath) {
@@ -306,7 +312,7 @@
                 })
             },
             checkInfo(data){
-                this.$router.push({ name: 'industryDetails' ,params:data});
+                this.$router.push({ name: 'newsInforDetails' ,params:data});
             }
 
         },

+ 34 - 0
src/views/client/aboutUs.vue

@@ -0,0 +1,34 @@
+<template>
+
+</template>
+
+<script>
+    import MtaBreadcrumb    from '@/components/client/common/MtaBreadcrumb.vue';
+    export default {
+        name:       'courseDev',
+        props:      {
+        },
+        data() {
+            return {
+            };
+        },
+        components: {
+            MtaBreadcrumb
+        },
+        computed:   {},
+        methods:    {
+
+        },
+        created() {
+
+        },
+        mounted() {
+
+        },
+        beforeDestroy() {
+        },
+    };
+</script>
+<style>
+
+</style>

+ 34 - 0
src/views/client/examPlatform.vue

@@ -0,0 +1,34 @@
+<template>
+
+</template>
+
+<script>
+    import MtaBreadcrumb    from '@/components/client/common/MtaBreadcrumb.vue';
+    export default {
+        name:       'courseDev',
+        props:      {
+        },
+        data() {
+            return {
+            };
+        },
+        components: {
+            MtaBreadcrumb
+        },
+        computed:   {},
+        methods:    {
+
+        },
+        created() {
+
+        },
+        mounted() {
+
+        },
+        beforeDestroy() {
+        },
+    };
+</script>
+<style>
+
+</style>

+ 34 - 0
src/views/client/helpCenter.vue

@@ -0,0 +1,34 @@
+<template>
+
+</template>
+
+<script>
+    import MtaBreadcrumb    from '@/components/client/common/MtaBreadcrumb.vue';
+    export default {
+        name:       'courseDev',
+        props:      {
+        },
+        data() {
+            return {
+            };
+        },
+        components: {
+            MtaBreadcrumb
+        },
+        computed:   {},
+        methods:    {
+
+        },
+        created() {
+
+        },
+        mounted() {
+
+        },
+        beforeDestroy() {
+        },
+    };
+</script>
+<style>
+
+</style>

+ 34 - 0
src/views/client/newsInfor.vue

@@ -0,0 +1,34 @@
+<template>
+
+</template>
+
+<script>
+    import MtaBreadcrumb    from '@/components/client/common/MtaBreadcrumb.vue';
+    export default {
+        name:       'courseDev',
+        props:      {
+        },
+        data() {
+            return {
+            };
+        },
+        components: {
+            MtaBreadcrumb
+        },
+        computed:   {},
+        methods:    {
+
+        },
+        created() {
+
+        },
+        mounted() {
+
+        },
+        beforeDestroy() {
+        },
+    };
+</script>
+<style>
+
+</style>

+ 1 - 13
src/views/client/industryDetails.vue → src/views/client/newsInforDetails.vue

@@ -1,16 +1,5 @@
 <template>
-    <div>
-        <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>
-        <MtaBreadcrumb style="margin-left: 0"></MtaBreadcrumb>
-    </div>
+
 </template>
 
 <script>
@@ -22,7 +11,6 @@
         },
         data() {
             return {
-                activeIndex:  '首页',
                 iiId:  '',
                 infoData:{}
             };

+ 34 - 0
src/views/client/peixunPlatform.vue

@@ -0,0 +1,34 @@
+<template>
+
+</template>
+
+<script>
+    import MtaBreadcrumb    from '@/components/client/common/MtaBreadcrumb.vue';
+    export default {
+        name:       'courseDev',
+        props:      {
+        },
+        data() {
+            return {
+            };
+        },
+        components: {
+            MtaBreadcrumb
+        },
+        computed:   {},
+        methods:    {
+
+        },
+        created() {
+
+        },
+        mounted() {
+
+        },
+        beforeDestroy() {
+        },
+    };
+</script>
+<style>
+
+</style>