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

src/views/enterprise/salutatory.vue

@@ -63,7 +63,7 @@
       </div>
     </div>
     <el-dialog title="加好友配置" :visible.sync="dialogVisible" width="590px" :before-close="handleClose">
-      <span class="tips">好办欢迎语支持文字、图片、视频、文件、链接及小程序</span>
+      <span class="tips">好办欢迎语支持文字、图片、视频、文件、链接</span>
       <el-form label-width="100px" style="margin-top:20px">
         <el-form-item label="加好友配置">
           <div v-for="(val, key) in friendSettingTypeOption" :key="key">
@@ -88,13 +88,12 @@ export default {
     return {
       friendSettingTypeOption: [
         { label: 2, content: '发送【好办欢迎语】+【带导购参数的公众号二维码】' },
-        { label: 1, content: '发送【好办欢迎语】+【带导购参数的会员小程序卡片】' },
-        { label: 3, content: '发送【好办欢迎语】' }
+        { label: 1, content: '发送【好办欢迎语】+【带导购参数的会员小程序卡片】' }
       ],
       title: '',
       wxEnterpriseId: localStorage.getItem('userInfos') ? JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId : '',
       friendSettingType: '',
-      type: 1,
+      type: 2,
       friendSettingId: '',
       btnLoading: false,
       dialogVisible: false,
@@ -148,7 +147,7 @@ export default {
         if (resData.code == 0 && resData.result) {
           const { friendSettingId, friendSettingType } = resData.result;
           this.friendSettingId = friendSettingId;
-          this.type = friendSettingType;
+          this.type = friendSettingType ? friendSettingType : 2;
           this.friendSettingType = friendSettingType;
         }
       });

src/views/enterprise/salutatorySet.vue

@@ -53,7 +53,7 @@
                 </ul>
                 <div slot="reference" style="cursor: pointer; display: inline-block;">
                   <i class="iconfont-hb3 icontianjiajiahaowubiankuang"></i>
-                  <p>添加图片/视频/文件/链接/小程序</p>
+                  <p>添加图片/视频/文件/链接</p>
                 </div>
               </el-popover>
               <p style="font-size:12px;color:#909399">(附件不超过9个，单个大小不超过2M，小程序仅支持添加1个)</p>