add:8/17

src/axios.js

@@ -3,8 +3,8 @@ import store from './store'
 import { Message } from 'element-ui'
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test
-// export const BASE_URL = 'https://test.xyyxt.net'   //预发布
-export const BASE_URL = 'http://192.168.1.24:5055'    //dev
+export const BASE_URL = 'https://test.xyyxt.net'   //预发布
+// export const BASE_URL = 'http://192.168.1.24:5055'    //dev
 // export const BASE_URL = 'http://120.79.166.78:19012'    //测试-外网
 export const tenantId = '867735392558919680'
 

src/components/header/index.vue

@@ -51,26 +51,32 @@
           </div>
         </a> -->
         <el-tooltip
-          placement="bottom"
-          effect="light"
+          placement="bottom-end"
           v-model="msgShow"
           :hide-after="0"
           manual
+          popper-class="tooltipStyle"
         >
-          <el-badge :is-dot="msgCount > 0 ? true : false" class="item">
+          <el-badge
+            :is-dot="msgCount > 0 ? true : false"
+            class="item"
+            style="vertical-align: baseline"
+          >
             <el-button
-              style="font-size: 18px; padding: 0px"
+              style="font-size: 20px; padding: 0px"
               icon="el-icon-message-solid"
               type="text"
               @click="go('/person-center/my-message')"
             ></el-button>
           </el-badge>
-          <div slot="content">
-            {{ msgData.text }}
-            <div>
-              <el-button type="text" @click="newGoToStudy">立即学习</el-button
-              ><el-button type="text" @click="clearMsg">关闭</el-button>
-            </div>
+          <div slot="content" class="dis_plays">
+            <p style="max-width: 247px">{{ msgData.text }}</p>
+            <div class="toolbth" @click="newGoToStudy">立即学习</div>
+            <i
+              style="font-size: 18px; cursor: pointer"
+              class="el-icon-close"
+              @click="clearMsg"
+            ></i>
           </div>
         </el-tooltip>
         <el-dropdown @command="handleCommand">
@@ -315,64 +321,66 @@ export default {
             //   });
             //   return;
             // }
-            if (
-              this.sysTime <= items.serviceStartTime ||
-              this.sysTime >= items.serviceEndTime
-            ) {
-              this.$message({
-                type: "warning",
-                message: "不在学习服务期，不能进入学习",
-              });
-              return;
-            }
+            if (items.goodsType !== 6) {
+              if (
+                this.sysTime <= items.serviceStartTime ||
+                this.sysTime >= items.serviceEndTime
+              ) {
+                this.$message({
+                  type: "warning",
+                  message: "不在学习服务期，不能进入学习",
+                });
+                return;
+              }
 
-            if (
-              (items.classStartTime && this.sysTime <= items.classStartTime) ||
-              (items.classEndTime && this.sysTime >= items.classEndTime)
-            ) {
-              this.$message({
-                type: "warning",
-                message: "不在班级有效期，不能进入学习",
-              });
-              return;
-            }
+              if (
+                (items.classStartTime &&
+                  this.sysTime <= items.classStartTime) ||
+                (items.classEndTime && this.sysTime >= items.classEndTime)
+              ) {
+                this.$message({
+                  type: "warning",
+                  message: "不在班级有效期，不能进入学习",
+                });
+                return;
+              }
 
-            if (items.learningStatus == 2) {
-              this.$message({
-                type: "warning",
-                message: "开放学习时间待定，不能进入学习",
-              });
-              return;
-            }
+              if (items.learningStatus == 2) {
+                this.$message({
+                  type: "warning",
+                  message: "开放学习时间待定，不能进入学习",
+                });
+                return;
+              }
 
-            if (items.classStatus == 0) {
-              this.$message({
-                type: "warning",
-                message: "尚未开班，不能进入学习",
-              });
-              return;
-            }
-            if (
-              items.learningStatus == 3 &&
-              this.sysTime < items.learningTimeStart
-            ) {
-              this.$message({
-                type: "warning",
-                message: "不在开放学习时间,不能进入学习",
-              });
-              return;
-            }
+              if (items.classStatus == 0) {
+                this.$message({
+                  type: "warning",
+                  message: "尚未开班，不能进入学习",
+                });
+                return;
+              }
+              if (
+                items.learningStatus == 3 &&
+                this.sysTime < items.learningTimeStart
+              ) {
+                this.$message({
+                  type: "warning",
+                  message: "不在开放学习时间,不能进入学习",
+                });
+                return;
+              }
 
-            let rebuildStatus = await this.courseGoodsRebuildStatus(
-              items.goodsId,
-              items.gradeId
-            );
+              let rebuildStatus = await this.courseGoodsRebuildStatus(
+                items.goodsId,
+                items.gradeId
+              );
 
-            if (rebuildStatus == 0) {
-              this.$refs.rebuildModal.showModal(items);
-              return;
+              if (rebuildStatus == 0) {
+                this.$refs.rebuildModal.showModal(items);
+                return;
+              }
             }
-
             // if (item.educationName == "继续教育") {
             this.$request
               .lockLockStatus({
@@ -469,7 +477,7 @@ export default {
         this.$router.push({
           path: "refresh", //refresh路由地址和当前要刷新路由地址同级即可
         });
-        return
+        return;
       }
       this.$router.push({
         path,
@@ -789,4 +797,30 @@ export default {
 .fade-leave-active {
   transition: all 0.3s;
 }
+.dis_plays {
+  display: flex;
+  align-items: center;
+}
+.toolbth {
+  border-radius: 55px;
+  background-color: #fff;
+  color: #3f8dfd;
+  font-size: 14px;
+  padding: 5px 14px;
+  margin-right: 16px;
+  user-select: none;
+  cursor: pointer;
+}
+</style>
+<style lang="scss">
+.tooltipStyle {
+  background-color: #3f8dfd !important;
+  color: #fff;
+}
+.tooltipStyle .popper__arrow {
+  border-bottom-color: #3f8dfd!important;
+}
+.tooltipStyle .popper__arrow::after {
+  border-bottom-color: #3f8dfd!important;
+}
 </style>

src/pages/home/index.vue

@@ -15,10 +15,10 @@
 
             <el-tooltip
               placement="bottom-end"
-              effect="light"
               v-model="msgShow"
               :hide-after="0"
               manual
+              popper-class="tooltipStyle"
             >
               <el-badge
                 :is-dot="msgCount > 0 ? true : false"
@@ -32,13 +32,14 @@
                   @click="go('/person-center/my-message')"
                 ></el-button>
               </el-badge>
-              <div slot="content">
-                {{ msgData.text }}
-                <div>
-                  <el-button type="text" @click="newGoToStudy"
-                    >立即学习</el-button
-                  ><el-button type="text" @click="clearMsg">关闭</el-button>
-                </div>
+              <div slot="content" class="dis_plays">
+                <p style="max-width: 247px">{{ msgData.text }}</p>
+                <div class="toolbth" @click="newGoToStudy">立即学习</div>
+                <i
+                  style="font-size: 18px;cursor:pointer;"
+                  class="el-icon-close"
+                  @click="clearMsg"
+                ></i>
               </div>
             </el-tooltip>
             <el-dropdown @command="handleCommand">
@@ -770,62 +771,65 @@ export default {
             //   });
             //   return;
             // }
-            if (
-              this.sysTime <= items.serviceStartTime ||
-              this.sysTime >= items.serviceEndTime
-            ) {
-              this.$message({
-                type: "warning",
-                message: "不在学习服务期，不能进入学习",
-              });
-              return;
-            }
+            if (items.goodsType !== 6) {
+              if (
+                this.sysTime <= items.serviceStartTime ||
+                this.sysTime >= items.serviceEndTime
+              ) {
+                this.$message({
+                  type: "warning",
+                  message: "不在学习服务期，不能进入学习",
+                });
+                return;
+              }
 
-            if (
-              (items.classStartTime && this.sysTime <= items.classStartTime) ||
-              (items.classEndTime && this.sysTime >= items.classEndTime)
-            ) {
-              this.$message({
-                type: "warning",
-                message: "不在班级有效期，不能进入学习",
-              });
-              return;
-            }
+              if (
+                (items.classStartTime &&
+                  this.sysTime <= items.classStartTime) ||
+                (items.classEndTime && this.sysTime >= items.classEndTime)
+              ) {
+                this.$message({
+                  type: "warning",
+                  message: "不在班级有效期，不能进入学习",
+                });
+                return;
+              }
 
-            if (items.learningStatus == 2) {
-              this.$message({
-                type: "warning",
-                message: "开放学习时间待定，不能进入学习",
-              });
-              return;
-            }
+              if (items.learningStatus == 2) {
+                this.$message({
+                  type: "warning",
+                  message: "开放学习时间待定，不能进入学习",
+                });
+                return;
+              }
 
-            if (items.classStatus == 0) {
-              this.$message({
-                type: "warning",
-                message: "尚未开班，不能进入学习",
-              });
-              return;
-            }
-            if (
-              items.learningStatus == 3 &&
-              this.sysTime < items.learningTimeStart
-            ) {
-              this.$message({
-                type: "warning",
-                message: "不在开放学习时间,不能进入学习",
-              });
-              return;
-            }
+              if (items.classStatus == 0) {
+                this.$message({
+                  type: "warning",
+                  message: "尚未开班，不能进入学习",
+                });
+                return;
+              }
+              if (
+                items.learningStatus == 3 &&
+                this.sysTime < items.learningTimeStart
+              ) {
+                this.$message({
+                  type: "warning",
+                  message: "不在开放学习时间,不能进入学习",
+                });
+                return;
+              }
 
-            let rebuildStatus = await this.courseGoodsRebuildStatus(
-              items.goodsId,
-              items.gradeId
-            );
+              let rebuildStatus = await this.courseGoodsRebuildStatus(
+                items.goodsId,
+                items.gradeId
+              );
 
-            if (rebuildStatus == 0) {
-              this.$refs.rebuildModal.showModal(items);
-              return;
+              if (rebuildStatus == 0) {
+                this.$refs.rebuildModal.showModal(items);
+                return;
+              }
             }
 
             // if (item.educationName == "继续教育") {
@@ -2124,4 +2128,30 @@ export default {
 /deep/ .el-badge__content.is-fixed {
   top: 7px;
 }
+.dis_plays {
+  display: flex;
+  align-items: center;
+}
+.toolbth {
+  border-radius: 55px;
+  background-color: #fff;
+  color: #3f8dfd;
+  font-size: 14px;
+  padding: 5px 14px;
+  margin-right: 16px;
+  user-select: none;
+  cursor: pointer;
+}
+</style>
+<style lang="scss">
+.tooltipStyle {
+  background-color: #3f8dfd !important;
+  color: #fff;
+}
+.tooltipStyle .popper__arrow {
+  border-bottom-color: #3f8dfd!important;
+}
+.tooltipStyle .popper__arrow::after {
+  border-bottom-color: #3f8dfd!important;
+}
 </style>

src/pages/person-center/index.vue

@@ -116,13 +116,13 @@
                 </router-link>
                 <!-- <router-link to="/person-center/my-examination">
                   <div class="item">我的考试</div>
-                </router-link>
+                </router-link> -->
                 <router-link to="/person-center/my-mock">
                   <div class="item">我的模考</div>
                 </router-link>
                 <router-link to="/person-center/mock-record">
                   <div class="item">模考记录</div>
-                </router-link> -->
+                </router-link>
                 <router-link to="/person-center/my-message">
                   <div class="item">系统消息</div>
                 </router-link>

src/pages/person-center/my-bank/bank-detailCopy/index.vue

@@ -1149,6 +1149,9 @@ export default {
             goodsId: this.goodsId,
           })
           .then((res) => {
+            res.data.sort((a, b) => {
+              return a.sort - b.sort;
+            });
             console.log(res, "res");
             chapter.showList = !chapter.showList;
             chapter.list = res.data;
@@ -1399,7 +1402,7 @@ export default {
         //收藏集
         this.getCollectData();
       } else if (e.name == "-2") {
-        console.log(123123123)
+        console.log(123123123);
         //错题集
         this.getWrongData();
       }

src/pages/person-center/my-course/index.vue

@@ -96,7 +96,9 @@
                             v-if="is.studyDuration && is.durationTime"
                             :show-text="false"
                             :percentage="
-                              (is.studyDuration / is.durationTime) * 100
+                              (is.studyDuration / is.durationTime) * 100 > 100
+                                ? 100
+                                : (is.studyDuration / is.durationTime) * 100
                             "
                           ></el-progress>
                         </el-col>
@@ -174,7 +176,7 @@
                             size="mini"
                             plain
                             type="primary"
-                            style="width: 90px !important;text-align:center;"
+                            style="width: 90px !important; text-align: center"
                             v-else-if="
                               is.liveEndTime > sysTime &&
                               is.liveStartTime < sysTime
@@ -236,7 +238,11 @@
                       <el-progress
                         v-if="i.studyDuration && i.durationTime"
                         :show-text="false"
-                        :percentage="(i.studyDuration / i.durationTime) * 100"
+                        :percentage="
+                          (i.studyDuration / i.durationTime) * 100 > 100
+                            ? 100
+                            : (i.studyDuration / i.durationTime) * 100
+                        "
                       ></el-progress>
                     </el-col>
                     <el-col :span="2">
@@ -306,7 +312,7 @@
                       >
                       <el-button
                         size="mini"
-                        style="width: 90px !important;text-align:center;"
+                        style="width: 90px !important; text-align: center"
                         plain
                         type="primary"
                         v-else-if="
@@ -354,7 +360,9 @@
                     v-if="items.studyDuration && items.durationTime"
                     :show-text="false"
                     :percentage="
-                      (items.studyDuration / items.durationTime) * 100
+                      (items.studyDuration / items.durationTime) * 100 > 100
+                        ? 100
+                        : (items.studyDuration / items.durationTime) * 100
                     "
                   ></el-progress>
                 </el-col>
@@ -427,7 +435,7 @@
                   >
                   <el-button
                     size="mini"
-                    style="width: 90px !important;text-align:center;"
+                    style="width: 90px !important; text-align: center"
                     plain
                     type="primary"
                     v-else-if="
@@ -522,7 +530,7 @@ export default {
   },
   methods: {
     comeStyle(courseItem, item) {
-      console.log(item,"itemitem")
+      console.log(item, "itemitem");
       this.$router.push({
         path: `/my-course-detail/${this.goodsData.goodsId}`,
         query: {
@@ -533,10 +541,10 @@ export default {
           moduleId: item.moduleId,
           sectionId: item.sectionId || item.menuId,
           recordingUrl: item.recordingUrl,
-          liveUrl:item.liveUrl,
+          liveUrl: item.liveUrl,
           sectionType: item.sectionType,
-          liveStartTime:item.liveStartTime,
-          liveEndTime:item.liveEndTime,
+          liveStartTime: item.liveStartTime,
+          liveEndTime: item.liveEndTime,
         },
       });
     },
@@ -822,7 +830,7 @@ export default {
     async studyFunc(courseItem, items) {
       this.sysTime = this.$tools.timest();
       let item = this.goodsData;
-      console.log(item,"学习服务期")
+      console.log(item, "学习服务期");
       if (item.interfaceAccountId > 0) {
         //学习账号已开通
 

src/pages/person-center/my-message/index.vue

@@ -172,6 +172,7 @@
             </div>
           </div>
         </div>
+
         <div
           class="my-message-modal__footer"
           v-if="
@@ -303,6 +304,7 @@ export default {
           this.list = res.rows;
           this.total = res.total;
           this.getreceiptStatus();
+          this.getMsgCount();
         })
         .finally(() => {
           this.listListStatus = true;
@@ -336,6 +338,10 @@ export default {
         case 21:
         case 22:
         case 23:
+        case 28:
+        case 29:
+        case 31:
+        case 32:
           arsty = "立刻学习";
           break;
         case 2:
@@ -378,9 +384,13 @@ export default {
         case 10:
         case 12:
         case 18:
+        case 28:
+        case 29:
+        case 31:
+        case 32:
           //课程
 
-          if (item.goodsType == 1) {
+          if (item.goodsType == 1 || item.goodsType == 6) {
             item.orderGoodsId = this.orderGoodsId;
             this.canJump(item).then((res) => {
               this.$router.push({
@@ -600,6 +610,7 @@ export default {
         } else {
           this.showDetailModal = true;
         }
+        this.getappinformUserlist();
       });
     },
 
@@ -670,64 +681,66 @@ export default {
             //   });
             //   return;
             // }
-            if (
-              this.sysTime <= items.serviceStartTime ||
-              this.sysTime >= items.serviceEndTime
-            ) {
-              this.$message({
-                type: "warning",
-                message: "不在学习服务期，不能进入学习",
-              });
-              return;
-            }
+            if (items.goodsType !== 6) {
+              if (
+                this.sysTime <= items.serviceStartTime ||
+                this.sysTime >= items.serviceEndTime
+              ) {
+                this.$message({
+                  type: "warning",
+                  message: "不在学习服务期，不能进入学习",
+                });
+                return;
+              }
 
-            if (
-              (items.classStartTime && this.sysTime <= items.classStartTime) ||
-              (items.classEndTime && this.sysTime >= items.classEndTime)
-            ) {
-              this.$message({
-                type: "warning",
-                message: "不在班级有效期，不能进入学习",
-              });
-              return;
-            }
+              if (
+                (items.classStartTime &&
+                  this.sysTime <= items.classStartTime) ||
+                (items.classEndTime && this.sysTime >= items.classEndTime)
+              ) {
+                this.$message({
+                  type: "warning",
+                  message: "不在班级有效期，不能进入学习",
+                });
+                return;
+              }
 
-            if (items.learningStatus == 2) {
-              this.$message({
-                type: "warning",
-                message: "开放学习时间待定，不能进入学习",
-              });
-              return;
-            }
+              if (items.learningStatus == 2) {
+                this.$message({
+                  type: "warning",
+                  message: "开放学习时间待定，不能进入学习",
+                });
+                return;
+              }
 
-            if (items.classStatus == 0) {
-              this.$message({
-                type: "warning",
-                message: "尚未开班，不能进入学习",
-              });
-              return;
-            }
-            if (
-              items.learningStatus == 3 &&
-              this.sysTime < items.learningTimeStart
-            ) {
-              this.$message({
-                type: "warning",
-                message: "不在开放学习时间,不能进入学习",
-              });
-              return;
-            }
+              if (items.classStatus == 0) {
+                this.$message({
+                  type: "warning",
+                  message: "尚未开班，不能进入学习",
+                });
+                return;
+              }
+              if (
+                items.learningStatus == 3 &&
+                this.sysTime < items.learningTimeStart
+              ) {
+                this.$message({
+                  type: "warning",
+                  message: "不在开放学习时间,不能进入学习",
+                });
+                return;
+              }
 
-            let rebuildStatus = await this.courseGoodsRebuildStatus(
-              items.goodsId,
-              items.gradeId
-            );
+              let rebuildStatus = await this.courseGoodsRebuildStatus(
+                items.goodsId,
+                items.gradeId
+              );
 
-            if (rebuildStatus == 0) {
-              this.$refs.rebuildModal.showModal(items);
-              return;
+              if (rebuildStatus == 0) {
+                this.$refs.rebuildModal.showModal(items);
+                return;
+              }
             }
-
             // if (item.educationName == "继续教育") {
             this.$request
               .lockLockStatus({

src/pages/person-center/my-order/index.vue

@@ -50,7 +50,7 @@
                   </div>
                   <div class="text">
                     <div class="title">{{ items.goodsName }}</div>
-                    <div class="desc">
+                    <div class="desc" v-if="item.orderFrom !== 6">
                       应付金额：
                       <span class="note">￥{{ items.goodsRealPrice }}</span>
                     </div>
@@ -77,7 +77,7 @@
                 </div>
               </div>
               <div class="price-wrap">
-                <div class="btns">
+                <div class="btns" v-if="item.orderFrom !== 6">
                   <div class="price-text">实付金额</div>
                   <div class="price-number">￥{{ item.payPrice }}</div>
                 </div>