1、开发激活/购买流程（内部逻辑）

2、部分弹框UI及交互
3、对接部分修改的接口

src/views/I-credit-detail.vue

@@ -130,10 +130,12 @@ export default {
       let param = {
         area: provinceId + "",
         cardType: 1,
-        pageNum: 1,
-        pageSize: 1
+        goodsType: 2,
+        cardTypeList: [1],
+        // pageNum: 1,
+        // pageSize: 1
       };
-      this.POST("trade/goods/cardList", param).then(res => {
+      this.POST("trade/goods/cardList_v2", param).then(res => {
         if (res.code == "000000") {
           this.showLoading = false;
           this.isShowPopup = true;

src/views/merge-detail.vue

@@ -449,7 +449,7 @@ export default {
       let param = {
         setEntry: true
       };
-      this.GET(`cme/projectCard/queryNoUsedCard/2`, param).then(({ data }) => {
+      this.GET(`cme/projectCard/queryNoUsedCard/${this.project.goodsType}/${this.project.cardType}`, param).then(({ data }) => {
         this.hasNoUsedCard = data.hasNoUsedCard;
         if (data.hasNoUsedCard == 1) {
           this.cmeCardModels = data.cmeCardModels[0] || {};
@@ -477,8 +477,10 @@ export default {
     changeCardAction(cardKey, isInTips) {
       let _this = this;
       let param = {
+        idType: 1,
         cardKey: cardKey,
-        cardType: 2,
+        cardType: this.project.cardType || 2,
+        goodsType: this.project.goodsType || 2,
         portalProjectId: this.projectId,
         setEntry: true
       };
@@ -667,9 +669,11 @@ export default {
     getCardInfoByProvinceId(provinceId) {
       let param = {
         area: provinceId + "",
-        cardType: 2,
-        pageNum: 1,
-        pageSize: 1
+        cardType: this.project.cardType || 2,
+        cardTypeList: [ this.project.cardType || 3],
+        goodsType: this.project.goodsType,
+        // pageNum: 1,
+        // pageSize: 1
       };
       this.POST("trade/goods/cardList", param).then(res => {
         if (res.code == "000000") {

src/views/share-merge-detail.vue

@@ -543,7 +543,7 @@ export default {
       let param = {
         setEntry: true
       };
-      this.GET(`cme/projectCard/queryNoUsedCard/2`, param).then(({ data }) => {
+      this.GET(`cme/projectCard/queryNoUsedCard/${this.project.goodsType}/${this.project.cardType}`, param).then(({ data }) => {
         this.hasNoUsedCard = data.hasNoUsedCard;
         if (data.hasNoUsedCard == 1) {
           this.cmeCardModels = data.cmeCardModels[0] || {};
@@ -556,8 +556,10 @@ export default {
     changeCardAction(cardKey, isInTips) {
       let _this = this;
       let param = {
+        idType: 1,
         cardKey: cardKey,
-        cardType: 2,
+        cardType: this.project.cardType || 2,
+        goodsType: this.project.goodsType || 2,
         channel: 3,
         portalProjectId: this.projectId,
         setEntry: true
@@ -666,11 +668,13 @@ export default {
     getCardInfoByProvinceId(provinceId) {
       let param = {
         area: provinceId + "",
-        cardType: 2,
-        pageNum: 1,
-        pageSize: 1
+        cardType: this.project.cardType || 2,
+        cardTypeList: [ this.project.cardType || 3],
+        goodsType: this.project.goodsType,
+        // pageNum: 1,
+        // pageSize: 1
       };
-      this.POST("trade/goods/cardList", param).then(res => {
+      this.POST("trade/goods/cardList_v2", param).then(res => {
         if (res.code == "000000") {
           this.showLoading = false;
           this.cardInfo = (res.data && res.data[0]) || {