Merge branch 'dev-coursedetail-0817' of...

Merge branch 'dev-coursedetail-0817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam into dev-coursedetail-0817

src/components/business/cell-list-detail-share.vue

@@ -75,7 +75,7 @@ import MergeTitle from "@/components/business/merge-title";
 import NoMoreContent from "@/components/business/no-more-content";
 import { Collapse, CollapseItem, Dialog, Toast  } from 'vant';
 import { mapGetters } from "vuex";
-import { getAppVersion, getWebPageUrl } from "@/utils";
+import { getAppVersion, getWebPageUrl, isWeiXin } from "@/utils";
 import vueFilters from '@/utils/filter';
 const actionMap = {
   11: "去考试",
@@ -165,7 +165,6 @@ export default {
     // 如果是考试，将根据appVersion判断是新考试还是老考试，如果是301或之前的，都是老考试
     gotoExamOrCourse(item, contentList, index, trySee) {
       this.$parent.$refs.tcPlayerRef && this.$parent.$refs.tcPlayerRef.pause();
-
       if(!this.logged) {
         if(item.type == 1) {
           Toast('请前往云鹊医APP参加考试');
@@ -186,7 +185,8 @@ export default {
       let logId = null;
       if (item.useFlag == 2) {
         if(item.type == 1) {
-          Toast('尚未完成所有课程学习');
+          // Toast('尚未完成所有课程学习');
+          Toast('请前往云鹊医APP参加考试');
         } else if(item.type == 2){
           Toast('尚未完成相关考试');
         }
@@ -207,58 +207,12 @@ export default {
       // });
     },
 
-    // 如果此模块中没有考试，则直接退出；否则
-    // 查看课程是否是最后一节课， 如果是，则要查找到相应的考试，并传递给原生端
-    beforeGotoCourse(item, contentList, index) {
-      let extendsParam = [];
-      let hasExam = false;
-      let currentExam = {};
-      // 查找当前课程后面的有没有考试
-      for(let i = index; i < contentList.length; i ++) {
-        // if(contentList[i].type == 1 && contentList[i].status != 14) {
-        if(contentList[i].type == 1 && contentList[i].id) {
-          hasExam = true;
-          currentExam = contentList[i];
-          break;
-        }
-      }
-
-      // 如果后面没有考试，则直接退出
-      if(!hasExam) return extendsParam;
-
-      let hasNoLearningCourse = false;
-      // 查找本模块中是否还有没有学习完的课程，排除当前这个
-      for(let j = 0; j < contentList.length; j ++) {
-        if(j == index) continue;
-        if(contentList[j].type == 2 && (contentList[j].status == 21 || contentList[j].status == 22)) {
-          hasNoLearningCourse = true;
-          break;
-        }
-      }
-
-      // 如果还有课程没有学完，则直接退出
-      if(hasNoLearningCourse) return extendsParam;
-
-      // let urlType = currentExam.urlType;
-      // let jumpUrl = currentExam.url;
-      // let jumpContent = '';
-      // let examType = 0;
-      // // (已经与后台约定只判断链接)如果有链接，则要加入相应参数
-      // if(jumpUrl) {
-      //   examType = urlType;
-      //   jumpContent = jumpUrl;
-      // } else {
-      //   examType = -1;
-      //   jumpContent = currentExam.id;
-      // }
-      extendsParam.push({key: "examType", value: -1, type: 4, seqNo: 1});
-      extendsParam.push({key: "jumpContent", value: currentExam.id, type: 4, seqNo: 1});
-
-      return extendsParam;
-    },
-
     // 跳转到课程
     gotoCourse: function(item, contentList, index, trySee) {
+      if(!isWeiXin()) {
+        Toast('请前往云鹊医APP学习课程');
+        return;
+      }
       let token = localStorage.getItem('token');
       let jumpUrl = getWebPageUrl(`profexam/#/course-detail?courseId=${item.id}&projectId=${this.projectId}&token=${token}`);
       window.location.href = jumpUrl;

src/utils/index.js

@@ -74,47 +74,47 @@ export function parseTime(time, cFormat) {
 
 // 获取APP版本号（数值型）
 export function getAppVersion(appVersion) {
-  if(!appVersion) return 200;
+  if (!appVersion) return 200;
   return appVersion.split('.').join('')
 }
 
-export function setEventByModuleCode(itemData){
+export function setEventByModuleCode(itemData) {
   let modeCode = itemData.appModuleInfo.code || '';
   let paramList = itemData.appModuleInfo.paramList ? itemData.appModuleInfo.paramList : ''
-  if( modeCode === 'M001' || modeCode === 'M002' || modeCode === 'M003') {
-      paramList = ''
-  }else if( modeCode === 'M100' || modeCode === 'M300' ) {
+  if (modeCode === 'M001' || modeCode === 'M002' || modeCode === 'M003') {
+    paramList = ''
+  } else if (modeCode === 'M100' || modeCode === 'M300') {
 
     let urlPara = getUrlParmByCode(paramList);
     paramList[0] && (paramList[0].value += urlPara);
 
-  }else if( modeCode === 'M400') {
+  } else if (modeCode === 'M400') {
 
-      let path = paramList[0]['key'];
-      let v = paramList[0]['value'];
-      let query = setRouterParm(paramList);
+    let path = paramList[0]['key'];
+    let v = paramList[0]['value'];
+    let query = setRouterParm(paramList);
   }
-  if(typeof paramList === 'string' && !paramList){
-      paramList = []
+  if (typeof paramList === 'string' && !paramList) {
+    paramList = []
   }
 
   return paramList;
 }
 
 function getUrlParmByCode(paramList) {
-    if ( paramList.length <= 1) {
-        return ''
-    }
-    let dataStr = ''
-    let list = [];
-    for( let i = 1; i < paramList.length; i ++) {
-        list.push(paramList[i].key + '=' + paramList[i].value)
-    }
-    dataStr = list.join('&')
-    if (dataStr !== '') {
-        return '?' + dataStr
-    }
+  if (paramList.length <= 1) {
     return ''
+  }
+  let dataStr = ''
+  let list = [];
+  for (let i = 1; i < paramList.length; i++) {
+    list.push(paramList[i].key + '=' + paramList[i].value)
+  }
+  dataStr = list.join('&')
+  if (dataStr !== '') {
+    return '?' + dataStr
+  }
+  return ''
 }
 
 export function deepCopy(obj) {
@@ -131,13 +131,13 @@ export function deepCopy(obj) {
   return result;
 }
 
-export function mergeObjs(...ojbs){
+export function mergeObjs(...ojbs) {
 
 }
 
 // 跳转：在App中使用原生跳转，在浏览器中使用本地路由跳转
 export function gotoPage(context, pageUrl) {
-  if(__isWeb) {
+  if (__isWeb) {
     context.$router.push(pageUrl)
     // context.$router.push({path: pageUrl, query: query});
   } else {
@@ -192,3 +192,13 @@ export function preLoadImg(url) {
     img.src = url;
   })
 }
+
+// 判断是否是微信浏览器
+export function isWeiXin() {
+  var ua = window.navigator.userAgent.toLowerCase();
+  if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+    return true;
+  } else {
+    return false;
+  }
+}
\ No newline at end of file

src/views/share-merge-detail.vue

@@ -99,7 +99,7 @@
       <div v-if="detailNum <= 9" class="no-more-bottom"></div>
     </div>
 
-    <div style="padding-top: 20px"></div>
+    <div v-if="!hasBindCard" style="padding-top: 60px"></div>
     <!-- <div v-if="!hasBindCard && !isWeb" style="padding-top: 30px"></div> -->
 
     <!-- <BindCardButton
@@ -1024,6 +1024,6 @@ export default {
 .no-more-bottom {
   position: relative;
   width: 100%;
-  height: 40px;
+  height: 0;
 }
 </style>