中华医学教育在线

src/components/cme/I-card-item.vue

 <template>
-  <section class="I-card-item-wrapper">
+  <section @click="jumpToCardList" class="I-card-item-wrapper">
     <article class="item">
       <img class="left-icon" src="../../images/cme/phrase2/I-img.png" alt />
       <article class="center">
@@ -21,7 +21,7 @@ export default {
     ...mapGetters(["userInfo"])
   },
   methods: {
-    // 跳转I类学习详情页面
+    // 跳转I类学习详情(介绍)页面
     jumpToCardList() {
       if (!this.userInfo.userMobile) {
         rocNative.gotoLogin();

src/components/cme/card-popup.vue

@@ -20,10 +20,10 @@
         <div class="btn">
           <span class="left" @click="cancle">已购买去学习</span>
           <span class="vert-line"></span>
-          <span class="right" @click="conform">去购买</span>
+          <span class="right" @click="confirm">去购买</span>
         </div>
         <!-- <p class="update-btn v-hairline-top confirm-btn" @click="cancle">确定</p>
-        <p class="update-btn v-hairline-top" @click="conform">取消</p> -->
+        <p class="update-btn v-hairline-top" @click="confirm">取消</p> -->
       </article>
     </van-popup>
   </section>
@@ -44,10 +44,10 @@ export default {
   },
   methods: {
     cancle() {
-      
+      this.$emit('cancle');
     },
-    conform() {
-
+    confirm() {
+      this.$emit('confirm');
     }
   },
 }

src/components/cme/exjumper-dialog.vue

@@ -23,7 +23,7 @@ export default {
   props: {
     title: {
       type: String,
-      default: '即将打开<br/>“中华医学教育在线”平台'
+      default: '即将打开<br/> “中华医学教育在线”平台'
     },
     content: {
       type: String,

src/views/I-credit-detail.vue

 <template>
   <section class="cd-wrapper">
-    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-1.png">
-    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-2.png">
-    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-3.png">
-    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-4.png">
-    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-5.png">
-    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-6.png">
-    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-7.png">
+    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-1.png">
+    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-2.png">
+    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-3.png">
+    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-4.png">
+    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-5.png">
+    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-6.png">
+    <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-7.png">
     <img @click="jumper" class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-8.png">
-    <CardPopup :showGoUpdate="showGoUpdate"></CardPopup>
+    <img @click="confirm" class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-8.png">
+    <img @click="jumpToCardList" class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-8.png">
+    <CardPopup :cardInfo="cardInfo" :showGoUpdate="showGoUpdate" @cancle="jumpToCardList" @confirm="confirm"></CardPopup>
   </section>
 </template>
 <script>
 import CardPopup from "@/components/cme/card-popup";
+import { mapGetters } from 'vuex';
 export default {
   data() {
     return {
       showGoUpdate: false,
+      cardInfo: {
+
+      }
     }
   },
   components: {
     CardPopup
   },
-
+  computed: {
+    ...mapGetters('jumpURLForII', 'organizationInfo')
+  },
+  created() {
+        // TEST
+    window.__getPositionData = function(param) {
+      console.log(param);
+      this.getProvinceIdByPosition(param);
+      // this.getCardInfoByProvinceId(param.city_code);
+    }
+  },
   methods: {
     /*
+      TODO
       1、判断用户是否购买过I类学习卡，没有购买过，则弹出Popup框（之前要调用接口）
       2、判断用户是否购买过I类学习卡，没有购买过，则弹出Popup框（之前要调用接口）
     */
     jumper() {
-      this.showGoUpdate = true;
+      // this.showGoUpdate = true;
+      // 如果有机构，则直接获取学习卡信息
+      if(organizationInfo.organizationId && organizationInfo.provinceId) {
+        this.getCardInfoByProvinceId(organizationInfo.provinceId);
+      // 否则获取地理位置信息
+      } else {
+        this.getPositionData();
+      }
+      console.log(organizationInfo)
       console.log('in jumper');
-    }
+    },
+
+    // 获取地理位置信息
+    getPositionData() {
+      console.log('getPositionData');
+      rocNative.getPositionData({
+        __funcName: "__getPositionData"
+      });
+    },
+
+    // 根据省ID，获取学习卡信息
+    getCardInfoByProvinceId(provinceId) {
+      let param = {
+        "area": provinceId + '',
+        "cardType": 1,
+        "pageNum": 1,
+        "pageSize": 1
+      }
+      this.GET("trade/goods/cardList", param).then(res => {
+        if (res.code == "000000") {
+          this.showGoUpdate = true;
+          console.log('getCardInfoByProvinceId', res);
+          this.cardInfo = res.data && res.data[0] || {} ;
+        }
+      });  
+    },
+
+    // 根据位置信息获取省ID
+    getProvinceIdByPosition(param) {
+      this.GET("aggregate/cme/convertLocationToProvinceId", param).then(res => {
+        if (res.code == "000000") {
+          console.log('getProvinceIdByPosition', res);
+          this.getCardInfoByProvinceId(res.data);
+        }
+      });       
+    },
+
+    // 跳转到原生的购买页面
+    confirm(goodId) {
+      console.log(goodId);
+      let paramList = [
+        {
+          key: "className",
+          value: "com.picahealth.yunque.activitys.studycard.StudyCardDetailActivity###PicaDo.LearningCardVC",
+          type: 4,
+          seqNo: 1
+        },
+        {
+          key: "goodId",
+          value: goodId,
+          type: 4,
+          seqNo: 1
+        },
+      ];
+      rocNative.dispatchEventByModuleCode({
+        modeCode: "M200",
+        jsonString: paramList
+      });
+    },
+
+    // 跳转I类学习详情页面（中华医学会项目列表页面）
+    jumpToCardList() {
+      if (window.__isWeb) {
+        console.log('in jumpToCardList');
+        return;
+      } else {
+        let pageUrl = this.jumpURLForII;
+        let paramList = [
+          {
+            key: "pageUrl",
+            value: pageUrl,
+            type: 4,
+            seqNo: 1
+          }
+        ]
+        rocNative.dispatchEventByModuleCode({
+          modeCode: "M300",
+          jsonString: paramList
+        });
+      }
+    }    
   },
 }
 </script>

src/views/index.vue

@@ -196,12 +196,11 @@ export default {
       this.GET("cme/project/list", param).then(res => {
         _this.showLoading = false;
         if (res.code == "000000") {
-          cachedJoinProjectList = res.data.myCMEProjectListDtoList;
-          cachedOtherProjectList = res.data.allCMEProjectListDtoList;
+          let organizationInfo = {}
           _this.joinProjectList = res.data.myCMEProjectListDtoList;
           _this.otherProjectList = res.data.allCMEProjectListDtoList;
-          _this.organizationInfo.provinceId = res.data.provinceId;
-          _this.organizationInfo.organizationId = res.data.organizationId;
+          organizationInfo.provinceId = res.data.provinceId;
+          organizationInfo.organizationId = res.data.organizationId;
           _this.oneLevelUrl = res.data.oneLevelUrl;   // 学习卡列表地址
           // _this.setJumpURLForIAndII(res.data.oneLevelUrl);
           _this.setOrganizationInfo(organizationInfo);
@@ -231,7 +230,29 @@ export default {
     // 滚动到顶部
     scrollTop() {
       window.scrollTo(0, 0);
-    }
+    },
+
+    // 跳转到原生的购买页面
+    confirm(goodId) {
+      let paramList = [
+        {
+          key: "className",
+          value: "com.picahealth.yunque.activitys.studycard.StudyCardDetailActivity###PicaDo.LearningCardVC",
+          type: 4,
+          seqNo: 1
+        },
+        {
+          key: "goodId",
+          value: goodId,
+          type: 4,
+          seqNo: 1
+        },
+      ];
+      rocNative.dispatchEventByModuleCode({
+        modeCode: "M200",
+        jsonString: paramList
+      });
+    },    
   }
 };
 </script>

src/views/merge-detail.vue

@@ -106,8 +106,8 @@
       :isShowDialog="isShowEJDialog"
       isSingle
       needSubContent
-      content="确保您已经从云鹊平台购买优惠学习卡。跳转后请申请考试、激活学习卡，考试通过后申请证书。"
-      subContent="学分由中华医学电子音像出版社授予，如有问题可致电400-920-8899云鹊医客服咨询。"
+      content="请确保您已经在云鹊平台购买学员优惠学习卡"
+      subContent="1. 跳转后点击“购买学习”，注册登录“中华医学教育在线”平台（首次登录需用手机号注册）<br/>2. 支付方式选择 “学习卡支付”，输入在云鹊平台已购学习卡的激活码，即可参加考试申请学分"
       cancleBtnText="我知道了"
       @handlerAction="handlerEJAction"
     />