Merge branch 'feature/3月迭代' into dev

src/views/enterprise/salutatory.vue

@@ -116,7 +116,10 @@ export default {
         1: 'iconwenjianleixingtupian',
         2: 'iconwenjianleixingshipin',
         3: 'iconwenjianleixing-wenjian',
-        4: 'iconwenjianleixing-lianjie'
+        4: 'iconwenjianleixing-lianjie',
+        5: 'iconwenjianleixing-xiaochengxu', // 小程序
+        6: 'iconwenjianleixing-xiaochengxu', // 带参小程序
+        7: 'icongongzhonghao1' // 带参公众号
       },
       tableData: [],
       loading: false

src/views/enterprise/salutatorySet.vue

@@ -341,7 +341,7 @@ export default {
     },
     handleDiabled(val) {
       console.log('handleDiabled');
-      if (this.form.welcomeMediaList.filter(item => item.miniProgramId && item.miniProgramId == val.miniprogramSettingId).length) {
+      if (this.form.welcomeMediaList.filter(item => item.miniprogramSettingId && item.miniprogramSettingId == val.miniprogramSettingId).length) {
         return true;
       } else {
         return false;
@@ -353,15 +353,16 @@ export default {
         return;
       }
       const obj = this.appTableData.filter(item => item.miniprogramSettingId == this.selectedApple)[0];
-      if (!this.form.welcomeMediaList.filter(item => item.miniProgramId && item.miniProgramId == obj.miniprogramSettingId).length) {
+      if (!this.form.welcomeMediaList.filter(item => item.miniprogramSettingId && item.miniprogramSettingId == obj.miniprogramSettingId).length) {
         this.form.welcomeMediaList.push({
           miniProgramName: obj.miniprogramName,
-          mediaType: obj.miniprogramSettingId == 6 ? 6 : 5,
+          mediaType: obj.miniprogramSettingId == -1 ? 6 : 5,
           mediaUrl: obj.imageUrl,
-          mediaTitle: obj.mediaTitle,
-          miniProgramId: obj.miniprogramSettingId
+          mediaTitle: obj.title,
+          miniprogramSettingId: obj.miniprogramSettingId
         });
       }
+      console.log(this.form.welcomeMediaList);
       this.closeAppletDialog();
     },
     closeAppletDialog() {
@@ -377,8 +378,9 @@ export default {
             this.appTableData = resData.result;
             this.appTableData.push({
               miniprogramName: '带参会员小程序',
-              miniprogramSettingId: 6,
-              mediaTitle: '小程序标题'
+              miniprogramSettingId: '-1',
+              imageUrl: 'https://other-1251519181.cos.ap-shanghai.myqcloud.com/haoban/20220316151939/1b31e9f76ff1ac4340e5e66497df7cea.png',
+              title: '带参会员小程序'
             });
           }
         })