Merge branch 'dev-urgent-0725' into dev-autoplay-0801

* dev-urgent-0725:
  到播放时长后，设置播放重0秒开始
  弹框等，文案“去试看”
  弹框内容弹框内容
  样式调整
  自动播放打开了
  特殊处理下返回
  新增 试看事件限制

# Conflicts:
#	src/utils/fetch.js
#	src/views/merge-detail.vue

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

@@ -276,6 +276,9 @@ export default {
       if(!actionText) {
         actionText = type == 1 ? '去考试' : '去学习';
       }
+      if(!this.hasBindCard && type == 2) {
+        actionText = '去试看'
+      }
       return actionText;
     },
     // showDialog(introduce) {

src/components/cme/common-dialog.vue

@@ -5,8 +5,8 @@
       <div class="dialog-content">{{content}}</div>
       <div v-show="needSubContent" class="dialog-sub-content" v-html="subContent"></div>
       <div class="dialog-footer v-hairline-top">
-        <span :class="{'single-btn': isSingle}" @click.stop.prevent="handlerAction(1)">{{cancleBtnText}}</span>
-        <span v-show="!isSingle" class="confirm-btn v-hairline-left" @click.stop.prevent="handlerAction(2)">{{confirmBtnText}}</span>
+        <span :class="{'single-btn': isSingle}" @click="handlerAction(1)">{{cancleBtnText}}</span>
+        <span v-show="!isSingle" class="confirm-btn v-hairline-left" @click="handlerAction(2)">{{confirmBtnText}}</span>
       </div>
     </div>
   </div>
@@ -151,5 +151,11 @@ export default {
       border: 0 solid #f0f1f2;
     }
   }
+  &.shikan {
+    .dialog-sub-content {
+      text-align: center;
+      font-size: px2rem(16px);
+    }
+  }
 }
 </style>

src/components/common/common-tcplayer.vue

@@ -62,8 +62,20 @@ export default {
         listener: this.listener,
         ...this.options
       };
-      options.width = htmlWidth
-      this.tcPlayer = new TcPlayer(this.id, options);
+      options.width = htmlWidth;
+      
+      const tcPlayer = new TcPlayer(this.id, options);
+      tcPlayer.video.on('timeupdate', (event) => {
+        let ct = tcPlayer.currentTime();
+
+        console.log('视频播放时长S => ', ct);
+        if (options.trySeeTime && ct >= options.trySeeTime) {
+          tcPlayer.currentTime(0);
+          tcPlayer.pause();
+          this.$emit('sk-tip');
+        }
+      });
+      this.tcPlayer = tcPlayer;
     },
     reset() {
       if (this.tcPlayer) {

src/utils/fetch.js

@@ -17,7 +17,7 @@ service.interceptors.request.use(config => {
     if(config.data.token){
        config.headers['token'] = config.data.token || 'CAF8336E76514F07BF195EFCEBE60775'
        if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
-        config.headers['token'] = config.data.token || 'CAF8336E76514F07BF195EFCEBE60775';
+        config.headers['token'] = config.data.token || '14587B3BBD77434EAFE8755FB1856008';
        }
        delete config.data.setEntry;
        delete config.data.token;