课程换成产品

src/layouts/header/index.vue

@@ -22,7 +22,8 @@
 
       <div class="right">
         <template v-if="token || serverToken">
-          <el-popover placement="top"
+          <el-popover v-if="!isIndex"
+                      placement="top"
                       :disabled="!notices.length">
             <p v-for="(item, i) in notices"
                :key="i"
@@ -150,7 +151,7 @@ export default {
     },
     initSocket ({ id, account }) {
       // 实例化socket
-      this.socket = new WebSocket(`wss://${Setting.isDev ? '192.168.31.51' : location.host}/nakadai/websocket/${id}/${account}`)
+      this.socket = new WebSocket(`wss://${Setting.isDev ? '121.37.12.51' : location.host}/nakadai/websocket/${id}/${account}`)
       // this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`)
       // 监听socket连接
       this.socket.onopen = this.open;
@@ -172,12 +173,13 @@ export default {
     // 前往评论列表
     async toComment (item) {
       await this.$post(`${this.api.noticeRead}?isRead=1&notifyId=${item.notifyId}`) // 该通知置为已读
+      this.getNotice()
       this.$router.push(`/station/preview?courseId=${item.cid}&commentId=${item.commentId}&notifyId=${item.notifyId}`)
     },
     // 获取用户信息
     getUserInfo () {
       this.$get(this.api.queryUserInfoDetails).then(res => {
-        this.initSocket(res.result.userAccount)
+        this.isIndex || this.initSocket(res.result.userAccount)
         const { userAvatars, userName, userId } = res.result.hrUserInfo || {}
         userAvatars && this.setAvatar(userAvatars);
         this.setUserId(userId)

src/pages/ass/list/index.vue

@@ -37,14 +37,14 @@
         <li>
           <label>课程名称：</label>
           <el-select size="small"
-                     v-model="form.curriculumId"
+                     v-model="form.mallId"
                      @change="initData">
             <el-option label="不限"
                        value=""></el-option>
             <el-option v-for="(item,index) in courseList"
                        :key="index"
-                       :label="item.sysName"
-                       :value="item.sysId"></el-option>
+                       :label="item.goodsName"
+                       :value="item.mallId"></el-option>
           </el-select>
         </li>
         <li>
@@ -93,7 +93,7 @@
             {{ scope.$index + (page - 1) * pageSize + 1 }}
           </template>
         </el-table-column>
-        <el-table-column prop="sysName"
+        <el-table-column prop="goodsName"
                          label="课程名称"
                          align="center"
                          show-overflow-tooltip></el-table-column>
@@ -234,7 +234,7 @@ export default {
         startTime: "",
         endTime: "",
         status: "",
-        curriculumId: "",
+        mallId: "",
         classId: ""
       },
       dateList: [

src/pages/station/preview/index.vue

@@ -157,8 +157,8 @@
       <div class="tab-content">
         <div v-if="active === 1"
              class="page">
-          <p class="intro"
-             v-html="briefIntroduction"></p>
+          <div class="des"
+               v-html="briefIntroduction"></div>
         </div>
         <div v-if="active === 2"
              class="page">
@@ -208,15 +208,13 @@
                                 :key="i">
                 <p class="sign">{{ item.createTime }}</p>
                 <div class="ver">
-                  <div>
-                    {{ item.noteName }}
-                    <span class="action">
-                      <i class="el-icon-edit-outline"
-                         @click="editNote(item)"></i>
-                      <i class="el-icon-delete"
-                         @click="delNote(item)"></i>
-                    </span>
-                  </div>
+                  {{ item.noteName }}
+                  <span class="action">
+                    <i class="el-icon-edit-outline"
+                       @click="editNote(item)"></i>
+                    <i class="el-icon-delete"
+                       @click="delNote(item)"></i>
+                  </span>
                 </div>
                 <div class="des"
                      v-html="item.noteContent"></div>
@@ -256,7 +254,7 @@
                   <i class="icon el-icon-chat-dot-square"
                      @click="showReplay(item)"></i>
                   <!-- 当前用户是管理员 || 当前用户的account==该条评论的创建人accountId -->
-                  <i v-if="item.currentRoleName.includes('管理员') || item.currentAccountId == item.createAccountId"
+                  <i v-if="(item.currentRoleName && item.currentRoleName.includes('管理员')) || item.currentAccountId == item.createAccountId"
                      class="icon el-icon-delete"
                      @click="delComment(item)"></i>
                   <!-- <div class="like-wrap"
@@ -310,7 +308,7 @@
                       <i class="icon el-icon-chat-dot-square"
                          @click="showReplay(reply)"></i>
                       <!-- 当前用户是管理员 || 当前用户的account==该条评论的创建人accountId -->
-                      <i v-if="reply.currentRoleName.includes('管理员') || reply.currentAccountId == reply.createAccountId"
+                      <i v-if="(reply.currentRoleName && reply.currentRoleName.includes('管理员')) || reply.currentAccountId == reply.createAccountId"
                          class="icon el-icon-delete"
                          @click="delComment(reply)"></i>
                       <!-- <div class="like-wrap"
@@ -578,11 +576,11 @@ export default {
     // 查询是否过期
     getStatus () {
       this.$get(this.api.whetherToRenewTheFee, {
-        cid: this.courseId
+        mallId: this.mallId
       }).then(({ isRenew }) => {
         // 1正常显示资源，0显示续费
         this.overdue = isRenew
-        this.getChapter(1)
+        this.getChapter()
         this.getProgress()
       }).catch(res => { })
     },
@@ -679,7 +677,6 @@ export default {
         this.$nextTick(async () => {
           if (this.curReplyId) {
             const el = document.querySelector('#comment' + this.curReplyId)
-            console.log("🚀 ~ file: index.vue:681 ~ this.$nextTick ~ el:", el)
             el && el.scrollIntoView(false)
           }
           if (this.commentId) {
@@ -971,9 +968,7 @@ export default {
       let userName = window.btoa(encodeURIComponent(this.userName));
       if (systemId == 11) {
         // 银行系统
-        sessionStorage.removeItem('projectId')
-        sessionStorage.removeItem('submited')
-        location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true`
+        location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true`
       } else if (systemId == 12) {
         // 众筹系统
         window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1`);
@@ -1001,10 +996,12 @@ $height: 700px;
     border: 0;
 }
 .page {
-    .intro {
-        font-size: 14px;
-        color: #333;
-        line-height: 24px;
+    /deep/.des {
+        div,
+        p,
+        span {
+            font-family: PingFangSC-Regular !important;
+        }
     }
 }
 .l-title {

src/setting.js

@@ -28,7 +28,7 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    // host = "http://192.168.31.152:9000/"; // 榕
+    host = "http://192.168.31.152:9000/"; // 榕
     // host = "http://192.168.31.51:9000/"; // 赓
 }
 

src/styles/page/station.scss

@@ -121,7 +121,7 @@
         align-items: center;
         padding-bottom: 10px;
         margin: -22px 0 20px;
-        font-size: 18px;
+        font-size: 20px;
         color: #007eff;
         border-bottom: 1px dashed #bfbfbf;
     }