Merge branch 'feature/6月迭代-抖音' into test

src/view/companyGroup/membershipSystem/addIntegralSytem.vue

@@ -768,6 +768,10 @@ export default {
       that.ruleForm.integralUse.fee = strLength.getCharVal(String(that.ruleForm.integralUse.fee).replace(/[^\.\d]/g, ''), 6);
       that.ruleForm.integralUse.integral = strLength.getCharVal(String(that.ruleForm.integralUse.integral).replace(/[^\d]/g, ''), 8);
       that.ruleForm.channelList[0].useProportionalRestriction = strLength.getCharVal(String(that.ruleForm.channelList[0].useProportionalRestriction).replace(/[^\d]/g, ''), 3);
+
+      if (parseInt(that.ruleForm.channelList[0].useProportionalRestriction) > 100) {
+        that.ruleForm.channelList[0].useProportionalRestriction = 100;
+      }
     },
     formatInputNumBlur() {
       let that = this;

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -245,7 +245,6 @@
               <el-form-item label="积分有效期：" v-if="ruleForm.integralGetStatus == 1" prop="integralGetEffectiveDays">
                 自获取之日起
                 <el-input v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInputNum($event)" style="width: 115px"></el-input><label>天</label>
-                <span class="setting-tips">适用于所有方式获取的积分</span>
               </el-form-item>
               <!-- 新增策略有效期配置 -->
               <el-form-item label="策略有效期：" prop="perpetualFlag">

src/view/companyGroup/membershipSystem/components/MemberCardTable.vue

@@ -158,6 +158,8 @@ export default {
       return new Promise((resolve, reject) => {
         if (this.isExist && this.type == 1) {
           this.$confirm('您已对接「天猫」、「抖音」渠道的会员等级，为确保每个渠道的会员等级对应关系一致，在调整会员等级顺序或者新增会员等级前请联系运营经理确认是否对应渠道的会员等级关系已维护完成！', '提示', {
+            type: 'warning',
+            customClass: 'check-open-channel',
             cancelButtonText: '未完成',
             confirmButtonText: '已完成'
           }).then(resolve);
@@ -363,6 +365,13 @@ export default {
 }
 </style>
 <style lang="less">
+.check-open-channel {
+  .el-message-box__status {
+    top: 3px;
+    transform: translateY(0);
+    font-size: 21px !important;
+  }
+}
 .el-tooltip__popper.member-grade-edit-form-tooltip {
   max-width: 400px;
   line-height: 18px;