Merge branch 'dev-coursedetail-0817' into release

* dev-coursedetail-0817:
  数据埋点及样式调整

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

@@ -39,7 +39,7 @@
                 </span>
                <span
                   v-else-if="!hasBindCard && item.type == 2 && cmeType == 2"
-                  @click="gotoExamOrCourse(item)"
+                  @click="gotoExamOrCourse(item, 'sk')"
                   class="text-action"
                   style="background: #f28662;border: none;color: #fff;"
                 >
@@ -166,7 +166,12 @@ export default {
   methods: {
     // 跳转到考试或课程 type 1: 考试;  2: 课程
     // 如果是考试，将根据appVersion判断是新考试还是老考试，如果是301或之前的，都是老考试
-    gotoExamOrCourse(item) {
+    gotoExamOrCourse(item, type) {
+      if(type == 'sk') {
+        this.$sendBuriedData({
+          component_tag: `883#88316#${item.id}#${item.name}`
+        });      
+      }
       if(!isWeiXin()) {
         if(item.type == 1) {
           Toast('请前往云鹊医APP参加考试');
@@ -270,7 +275,12 @@ export default {
     },
 
     // 弹框提示
-    toastToBuy() {
+    toastToBuy(item) {
+      if(item) {
+        this.$sendBuriedData({
+          component_tag: `883#88315#${item.id}#${item.name}`
+        });
+      }
       Toast('购买后可学习课程');
     }
   }

src/components/cme/bind-card-button-share.vue

@@ -31,6 +31,9 @@ export default {
   },
   methods: {
     download() {
+      this.$sendBuriedData({
+        component_tag: `883#88317`
+      });
       window.location.href =
         "https://a.app.qq.com/o/simple.jsp?pkgname=com.picahealth.yunque";
     },

src/components/common/common-navbar.vue

@@ -116,6 +116,9 @@ export default {
 
     // 生成分享的url
     goShare() {
+      this.$sendBuriedData({
+        component_tag: `883#88309`
+      });      
       let _this = this;
       let videoUrl = this.$route.query.videoUrl || '';
       let info = "";

src/components/course/pica-video.vue

@@ -262,6 +262,9 @@ export default {
     },
     // 重播
     onReplay() {
+      this.$sendBuriedData({
+        component_tag: `883#88313`
+      });
       this.player.style.display = 'block';
       this.player.currentTime = 0;
       this.player.play();
@@ -635,7 +638,7 @@ export default {
     color: #fff;
     font-size: 12px;
     left: 10px;
-    bottom: 44px;
+    bottom: 12px;
     height: 24px;
     line-height: 24px;
     padding: 0 12px;
@@ -666,7 +669,7 @@ export default {
     color: #fff;
     font-size: 12px;
     right: 10px;
-    bottom: 44px;
+    bottom: 12px;
     height: 24px;
     line-height: 24px;
     padding: 0 12px 0 22px;

src/main.js

@@ -6,7 +6,6 @@ import store from './store/'
 const mixins = require('@/utils/mixins');
 import '@/utils/rem'					// 引入自适应
 import '@/utils/yqy-bridge'				// 移动端服务
-// import FastClick from 'fastclick'
 import vueFilters from '@/utils/filter'
 import VConsole from 'vconsole/dist/vconsole.min.js'
 import BuriedPoint,{ sendBuriedData} from 'web-buried-point';
@@ -14,6 +13,7 @@ import Vant from 'vant';
 import 'vant/lib/index.css';
 import clipboard from 'clipboard';
 import "@/utils/wxShare"
+
 //注册到vue原型上
 Vue.prototype.clipboard = clipboard;
 

src/views/share-merge-detail.vue

@@ -28,15 +28,15 @@
         <pica-video ref="picaVideo" :coverType="coverType" :download="download" @onVideoEnd="onVideoEnd" @onReplay="onReplay">
           <!-- 试看结束 -->
           <div class="cover" v-if="logged && coverType === 1">
-            <course-covers coverTips="试看结束<br />请来云鹊医App学习完整课程" :isSingle="true" rightBtnText="学习完整课程" @btnClick="btnClick" />
+            <course-covers coverTips="试看结束<br />请来云鹊医App学习完整课程" :isSingle="true" rightBtnText="学习完整课程" @btnClick="btnClick(1)" />
           </div>
           <!-- 播放结束，下载App -->
           <div class="cover" v-if="logged && coverType === 2">
-            <course-covers coverTips="播放结束<br />更多其他课程，请前往鹊医App学习" :isSingle="true" rightBtnText="去云鹊医App" @btnClick="btnClick" />
+            <course-covers coverTips="播放结束<br />更多其他课程，请前往鹊医App学习" :isSingle="true" rightBtnText="去云鹊医App" @btnClick="btnClick(2)" />
           </div>
           <!-- 未登录 -->
           <div class="cover" v-if="!logged">
-            <course-covers coverTips="登录后马上学习课程" :isSingle="true" rightBtnText="去登录" @btnClick="goLogin" />
+            <course-covers coverTips="登录后马上学习课程" :isSingle="true" rightBtnText="去登录" @btnClick="beforeGoLogin" />
           </div>
         </pica-video>
       </div>
@@ -47,7 +47,7 @@
         :studyNum="project.studyNum"
         :subject="project.subject"
       />
-      <CommonAdertImg :advertInfoList="advertInfoList" position="0" />
+      <!-- <CommonAdertImg :advertInfoList="advertInfoList" position="0" /> -->
       <!-- 步骤条 -->
       <div v-if="project.cmeType != 2">
         <CmeStep
@@ -119,7 +119,7 @@
         </div>
       </div>
 
-      <CommonAdertImg needPadTop :advertInfoList="advertInfoList" position="1" />
+      <!-- <CommonAdertImg needPadTop :advertInfoList="advertInfoList" position="1" /> -->
       <NoMoreContent />
       <div v-if="detailNum <= 9" class="no-more-bottom"></div>
     </div>
@@ -227,7 +227,7 @@ import CommonDialog from "@/components/cme/common-dialog";
 import ExjumperDialog from "@/components/cme/exjumper-dialog";
 import ExjumperButton from "@/components/cme/exjumper-button";
 import NoMoreContent from "@/components/business/no-more-content";
-import CommonAdertImg from "@/components/common/common-advert-img";
+// import CommonAdertImg from "@/components/common/common-advert-img";
 
 import { getWebPageUrl, gotoPage, getAppVersion } from "@/utils/index";
 import { mapGetters, mapActions } from "vuex";
@@ -367,7 +367,7 @@ export default {
     ExjumperButton,
     ExjumperDialog,
     // CardPopup,
-    CommonAdertImg,
+    // CommonAdertImg,
     NoMoreContent,
     BindCardButtonShare,
     ChangeCard,
@@ -414,6 +414,13 @@ export default {
   methods: {
     ...mapActions(["setUserInfo", "goLogin"]),
 
+    beforeGoLogin() {
+      this.$sendBuriedData({
+        component_tag: `883#88311`
+      });
+      this.goLogin();
+    },
+
     // 解析uuid
     queryByUuid(uuid) {
       let param = {
@@ -441,11 +448,27 @@ export default {
       this.coverType = 0;
     },
 
-    btnClick() {
+    btnClick(index, type) {
+      // 学习完整课程
+      if(type == 1) {
+        this.$sendBuriedData({
+          component_tag: `883#88312`
+        });
+      // 播放结束
+      } else if(type == 2) {
+        this.$sendBuriedData({
+          component_tag: `883#88314`
+        });
+      }      
       this.download();
     },
 
-    download() {
+    download(type) {
+      if(type == 1) {
+        this.$sendBuriedData({
+          component_tag: `883#88310`
+        });
+      }      
       window.location.href =
         "https://a.app.qq.com/o/simple.jsp?pkgname=com.picahealth.yunque";
     },