则直接获取学习卡信息 3e541bde guangjun.yang <guangjun.yang@picahealth.com> 2020年6月5日 下午2:21

src/store/getters.js

@@ -2,6 +2,7 @@ const getters = {
   userInfo: state => state.coop.userInfo,
   statusBarHeight: state => state.coop.statusBarHeight,
   projectTabIndex: state => state.coop.projectTabIndex,
+  jumpURLForI: state => state.coop.jumpURLForI,
   jumpURLForII: state => state.coop.jumpURLForII,
   positionInfo: state => state.coop.positionInfo,
   organizationInfo: state => state.coop.organizationInfo,

src/store/modules/coop.js

@@ -3,7 +3,8 @@ const coop = {
     userInfo: {},
     statusBarHeight: {},
     projectTabIndex: 1,
-    jumpURLForII: "",  //中华医学会一类或二类跳转地址
+    jumpURLForI: "",    //中华医学会一类跳转地址
+    jumpURLForII: "",   //中华医学会二类跳转地址
     positionInfo: {
       accuracy: "",
       address: "",
@@ -35,6 +36,9 @@ const coop = {
     SET_PROJECT_TAB_INDEX: (state, projectTabIndex) => {
       state.projectTabIndex = projectTabIndex
     },
+    SET_JUMP_URL_FOR_I_AND_II: (state, jumpURLForI) => {
+      state.jumpURLForI = jumpURLForI
+    },
     SET_JUMP_URL_FOR_I_AND_II: (state, jumpURLForII) => {
       state.jumpURLForII = jumpURLForII
     },
@@ -55,8 +59,11 @@ const coop = {
     setProjectTabIndex({ commit }, projectTabIndex) {
       commit('SET_PROJECT_TAB_INDEX', projectTabIndex)
     },
+    setJumpURLForI({ commit }, jumpURLForI) {
+      commit('SET_JUMP_URL_FOR_I', jumpURLForI)
+    },
     setJumpURLForII({ commit }, jumpURLForII) {
-      commit('SET_JUMP_URL_FOR_I_AND_II', jumpURLForII)
+      commit('SET_JUMP_URL_FOR_II', jumpURLForII)
     },
     setPositionInfo({ commit }, positionInfo) {
       commit('SET_POSITION_INFO', positionInfo)

src/views/I-credit-detail.vue

@@ -15,7 +15,7 @@
     <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" 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">
     <CardPopup :cardInfo="cardInfo" :showGoUpdate="showGoUpdate" @cancle="jumpToCardList" @confirm="confirm"></CardPopup>
   </section>
@@ -42,7 +42,7 @@ export default {
     CardPopup
   },
   computed: {
-    ...mapGetters(['jumpURLForII', 'organizationInfo'])
+    ...mapGetters(['jumpURLForI', 'organizationInfo'])
   },
   created() {
         // TEST
@@ -62,14 +62,13 @@ export default {
     jumper() {
       // this.showGoUpdate = true;
       // 如果有机构，则直接获取学习卡信息
+      console.log('in jumper this.organizationInfo', this.organizationInfo, '');
       if(this.organizationInfo.organizationId && this.organizationInfo.provinceId) {
         this.getCardInfoByProvinceId(this.organizationInfo.provinceId);
       // 否则获取地理位置信息
       } else {
         this.getPositionData();
       }
-      console.log(this.organizationInfo)
-      console.log('in jumper');
     },
 
     // 获取地理位置信息
@@ -132,12 +131,12 @@ export default {
 
     // 跳转I类学习详情页面（中华医学会项目列表页面）
     jumpToCardList() {
-      console.log(this.jumpURLForII);
+      console.log(this.jumpURLForI);
       if (window.__isWeb) {
         console.log('in jumpToCardList');
         return;
       } else {
-        let pageUrl = this.jumpURLForII;
+        let pageUrl = this.jumpURLForI;
         let paramList = [
           {
             key: "pageUrl",

src/views/index.vue

@@ -99,6 +99,7 @@ export default {
       userMobile: "",
       needShowBackup: false,
       showGoUpdate: false,
+      oneLevelUrl: '',
     };
   },
   computed: {
@@ -153,7 +154,7 @@ export default {
   },
 
   methods: {
-    ...mapActions(["setUserInfo", "setOrganizationInfo"]),
+    ...mapActions(["setUserInfo", "setOrganizationInfo", "setJumpURLForI"]),
 
     //获取位置信息  测试代码 TEST
     getPositionData() {
@@ -201,8 +202,8 @@ export default {
           _this.otherProjectList = res.data.allCMEProjectListDtoList;
           organizationInfo.provinceId = res.data.provinceId;
           organizationInfo.organizationId = res.data.organizationId;
-          _this.oneLevelUrl = res.data.oneLevelUrl;   // 学习卡列表地址
-          // _this.setJumpURLForIAndII(res.data.oneLevelUrl);
+          // _this.oneLevelUrl = res.data.oneLevelUrl;   // I类学习卡列表地址
+          _this.setJumpURLForI(res.data.oneLevelUrl);
           _this.setOrganizationInfo(organizationInfo);
           if (_this.userMobile) {
             _this.tabIndex = 1;