Merge remote-tracking branch 'origin/master' into ecollage

# Conflicts: # build.zip # client-dist/index.html # client-dist/resources/app.276ffb3550e5.css # client-dist/resources/app.68a82e13.js # client-dist/resources/manifest.b163f7cd.js

Merge remote-tracking branch 'origin/master' into ecollage
cabe6022 · GOD_ZYX · 0b56766d · 6615cda2 · cabe6022 · cabe6022
--- a/client-dist/index.html
+++ b/client-dist/index.html
+<<<<<<< HEAD
 <!DOCTYPE html><html lang="zh-cn"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta content="origin" name="referrer"><title>选修课在线学习系统</title><meta name="viewport" id="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,shrink-to-fit=no"><link rel="shortcut icon" href="https://zws-imgs-pub.ezijing.com/static/build/learn-ecollage/favicon.ico"><link href="https://zws-imgs-pub.ezijing.com/static/build/learn-ecollage/resources/app.f9e2048af498.css" rel="stylesheet"></head><body><div id="app"></div><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-shim.min.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-sham.min.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/ckeditor/ckeditor.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/videoJs/videoJs.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/convertString/base64-new.js"></script><!--[if lt IE 9]>
    <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-ecollage/resources/manifest.b163f7cd.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-ecollage/resources/vendor.435ab98c.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-ecollage/resources/app.e884a564.js"></script></body></html>
\ No newline at end of file
+=======
+<!DOCTYPE html><html lang="zh-cn"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta content="origin" name="referrer"><title>紫荆教育MBA学习系统</title><meta name="viewport" id="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,shrink-to-fit=no"><link rel="shortcut icon" href="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/favicon.ico"><link href="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app.276ffb3550e5.css" rel="stylesheet"></head><body><div id="app"></div><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-shim.min.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-sham.min.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/ckeditor/ckeditor.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/videoJs/videoJs.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/convertString/base64-new.js"></script><!--[if lt IE 9]>
+    <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-mba/resources/manifest.f5ee8dee.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor.435ab98c.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app.68a82e13.js"></script></body></html>
+>>>>>>> origin/master
--- a/client-dist/resources/15.3d4a809b.js
+++ b/client-dist/resources/15.3d4a809b.js
--- a/client-dist/resources/15.dfc0763315c8.css
+++ b/client-dist/resources/15.dfc0763315c8.css
-ul.tabs-list[data-v-59867b33]{float:left;width:100%;margin:0 0 .15rem;padding:0;font-size:.16rem;line-height:1.5;border-top:1px solid #e8e8e8}ul.tabs-list[data-v-59867b33]:last-child{margin-bottom:0}ul.tabs-list .tabs-hd[data-v-59867b33]{display:inline-block;color:#fff;padding:5px 0 9px;margin-top:-5px;width:94px;text-align:center;background:url(https://zws-imgs-pub.ezijing.com/754005be709bf2295bc55923c2b91fd8.png) no-repeat 0 0}ul.tabs-list li[data-v-59867b33]{float:left;list-style:none;padding:.1rem 0;margin-right:.2rem}ul.tabs-list li .tab[data-v-59867b33]{padding:0 .1rem;cursor:pointer}ul.tabs-list li .tab.on[data-v-59867b33]{background:#b49441;color:#fff}ul.tabs-list li .tab[data-v-59867b33]:focus,ul.tabs-list li .tab[data-v-59867b33]:hover{color:#b49441;background:#eee}.switch-box[data-v-59867b33]{margin:0 .3rem}.switch-box .icon[data-v-59867b33]{margin-left:.1rem}.switch-box .rbtn[data-v-59867b33]{float:right}ul.course-list[data-v-59867b33]{margin:0;padding:0;font-size:.18rem;color:#313131}ul.course-list .no-data[data-v-59867b33]{text-align:center;line-height:2rem}ul.course-list li.item[data-v-59867b33]{padding:.1rem 0;list-style:none;border-bottom:1px solid #dcdcdc;overflow:hidden}ul.course-list li.item[data-v-59867b33]:first-child{padding-top:0}ul.course-list li.item[data-v-59867b33]:last-child{margin-bottom:.2rem}ul.course-list li.item .left-pic[data-v-59867b33]{position:relative;float:left;width:1.8rem;overflow:hidden}ul.course-list li.item .left-pic .no-img[data-v-59867b33]{width:100%;height:1rem;text-align:center;line-height:1.1rem;border:1px solid #e2e2e2}ul.course-list li.item .left-pic .no-img i[data-v-59867b33]{font-size:.4rem;color:#e2e2e2}ul.course-list li.item .left-pic img[data-v-59867b33]{display:block;width:100%}ul.course-list li.item .right-bd[data-v-59867b33]{position:relative;display:block;margin-left:2rem}ul.course-list li.item .right-bd .title[data-v-59867b33]{width:80%;line-height:1.5;font-weight:700;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap}ul.course-list li.item .right-bd .tags[data-v-59867b33]{margin:.05rem 0;font-size:.14rem}ul.course-list li.item .right-bd .tags span[data-v-59867b33]{padding:0 .1rem;margin:0;border-right:1px solid #313131}ul.course-list li.item .right-bd .tags span[data-v-59867b33]:first-child{padding-left:0}ul.course-list li.item .right-bd .tags span[data-v-59867b33]:last-child{border:none}ul.course-list li.item .right-bd .time[data-v-59867b33]{font-size:.12rem}ul.course-list li.item .right-bd .time em[data-v-59867b33]{font-style:normal;color:#898989}ul.course-list li.item .right-bd .progress[data-v-59867b33]{margin-top:.05rem;font-size:14px}ul.course-list li.item .right-bd .progress .el-progress[data-v-59867b33]{width:50%;display:inline-block;vertical-align:text-bottom}ul.course-list li.item .right-bd .right-sel[data-v-59867b33]{position:absolute;right:0;top:0;font-size:14px;padding:0 .1rem}ul.course-list li.item .right-bd .in-btn[data-v-59867b33]{position:absolute;right:0;bottom:0}@media (max-width:767px){.switch-box[data-v-59867b33]{margin:0}}
+ul.tabs-list[data-v-f8c2614e]{float:left;width:100%;margin:0 0 .15rem;padding:0;font-size:.16rem;line-height:1.5;border-top:1px solid #e8e8e8}ul.tabs-list[data-v-f8c2614e]:last-child{margin-bottom:0}ul.tabs-list .tabs-hd[data-v-f8c2614e]{display:inline-block;color:#fff;padding:5px 0 9px;margin-top:-5px;width:94px;text-align:center;background:url(https://zws-imgs-pub.ezijing.com/754005be709bf2295bc55923c2b91fd8.png) no-repeat 0 0}ul.tabs-list li[data-v-f8c2614e]{float:left;list-style:none;padding:.1rem 0;margin-right:.2rem}ul.tabs-list li .tab[data-v-f8c2614e]{padding:0 .1rem;cursor:pointer}ul.tabs-list li .tab.on[data-v-f8c2614e]{background:#b49441;color:#fff}ul.tabs-list li .tab[data-v-f8c2614e]:focus,ul.tabs-list li .tab[data-v-f8c2614e]:hover{color:#b49441;background:#eee}.switch-box[data-v-f8c2614e]{margin:0 .3rem}.switch-box .icon[data-v-f8c2614e]{margin-left:.1rem}.switch-box .rbtn[data-v-f8c2614e]{float:right}ul.course-list[data-v-f8c2614e]{margin:0;padding:0;font-size:.18rem;color:#313131}ul.course-list .no-data[data-v-f8c2614e]{text-align:center;line-height:2rem}ul.course-list li.item[data-v-f8c2614e]{padding:.1rem 0;list-style:none;border-bottom:1px solid #dcdcdc;overflow:hidden}ul.course-list li.item[data-v-f8c2614e]:first-child{padding-top:0}ul.course-list li.item[data-v-f8c2614e]:last-child{margin-bottom:.2rem}ul.course-list li.item .left-pic[data-v-f8c2614e]{position:relative;float:left;width:1.8rem;overflow:hidden}ul.course-list li.item .left-pic .no-img[data-v-f8c2614e]{width:100%;height:1rem;text-align:center;line-height:1.1rem;border:1px solid #e2e2e2}ul.course-list li.item .left-pic .no-img i[data-v-f8c2614e]{font-size:.4rem;color:#e2e2e2}ul.course-list li.item .left-pic img[data-v-f8c2614e]{display:block;width:100%}ul.course-list li.item .right-bd[data-v-f8c2614e]{position:relative;display:block;margin-left:2rem}ul.course-list li.item .right-bd .title[data-v-f8c2614e]{width:80%;line-height:1.5;font-weight:700;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap}ul.course-list li.item .right-bd .tags[data-v-f8c2614e]{margin:.05rem 0;font-size:.14rem}ul.course-list li.item .right-bd .tags span[data-v-f8c2614e]{padding:0 .1rem;margin:0;border-right:1px solid #313131}ul.course-list li.item .right-bd .tags span[data-v-f8c2614e]:first-child{padding-left:0}ul.course-list li.item .right-bd .tags span[data-v-f8c2614e]:last-child{border:none}ul.course-list li.item .right-bd .time[data-v-f8c2614e]{font-size:.12rem}ul.course-list li.item .right-bd .time em[data-v-f8c2614e]{font-style:normal;color:#898989}ul.course-list li.item .right-bd .progress[data-v-f8c2614e]{margin-top:.05rem;font-size:14px}ul.course-list li.item .right-bd .progress .el-progress[data-v-f8c2614e]{width:50%;display:inline-block;vertical-align:text-bottom}ul.course-list li.item .right-bd .right-sel[data-v-f8c2614e]{position:absolute;right:0;top:0;font-size:14px;padding:0 .1rem}ul.course-list li.item .right-bd .in-btn[data-v-f8c2614e]{position:absolute;right:0;bottom:0}@media (max-width:767px){.switch-box[data-v-f8c2614e]{margin:0}}
\ No newline at end of file
--- a/client-dist/resources/17.f3b61509.js
+++ b/client-dist/resources/17.f3b61509.js
--- a/client-dist/resources/17.e10160ee3f3a.css
+++ b/client-dist/resources/17.e10160ee3f3a.css
--- a/client-dist/resources/app.276ffb3550e5.css
+++ b/client-dist/resources/app.276ffb3550e5.css
--- a/client-dist/resources/app.68a82e13.js
+++ b/client-dist/resources/app.68a82e13.js
--- a/client-dist/resources/manifest.f5ee8dee.js
+++ b/client-dist/resources/manifest.f5ee8dee.js
+!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],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(b&&b(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=p(p.s=r[0]))}return e}var r={},l={3:0},s={3:0},i=[];function p(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,p),t.l=!0,t.exports}p.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}[i]&&e.push(l[i]=new Promise(function(e,n){for(var t="resources/"+({}[i]||i)+"."+{0:"7e9c19881242",1:"31d6cfe0d16a",5:"b6a10460f085",6:"1b8137937536",7:"edadd3d1dece",8:"2b76410db4d0",9:"30b36ab56f09",10:"eb5caf8d2af7",11:"63cef44e90fb",12:"fc688477e0f2",13:"9c95c5430f41",14:"d32639348e7f",15:"ca7cab1d6dca",16:"a6265ac4f731",17:"d80cfa33564a",18:"abf993cecc16",19:"da1346fedd49",20:"5ba1b1bc7480",21:"43ee51cf782c",22:"12c536f6abaf",23:"31d6cfe0d16a",24:"31d6cfe0d16a",25:"31d6cfe0d16a",26:"31d6cfe0d16a",27:"31d6cfe0d16a",28:"31d6cfe0d16a",29:"31d6cfe0d16a",30:"31d6cfe0d16a"}[i]+".css",a=p.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 t,r=s[i];if(0!==r)if(r)e.push(r[2]);else{var n=new Promise(function(e,t){r=s[i]=[e,t]});e.push(r[2]=n);var a,c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.charset="utf-8",o.timeout=120,p.nc&&o.setAttribute("nonce",p.nc),o.src=p.p+"resources/"+({}[t=i]||t)+"."+{0:"44b419c5",1:"b54a4784",5:"09a1f3ee",6:"5788073d",7:"34107010",8:"3725acf5",9:"bbdfab9a",10:"921c3354",11:"3a3f1cdf",12:"bc06c483",13:"c50bed76",14:"21f6e4db",15:"57645cc7",16:"eb41993a",17:"a6126945",18:"15cc538d",19:"d19d94e7",20:"ed197405",21:"ff867a66",22:"51a95842",23:"aa46f405",24:"f05a2d7d",25:"cd45549d",26:"2e14c205",27:"12a87957",28:"01ab5f90",29:"c6599869",30:"d3ea8c6f"}[t]+".js",a=function(e){o.onerror=o.onload=null,clearTimeout(f);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,a=new Error("Loading chunk "+i+" failed.\n("+r+": "+n+")");a.type=r,a.request=n,t[1](a)}s[i]=void 0}};var f=setTimeout(function(){a({type:"timeout",target:o})},12e4);o.onerror=o.onload=a,c.appendChild(o)}return Promise.all(e)},p.m=d,p.c=r,p.d=function(e,t,r){p.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},p.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},p.t=function(t,e){if(1&e&&(t=p(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(p.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var n in t)p.d(r,n,function(e){return t[e]}.bind(null,n));return r},p.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return p.d(t,"a",t),t},p.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},p.p="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/",p.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 b=n;u()}([]);
\ No newline at end of file
--- a/client/components/websocket/index.vue
+++ b/client/components/websocket/index.vue
@@ -57,7 +57,7 @@ export default {
    },
    sendData (action, val) {
      let str = ''
-      let version = 'PC-1.0.0' // 客户端版本号，每次更新后，更新版本号。可以方便查看是否客户端都是最新版本
+      let version = 'PC-1.0.1' // 客户端版本号，每次更新后，更新版本号。可以方便查看是否客户端都是最新版本
      if (window.G.UserInfo && window.G.UserInfo.student_info) {
        let tmp_info = window.G.UserInfo.student_info // eslint-disable-line
        str = tmp_info.personal_name + ':' + tmp_info.telephone + ':' + tmp_info.email + ':' + tmp_info.id + ':' + window.G.UserInfo.auth_key + ':' + (window.G.pwd || '')

--- a/client/project/components/style/_com.scss
+++ b/client/project/components/style/_com.scss
@@ -52,7 +52,8 @@ body {
 /* 进度条 原始背景色 加深 */
 .el-progress-bar__outer { background-color: #e5e5e5 !important; }
 .el-progress-bar__innerText { color: #313131; }
-.el-progress-bar { margin-right: -60px; }
+.el-progress-bar { margin-right: -65px; padding-right: 65px; }
+.el-progress__text { margin-left: 6px; }
 /* 富文本 */
 .course-assess .detail .b1 { display: block; max-width: 5rem; margin: 0.2rem auto; width: 100%; height: auto; }
 .course-assess .detail .h1 { font-size: 0.16rem; font-weight: 700; color: #313131; line-height: 0.38rem; }

--- a/client/project/pages/myLearn/course.vue
+++ b/client/project/pages/myLearn/course.vue
@@ -43,7 +43,7 @@
              {{item.status}}&emsp;&emsp;<em>{{item.time}}</em>
            </div>
            <div class="progress">
-              学习进度&emsp;<el-progress :percentage="item.progress" color="#b49441"></el-progress>
+              视频观看进度&emsp;<el-progress :percentage="item.progress" color="#b49441"></el-progress>
            </div>
            <div class="right-sel">{{item.myStatus}}</div>
            <el-button class="in-btn" type="primary" size="small" round @click="goCourseContent" :data-cid='item.id' :data-sid='item.sid'>查看课程</el-button>

--- a/client/project/pages/myLearn/courseDetail.vue
+++ b/client/project/pages/myLearn/courseDetail.vue
@@ -22,7 +22,7 @@
      <div class="time">{{headerInfo.time}} {{headerInfo.status}}</div>
      <div style="float: left; width: 100%; height: 1px;"></div>
      <div class="progress">
-        学习进度&emsp;<el-progress :percentage="headerInfo.progress" color="#b49441"></el-progress>
+        视频观看进度&emsp;<el-progress :percentage="headerInfo.progress" color="#b49441"></el-progress>
      </div>
    </div>
    <div class="box-tbd">