Merge branch 'dev-phase2-0512' into 'release'

教培二期需求  code reviewer: 张平

教培二期需求  code reviewer: 张平

See merge request !8

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

@@ -123,6 +123,19 @@ export default {
       }
     },
     coopDetails(item) {
+      // 临时添加 
+      if(window.__isWeb) {
+        this.$router.push({
+          path: "/coop",
+          query: {
+            id: item.id,
+            coopType: this.coopType,
+            courseRequire: item.courseRequire
+          }
+        });
+        return;
+      }
+
       if (this.userMobile) {
         let paramList = [
           {

src/components/cme/basic-info.vue

 <template>
     <div class="basic-container">
         <div class="basic-title">基本信息</div>
-        <div class="content">
+        <div v-if="projectNo" class="content">
             <span>项目编号</span>
             <span>{{projectNo}}</span>
         </div>

src/components/cme/common-button.vue

@@ -40,7 +40,7 @@ export default {
         line-height: px2rem(50px);
         width: 100%;
         border-radius: px2rem(25px);
-        font-size: 17px;
+        font-size: px2rem(17px);
         font-weight: 700;
         color: #FFFFFF;
         background: #449284;

src/components/cme/exjumper-button.vue

+<template>
+  <div class="exjumper-button-wrapper button-default" :class="type" @click="btnClick">
+    <span>{{btnText}}</span>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    btnText: {
+      type: String,
+      default: '确定'
+    },
+    type: {
+      type: String,
+      default: 'primary'
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    btnClick() {
+      if(this.type == 'disabled') return;
+      this.$emit('btnClick');
+    }
+  },
+}
+</script>
+<style  lang="scss" scoped>
+  @import "../../style/mixin";
+  .exjumper-button-wrapper {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 1000;
+    font-size: px2rem(14px);
+    margin: px2rem(20px) px2rem(15px);
+    text-align: center;
+    &.button-default {
+      span {
+        display: block;
+        height: px2rem(50px);
+        line-height: px2rem(50px);
+        width: 100%;
+        border-radius: px2rem(25px);
+        font-size: px2rem(17px);
+        font-weight: 700;
+        color: #FFFFFF;
+        background: #449284;
+      }
+    }
+    &.primary {
+      span {
+        color: #FFFFFF;
+        background: #449284;
+      }
+    }
+    &.disabled {
+      span {
+        color: rgba(255, 255, 255, 0.95);
+        background: #C7C8C9;
+      }
+    }
+  }
+
+</style>
\ No newline at end of file

src/components/cme/exjumper-dialog.vue

+<template>
+  <div class="exjumper-dialog-wrraper" v-if="isShowDialog">
+    <div class="dialog-mask"></div>
+    <div class="dialog-container">
+      <div class="title" v-html="title"></div>
+      <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>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "common-dialog",
+  data() {
+    return {
+
+    };
+  },
+  props: {
+    title: {
+      type: String,
+      default: '即将打开<br/>“中华医学教育在线”平台'
+    },
+    content: {
+      type: String,
+      default: ''
+    },
+    needSubContent: {
+      type: Boolean,
+      default: false
+    },
+    subContent: {
+      type: String,
+      default: ''
+    },
+    cancleBtnText: {
+      type: String,
+      default: '取消'
+    },
+    confirmBtnText: {
+      type: String,
+      default: '确定'
+    },
+    isShowDialog: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: false
+    },
+  },
+  methods: {
+    handlerAction(type) {
+      this.$emit("handlerAction", type);
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "../../style/mixin";
+.exjumper-dialog-wrraper {
+  position: fixed;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 2019;
+  .dialog-mask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 2020;
+  }
+  .dialog-container {
+    z-index: 2021;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    overflow: hidden;
+    width: px2rem(300px);
+    font-size: px2rem(18px);
+    -webkit-transition: 0.3s;
+    transition: 0.3s;
+    border-radius: px2rem(4px);
+    background-color: #fff;
+    -webkit-transform: translate3d(-50%, -50%, 0);
+    transform: translate3d(-50%, -50%, 0);
+    -webkit-backface-visibility: hidden;
+    backface-visibility: hidden;
+    .title {
+      margin-top: px2rem(30px);
+      text-align: center;
+      font-size: px2rem(18px);
+      font-weight: 700;
+      color: #373839;
+    }
+    .dialog-content {
+      // margin: px2rem(30px) px2rem(22px);
+      margin: px2rem(20px) px2rem(30px) px2rem(30px);
+      text-align: left;
+      font-size: px2rem(14px);
+      font-weight: 400;
+      color: #373839;
+    }
+    .dialog-sub-content {
+      margin: px2rem(-16px) px2rem(30px) px2rem(20px);
+      // margin: px2rem(-16px) px2rem(22px) px2rem(30px);
+      text-align: left;
+      font-size: px2rem(14px);
+      line-height: px2rem(24px);
+      font-weight: 400;
+      color: #979899;
+    }
+    .dialog-footer {
+      height: px2rem(50px);
+      display: flex;
+      align-items: center;
+      &.v-hairline-top::after {
+        border-top-width: 1px;
+      }
+      span {
+        display: inline-block;
+        // width: 50%;
+        flex: 1;
+        height: px2rem(50px);
+        line-height: px2rem(50px);
+        font-size: px2rem(17px);
+        text-align: center;
+        color: #979899;
+        &.v-hairline-left::after {
+          border-left-width: 1px;
+        }
+        &.confirm-btn {
+          color: #449284;
+        }
+        &.single-btn {
+          color: #449284;
+        }
+      }
+    }
+  }
+
+  [class*="v-hairline"] {
+    position: relative;
+    &::after {
+      content: " ";
+      position: absolute;
+      pointer-events: none;
+      box-sizing: border-box;
+      top: -50%;
+      left: -50%;
+      right: -50%;
+      bottom: -50%;
+      -webkit-transform: scale(0.5);
+      transform: scale(0.5);
+      border: 0 solid #f0f1f2;
+    }
+  }
+}
+</style>

src/components/cme/item-leader.vue

@@ -12,7 +12,7 @@
       </div>
     </div>
     <div class="content">
-      <div class="text">{{leaderText}}</div>
+      <div class="text" v-html="leaderText"></div>
       <div v-if="leaderText.length > 70" class="desc" @click="allText">
         <span>{{btnText}}</span>
         <img v-if="!allTextFlag" src="../../images/down.png" />

src/components/common/common-loading.vue

@@ -26,8 +26,8 @@
             left: 0;
             bottom: 0;
             right: 0;
-            z-index: 200;
-            background: rgba(0, 0, 0, 0);
+            z-index: 1000;
+            background: rgba(0, 0, 0, 0.5);
         }
         svg {
             position: fixed;

src/utils/env-config.js

@@ -9,7 +9,7 @@ export const envConfig = {
     // baseUrl: 'http://192.168.140.14:10201/',
     apiUrl: 'https://dev-api.yunqueyi.com/',
     webPageUrl: 'https://dev-phome.yunqueyi.com/',
-    baseUrl: 'https://test1-sc.yunqueyi.com/',
+    baseUrl: 'https://dev-sc.yunqueyi.com/',
 
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
     // apiUrl: 'https://test1-api.yunqueyi.com/',

src/utils/fetch.js

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

src/utils/mixins.js

@@ -13,7 +13,7 @@ module.exports = {
             query = this.$route.query
         }
         // alert('this.token' + this.token)
-        this.token = this.getUrlKey('token') || (query && query.token) || '9B62E5874DA94979A54DB3E9DFC1443F'
+        this.token = this.getUrlKey('token') || (query && query.token) || '413649EAAF9D4C719DA183FB49E1911F'
     },
     mounted() {
 

src/views/index.vue

@@ -10,6 +10,8 @@
       borderStyle="1px solid #fff"
     ></CommonNavbar>
     <section class="page-content">
+      <!-- <button @click="jumpToExamAction" style="margin: 20px;font-size:20px;text-align:center;padding:10px;border-radius:10px;">测试按钮1</button>
+      <button @click="jumpToExamAction2" style="margin: 20px;font-size:20px;text-align:center;padding:10px;border-radius:10px;">测试按钮2</button> -->
       <!-- {{token}} -->
       <table class="page-content-table">
         <tr>
@@ -131,7 +133,54 @@ export default {
   },
 
   methods: {
+    // 跳转到第三方考试页面
+    // 
+    jumpToExamAction() {
+      let paramList = [
+        {
+          key: "pageUrl",
+          value: 'http://cmeonline.cma-cmc.com.cn/cms/weixinCourseDetail.htm?courseId=a245b2060ac0495cae440de859321b91&openCourseId=2d9b152a85dc4833892aeaa713362b9f',
+          type: 4,
+          seqNo: 1
+        },
+        // 此字段不配置，则用原来的逻辑
+        {
+          key: "needCache",
+          value: '1', // 0不缓存，其它值都做缓存
+          type: 4,
+          seqNo: 1
+        }
+      ];
+      rocNative.dispatchEventByModuleCode({
+        modeCode: "M300",
+        jsonString: paramList
+      });
+    },
+
+    jumpToExamAction2() {
+      let paramList = [
+        {
+          key: "pageUrl",
+          value: 'http://cmeonline.cma-cmc.com.cn/cms/weixinCourseDetail.htm?courseId=0aeee9f7712b4543ab8eadb0571a78a7&openCourseId=e9e124392d3f4e2494d46e8f990b085e',
+          type: 4,
+          seqNo: 1
+        },
+        // 此字段不配置，则用原来的逻辑
+        {
+          key: "needCache",
+          value: '1', // 0不缓存，其它值都做缓存
+          type: 4,
+          seqNo: 1
+        }
+      ];
+      rocNative.dispatchEventByModuleCode({
+        modeCode: "M300",
+        jsonString: paramList
+      });
+    },
+
     ...mapActions(["setUserInfo"]),
+
     //获取版本号
     getUserInfo() {
       rocNative.getUserInfo({