v1.5.2

client/History.md

+PC-1.5.2 / 2019-09-02
+==================
+
+ * 修改 ckeditor upload。
+ * 修改 course/0/0 可能会出现的情况。
+
 PC-1.5.1 / 2019-08-27
 ==================
 

client/client/components/player/index.vue

@@ -156,6 +156,15 @@ export default {
       this.state.isChapterVideo = false
     }
     const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
+    if (to.params.cid === '0' && to.params.sid === '0') {
+      this.$message({
+        message: 'URL异常，重新选择课程学习！！！',
+        type: 'info',
+        duration: 10000
+      })
+      loading.close()
+      return
+    }
     cAction.chapterAction.getChapterList(to.params.cid, to.params.sid, to.params.id).then(json => {
       this.chapterList = json.json
       this.courseInfo = json.courseInfo

client/client/components/player/rightSide/sideChapterList.vue

@@ -7,7 +7,7 @@
         <ul class="knot-list">
           <template v-for="(_item, _index) in item.chapters">
             <li v-bind:key="_index" :class="['knob-item', (_item.id === list.currentChapterId ? 'on' : '')]">
-              <a :data-vid="_item.id" :data-type="_item.video_provider" :data-hasVA='_item.time' @click='jumpToOtherVA' :data-index='index' :data-index1='_index' class="knot-name">{{_item.name}}</a>
+              <a :data-vid="_item.id" :data-type="_item.video_provider" :data-hasVA='_item.time' @click='jumpToOtherVA' :data-index='index' :data-count='_index' class="knot-name">{{_item.name}}</a>
               <i :class="['el-icon', (_item.time ? 'el-icon-self-iconset0481' : (_item.type === 3 ? 'el-icon-edit-outline' : 'el-icon-self-cc-book'))]"></i>
             </li>
           </template>
@@ -39,7 +39,7 @@ export default {
         /* 如果存在 - 课后问题类型(chapterWork)， type:3、work_type:2 */
         /* 如果存在 - 课后阅读类型(chapterRead)， type:4 */
         let i1 = _data.index
-        let i2 = _data.index1
+        let i2 = _data.count
         let _course = this.list.course[i1]
         if (_course && _course.chapters[i2]) {
           if (_course.chapters[i2].id === 'course_info') {
@@ -64,7 +64,7 @@ export default {
           }
           return
         }
-        this.$message.error('系统未知错误，001')
+        this.$message.error('系统未知错误，002')
         return
       }
       this.$router.push({ path: `/player/${cid}/chapter-video/${_id}/${type}` })

client/client/project/main.js

@@ -21,7 +21,7 @@ Vue.use(VueRouter)
 const router = createRouter()
 /* 设置全局变量 */
 window.G = Vue.prototype.$GlobalVariable = {
-  VERSION: 'PC-1.5.1'
+  VERSION: 'PC-1.5.2'
 }
 Vue.prototype.$md5 = md5
 /* 导航守卫 */

client/client/project/pages/myLearn/courseDetail.vue

@@ -48,7 +48,7 @@
                   </div>
                   <template v-for="(item1, index1) in _item.chapters">
                     <div v-bind:key="index1" :class='["body", (item1.id === tabs[1].chapterList.currentChapterId && "on")]'>
-                      <div class='name' :data-vid='item1.vid' :data-cid='item1.cid' :data-sid='item1.sid' :data-hasVA='item1.time' :data-type="item1.video_provider" :data-name='item1.name' @click='jumpToOtherVA' :data-index='index' :data-index1='index1'>
+                      <div class='name' :data-vid='item1.vid' :data-cid='item1.cid' :data-sid='item1.sid' :data-hasVA='item1.time' :data-type="item1.video_provider" :data-name='item1.name' @click='jumpToOtherVA' :data-index='index' :data-count='index1'>
                         {{item1.name}}
                         <div class='time'>{{item1.time}}</div>
                       </div>
@@ -363,6 +363,15 @@ export default {
   },
   mounted () {
     const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
+    if (this.cid === '0' && this.sid === '0') {
+      this.$message({
+        message: 'URL异常，请点击“返回首页”，重新选择课程学习！！',
+        type: 'info',
+        duration: 10000
+      })
+      loading.close()
+      return
+    }
     cAction.courseAction.getCourseDetail(this.cid, this.sid).then(json => {
       this.headerInfo = json.headerInfo
       this.tabs[0].content = json.tabs0Content
@@ -496,7 +505,7 @@ export default {
         /* 如果存在 - 课后问题类型(chapterWork)， type:3、work_type:2 */
         /* 如果存在 - 课后阅读类型(chapterRead)， type:4 */
         let i1 = _data.index
-        let i2 = _data.index1
+        let i2 = _data.count
         let _course = this.tabs[1].chapterList.course[i1]
         if (_course && _course.chapters[i2]) {
           if (_course.chapters[i2].type === 3) {
@@ -510,7 +519,7 @@ export default {
           }
           return
         }
-        this.$message.error('系统未知错误，001')
+        this.$message.error('系统未知错误，003')
         return
       }
       this.$router.push({ path: `/player/${cid}/chapter-video/${_id}/${type}` })

server/client-dist/index.html

@@ -15,4 +15,4 @@
     <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/console-polyfill.js"></script>
     <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/html5shiv.min.js"></script>
     <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/respond.min.js"></script>
-  <![endif]--><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/manifest.da37a6f4.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor.2e5cc9e8.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/app.a2bdee5a.js"></script></body></html>
\ No newline at end of file
+  <![endif]--><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/manifest.f9454a05.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor.2e5cc9e8.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/app.3759cb8e.js"></script></body></html>
\ No newline at end of file

server/client-dist/resources/manifest.da37a6f4.js → server/client-dist/resources/manifest.f9454a05.js

-!function(d){function e(e){for(var t,r,n=e[0],a=e[1],o=e[2],c=0,f=[];c<n.length;c++)r=n[c],Object.prototype.hasOwnProperty.call(s,r)&&s[r]&&f.push(s[r][0]),s[r]=0;for(t in a)Object.prototype.hasOwnProperty.call(a,t)&&(d[t]=a[t]);for(p&&p(e);f.length;)f.shift()();return i.push.apply(i,o||[]),u()}function u(){for(var e,t=0;t<i.length;t++){for(var r=i[t],n=!0,a=1;a<r.length;a++){var o=r[a];0!==s[o]&&(n=!1)}n&&(i.splice(t--,1),e=b(b.s=r[0]))}return e}var r={},l={3:0},s={3:0},i=[];function b(e){if(r[e])return r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return d[e].call(t.exports,t,t.exports,b),t.l=!0,t.exports}b.e=function(i){var e=[];l[i]?e.push(l[i]):0!==l[i]&&{0:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,15:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1}[i]&&e.push(l[i]=new Promise(function(e,n){for(var t="resources/"+({}[i]||i)+"."+{0:"8c0fccc8dcdf",1:"31d6cfe0d16a",5:"930984a29124",6:"b05fee171e11",7:"eeb045eabfe1",8:"0f44f155a214",9:"7acee47d5dff",10:"7af67fe88b2d",11:"5429a27bb7bb",12:"1f6314bfe897",13:"35e9fd271343",14:"96e432718f45",15:"fcef4db14df7",16:"e49666539688",17:"0ba27a54f3b2",18:"649d251c3201",19:"77c545d728a7",20:"4cf28fe4458d",21:"ea3ddb59c757",22:"d0b0367588f8",23:"d0a83561e812",24:"074cd78c0ecf",25:"f9edc40b7bd4",26:"31d6cfe0d16a",27:"31d6cfe0d16a",28:"31d6cfe0d16a",29:"31d6cfe0d16a",30:"31d6cfe0d16a",31:"31d6cfe0d16a",32:"31d6cfe0d16a",33:"31d6cfe0d16a",34:"31d6cfe0d16a"}[i]+".css",a=b.p+t,r=document.getElementsByTagName("link"),o=0;o<r.length;o++){var c=(d=r[o]).getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(c===t||c===a))return e()}var f=document.getElementsByTagName("style");for(o=0;o<f.length;o++){var d;if((c=(d=f[o]).getAttribute("data-href"))===t||c===a)return e()}var u=document.createElement("link");u.rel="stylesheet",u.type="text/css",u.onload=e,u.onerror=function(e){var t=e&&e.target&&e.target.src||a,r=new Error("Loading CSS chunk "+i+" failed.\n("+t+")");r.request=t,delete l[i],u.parentNode.removeChild(u),n(r)},u.href=a,document.getElementsByTagName("head")[0].appendChild(u)}).then(function(){l[i]=0}));var r=s[i];if(0!==r)if(r)e.push(r[2]);else{var t=new Promise(function(e,t){r=s[i]=[e,t]});e.push(r[2]=t);var n,a=document.createElement("script");a.charset="utf-8",a.timeout=120,b.nc&&a.setAttribute("nonce",b.nc),a.src=function(e){return b.p+"resources/"+({}[e]||e)+"."+{0:"8699c484",1:"3eb39947",5:"4fab6ab3",6:"f435afe3",7:"430564b5",8:"eb5fc1ed",9:"4479c9d4",10:"147c22e9",11:"3ea6f560",12:"ec0cf198",13:"c7f591f9",14:"12638ba8",15:"50239edc",16:"310a8433",17:"68fe78e9",18:"81d91505",19:"f95b9e3c",20:"28ed8e94",21:"222bf939",22:"6253584d",23:"28c50b9e",24:"d1dc65eb",25:"cbf289c0",26:"38035efc",27:"ebf0c26c",28:"68e02fb9",29:"8b0d5c25",30:"4c215296",31:"9631a4ea",32:"3cb8f7aa",33:"88b89200",34:"9b388327"}[e]+".js"}(i);var o=new Error;n=function(e){a.onerror=a.onload=null,clearTimeout(c);var t=s[i];if(0!==t){if(t){var r=e&&("load"===e.type?"missing":e.type),n=e&&e.target&&e.target.src;o.message="Loading chunk "+i+" failed.\n("+r+": "+n+")",o.name="ChunkLoadError",o.type=r,o.request=n,t[1](o)}s[i]=void 0}};var c=setTimeout(function(){n({type:"timeout",target:a})},12e4);a.onerror=a.onload=n,document.head.appendChild(a)}return Promise.all(e)},b.m=d,b.c=r,b.d=function(e,t,r){b.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},b.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},b.t=function(t,e){if(1&e&&(t=b(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(b.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var n in t)b.d(r,n,function(e){return t[e]}.bind(null,n));return r},b.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(t,"a",t),t},b.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},b.p="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/",b.oe=function(e){throw console.error(e),e};var t=window.webpackJsonp=window.webpackJsonp||[],n=t.push.bind(t);t.push=e,t=t.slice();for(var a=0;a<t.length;a++)e(t[a]);var p=n;u()}([]);
\ No newline at end of file
+!function(d){function e(e){for(var t,r,n=e[0],a=e[1],c=e[2],o=0,f=[];o<n.length;o++)r=n[o],Object.prototype.hasOwnProperty.call(s,r)&&s[r]&&f.push(s[r][0]),s[r]=0;for(t in a)Object.prototype.hasOwnProperty.call(a,t)&&(d[t]=a[t]);for(p&&p(e);f.length;)f.shift()();return i.push.apply(i,c||[]),u()}function u(){for(var e,t=0;t<i.length;t++){for(var r=i[t],n=!0,a=1;a<r.length;a++){var c=r[a];0!==s[c]&&(n=!1)}n&&(i.splice(t--,1),e=b(b.s=r[0]))}return e}var r={},l={3:0},s={3:0},i=[];function b(e){if(r[e])return r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return d[e].call(t.exports,t,t.exports,b),t.l=!0,t.exports}b.e=function(i){var e=[];l[i]?e.push(l[i]):0!==l[i]&&{0:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,15:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1}[i]&&e.push(l[i]=new Promise(function(e,n){for(var t="resources/"+({}[i]||i)+"."+{0:"8c0fccc8dcdf",1:"31d6cfe0d16a",5:"930984a29124",6:"7acaef322a03",7:"eeb045eabfe1",8:"0f44f155a214",9:"7acee47d5dff",10:"7af67fe88b2d",11:"5429a27bb7bb",12:"1f6314bfe897",13:"35e9fd271343",14:"96e432718f45",15:"fcef4db14df7",16:"e49666539688",17:"0ba27a54f3b2",18:"649d251c3201",19:"77c545d728a7",20:"f1f2585b7c21",21:"ea3ddb59c757",22:"d0b0367588f8",23:"d0a83561e812",24:"074cd78c0ecf",25:"f9edc40b7bd4",26:"31d6cfe0d16a",27:"31d6cfe0d16a",28:"31d6cfe0d16a",29:"31d6cfe0d16a",30:"31d6cfe0d16a",31:"31d6cfe0d16a",32:"31d6cfe0d16a",33:"31d6cfe0d16a",34:"31d6cfe0d16a"}[i]+".css",a=b.p+t,r=document.getElementsByTagName("link"),c=0;c<r.length;c++){var o=(d=r[c]).getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(o===t||o===a))return e()}var f=document.getElementsByTagName("style");for(c=0;c<f.length;c++){var d;if((o=(d=f[c]).getAttribute("data-href"))===t||o===a)return e()}var u=document.createElement("link");u.rel="stylesheet",u.type="text/css",u.onload=e,u.onerror=function(e){var t=e&&e.target&&e.target.src||a,r=new Error("Loading CSS chunk "+i+" failed.\n("+t+")");r.request=t,delete l[i],u.parentNode.removeChild(u),n(r)},u.href=a,document.getElementsByTagName("head")[0].appendChild(u)}).then(function(){l[i]=0}));var r=s[i];if(0!==r)if(r)e.push(r[2]);else{var t=new Promise(function(e,t){r=s[i]=[e,t]});e.push(r[2]=t);var n,a=document.createElement("script");a.charset="utf-8",a.timeout=120,b.nc&&a.setAttribute("nonce",b.nc),a.src=function(e){return b.p+"resources/"+({}[e]||e)+"."+{0:"8699c484",1:"3eb39947",5:"4fab6ab3",6:"fe7ef53a",7:"430564b5",8:"eb5fc1ed",9:"4479c9d4",10:"147c22e9",11:"3ea6f560",12:"ec0cf198",13:"c7f591f9",14:"12638ba8",15:"50239edc",16:"310a8433",17:"68fe78e9",18:"81d91505",19:"f95b9e3c",20:"9123ae40",21:"222bf939",22:"6253584d",23:"28c50b9e",24:"d1dc65eb",25:"cbf289c0",26:"38035efc",27:"ebf0c26c",28:"68e02fb9",29:"8b0d5c25",30:"4c215296",31:"9631a4ea",32:"3cb8f7aa",33:"88b89200",34:"9b388327"}[e]+".js"}(i);var c=new Error;n=function(e){a.onerror=a.onload=null,clearTimeout(o);var t=s[i];if(0!==t){if(t){var r=e&&("load"===e.type?"missing":e.type),n=e&&e.target&&e.target.src;c.message="Loading chunk "+i+" failed.\n("+r+": "+n+")",c.name="ChunkLoadError",c.type=r,c.request=n,t[1](c)}s[i]=void 0}};var o=setTimeout(function(){n({type:"timeout",target:a})},12e4);a.onerror=a.onload=n,document.head.appendChild(a)}return Promise.all(e)},b.m=d,b.c=r,b.d=function(e,t,r){b.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},b.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},b.t=function(t,e){if(1&e&&(t=b(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(b.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var n in t)b.d(r,n,function(e){return t[e]}.bind(null,n));return r},b.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(t,"a",t),t},b.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},b.p="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/",b.oe=function(e){throw console.error(e),e};var t=window.webpackJsonp=window.webpackJsonp||[],n=t.push.bind(t);t.push=e,t=t.slice();for(var a=0;a<t.length;a++)e(t[a]);var p=n;u()}([]);
\ No newline at end of file

server/server/controller/ckeditorMonitor.js

@@ -23,7 +23,7 @@ const ckeditorUpload = (req, res) => {
   if (req.files.length) {
     if (!req.files[0].mimetype.startsWith('image')) { sendHtml('', '文件类型错误，请上传图片'); return }
     if (req.files[0].size > 10 * 1024 * 1024) { sendHtml('', '图片大小超限'); return }
-
+    req.files[0].fieldname = 'image'
     let headers = req.headers
     let options = {}
     options = {