wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-26 19:51:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
liyang_v
2024-09-22 23:01:47 +08:00
parent c4944acb5e
commit b7c042dd44
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-ui/src/views/merchant/index.vue
View File

@@ -317,7 +317,7 @@
<el-radio :label="1">准入渠道</el-radio> <el-radio :label="1">准入渠道</el-radio>
<el-radio :label="2">禁入渠道</el-radio> <el-radio :label="2">禁入渠道</el-radio>
</el-radio-group> </el-radio-group>
<el-select v-model="form.channelLimnit" <el-select v-model="form.channelLimit"
placeholder="请选择渠道" placeholder="请选择渠道"
clearable clearable
multiple multiple
@@ -327,7 +327,7 @@
<el-option v-for="item in merchantChannelList" <el-option v-for="item in merchantChannelList"
:key="item.id" :key="item.id"
:label="item.channelName" :label="item.channelName"
:value="item.id"></el-option> :value="item.id + ''"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -778,7 +778,7 @@ export default {
huaBeiMiddle: 0, huaBeiMiddle: 0,
huaBeiHigh: 0, huaBeiHigh: 0,
zhiMa: null, zhiMa: null,
channelLimnit: [] channelLimit: []
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@@ -811,7 +811,11 @@ export default {
getMerchant(id).then((response) => { getMerchant(id).then((response) => {
this.form = response.data; this.form = response.data;
this.form.period = this.form.period ? this.form.period.split(",") : []; this.form.period = this.form.period ? this.form.period.split(",") : [];
this.form.period = this.form.channelLimnit ? this.form.channelLimnit.split(",") : []; this.form.channelLimit = this.form.channelLimit ? this.form.channelLimit.split(",") : [];
let checkedCount = this.form.period.length;
this.checkAll = checkedCount === this.cityOptions.length;
this.isIndeterminate =
checkedCount > 0 && checkedCount < this.cityOptions.length;
this.open = true; this.open = true;
this.title = "修改商户"; this.title = "修改商户";
}); });
@@ -825,8 +829,8 @@ export default {
if (params.period) { if (params.period) {
params.period = params.period.join(","); params.period = params.period.join(",");
} }
if (params.channelLimnit) { if (params.channelLimit) {
params.channelLimnit = params.channelLimnit.join(","); params.channelLimit = params.channelLimit.join(",");
} }
updateMerchant(params).then((response) => { updateMerchant(params).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
@@ -838,8 +842,8 @@ export default {
if (params.period) { if (params.period) {
params.period = params.period.join(","); params.period = params.period.join(",");
} }
if (params.channelLimnit) { if (params.channelLimit) {
params.channelLimnit = params.channelLimnit.join(","); params.channelLimit = params.channelLimit.join(",");
} }
addMerchant(params).then((response) => { addMerchant(params).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");

2
ruoyi-ui/vue.config.js
View File

@@ -35,7 +35,7 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://y787tf.natappfree.cc`, target: `http://r6a2wb.natappfree.cc`,
// target: `http://124.222.144.55/dev-api`, // target: `http://124.222.144.55/dev-api`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {