去试看去试看

35029eb2 · guangjun.yang · c920446d · 35029eb2 · 35029eb2 · 35029eb2
--- a/src/components/business/cell-list-detail.vue
+++ b/src/components/business/cell-list-detail.vue
@@ -32,6 +32,16 @@
                  <p class="name-title" :class="{'name-title-no': item.useFlag == 2}">{{item.name | shortName(30)}}</p>
                </div>
                <span
+                  v-if="!hasBindCard"
+                  @click="gotoExamOrCourse(item)"
+                  class="text-action"
+                  :class="{'text-action-no': item.useFlag == 2}"
+                  style="background: #f28662;border: none;color: #fff;"
+                >
+                  去试看
+                </span>                
+                <span
+                  v-else
                  @click="gotoExamOrCourse(item)"
                  class="text-action"
                  :class="{'text-action-no': item.useFlag == 2}"

--- a/src/components/business/coop-list-item.vue
+++ b/src/components/business/coop-list-item.vue
@@ -20,7 +20,9 @@
        <span class="coop-item-right-title">{{item.name}}</span>
        <span v-if="item.cmeType == 2" class="coop-item-right-other">{{item.level}} | {{item.scope}}</span>
        <span v-if="item.cmeType != 2" class="coop-item-right-other">{{item.level}} | {{item.credit}} | {{item.scope}}</span>
-        <span class="coop-item-right-other">{{item.startDate | formatTime('{y}.{m}.{d}')}}至{{item.endDate | formatTime('{y}.{m}.{d}')}} <span v-if="item.cardStatus == 1" class="active"><span>已激活</span></span></span>
+        <span class="coop-item-right-other">{{item.startDate | formatTime('{y}.{m}.{d}')}}至{{item.endDate | formatTime('{y}.{m}.{d}')}}
+        <span v-if="item.cardStatus != 1" class="active sk"><span>可试看</span></span></span>
+        <span v-if="item.cardStatus == 1" class="active"><span>已激活</span></span></span>
      </div>
    </div>
    <NoMoreContent v-show="paramData.length > 9"></NoMoreContent>
@@ -300,7 +302,10 @@ export default {
        line-height: px2rem(18px);
        color: #CAA861;
        border-radius: px2rem(3px);
-        border: 1px solid rgba(202,168,97,1);
+        // border: 1px solid rgba(202,168,97,1);
+        &.sk {
+          color: rgba(68, 146, 132, 1);
+        }
        span {
          position: relative;
          top: px2rem(-1.1px);

--- a/src/components/cme/bind-card-button.vue
+++ b/src/components/cme/bind-card-button.vue
@@ -98,22 +98,23 @@ export default {
      justify-content: center;
      width: px2rem(80px);
      font-size: px2rem(14px);
-      font-weight: 700;
+      font-weight: 400;
      text-align: center;
+      color: #7f7f7f;
+      border: 1px solid #d2b573;
      &.left {
        border-radius: px2rem(20px) 0px 0px px2rem(20px);
-        border: 1px solid rgba(255, 122, 75, 1);
        border-right-style: none;
-        color: #ff7a4b;
+        // color: #ff7a4b;
      }
      &.right {
-        background: linear-gradient(
-          137deg,
-          rgba(255, 166, 95, 1) 0%,
-          rgba(255, 122, 75, 1) 100%
-        );
+        // background: linear-gradient(
+        //   137deg,
+        //   rgba(255, 166, 95, 1) 0%,
+        //   rgba(255, 122, 75, 1) 100%
+        // );
        border-radius: 0px px2rem(20px) px2rem(20px) 0px;
-        color: #fff;
+        // color: #fff;
      }
    }
  }

--- a/src/utils/env-config.js
+++ b/src/utils/env-config.js
@@ -7,10 +7,11 @@ export const envConfig = {
    // baseUrl: 'https://dev-sc.yunqueyi.com/',
    // baseUrl: 'http://10.177.15.180:10202/',
    // baseUrl: 'http://192.168.140.14:10201/',
-    apiUrl: 'https://dev-api.yunqueyi.com/',
-    webPageUrl: 'https://dev-phome.yunqueyi.com/',
-    baseUrl: 'https://dev-sc.yunqueyi.com/',
-    hactiveUrl: 'https://dev-hactive.yunqueyi.com',
+
+    // apiUrl: 'https://dev-api.yunqueyi.com/',
+    // webPageUrl: 'https://dev-phome.yunqueyi.com/',
+    // baseUrl: 'https://dev-sc.yunqueyi.com/',
+    // hactiveUrl: 'https://dev-hactive.yunqueyi.com',

    // http://dev-hactive.yunqueyi.com/message_push/#/study-card
    // baseUrl: 'https://test1-sc.yunqueyi.com/',
@@ -18,14 +19,14 @@ export const envConfig = {
    // webPageUrl: 'https://test1-phome.yunqueyi.com/'
    // hactiveUrl: 'https://dev-hactive.yunqueyi.com',

-    // baseUrl: 'https://uat-sc.yunqueyi.com/',
-    // apiUrl: 'https://uat-api.yunqueyi.com/',
-    // webPageUrl: 'https://uat-phome.yunqueyi.com/'
-    // hactiveUrl: 'https://uat-hactive.yunqueyi.com',
+    baseUrl: 'https://uat-sc.yunqueyi.com/',
+    apiUrl: 'https://uat-api.yunqueyi.com/',
+    webPageUrl: 'https://uat-phome.yunqueyi.com/',
+    hactiveUrl: 'https://uat-hactive.yunqueyi.com',

    // baseUrl: 'https://sc.yunqueyi.com/',
    // apiUrl: 'https://api.yunqueyi.com/',
-    // webPageUrl: 'https://phome.yunqueyi.com/'
+    // webPageUrl: 'https://phome.yunqueyi.com/',
    // hactiveUrl: 'https://hactive.yunqueyi.com',

  },

--- a/src/utils/fetch.js
+++ b/src/utils/fetch.js
@@ -15,9 +15,9 @@ service.interceptors.request.use(config => {
  if (config.data && config.data.setEntry) {
    config.headers['sysCode'] = config.data.sysCode || 10
    if(config.data.token){
-       config.headers['token'] = config.data.token || '891F256CC48A4D57905F79C8F7628A74'
+       config.headers['token'] = config.data.token || 'CAF8336E76514F07BF195EFCEBE60775'
       if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
-        config.headers['token'] = config.data.token || '891F256CC48A4D57905F79C8F7628A74';
+        config.headers['token'] = config.data.token || 'CAF8336E76514F07BF195EFCEBE60775';
       }
       delete config.data.setEntry;
       delete config.data.token;

--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -315,6 +315,7 @@ export default {
 }
 .back-up-icon {
  position: fixed;
+  z-index: 110;
  bottom: px2rem(50px);
  right: px2rem(15px);
  img {

--- a/src/views/merge-detail.vue
+++ b/src/views/merge-detail.vue
@@ -17,11 +17,14 @@
    ></CommonNavbar>
    <div class="page-content list-container">
      <!-- banner图片 -->
-      <div v-if="bannerType == 1" class="page-content-img-container">
+      <div @click="gotoCourse()" v-if="bannerType == 1" class="page-content-img-container" style="position:relative;">
        <img class="banner-img" :src="attachmentUrl" />
        <!-- <img v-show="project.status == 1" class="banner-img-1" src="../images/status-join.png" /> -->
        <img v-show="project.status == 5" class="banner-img-5" src="../images/status-keep-on.png" />
        <img v-show="project.status == 10" class="banner-img-10" src="../images/status-end-cme.png" />
+        <div v-if="skCourseId" class="sk-btn-cover">
+          去试看
+        </div>
      </div>
      <!-- banner视频 -->
      <CommonTcPlayer v-if="bannerType == 2" style="flex" :options="videoOptions"></CommonTcPlayer>
@@ -126,7 +129,7 @@
      :type="project.currentProgress > 1 ? 'primary' : 'disabled'"
    ></ExjumperButton>
    <div v-if="project.cmeType == 2 && !isWeb" style="padding-top: 30px"></div>
-
+      
    <BindCardButton
      v-if="project.cmeType == 2 && !hasBindCard && !isWeb"
      :cardInfo="cardInfo"
@@ -176,13 +179,14 @@ import ExjumperButton from "@/components/cme/exjumper-button";
 import NoMoreContent from "@/components/business/no-more-content";
 import CommonAdertImg from "@/components/common/common-advert-img";

-import { getWebPageUrl, gotoPage } from "@/utils/index";
+import { getWebPageUrl, gotoPage, getAppVersion } from "@/utils/index";
 import { mapGetters, mapActions } from "vuex";
 import vueFilters from "@/utils/filter";
 import { Toast } from "vant";
 // import CardPopup from "@/components/cme/card-popup";
 import BindCardButton from "@/components/cme/bind-card-button";
 import ChangeCard from "@/components/cme/change-card";
+
 let cataOffsetTop = 0;
 let intorOffsetTop = 0;
 let titleOffsetHeight = 50;
@@ -195,7 +199,7 @@ export default {
      textContent: "",
      leaderText: "",
      pageTitle: "",
-      isShowShare: true,
+      isShowShare: false,
      premissionFlag: false,
      isSingle: false,
      dialogContent: "", // 弹框内容
@@ -283,7 +287,8 @@ export default {
      },
      advertInfoList: [],
      showChangeCard: false, //是否展示激活弹框,
-      changeCardErrorMsg: ""
+      changeCardErrorMsg: "",
+      skCourseId: 0,
    };
  },
  components: {
@@ -369,6 +374,10 @@ export default {
  methods: {
    ...mapActions(["setUserInfo"]),

+    skAction() {
+
+    },
+
    cancleChangeCard() {
      this.showChangeCard = false;
    },
@@ -894,6 +903,13 @@ export default {
                : this.projectLeader.info;
          }
          _this.doctorList = res.data.doctorList;
+          _this.skCourseId = 0;
+          if( res.data.projectComponentDTOS.length 
+              && res.data.projectComponentDTOS[0].portalModuleDTOS.length
+              && res.data.projectComponentDTOS[0].portalModuleDTOS[0].contentList.length
+              ) {
+            _this.skCourseId = res.data.projectComponentDTOS[0].portalModuleDTOS[0].contentList[0].id;
+          }

          //_this.projectStatus = res.data.projectStatus;
          _this.projectComponentDTOS = _this.setListData(
@@ -925,8 +941,8 @@ export default {
              cataOffsetTop,
              intorOffsetTop
            );
-            // 直接跳转
-            if (_this.project.jumpToContents) {
+            // 直接跳转   cmeType == 2
+            if (_this.project.jumpToContents || this.project.cmeType == 2) {
              setTimeout(() => {
                this.jumpCatalogue();
              }, 200);
@@ -1026,7 +1042,68 @@ export default {
      } else if (len <= 30 && certificate != 2) {
        return 1;
      }
-    }
+    },
+
+    // 跳转到课程
+    gotoCourse: function() {
+      let courseId = '';
+      let appVersion = getAppVersion(this.userInfo.appVersion);
+      // 弹框提示下载新版本可以试看
+      if(appVersion < 343 && !this.hasBindCard) {
+        this.$dialog.confirm({
+          className: 'con-dialog',
+          showCancelButton: false,
+          // message: '激活/购买后可学习完整课程',
+          message: '升级最新版本可试看课程',
+          confirmButtonText: '我知道了',
+        }).then(res => { 
+          
+        })       
+        return;
+      }
+      let paramList = []
+      let limitTimes = this.limitTimes - 0;
+      if(this.hasBindCard) {
+        limitTimes = -1;
+      }
+      paramList = [
+        {
+          key: "className",
+          value: "com.picahealth.yunque.activitys.courseplaynew.MyTcPlayVideoActivity###CourseMultiMediaPlayController",
+          type: 4,
+          seqNo: 1
+        },
+        {
+          key: "isCHC",
+          value: 0,
+          type: 4,
+          seqNo: 1
+        },
+        {
+          key: "courseId",
+          value: courseId,
+          type: 4,
+          seqNo: 1
+        },
+        {
+          key: "courseRequire",
+          value: this.courseRequire - 0,
+          type: 4,
+          seqNo: 1
+        },
+        {
+          key: "limitTimes",
+          value: limitTimes,
+          type: 4,
+          seqNo: 1
+        },
+      ];
+      console.log(paramList);
+      rocNative.dispatchEventByModuleCode({
+        modeCode: "M200",
+        jsonString: paramList
+      });
+    },
  }
 };
 </script>
@@ -1065,6 +1142,20 @@ export default {
  }
  .list-container {
    // margin-bottom: px2rem(40px);
+    .sk-btn-cover {
+      position: absolute;
+      top: px2rem(82px);
+      left: px2rem(163px);
+      z-index: 100;
+      width: px2rem(50px);
+      height: px2rem(50px);
+      line-height: px2rem(50px);
+      text-align: center;
+      background: #fff;
+      color: rgba(68, 146, 132, 1);
+      font-size: px2rem(13px);
+      border-radius: 50%;
+    }
  }
  .intro-catalogue-container {
    .title {