Merge remote-tracking branch 'origin/2021久创锐康科技' into 2021久创锐康科技

components/footer.vue

@@ -123,7 +123,7 @@
       },
       // 通用课程资源
       goZiyuanPage() {
-        this.$router.push({name: 'courseresource'});
+        this.$router.push({name: 'courseResource'});
       },
       // 关于帮助中心
       goaboutUs() {

components/footer2.vue

@@ -86,7 +86,7 @@
       },
       // 通用课程资源
       goZiyuanPage() {
-        this.$router.push({name: 'courseresource'});
+        this.$router.push({name: 'courseResource'});
       },
       // 关于帮助中心
       goaboutUs(){

components/header.vue

@@ -87,7 +87,7 @@
           },
           {
             content:  '课程资源',
-            keyPath:  '/courseresource',
+            keyPath:  '/courseResource',
             children: [],
           },
           {

components/registerDialog.vue

@@ -61,6 +61,9 @@
           verification: [
             { trigger: 'blur', required: true, message: '请输入验证码' },
           ],
+          company: [
+            { trigger: 'blur', required: true, message: '请输入公司名称' },
+          ],
         },
         kaoshiCnt:0,// 考试人数
         peixunCnt:0,// 培训人数
@@ -301,7 +304,7 @@
 
                 this.$message.success('申请成功');
               } else {
-                this.$message.error('申请失败');
+                this.$message.error(res.msg);
               }
             });
           }

pages/courseResource/index.vue

@@ -136,11 +136,11 @@
 
 <script>
   export default {
-    name:       'courseresource',
+    name:       'courseResource',
     layout:'templateB',
     async asyncData({ $axios, store }) {
       // 设置选中菜单
-      store.commit('setActiveNav', '/courseresource');
+      store.commit('setActiveNav', '/courseResource');
 
       let [res1,res2] =  await Promise.all([
                                              await $axios.$post(`/home/news/carousel`,{'newsClassifyId':0,'keyword':'课程'}).then(res=>{
@@ -398,7 +398,7 @@
                 this.sqfaDl = false;
                 this.$message.success('申请成功');
               } else {
-                this.$message.error('申请失败');
+                this.$message.error(res.msg);
               }
             });
           }

pages/courseware/index.vue

@@ -405,7 +405,7 @@
                 this.telDl = false;
                 this.$message.success('申请成功');
               } else {
-                this.$message.error('申请失败');
+                this.$message.error(res.msg);
               }
             });
           }

pages/index.vue

@@ -2,8 +2,8 @@
 
   <div class="client-index-page">
     <div style="display: none">
-      <a :href="`${baseUrl}/pcdituye.html`"></a>
-      <a :href="`${baseUrl}/pcsitemap.xml`"></a>
+      <!--<a :href="`${baseUrl}/pcdituye.html`"></a>-->
+      <a :href="`${baseUrl}/jiuchuangruikang/pcsitemap.xml`"></a>
     </div>
 
     <h1 style='display:none;'>在线考试系统在线培训系统在线考试平台考试管理系统培训管理系统</h1>
@@ -439,7 +439,7 @@
                 this.sqfaDl = false;
                 this.$message.success('申请成功');
               } else {
-                this.$message.error('申请失败');
+                this.$message.error(res.msg);
               }
             });
           }
@@ -658,7 +658,7 @@
         this.$router.push({ name: 'courseware' });
       },
       goKechengZyPage(){
-        this.$router.push({ name: 'courseresource' });
+        this.$router.push({ name: 'courseResource' });
       },
 
       onlineFun(){

pages/introduction/index.vue

@@ -106,7 +106,7 @@
         this.$router.push({ name: 'courseware' });
       },
       goKechengZyPage(){
-        this.$router.push({ name: 'courseresource' });
+        this.$router.push({ name: 'courseResource' });
       },
     },
     created() {

pages/resources/index.vue

@@ -378,7 +378,7 @@
                 this.telDl = false;
                 this.$message.success('申请成功');
               } else {
-                this.$message.error('申请失败');
+                this.$message.error(res.msg);
               }
             });
           }

pages/tiyanCenter/index.vue

@@ -10,12 +10,12 @@
       <ul class="experience-ul-box">
         <li>
           <div>
-            <i></i><h4>考试电脑管理端</h4><a @click="FreeTrial('ksAdmin')">立即体验</a><p><span>{{kaoshiCnt}}</span>人正在体验学员端</p>
+            <i></i><h4>考试电脑管理端</h4><a @click="FreeTrial('ksAdmin')">立即体验</a><p><span>{{kaoshiCnt}}</span>人正在体验管理端</p>
           </div>
         </li>
         <li>
           <div>
-            <i></i><h4>考试电脑学员端</h4><a @click="FreeTrial('ksClient')">立即体验</a><p><span>{{kaoshiCnt}}</span>人正在体验管理端</p>
+            <i></i><h4>考试电脑学员端</h4><a @click="FreeTrial('ksClient')">立即体验</a><p><span>{{kaoshiCnt}}</span>人正在体验学员端</p>
           </div>
         </li>
         <li>
@@ -32,12 +32,12 @@
       <ul class="experience-ul-box peixun-ul-box">
         <li>
           <div>
-            <i></i><h4>培训电脑管理端</h4><a @click="FreeTrial('pxAdmin')">立即体验</a><p><span>{{peixunCnt}}</span>人正在体验学员端</p>
+            <i></i><h4>培训电脑管理端</h4><a @click="FreeTrial('pxAdmin')">立即体验</a><p><span>{{peixunCnt}}</span>人正在体验管理端</p>
           </div>
         </li>
         <li>
           <div>
-            <i></i><h4>培训电脑学员端</h4><a @click="FreeTrial('pxClient')">立即体验</a><p><span>{{peixunCnt}}</span>人正在体验管理端</p>
+            <i></i><h4>培训电脑学员端</h4><a @click="FreeTrial('pxClient')">立即体验</a><p><span>{{peixunCnt}}</span>人正在体验学员端</p>
           </div>
         </li>
         <li>