Merge branch 'feature/朋友圈卡片' into dev

src/views/game/cmh/base-config.vue

@@ -147,6 +147,7 @@ export default {
         adsFlag: 0,
         bulletFlag: 0,
         backMusicUrlObj: ''
+        // addMomentsCard: false
       },
       gameExt: {},
       adsImageUrl: { imgUrl: '', code: '' },
@@ -246,6 +247,9 @@ export default {
           this.backMusicOptions.push(item);
         } else if (!keys.includes(item.materialKey)) {
           obj[item.materialKey] = item;
+          // if (item.materialKey == 'momentsCard') {
+          //   this.baseForm.addMomentsCard = true;
+          // }
         }
       });
       if (initTemp) {
@@ -364,6 +368,7 @@ export default {
           }
         }
       });
+      console.log(this.baseForm);
     },
     handleListen() {
       this.isPlay = !this.isPlay;

src/views/game/cmh/form.vue

@@ -256,6 +256,7 @@ export default {
         momentsCard,
         momentsCardSize0,
         momentsCardSize1
+        // addMomentsCard
       };
       this.gameTime = gameTime;
     },

src/views/game/cmh/rule-config.vue

@@ -251,7 +251,9 @@ export default {
       momentsCardSize0: '',
       momentsCardSize1: 1,
       shareReportSize1: 1,
-      shareReportSize0: ''
+      shareReportSize0: '',
+      addMomentsCard: false,
+      momentsCard: ''
     };
   },
   props: {
@@ -273,7 +275,6 @@ export default {
   },
   watch: {
     shareImgData(val) {
-      console.log(val.shareCard);
       const { shareCard, shareReport, shareCardSize0, shareCardSize1, shareReportSize1, shareReportSize0, momentsCard, momentsCardSize0, momentsCardSize1 } = val;
       this.ruleForm.gameRuleConditionList[2].conditionJson.shareCard = shareCard;
       this.ruleForm.gameRuleConditionList[2].conditionJson.momentsCard = momentsCard;
@@ -285,6 +286,8 @@ export default {
       this.momentsCardSize1 = momentsCardSize1;
       this.shareReportSize1 = shareReportSize1;
       this.shareReportSize0 = shareReportSize0;
+      // this.addMomentsCard = addMomentsCard;
+      // this.momentsCard = momentsCard;
       this.ruleForm.gameRuleConditionList = this.ruleForm.gameRuleConditionList.splice(0);
     },
     echoData(val) {
@@ -301,6 +304,9 @@ export default {
             item.conditionId = obj[item.type].conditionId;
           }
         });
+        // if (this.addMomentsCard) {
+        //   this.ruleForm.gameRuleConditionList[2].conditionJson.momentsCard = this.momentsCard;
+        // }
       }
       if (this.isEdit) {
         if (memberType == 1) {