Merge branch 'dev-jump-with-pID-0902' into 'release'

传递项目ID给原生：code reviewer：杨广俊

传递项目ID给原生：code reviewer：杨广俊

See merge request !16

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

@@ -97,7 +97,7 @@ const sendBuriedDataMap = {
   23: "8823"
 }
 export default {
-  name: "cell-list-item",
+  name: "cell-list-detail-share",
   data() {
     return {
       appVersion: "200",

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

@@ -96,7 +96,7 @@ const sendBuriedDataMap = {
   23: "8823"
 }
 export default {
-  name: "cell-list-item",
+  name: "cell-list-detail",
   data() {
     return {
       appVersion: "200",
@@ -242,8 +242,14 @@ export default {
           type: 4,
           seqNo: 1
         },
+        {
+          key: "projectId",
+          value: this.projectId,
+          type: 4,
+          seqNo: 1
+        },
       ];
-      console.log(paramList);
+      console.log('gotoCourse', paramList);
       rocNative.dispatchEventByModuleCode({
         modeCode: "M200",
         jsonString: paramList

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

@@ -77,6 +77,10 @@ export default {
     courseRequire: {
       type: Number,
       default: 0,
+    },
+    projectId: {
+      type: Number | String,
+      default: 0,
     }
   },
   computed: {
@@ -143,7 +147,14 @@ export default {
           type: 4,
           seqNo: 1
         },
+        {
+          key: "projectId",
+          value: this.projectId,
+          type: 4,
+          seqNo: 1
+        },
       ];
+      console.log('gotoCourse', paramList);
       rocNative.dispatchEventByModuleCode({
         modeCode: "M200",
         jsonString: paramList

src/components/cme/teacter-intro.vue

 <template>
-    <div class="teacter-intro-container">
-        <div class="basic-title">讲师介绍</div>
-        <div class="leader-info" v-for="(item,index) in doctorList" :key="index">
-            <img :src="item.appImageUrl"/>
-            <div class="leader-text">
-                <div class="leader-con">
-                    <span>{{item.name}}</span>
-                    <span class="leader-title">{{item.title}}</span>
-                </div>
-                <div class="address">{{item.hospital}}</div>
-            </div>
+  <div class="teacter-intro-container">
+    <div class="basic-title">讲师介绍</div>
+    <div class="leader-info" v-for="(item,index) in current" :key="index">
+      <img :src="item.appImageUrl" />
+      <div class="leader-text">
+        <div class="leader-con">
+          <span>{{item.name}}</span>
+          <span class="leader-title">{{item.title}}</span>
         </div>
+        <div class="address">{{item.hospital}}</div>
+      </div>
     </div>
+    <div v-show="doctorList.length > 1" class="toggle-btn" @click="toggle">
+      <span class="btn">{{ isUp ? '展开更多' : '向上收起'}}</span>
+      <img v-if="isUp" src="../../images/cme/arrow-grey-down.png" />
+      <img v-if="!isUp" src="../../images/cme/arrow-grey-up.png" />
+    </div>
+  </div>
 </template>
 <script>
 export default {
-    props: {
-        doctorList: {
-            type: Array,
-            default: () => []
-        }
-    },
-    data() {
-        return {
-            
-        }
-    },
-    created() {
-
-    },
-    mounted() {
-        
-    },
-    methods: {
-        
+  props: {
+    doctorList: {
+      type: Array,
+      default: () => []
     }
-}
+  },
+  data() {
+    return {
+      isUp: true,
+      one: [],
+      all: [],
+      current: []
+    };
+  },
+  created() {},
+  mounted() {
+    this.one = this.doctorList.slice(0, 1);
+    this.current = this.one;
+    this.all = this.doctorList.slice(0);
+  },
+  methods: {
+    toggle() {
+      this.isUp = !this.isUp;
+      if (this.isUp) {
+        this.current = this.one;
+      } else {
+        this.current = this.all;
+      }
+    }
+  }
+};
 </script>
 <style lang="less" scoped>
 .teacter-intro-container {
-    margin: 30px 15px 0px;
-    .basic-title {
-        font-size: 18px;
-        line-height: 18px;
-        color: #373839;
-        font-weight: 700;
+  margin: 30px 15px 0px;
+  .basic-title {
+    font-size: 18px;
+    line-height: 18px;
+    color: #373839;
+    font-weight: 700;
+  }
+  .leader-info {
+    display: flex;
+    flex-direction: row;
+    margin-top: 16px;
+    padding-bottom: 16px;
+    img {
+      display: inline-block;
+      width: 44px;
+      height: 44px;
+      border-radius: 50%;
     }
-    .leader-info {
+    .leader-text {
+      flex: 1;
+      width: 100px;
+      margin-left: 16px;
+      margin-top: 6px;
+      .leader-con {
+        line-height: 14px;
         display: flex;
         flex-direction: row;
-        margin-top: 16px;
-        padding-bottom: 16px;
-        img {
-            display: inline-block;
-            width: 44px;
-            height: 44px;
-            border-radius: 50%;
+        white-space: nowrap;
+        span {
+          font-size: 16px;
+          color: #676869;
+        }
+        span:first-child {
+          font-size: 16px;
+          color: #373839;
+          font-weight: 700;
+          line-height: 1.1;
         }
-        .leader-text {
-            flex: 1;
-            width: 100px;
-            margin-left: 16px;
-            margin-top: 6px;
-            .leader-con {
-                line-height: 14px;
-                display: flex;
-                flex-direction: row;
-                white-space: nowrap;
-                span {
-                    font-size: 16px;
-                    color: #676869;
-                }
-                span:first-child {
-                    font-size: 16px;
-                    color: #373839;
-                    font-weight: 700;
-                    line-height: 1.1;
-                }
-                .leader-title {
-                    width: 220px;
-                    overflow : hidden;
-                    text-overflow: ellipsis;
-                    white-space:nowrap;
-                    line-height: 16px;
-                    margin-left: 10px;
-                }
-            }
-            .address {
-                margin-top: 5px;
-                font-size: 13px;
-                color: #979899;
-                width: 240px;
-                overflow : hidden;
-                text-overflow: ellipsis;
-                white-space:nowrap;
-            }
+        .leader-title {
+          width: 220px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          line-height: 16px;
+          margin-left: 10px;
         }
+      }
+      .address {
+        margin-top: 5px;
+        font-size: 13px;
+        color: #979899;
+        width: 240px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
+  .toggle-btn {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 20px;
+    & > span {
+      font-size: 14px;
+      color: #979899;
+      font-weight: 400;
+    }
+    & > img {
+      width: 15px;
+      height: 15px;
     }
+  }
 }
 </style>
\ No newline at end of file

src/views/component-details.vue

@@ -19,20 +19,25 @@
       >-->
       <!-- <div v-if="bannerType == 1" class="page-content-img-container"> -->
       <div v-if="bannerType == 1" class="page-content-img-container">
-        <img class="banner-img" :src="attachmentUrl">
-        <img v-show="pStatus == 1" class="banner-img-1" src="../images/status-join.png">
-        <img v-show="pStatus == 5" class="banner-img-5" src="../images/status-keep-on.png">
-        <img v-show="pStatus == 10" class="banner-img-10" src="../images/status-end.png">
+        <img class="banner-img" :src="attachmentUrl" />
+        <img v-show="pStatus == 1" class="banner-img-1" src="../images/status-join.png" />
+        <img v-show="pStatus == 5" class="banner-img-5" src="../images/status-keep-on.png" />
+        <img v-show="pStatus == 10" class="banner-img-10" src="../images/status-end.png" />
       </div>
       <!-- <CommonBannerVideo v-if="bannerType == 1" :videoOptions="videoOptions"></CommonBannerVideo> -->
       <CommonTcPlayer v-if="bannerType == 2" style="flex" :options="videoOptions"></CommonTcPlayer>
       <CommonDescription :descTitle="projectName" :value="projectIntro"></CommonDescription>
       <CommonSpliteLine></CommonSpliteLine>
-      
-      <CellListItem :paramData="contentList" :moduleName="moduleName" :courseRequire="courseRequire"></CellListItem>
+
+      <CellListItem
+        :paramData="contentList"
+        :moduleName="moduleName"
+        :courseRequire="courseRequire"
+        :projectId="projectId"
+      ></CellListItem>
       <!-- <CellListDetail :paramData="contentList" :moduleName="moduleName"></CellListDetail> -->
     </div>
-    <Loading v-show="showLoading"/>
+    <Loading v-show="showLoading" />
   </div>
 </template>
 <script>
@@ -46,7 +51,7 @@ import CommonBannerVideo from "@/components/common/common-banner-video";
 import CommonTcPlayer from "@/components/common/common-tcplayer";
 import Loading from "@/components/common/common-loading";
 import { mapGetters, mapActions } from "vuex";
-import vueFilters from '@/utils/filter'
+import vueFilters from "@/utils/filter";
 export default {
   data() {
     return {
@@ -139,9 +144,9 @@ export default {
         __funcName: "__getUserInfo4Comp"
       });
       if (window.__isWeb && process.env.BUILD_ENV == "development") {
-        console.log('projectId',this.projectId);
+        console.log("projectId", this.projectId);
         let param = {
-          userToken: 'ED9F3381362641858B2B1F90C92A8050',
+          userToken: "ED9F3381362641858B2B1F90C92A8050"
         };
         __getUserInfo4Comp(param);
       }
@@ -190,20 +195,20 @@ export default {
     },
     setContent(data) {
       let list = data;
-      for(let i=0;i<list.length;i++) {
+      for (let i = 0; i < list.length; i++) {
         let len = vueFilters.strLength(list[i].name);
         let certificate = list[i].certificateFlag;
-        if(len > 30 && certificate == 2) {
+        if (len > 30 && certificate == 2) {
           list[i].height = "2";
         } else if (len > 30 && certificate != 2) {
           list[i].height = 2;
         } else if (len <= 30 && certificate == 2) {
           list[i].height = "1";
-        } else if(len <= 30 && certificate != 2) {
+        } else if (len <= 30 && certificate != 2) {
           list[i].height = 1;
         }
       }
-      console.log('contentList!',list);
+      console.log("contentList!", list);
       return list;
     },
     // 获取内容列表
@@ -213,7 +218,7 @@ export default {
         moduleId: _this.moduleId,
         token: _this.userInfo.userToken,
         setEntry: true,
-        projectId: _this.projectId,
+        projectId: _this.projectId
       };
       _this.showLoading = true;
       this.GET("portal/portalApp/contentList", param).then(res => {
@@ -239,39 +244,39 @@ export default {
 </script>
 <style lang="less" >
 .page-container-comp {
-.nav-top .nav-title {
-  height: 0px;
-  padding: 18px;
-}
-.banner-img {
-  display: inherit;
-  width: 375px;
-  height: 210px;
-  &-1 {
-    position: absolute;
-    left: 0;
-    top: 180px;
-    width: 76px;
-    height: 30px;
+  .nav-top .nav-title {
+    height: 0px;
+    padding: 18px;
   }
-  &-5 {
-    position: absolute;
-    left: 0;
-    top: 180px;
-    width: 76px;
-    height: 30px;
+  .banner-img {
+    display: inherit;
+    width: 375px;
+    height: 210px;
+    &-1 {
+      position: absolute;
+      left: 0;
+      top: 180px;
+      width: 76px;
+      height: 30px;
+    }
+    &-5 {
+      position: absolute;
+      left: 0;
+      top: 180px;
+      width: 76px;
+      height: 30px;
+    }
+    &-10 {
+      position: absolute;
+      left: 0;
+      top: 180px;
+      width: 148px;
+      height: 30px;
+    }
   }
-  &-10 {
-    position: absolute;
-    left: 0;
-    top: 180px;
-    width: 148px;
-    height: 30px;
+  .list-container {
+    margin-bottom: 40px;
   }
 }
-.list-container {
-  margin-bottom: 40px;
-}
-}
 </style>
 

src/views/merge-detail.vue

@@ -1198,10 +1198,6 @@ export default {
         return;
       }
       let paramList = []
-      // let limitTimes = this.limitTimes - 0;
-      // if(this.hasBindCard) {
-      //   limitTimes = -1;
-      // }
       paramList = [
         {
           key: "className",
@@ -1227,12 +1223,6 @@ export default {
           type: 4,
           seqNo: 1
         },
-        // {
-        //   key: "limitTimes",
-        //   value: limitTimes,
-        //   type: 4,
-        //   seqNo: 1
-        // },
       ];
       console.log('gotoCourse', paramList);
       rocNative.dispatchEventByModuleCode({