Merge branch 'master' into liua

* master:
  提交
  提交
  提交

src/pages/courseResources.vue

@@ -52,7 +52,7 @@
           courseDetail: [
             {
               ni_pid:'baseCourse',
-              img: '../src/assets/kczy/singlePic1.png',
+              img: '/kczy/singlePic1.png',
               title: '野天鹅',
               starNum: 5,
               collectNum: '10w+',
@@ -60,7 +60,7 @@
             },
             {
               ni_pid:'baseCourse',
-              img: '../src/assets/kczy/singlePic2.png',
+              img: '/kczy/singlePic2.png',
               title: '安徒生世界插画',
               starNum: 5,
               collectNum: '10w+',
@@ -68,7 +68,7 @@
             },
             {
               ni_pid:'baseCourse',
-              img: '../src/assets/kczy/singlePic3.png',
+              img: '/kczy/singlePic3.png',
               title: '传送门',
               starNum: 5,
               collectNum: '10w+',
@@ -84,7 +84,7 @@
           courseDetail: [
             {
               ni_pid:'famousCourse',
-              img: '../src/assets/kczy/mszx1.png',
+              img: '/kczy/mszx1.png',
               title: '初中语文',
               starNum: 5,
                collectNum: '10w+',
@@ -92,7 +92,7 @@
             },
             {
               ni_pid:'famousCourse',
-              img: '../src/assets/kczy/mszx2.png',
+              img: '/kczy/mszx2.png',
               title: '初中社会思品',
               starNum: 4,
                collectNum: '10w+',
@@ -100,7 +100,7 @@
             },
             {
               ni_pid:'famousCourse',
-              img: '../src/assets/kczy/mszx3.png',
+              img: '/kczy/mszx3.png',
               title: '小学语文',
               starNum: 3,
                collectNum: '10w+',
@@ -116,7 +116,7 @@
           courseDetail: [
             {
               ni_pid:'homeworkAss',
-              img: '../src/assets/kczy/zyfd1.png',
+              img: '/kczy/zyfd1.png',
               title: '作业同步辅导',
               starNum:5,
                collectNum: '10w+',
@@ -132,7 +132,7 @@
           courseDetail: [
             {
               ni_pid:'familyCourse',
-              img: '../src/assets/kczy/jtjy1.png',
+              img: '/kczy/jtjy1.png',
               title: '亲子沟通教育2.0',
               starNum: 5,
                collectNum: '10w+',
@@ -140,7 +140,7 @@
             },
             {
               ni_pid:'familyCourse',
-              img: '../src/assets/kczy/jtjy2.png',
+              img: '/kczy/jtjy2.png',
               title: '阅读时光',
               starNum: 3,
                collectNum: '10w+',
@@ -156,7 +156,7 @@
           courseDetail: [
             {
               ni_pid:'specialCourse',
-              img: '../src/assets/kczy/tskc1.png',
+              img: '/kczy/tskc1.png',
               title: '体育综合素质课程',
               starNum: 3,
                collectNum: '10w+',
@@ -164,7 +164,7 @@
             },
             {
               ni_pid:'specialCourse',
-              img: '../src/assets/kczy/tskc2.png',
+              img: '/kczy/tskc2.png',
               title: '一起学寓言',
               starNum:5,
                collectNum: '10w+',
@@ -180,7 +180,7 @@
           courseDetail: [
             {
               ni_pid:'specialCourse',
-              img: '../src/assets/kczy/singlePic1.png',
+              img: '/kczy/singlePic1.png',
               title: '野天鹅',
               starNum: 5,
                collectNum: '10w+',
@@ -188,7 +188,7 @@
             },
             {
               ni_pid:'specialCourse',
-              img: '../src/assets/kczy/singlePic2.png',
+              img: '/kczy/singlePic2.png',
               title: '安徒生世界插画',
               starNum:1,
                collectNum: '10w+',
@@ -196,7 +196,7 @@
             },
             {
               ni_pid:'specialCourse',
-              img: '../src/assets/kczy/singlePic3.png',
+              img: '/kczy/singlePic3.png',
               title: '传送门',
               starNum: 3,
                collectNum: '10w+',
@@ -204,7 +204,7 @@
             },
             {
               ni_pid:'specialCourse',
-              img: '../src/assets/kczy/singlePic5.png',
+              img: '/kczy/singlePic5.png',
               title: '拇指姑娘',
               starNum: 4,
                collectNum: '10w+',
@@ -212,7 +212,7 @@
             },
             {
               ni_pid:'specialCourse',
-              img: '../src/assets/kczy/singlePic4.png',
+              img: '/kczy/singlePic4.png',
               title: '书中花园',
               starNum:5,
                collectNum: '10w+',

src/pages/courseResourcesChapter.vue

@@ -189,7 +189,7 @@ import commonHeader from "@/components/header/index.vue";
   box-sizing: border-box;
   padding:52px 66px;
   color: #ffffff;
-  background: url('../src/assets/kczy/chapterBG.png') no-repeat top left;
+  background: url('/kczy/chapterBG.png') no-repeat top left;
   background-size: 100%;
 
   .bigT{

src/pages/resourceFileReview.vue

@@ -14,12 +14,12 @@
     </div>
     <div class="common1280 resourceView">
       <div class="bigTitle">
-        <img :src=" '../src/assets/kczy/'+transIconType+'.png'" alt="" srcset="">
+        <img :src="'/kczy/'+transIconType+'.png'" alt="" srcset="">
         <p>数学体系</p>
       </div>
       <!-- posti -->
       <div class="downIcon">
-        <img src="../assets/kczy/downIcon.png" alt="" srcset="">
+        <img src="/kczy/downIcon.png" alt="" srcset="">
         <p>下载</p>
       </div>
       <div class="sourceCont">

src/pages/resourceMovReview.vue

@@ -45,8 +45,8 @@
           </div>
           <div class="vedioMainContent_left_bottom">
             <video controls>
-                <source src="movie.mp4" type="video/mp4">
-                <source src="movie.ogg" type="video/ogg">
+<!--                <source src="movie.mp4" type="video/mp4">-->
+<!--                <source src="movie.ogg" type="video/ogg">-->
                 您的浏览器不支持 video 标签。
             </video>
             <div class="assi">助教：沈老师</div>