跳转到学习卡列表页面

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

@@ -11,12 +11,26 @@
   </section>
 </template>
 <script>
-import { getWebPageUrl } from "@/utils/index"
-import { mapGetters } from 'vuex'
+import { getWebPageUrl } from "@/utils/index";
+import { mapGetters } from "vuex";
 export default {
   data() {
     return {};
   },
+  props: {
+    oneLevelUrl: {
+      type: String,
+      default: ""
+    },
+    provinceId: {
+      type: String | Number,
+      default: ""
+    },
+    organizationId: {
+      type: String | Number,
+      default: ""
+    }
+  },
   computed: {
     ...mapGetters(["userInfo"])
   },
@@ -28,18 +42,18 @@ export default {
         return;
       }
       if (window.__isWeb) {
-        console.log('in jumpToCardList');
+        console.log("in jumpToCardList");
         return;
       } else {
-        let pageUrl = getWebPageUrl('cme/#/icredit-detail');
+        let pageUrl = getWebPageUrl("cme/#/icredit-detail");
         let paramList = [
           {
             key: "pageUrl",
-            value: pageUrl,
+            value: `${pageUrl}?provinceId=${provinceId}&organizationId=${organizationId}&oneLevelUrl=` + encodeURIComponent(this.oneLevelUrl),
             type: 4,
             seqNo: 1
           }
-        ]
+        ];
         rocNative.dispatchEventByModuleCode({
           modeCode: "M300",
           jsonString: paramList
@@ -63,7 +77,7 @@ export default {
     align-items: center;
     // box-sizing: border-box;
     padding: 0 px2rem(15px);
-    background: #F8F9FA;
+    background: #f8f9fa;
     border-radius: px2rem(6px);
     .left-icon {
       width: px2rem(40px);
@@ -85,7 +99,7 @@ export default {
         line-height: px2rem(26px);
         font-size: px2rem(16px);
         font-weight: 700;
-        color: rgba(55, 56, 57, 1);      
+        color: rgba(55, 56, 57, 1);
       }
       .bottom {
         font-size: px2rem(14px);

src/components/cme/card-banner.vue

@@ -11,7 +11,9 @@
 import { getHactiveUrl } from "@/utils/index";
 export default {
   data() {
-    return {};
+    return {
+
+    }
   },
   methods: {
     // 跳转到学习卡列表页面

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) || 'EF1CB4B4133F403ABF088F2B7947738F'
+        this.token = this.getUrlKey('token') || (query && query.token) || 'EEF69589911F4D3CAC8700AC11EE8096'
     },
     mounted() {
 

src/views/I-credit-detail.vue

@@ -14,9 +14,7 @@
     <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">
-    <img @click="confirm(1)" 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">
+    <img @click="isBuy(1)" class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-8.png">
     <CardPopup :cardInfo="cardInfo" :isShow="showGoUpdate" @cancle="jumpToCardList" @confirm="confirm"></CardPopup>
   </section>
 </template>
@@ -32,6 +30,9 @@ export default {
       showNavBar: true,
       showGoUpdate: false,
       isFixNavbar: true,
+      oneLevelUrl: '',
+      provinceId: 0,
+      organizationId: 0,
       cardInfo: {
 
       }
@@ -45,47 +46,41 @@ export default {
     ...mapGetters(['jumpURLForI', 'organizationInfo'])
   },
   created() {
-        // TEST
+    // TEST
     let _this = this;
     window.__getPositionData = function(param) {
       console.log(param);
       _this.getProvinceIdByPosition(param);
     }
-
-    alert(this.jumpURLForI);
-    // TODO TEST
-    // this.getCardInfoByProvinceId(110);
-    // this.isBuy(1);
+    this.oneLevelUrl = decodeURIComponent(this.$route.query && this.$route.query.oneLevelUrl || '');
+    this.provinceId = this.$route.query && this.$route.query.provinceId || 0;
+    this.organizationId = this.$route.query && this.$route.query.organizationId || 0;
+    console.log(this.oneLevelUrl, this.provinceId, this.organizationId);
   },
   methods: {
-    /*
-      TODO
-      1、判断用户是否购买过I类学习卡，没有购买过，则弹出Popup框（之前要调用接口）
-      2、判断用户是否购买过I类学习卡，没有购买过，则弹出Popup框（之前要调用接口）
-    */
     // 判断用户是否购买过I类学习卡
     isBuy(cardType) {
       let param = {
-        "cardType": cardType,
+        cardType: cardType,
+        setEntry: true,
       }
       this.GET("trade/storage/card/isBuy", param).then(res => {
         if (res.code == "000000") {
-          console.log('isBuy', res);
           // 如果购买过，则直接跳转到中华医学会页面
-          if(true) {
+          if(res.data) {
             this.jumpToCardList();          
           } else {
-            this.jumper();
+            this.preJumper();
           }
         }
       });  
     },
 
-    jumper() {
+    preJumper() {
       // 如果有机构，则直接获取学习卡信息
       console.log('in jumper this.organizationInfo', this.organizationInfo, '');
-      if(this.organizationInfo.organizationId && this.organizationInfo.provinceId) {
-        this.getCardInfoByProvinceId(this.organizationInfo.provinceId);
+      if(this.organizationId != 0 && this.provinceId != 0) {
+        this.getCardInfoByProvinceId(this.provinceId);
       // 否则获取地理位置信息
       } else {
         this.getPositionData();

src/views/index.vue

@@ -31,7 +31,7 @@
       </article>
       <article class="page-content-list">
         <CommonTitle v-show="tabIndex === 2" title="I类学分项目" :isShowCert="false"></CommonTitle>
-        <ICardItem v-show="tabIndex === 2"></ICardItem>
+        <ICardItem v-show="tabIndex === 2" :oneLevelUrl="oneLevelUrl" :provinceId="provinceId" :organizationId="organizationId"></ICardItem>
         <CommonTitle title="II类学分项目" :isShowCert="false"></CommonTitle>
         <section v-if="tabIndex === 1">
           <CoopListItem
@@ -200,11 +200,13 @@ export default {
           // let organizationInfo = {}
           _this.joinProjectList = res.data.myCMEProjectListDtoList;
           _this.otherProjectList = res.data.allCMEProjectListDtoList;
-          _this.organizationInfo.provinceId = res.data.provinceId;
-          _this.organizationInfo.organizationId = res.data.organizationId;
-          // _this.oneLevelUrl = res.data.oneLevelUrl;   // I类学习卡列表地址
-          _this.setJumpURLForI(res.data.oneLevelUrl);
-          _this.setOrganizationInfo(_this.organizationInfo);
+          _this.provinceId = res.data.provinceId;
+          _this.organizationId = res.data.organizationId;
+          // _this.organizationInfo.provinceId = res.data.provinceId;
+          // _this.organizationInfo.organizationId = res.data.organizationId;
+          _this.oneLevelUrl = res.data.oneLevelUrl;   // I类学习卡列表地址
+          // _this.setJumpURLForI(res.data.oneLevelUrl);
+          // _this.setOrganizationInfo(_this.organizationInfo);
           if (_this.userMobile) {
             _this.tabIndex = 1;
           } else {