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

9.16

Browse Source
This commit is contained in:
cun-nan 2024-09-16 16:30:12 +08:00
parent a5b7f4b5bf
commit 50facae364
6 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,6 +528,7 @@ export default {
Typeindex2(index) {
this.tindex2 = index
this.ruleForm.offerType = index
this.ruleForm.activeType = 0
if (index == 0) {
this.activityTypeList = ['固定满减', '随机满减', '每满']
} else {

28
fuintAdmin/src/views/power/banner.vue
View File

@ -13,16 +13,16 @@
</el-form-item>
<!-- <el-form-item style="float: right">-->
<el-form-item label="" prop="bannerName">
<el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">
<el-option
v-for="item in systemPositionList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="" prop="bannerName">-->
<!-- <el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">-->
<!-- <el-option-->
<!-- v-for="item in systemPositionList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="" prop="bannerName">
<el-select v-model="queryParams.bannerStatus" placeholder="请选择banner图状态">
@ -202,10 +202,7 @@ export default {
systemPositionList:[{
value: '首页',
label: '首页'
}, {
value: '系统首页',
label: '系统首页'
},],
}, ],
// 是否显示弹出层
open: false,
title:"",
@ -215,7 +212,7 @@ export default {
page: 1,
pageSize: 10,
bannerName:'',
systemPosition:'',
systemPosition:'首页',
bannerStatus:'',
},
rules: {
@ -315,6 +312,7 @@ export default {
page: 1,
pageSize: 10,
deviceName:'',
systemPosition:'首页',
},
this.getList()
},

3
fuintAdmin/src/views/power/message.vue
View File

@ -395,7 +395,7 @@
</el-form-item>
<!-- 接收角色 -->
<el-form-item label="接收角色" :required="true">
<el-select v-model="form.roeleList" multiple placeholder="请选择角色" style="width: 100%">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色" style="width: 100%">
<el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
</el-select>
</el-form-item>
@ -866,6 +866,7 @@ export default {
if (!valid) {
return;
}
if (this.form.roleIds) this.form.roleIds = this.form.roleIds.toString()
// 修改的提交
if (this.form.id != null) {
updateApi(this.form).then(response => {

4
fuintAdmin/src/views/setting/device/content/youqiji.vue
View File

@ -114,8 +114,8 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('deviceForm')">取消</el-button>
<el-button @click="submitForm('deviceForm')">提交</el-button>
<el-button @click="open = false">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
</el-form-item>
</el-form>
</el-dialog>

2
fuintAdmin_zt/src/views/components/Service/payment.vue
View File

@ -490,7 +490,7 @@ import {
getRuleConfig,
listRuleConfig
} from "@/api/payConfig/ruleConfig";
import {getPaymentParameterByDeptId} from "@/api/payConfig/paymentParameter";
import {getPaymentParameterByDeptId} from "../../../api/payConfig/paymentParameter";
export default {
dicts: ['payment_channel'],

28
fuintAdmin_zt/src/views/setting/banner/index.vue
View File

@ -13,16 +13,16 @@
</el-form-item>
<!-- <el-form-item style="float: right">-->
<el-form-item label="" prop="bannerName">
<el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">
<el-option
v-for="item in systemPositionList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="" prop="bannerName">-->
<!-- <el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">-->
<!-- <el-option-->
<!-- v-for="item in systemPositionList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="" prop="bannerName">
<el-select v-model="queryParams.bannerStatus" placeholder="请选择banner图状态">
@ -199,10 +199,7 @@ export default {
createByName: '', //
},
systemPositionList:[{
value: '首页',
label: '首页'
}, {
systemPositionList:[ {
value: '系统首页',
label: '系统首页'
},],
@ -215,7 +212,7 @@ export default {
page: 1,
pageSize: 10,
bannerName:'',
systemPosition:'',
systemPosition:'系统首页',
bannerStatus:'',
},
rules: {
@ -315,6 +312,7 @@ export default {
page: 1,
pageSize: 10,
deviceName:'',
systemPosition:'系统首页',
},
this.getList()
},