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

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -229,7 +229,7 @@
                   <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="请输入" :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>
@@ -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

@@ -679,7 +679,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: [