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

src/components/memberShip/point-form.vue

@@ -17,7 +17,7 @@
           <el-select v-model="ruleForm.integralGetStrategy" placeholder="请选择" style="width:115px;margin-left:5px;">
             <el-option v-for="item in cateOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
           </el-select><br/>
-          <span style="color: #909399;font-size:12px; padding-left:22px;"> 例：根据消费金额计算出积分为4.3，选择「四舍五入」和「进位制」时为5积分，选择「抹零」则为4积分</span>
+          <span style="color: #909399;font-size:12px; padding-left:22px;"> 例：根据消费金额计算出积分为4.3，选择「四舍五入」和「抹零」时为4积分，选择「进位制」则为5积分</span>
         </div>
         <div class="form-child margin-20" v-if="ruleForm.integralGetStatus == 1">
           <el-form-item label="折扣控制:" prop="" label-width="100px">

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -229,12 +229,12 @@
                   <el-input-number v-model="ruleForm.integralGet.fee" placeholder="请输入" :precision="1" :controls="false" :max="10000.0" :min="0.1" style="width: 115px"></el-input-number>
                   <label>元，获取 </label>
                   <!-- <el-input v-model="ruleForm.integralGet.integral" @blur="formatInputNumBlur($event)"></el-input> -->
-                  <el-input-number v-model="ruleForm.integralGet.integral" placeholder="请输入" :precision="1" :controls="false" :max="10000.0" :min="0.1" style="width: 115px"></el-input-number>
+                  <el-input-number v-model="ruleForm.integralGet.integral" placeholder="请输入" step-strictly  :controls="false" style="width: 115px"></el-input-number>
                   <label>积分。取整策略为</label>
                   <el-select v-model="ruleForm.integralGetStrategy" placeholder="请选择" style="width: 115px">
                     <el-option v-for="item in cateOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
                   </el-select>
-                  <p class="setting-tips" style="margin: 6px 0 0">例：根据消费金额计算出积分为4.3，选择「四舍五入」和「进位制」时为5积分，选择「抹零」则为4积分</p>
+                  <p class="setting-tips" style="margin: 6px 0 0">例：根据消费金额计算出积分为4.3，选择「四舍五入」和「抹零」时为4积分，选择「进位制」则为5积分</p>
                 </div>
               </el-form-item>
               <el-form-item label="积分冻结期：" v-if="ruleForm.integralGetStatus == 1" prop="integralGetFreezeDays">
@@ -485,7 +485,7 @@ export default {
         integralGetFreezeDays: 1, // 获取积分冻结天数
         integralGetEffectiveDays: 1, // 获取积分有效天
         integralUseStatus: '0', // 积分抵现开启 1是0否
-        integralUse: { fee: undefined, integral: undefined }, // 积分抵现 {fee:5,integral:5}
+        // integralUse: { fee: undefined, integral: undefined }, // 积分抵现 {fee:5,integral:5}
         perpetualFlag: 1,
         channelList: [
           {

src/view/companyGroup/membershipSystem/editPointSystem.vue

@@ -414,7 +414,7 @@
                   <el-select v-model="ruleForm.integralGetStrategy" placeholder="请选择" style="width:115px;">
                     <el-option v-for="item in cateOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
                   </el-select>
-                  <p style="color: #909399;font-size:12px;">例：根据消费金额计算出积分为4.3，选择「四舍五入」和「进位制」时为5积分，选择「抹零」则为4积分</p>
+                  <p style="color: #909399;font-size:12px;">例：根据消费金额计算出积分为4.3，选择「四舍五入」和「抹零」时为4积分，选择「进位制」则为5积分</p>
                 </div>
               </el-form-item>
               <el-form-item label="积分冻结期:" v-if="ruleForm.integralGetStatus == 1" prop="integralGetFreezeDays">
@@ -423,7 +423,6 @@
               </el-form-item>
               <el-form-item label="积分有效期:" v-if="ruleForm.integralGetStatus == 1" prop="integralGetEffectiveDays">
                 <label>自获取之日起</label><el-input v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label>
-                <span style="font-size: 12px;color: #828282;;padding-left: 10px;">适用于所有方式获取的积分</span>
               </el-form-item>
               <!-- 新增策略有效期配置 -->
               <el-form-item label="策略有效期:" prop="perpetualFlag">
@@ -679,7 +678,7 @@ export default {
         integralGetFreezeDays: 1, // 获取积分冻结天数
         integralGetEffectiveDays: 1, // 获取积分有效天
         integralUseStatus: 0, // 积分抵现开启 1是0否
-        integralUse: { fee: undefined, integral: undefined }, // 积分抵现 {fee:5,integral:5}
+        // integralUse: { fee: undefined, integral: undefined }, // 积分抵现 {fee:5,integral:5}
         perpetualFlag: 1,
         channelList: [],
         perpetualDate: [