2024.07.13 补充提交

src/views/active/combinationActivityConfiguration/components/EditModal.vue

@@ -102,12 +102,12 @@
         label="是否发送卡包" prop="isCardHolder"
       >
         <el-radio-group v-model="formData.isCardHolder">
-          <el-radio :label="1">是</el-radio>
-          <el-radio :label="0">否</el-radio>
+          <el-radio :label="true">是</el-radio>
+          <el-radio :label="false">否</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && (formData.isCardHolder === 1)"
+        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && formData.isCardHolder"
         label="卡券类型" prop="cardType"
       >
         <el-select v-model="formData.cardType" clearable size="mini" placeholder="请选择卡券类型">
@@ -117,7 +117,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && (formData.isCardHolder === 1)"
+        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && formData.isCardHolder"
         label="卡券类型规则" prop="cardRule"
       >
         <el-radio-group v-model="formData.cardRule">
@@ -126,7 +126,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && (formData.isCardHolder === 1)"
+        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && formData.isCardHolder"
         label="卡包价格规则" prop="cardMoney"
       >
         <el-input v-model="formData.cardMoney" placeholder="请输入卡包价格规则" style="width: 250px;">
@@ -141,7 +141,7 @@
         </el-input>
       </el-form-item>
       <el-form-item
-        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && (formData.isCardHolder === 1)"
+        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && formData.isCardHolder"
         label="卡券发放数量" prop="cardNum"
       >
         <el-input v-model="formData.cardNum" placeholder="请输入卡券发放数量" style="width: 200px;">
@@ -151,7 +151,7 @@
         </el-input>
       </el-form-item>
       <el-form-item
-        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && (formData.isCardHolder === 1)"
+        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && formData.isCardHolder"
         label="卡券有效期" prop="cardEffectiveTime"
       >
         <el-input v-model="formData.cardEffectiveTime" placeholder="请输入卡券有效期" style="width: 200px;">
@@ -161,7 +161,7 @@
         </el-input>
       </el-form-item>
       <el-form-item
-        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && (formData.isCardHolder === 1)"
+        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && formData.isCardHolder"
         label="卡券使用范围" prop="cardRange"
       >
         <el-select v-model="formData.cardRange" clearable size="mini" placeholder="请选择卡券使用范围">
@@ -170,7 +170,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && (formData.isCardHolder === 1) && (formData.cardRange === 1)"
+        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && formData.isCardHolder && (formData.cardRange === 1)"
         label="卡券指定区域" prop="cardRange"
       >
         <el-cascader
@@ -180,7 +180,7 @@
         <div v-if="String(formData.cardJson)">已选ID：{{ formData.cardJson }}</div>
       </el-form-item>
       <el-form-item
-        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && (formData.isCardHolder === 1)"
+        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && formData.isCardHolder"
         label="业务json字段" prop="cardBusinessFields"
       >
         <el-input
@@ -331,7 +331,7 @@ export default {
           joinRule: res.data.joinRule || '',
           roleType: res.data.roleType || '',
           joinMoney: (res.data.joinRule === 2) && (typeof res.data.joinMoney === 'number') ? res.data.joinMoney * 100 : res.data.joinMoney,
-          commissionPrice: '',
+          commissionPrice: res.data.commissionPrice || '',
           ruleId: res.data.ruleId || '',
           isCardHolder: res.data.isCardHolder,
           cardType: res.data.cardType || '',