Merge branch 'dev-jump-with-pID-0902' into dev-purchase-0901

* dev-jump-with-pID-0902:
  讲师优化等
  打点日志出来
  直接传projectId给原生

# Conflicts:
#	src/components/cme/teacter-intro.vue
#	src/utils/env-config.js

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

@@ -281,6 +281,12 @@ export default {
           type: 4,
           seqNo: 1
         },
+        {
+          key: "projectId",
+          value: this.projectId,
+          type: 4,
+          seqNo: 1
+        },
       ];
 
       if(trySee) {

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-old.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>
+    </div>
+</template>
+<script>
+export default {
+    props: {
+        doctorList: {
+            type: Array,
+            default: () => []
+        }
+    },
+    data() {
+        return {
+
+        }
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+
+    }
+}
+</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;
+    }
+    .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-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;
+            }
+        }
+    }
+}
+</style>

src/utils/env-config.js

@@ -9,12 +9,14 @@ export const envConfig = {
     // 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/',
+    webPageUrl: 'https://dev-phome.yunqueyi.com/',
     hactiveUrl: 'https://dev-hactive.yunqueyi.com',
     fileUrl: 'https://dev-www.yunqueyi.com',
     appId: 'wx08b383d002c73f26', // 用于微信授权登录
 
+    // appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
+    
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
     // apiUrl: 'https://test1-api.yunqueyi.com/',
     // webPageUrl: 'https://test1-phome.yunqueyi.com/',

src/views/merge-detail.vue

@@ -86,6 +86,7 @@
             :courseRequire="courseRequire"
             :hasBindCard="hasBindCard"
             :limitTimes="limitTimes"
+            :projectId="projectId"
           />
         </div>
       </div>
@@ -1087,10 +1088,6 @@ export default {
         return;
       }
       let paramList = []
-      // let limitTimes = this.limitTimes - 0;
-      // if(this.hasBindCard) {
-      //   limitTimes = -1;
-      // }
       paramList = [
         {
           key: "className",
@@ -1116,12 +1113,12 @@ export default {
           type: 4,
           seqNo: 1
         },
-        // {
-        //   key: "limitTimes",
-        //   value: limitTimes,
-        //   type: 4,
-        //   seqNo: 1
-        // },
+        {
+          key: "projectId",
+          value: this.projectId,
+          type: 4,
+          seqNo: 1
+        },
       ];
       console.log('gotoCourse', paramList);
       rocNative.dispatchEventByModuleCode({