merge...

client/src/components/editor.vue

@@ -20,13 +20,15 @@ export default {
   },
   watch: {
     value(val) {
-      if (this.ckEditor.getData() !== val) {
+      if (this.ckEditor && this.ckEditor.getData() !== val) {
         this.ckEditor.setData(val)
       }
     },
     disabled(val) {
+      if (this.ckEditor && this.ckEditor.instanceReady) {
         this.ckEditor.setReadOnly(val)
       }
+    }
   },
   methods: {
     createEditor() {
@@ -97,7 +99,6 @@ export default {
 
         editor.setData(data, {
           callback: () => {
-            editor.setReadOnly(this.disabled)
             this.bindEvent()
 
             const newData = editor.getData()

client/src/modules/viewer/components/common/editor.vue

@@ -20,13 +20,15 @@ export default {
   },
   watch: {
     value(val) {
-      if (this.ckEditor.getData() !== val) {
+      if (this.ckEditor && this.ckEditor.getData() !== val) {
         this.ckEditor.setData(val)
       }
     },
     disabled(val) {
+      if (this.ckEditor && this.ckEditor.instanceReady) {
         this.ckEditor.setReadOnly(val)
       }
+    }
   },
   methods: {
     createEditor() {
@@ -97,7 +99,6 @@ export default {
 
         editor.setData(data, {
           callback: () => {
-            editor.setReadOnly(this.disabled)
             this.bindEvent()
 
             const newData = editor.getData()

client/src/pages/other/message.vue

 <template>
   <div>
-    <div class="con-title">消息通知</div>
+    <div class="con-title">通知</div>
     <div class="con-box">
-      <el-collapse accordion v-model="activeNames" @change="handleChange">
+      <el-collapse accordion v-model="activeName" @change="handleChange" v-if="msgList.length">
         <template v-for="(item, index) in msgList">
           <el-collapse-item v-bind:key="index" :name="index">
             <template slot="title">
-              <template v-if="!item.isShow">
-                <el-badge is-dot class="item">系统通知</el-badge>
-              </template>
-              <template v-if="item.isShow">
-                系统通知
-              </template>
+              <el-badge :is-dot="!item.isShow" class="item">系统通知</el-badge>
             </template>
             <div v-html="item.text"></div>
           </el-collapse-item>
         </template>
       </el-collapse>
-      <div style="height: 0.3rem;"></div>
+      <div class="empty" v-else>您没有收到任何通知</div>
       <el-pagination
+        background
+        layout="prev, pager, next"
         :current-page.sync="page.currentPage"
         :page-size="page.limit"
-        layout="total, prev, pager, next, jumper"
         :total="page.total"
+        :hide-on-single-page="true"
         @current-change="handleCurrentChange"
+        style="margin:0 auto;padding:40px 0;text-align:center;"
       ></el-pagination>
     </div>
   </div>
@@ -33,10 +31,9 @@
 import cAction from '@action'
 
 export default {
-  components: { },
-  data () {
+  data() {
     return {
-      activeNames: ['1'],
+      activeName: null,
       msgList: [],
       page: {
         offset: 0,
@@ -46,29 +43,26 @@ export default {
       }
     }
   },
-  mounted () {
+  beforeMount() {
     this.getData()
   },
   methods: {
-    handleChange (val) {
+    handleChange(val) {
       if (typeof val === 'number' && this.msgList[val].isShow === 0) {
         cAction.Other.setMyMsg(this.msgList[val].id).then(json => {
           this.getData()
           cAction.Other.getNavMsg().then(data => {
             this.$store.commit('myMsg', data.num)
-          }).catch(e => { this.$message.error(e.message) }).finally(() => { })
-        }).catch(e => { this.$message.error(e.message) }).finally(() => { })
+          })
+        })
       }
     },
-    getData () {
-      const pageParam = {
-        offset: this.page.offset,
-        limit: this.page.limit
-      }
-      cAction.Other.getMyMsg(pageParam).then(json => {
-        this.msgList = json.list
-        this.page.total = parseInt(json.count)
-      }).catch(e => { this.$message.error(e.message) }).finally(() => { })
+    getData() {
+      const params = { offset: this.page.offset, limit: this.page.limit }
+      cAction.Other.getMyMsg(params).then(response => {
+        this.msgList = response.list
+        this.page.total = parseInt(response.count)
+      })
     },
     handleCurrentChange() {
       this.page.offset = (this.page.currentPage - 1) * this.page.limit
@@ -79,37 +73,13 @@ export default {
 </script>
 
 <style lang="scss">
-.el-collapse-item__header{
+.el-collapse-item__header {
   line-height: 15px;
 }
-.total-core, .compulsory-core, .elective-core {
-  margin-top: 0.1rem;
-  font-size: 16px;
-  line-height: 36px;
-  .title {
-    float: left;
-    // margin-left: 5px;
-  }
-  .core {
-    float: right;
-    margin-right: 3px;
-    font-size: 12px;
-  }
-}
-.color-box {
-  padding: 0.1rem 0 0.2rem 0;
-  text-align: right;
-  .color {
-    display: inline-block;
-    vertical-align: text-bottom;
-    width: 14px;
-    height: 14px;
-  }
-  .txt {
-    display: inline-block;
-    padding: 0 0.2rem 0 0.1rem;
-    font-size: 14px;
-    line-height: 36px;
-  }
+.empty {
+  padding: 100px;
+  font-size: 18px;
+  color: #5f6368;
+  text-align: center;
 }
 </style>

server/server/config.js

@@ -2,8 +2,9 @@ const state = process.env.NODE_ENV
 let conf = {}
 if (state === 'test') {
   conf.agentApiUrl = 'https://api2.ezijing.com/'
-  conf.apiKey = 'jOYRA5oMFqjwvPGjssRf7cpo25vV3ENt'
+  conf.apiKey = 'mwLyCymyEVCcKTn7nKDjYIMPBwScbugX'
   conf.host = 'lms-api2.ezijing.com'
+  // conf.host = 'docker-lms-api.ezijing.com'
 } else if (state === 'production') {
   conf.agentApiUrl = 'https://zapi.ezijing.com/'
   conf.apiKey = 'jOYRA5oMFqjwvPGjssRf7cpo25vV3ENt'