fix: 1、商品专题页弹窗页面布局和咨询电话从接口获取 2、学习页双师制点击老师名称 3、考试成绩页相关推荐的接口新增参数

src/axios.js

@@ -1,9 +1,9 @@
 import axios from 'axios'
 import store from './store'
 import { Message } from 'element-ui'
-// export const BASE_URL = 'https://api.xyyxt.net'   //release
+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 = 'https://test.xyyxt.net'   //预发布
 // export const BASE_URL = 'http://192.168.1.7:5055'    //dev
 // export const BASE_URL = 'http://192.168.1.24:5055'    //dev
 // export const BASE_URL = 'http://120.79.166.78:19012'    //测试-外网
@@ -13,8 +13,8 @@ export const tenantId = '867735392558919680'
 
 
 //图片上传api
-// export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
-export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
+export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
+// export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 import tools from './common/tools'
 import router from './router'

src/common/tools.js

@@ -128,6 +128,7 @@ export default {
 	 * @returns {*}
 	 */
 	timestampToTime(timestamp, isDay = true,hasChinese) {
+		console.log('timestampToTime---', timestamp)
 		var date = new Date(timestamp * 1000); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
 		var Y = date.getFullYear() + (hasChinese ? '' : '-');
 		var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + (hasChinese ? '' : '-');

src/pages/bank-report/index.vue

@@ -250,6 +250,7 @@ export default {
                 examId: this.examId,
                 pageNum: this.pageNum,
                 pageSize: this.pageSize,
+                platform: 2,
             }
         }).then((res) => {
             if (res.code == 200) {

src/pages/course-report/index.vue

@@ -175,6 +175,7 @@ export default {
                 examId: this.examId,
                 pageNum: this.pageNum,
                 pageSize: this.pageSize,
+                platform: 2,
             }
         }).then((res) => {
             if (res.code == 200) {

src/pages/goods-detail/course-detail.vue

@@ -1562,15 +1562,15 @@ export default {
     switchTeacher(data, index, tindex){
       this.States[tindex] = index
       this.teaIndex = index
-        console.log(data,'data');
+        console.log(data,'data',index, tindex);
         this.goodsTeacher.forEach((item,index) => {
             if(item.teaList && item.teaList.length > 0){
                let list = item.teaList.filter(x => x.aliasName == data.aliasName)
                if(list && list.length > 0){
                   item.courseList.forEach((course,courseIndex) => {
                       if(course.courseId == data.courseId){
-                        console.log(index,'index');
-                         console.log(courseIndex,'courseIndex');
+                        // console.log(index,'index');
+                        //  console.log(courseIndex,'courseIndex');
                         this.$set(this.goodsTeacher[index].courseList[courseIndex],"show",1)
                       }else{
                         this.$set(this.goodsTeacher[index].courseList[courseIndex],"show",0)

src/pages/goodsTopic/components/buyDialog.vue

@@ -71,7 +71,6 @@ export default {
     watch: {
         buyModal(newV, oldV) {
             if (newV) {
-                console.log('监听')
                 this.getDetail()
             }
         },
@@ -109,7 +108,6 @@ export default {
                 } else {
                     this.$message.warning(res.msg)
                 }
-                console.log('---courseSku： ', this.courseSku)
                 this.loading = false
             }).catch(err => {
                 this.loading = false
@@ -194,7 +192,9 @@ export default {
         }
     }
     .check_con {
+        width: 100%;
         display: flex;
+        flex-wrap: wrap;
         .course_items {
             min-width: 190px;
             padding: 13px 16px;

src/pages/goodsTopic/components/catalogue.vue

@@ -215,24 +215,32 @@
                                         </div>
                                     </div>
                                     <div class="down_bottons">
-                                        <div class="ask_manage" @click="toAskManage()">咨询管理</div>
-                                        <div class="ask_manage ask_buy" @click="togoBuy()">立即购买</div>
-                                        <div v-if="showAsk" class="apply_ask">
-                                            <div class="ask_titles">报名咨询</div>
-                                            <div class="ask_time">周一至周日 9:00-18:00</div>
-                                            <div class="phones">
-                                                <img class="icon_phone" src="@/assets/topic/ask_phone.png" alt="" />
-                                                <span>020-87085983</span>
+                                        <!-- <div class="asks">
+                                            <div class="ask_manage" @click="toAskManage()">咨询管理</div>
+                                            <div class="apply_ask">
+                                                <div class="ask_titles">报名咨询</div>
+                                                <div class="ask_time">{{ header.serviceTel.time }}</div>
+                                                <div class="phones" v-for="(item, index) in getTel(header.serviceTel.tel)" :key="index">
+                                                    <img class="icon_phone" src="@/assets/topic/ask_phone.png" alt="" />
+                                                    <span>{{ item }}</span>
+                                                </div>
                                             </div>
-                                            <div class="phones">
-                                                <img class="icon_phone" src="@/assets/topic/ask_phone.png" alt="" />
-                                                <span>020-87085982</span>
+                                        </div> -->
+                                        <el-popover placement="top" width="202" trigger="hover">
+                                            <div class="apply_ask">
+                                                <div class="ask_titles">报名咨询</div>
+                                                <div class="ask_time">{{ header.serviceTel.time }}</div>
+                                                <div class="phones" v-for="(item, index) in getTel(header.serviceTel.tel)" :key="index">
+                                                    <img class="icon_phone" src="@/assets/topic/ask_phone.png" alt="" />
+                                                    <span>{{ item }}</span>
+                                                </div>
                                             </div>
-                                            <div class="phones">
-                                                <img class="icon_phone" src="@/assets/topic/ask_phone.png" alt="" />
-                                                <span>13631379636</span>
+                                            <div slot="reference">
+                                                <div class="ask_manage" @click="toAskManage()">咨询管理</div>
                                             </div>
-                                        </div>
+                                        </el-popover>
+                                        <div class="ask_buy" @click="togoBuy()">立即购买</div>
+                                        
                                     </div>
                                 </template>
                             </el-tab-pane>
@@ -250,6 +258,7 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex"
 import buyDialog from './buyDialog.vue'
 export default {
     name: 'boxs',
@@ -310,13 +319,18 @@ export default {
     watch: {
         async goodsId(newV, oldV) {
             if (newV) {
-                console.log('监听', this.topicId)
                 await this.getGoodsDetail()
                 this.goodsCourseList()
             }
         }
     },
+    computed: {
+        ...mapGetters(["header"]),
+    },
     methods: {
+        getTel(tel) {
+            return tel ? tel.split(";") : []
+        },
         toAskManage() {
             this.showAsk = !this.showAsk
         },
@@ -814,7 +828,7 @@ export default {
 
                         &__item {
                             padding-top: 10px;
-                            padding-bottom: 10px;
+                            // padding-bottom: 10px;
                             font-size: 14px;
                             color: #fff;
                             &__text {
@@ -829,7 +843,7 @@ export default {
 
                         &__item {
                             padding-top: 10px;
-                            padding-bottom: 10px;
+                            // padding-bottom: 10px;
                             font-size: 14px;
                             display: flex;
                             color: #3f8dfd;
@@ -865,68 +879,53 @@ export default {
     width: 404px;
     height: 44px;
     display: flex;
-    position: relative;
-    top: 0px;
-    left: 0px;
-    .ask_manage {
-        width: 202px;
-        height: 44px;
-        background: #1B2632;
-        font-size: 16px;
-        font-weight: 500;
-        color: #FFFFFF;
-        line-height: 44px;
-        text-align: center;
-        cursor: pointer;
+    align-items: center;
+}
+.ask_manage, .ask_buy {
+    width: 202px;
+    height: 44px;
+    background: #1B2632;
+    font-size: 16px;
+    font-weight: 500;
+    color: #FFFFFF;
+    line-height: 44px;
+    text-align: center;
+    cursor: pointer;
+}
+.ask_buy {
+    background: #3F8DFD;
+}
+
+.apply_ask {
+    display: block;
+    width: 173px;
+    // height: 196px;
+    background: #FFFFFF;
+    border-radius: 2px;
+    padding: 20px;
+    .ask_titles {
+        font-size: 14px;
+        font-weight: bold;
+        color: #222222;
     }
-    .ask_buy {
-        background: #3F8DFD;
+    .ask_time {
+        font-size: 12px;
+        color: #999999;
+        margin: 3px 0px 21px 0px;
     }
-    .apply_ask {
-        width: 173px;
-        height: 196px;
-        background: #FFFFFF;
-        border: 1px solid #CCCCCC;
-        border-radius: 2px;
-        padding: 20px;
-        position: absolute;
-        top: -213px;
-        left: 17px;
-        .ask_titles {
+    .phones {
+        margin-bottom: 21px;
+        display: flex;
+        align-items: center;
+        .icon_phone {
+            width: 16px;
+            height: 16px;
+            margin-right: 12px;
+        }
+        >span {
             font-size: 14px;
-            font-weight: bold;
             color: #222222;
         }
-        .ask_time {
-            font-size: 12px;
-            color: #999999;
-            margin: 3px 0px 21px 0px;
-        }
-        .phones {
-            margin-bottom: 21px;
-            display: flex;
-            align-items: center;
-            .icon_phone {
-                width: 16px;
-                height: 16px;
-                margin-right: 12px;
-            }
-            >span {
-                font-size: 14px;
-                color: #222222;
-            }
-        }
-        &::after {
-            content: '';
-            width: 0;
-            height: 0;
-            border-top: 14px solid #fff;
-            border-right: 12px solid transparent;
-            border-left: 12px solid transparent;
-            position: absolute;
-            bottom: -10px;
-            left: 72px;
-        }
     }
 }
 // 老师名称样式

src/pages/mock-report/index.vue

@@ -10,6 +10,7 @@
       >
         <div class="container section__top">
           <div class="text">
+            {{ subscribeInfo.liveStartTime}}
             模考讲解直播将在{{
               $tools.timestampToTime(subscribeInfo.liveStartTime, false, true)
             }}开始，开启模考讲解直播提醒,不错过每一个考点
@@ -23,7 +24,7 @@
       <template v-else>
         <div
           class="container section__top"
-          v-if="subscribeInfo.liveSubscribe == 0"
+          v-if="subscribeInfo.liveSubscribe == 0 && subscribeInfo.liveStartTime"
         >
           <div class="text">
             模考讲解直播将在{{
@@ -42,7 +43,7 @@
 
         <div
           class="container section__top"
-          v-if="subscribeInfo.liveSubscribe == 1"
+          v-if="subscribeInfo.liveSubscribe == 1 && subscribeInfo.liveStartTime"
         >
           <div class="text">
             模考讲解直播将在{{
@@ -309,6 +310,7 @@ export default {
     ...mapGetters(["examResult", "sysTime"]),
   },
   async mounted() {
+    console.log('sysTime', this.sysTime)
     this.eachExamId = this.$route.query.eachExamId;
     this.examId = this.$route.query.examId;
     this.recordId = this.$route.query.recordId;
@@ -330,6 +332,7 @@ export default {
                 examId: this.examId,
                 pageNum: this.pageNum,
                 pageSize: this.pageSize,
+                platform: 2,
             }
         }).then((res) => {
             if (res.code == 200) {

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

@@ -58,8 +58,8 @@
             <span class="iconStyle">课</span>
             <span class="titles">{{ item.courseName }}</span>
             <div v-if="courseItem.teaList && courseItem.teaList.length > 0" class="teacher_names">
-              <div v-for="(tea, lindex) in courseItem.teaList" :key="lindex + 'three'" class="names"
-                :class="{nactive: States[teacherIndex] = lindex}" @click="switchTeacher(tea, lindex, teacherIndex)">
+              <div v-for="(tea, lindex) in courseItem.teaList" :key="lindex + 'three'" class="names" :class="{nactive: States[teacherIndex] == lindex}"
+                 @click="switchTeacher(tea, lindex, teacherIndex)">
                 {{ tea.aliasName }}
               </div>
             </div>
@@ -606,6 +606,7 @@
           </template>
         </div>
         </div>
+
       </div>
       </div>
     </div>
@@ -710,6 +711,7 @@ export default {
     // },
   },
   mounted() {
+    console.log('States-----', this.States)
     this.getRecord();
     this.sysTime = this.$tools.timest();
   },
@@ -778,7 +780,7 @@ export default {
             this.$request.courseTeacherList({
                goodsId: item.goodsId
             }).then((res1) => {
-              console.log(res1,'res1');
+              // console.log(res1,'res1');
               if(res1.data && res1.data.length > 0){
                   //课程老师模板
                   let teacherTel = res1.data;
@@ -835,9 +837,10 @@ export default {
                   data.courseList.push(item)
                   this.goodsTeacher.push(data)
                 })
-                console.log(this.goodsTeacher,'this.goodsTeacher');
               }
-            })   
+              console.log(this.goodsTeacher,'this.goodsTeacher')
+            })
+
             this.courseList = res.rows;
             array = this.uniqueFunc(array, "id");
             array.unshift({
@@ -856,7 +859,7 @@ export default {
     },
     //切换老师
     switchTeacher(data, index, teacherIndex){
-        console.log(data,'data',  index, teacherIndex);
+        // console.log(data,'data',  index, teacherIndex);
         this.States[teacherIndex] = index
         this.teaIndex = index
         this.goodsTeacher.forEach((item,index) => {
@@ -865,8 +868,8 @@ export default {
                if(list && list.length > 0){
                   item.courseList.forEach((course,courseIndex) => {
                       if(course.courseId == data.courseId){
-                        console.log(index,'index');
-                         console.log(courseIndex,'courseIndex');
+                        // console.log(index,'index');
+                        //  console.log(courseIndex,'courseIndex');
                         this.$set(this.goodsTeacher[index].courseList[courseIndex],"show",1)
                       }else{
                         this.$set(this.goodsTeacher[index].courseList[courseIndex],"show",0)