update: 合并后样式修改

src/views/business/authMerchant-form.vue

@@ -61,7 +61,7 @@
                   <gic-select-group-auth :brandId="enterpriseId" width="287px" :authMerchant="true" :selectData="partForm.storeGroup" @checkGroupIds="checkGroupIds"> </gic-select-group-auth>
                 </el-form-item>
                 <el-form-item style="margin-top:-10px;margin-bottom:12px;">
-                  <el-tooltip slot="label" class="item" effect="dark" :open-delay="200" placement="top-start">
+                  <el-tooltip popper-class="authMerchant-member-open-card-flag-tooltip" slot="label" class="item" effect="dark" :open-delay="200" placement="top-start">
                     <div slot="content" style="line-height:18px;">
                       ①选择同一开平，通过企业微信添加客户，可以直接更新会员信息（一码两用）。<br />
                       原因：因为获取的用户unionid相同，可以将客户身份（企微客户）和会员（微信会员）身份直接关联；<br />
@@ -450,4 +450,8 @@ export default {
 .authMerchant-select-pop {
   left: 168px !important;
 }
+.authMerchant-member-open-card-flag-tooltip {
+  max-width: 440px !important;
+  width: 440px;
+}
 </style>

src/views/enterprise/salutatory.vue

@@ -81,7 +81,7 @@ export default {
       const that = this;
       that.$refs.form.validate(value => {
         if (value) {
-          this.$confirm('是否确定修改欢迎语启用状态？', '提示', {
+          this.$confirm('是否确定修改欢迎语启用状态？', '', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'