feat:我要赚米

src/views/act/act-ad/form.vue

@@ -9,6 +9,11 @@
         </el-col>
         <el-col :span="12" class="mb20">
         </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="活动商户" prop="mchId">
+            <select-mch v-model="form.mchId" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12" class="mb20">
           <el-form-item label="优惠券名称" prop="name">
             <el-input v-model="form.name" placeholder="请输入优惠券名称" />
@@ -103,6 +108,7 @@ const form = reactive<any>({
 
 // 定义校验规则
 const dataRules = ref({
+  mchId: [{ required: true, message: '活动商户不能为空', trigger: 'change' }],
   name: [{ required: true, message: '优惠券名称不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
   typeList: [{ required: true, message: '活动类型列表不能为空', trigger: 'change' }],

src/views/integral/integral-manage/form.vue

@@ -84,7 +84,7 @@ const dataRules = ref({
 })
 
 // 变动后的积分
-const integralNumResult = computed(() => Number(form.integralNum) + Number(form.changeIntegralNum))
+const integralNumResult = computed(() => Number(form.integralNum) + (Number(form.changeIntegralNum) * form.changeType))
 
 // 打开弹窗
 const openDialog = (id: string) => {
@@ -117,7 +117,7 @@ const onSubmit = async () => {
     loading.value = true;
     const _params: any = {
       id: form.id,
-      integralNum: form.changeIntegralNum,
+      integralNum: form.changeIntegralNum * form.changeType,
     }
     await integralTransactionApi.updateIntegral(_params);
     useMessage().success(form.id ? '修改成功' : '添加成功');