dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-10 16:19:21 +08:00
commit c19bd7b33f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue
View File

@ -157,9 +157,9 @@
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="活动方式" prop="activeManner"> <el-form-item label="活动方式" prop="activeManner">
<el-checkbox-group v-model="ruleForm.activeManner"> <el-radio-group v-model="ruleForm.activeManner">
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center"> <div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="0" name="type">按订单金额</el-checkbox> <el-radio label="0" name="type">按订单金额</el-radio>
<img src="@/assets/images/tjb.png" <img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px" style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addPoints(0)"> @click="addPoints(0)">
@ -235,7 +235,7 @@
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center"> <div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="1" name="type">按加油升数</el-checkbox> <el-radio label="1" name="type">按加油升数</el-radio>
<img src="@/assets/images/tjb.png" <img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px" style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addGrowthValues(1)"> @click="addGrowthValues(1)">
@ -316,7 +316,7 @@
@click="deleteGrowthValues(index)"> @click="deleteGrowthValues(index)">
</div> </div>
</div> </div>
</el-checkbox-group> </el-radio-group>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -426,6 +426,18 @@ export default {
activeManner: [ activeManner: [
{required: true, message: '活动方式不能为空', trigger: 'blur'}, {required: true, message: '活动方式不能为空', trigger: 'blur'},
], ],
timeApplyStart: [
{
validator: (rule, value, callback) => {
if (!this.ruleForm.timeApplyStart || !this.ruleForm.timeApplyEnd) {
callback(new Error("请选择完整的时间段"));
} else {
callback();
}
},
trigger: "change"
}
]
} }
} }
}, },