-
+
+
-
+
-
+
-
+
-
+
-
+
{
if (valid) {
@@ -657,7 +835,11 @@ export default {
if (this.add) {
//新增商户--merchantCreate
try {
- const res = await merchantCreate(this.form);
+ let f_data = JSON.parse(JSON.stringify(this.form));
+ delete f_data.options;
+ delete f_data.options1;
+ delete f_data.options2;
+ const res = await merchantCreate(f_data);
console.log("res", res);
if (res.status == 200) {
this.open2(res.message);
@@ -671,7 +853,11 @@ export default {
try {
console.log(this.form);
console.log("id", this.merid);
- const res = await merchantUpdateA(this.merid, this.form);
+ let f_data = JSON.parse(JSON.stringify(this.form));
+ delete f_data.options;
+ delete f_data.options1;
+ delete f_data.options2;
+ const res = await merchantUpdateA(this.merid, f_data);
console.log("res", res);
if (res.status == 200) {
this.open2(res.message);
@@ -689,20 +875,20 @@ export default {
});
},
//重置
- resetForm(formName) {
+ resetForm (formName) {
this.$nextTick(() => {
this.$refs[formName].resetFields();
});
// this.$refs[formName].resetFields();
},
//计数器
- handleChange(value) {
+ handleChange (value) {
console.log(value);
},
//获取商户分类
- getShopClassify() {},
+ getShopClassify () { },
//获取商圈
- async getshopList() {
+ async getshopList () {
const data = { city_code: "510500" };
const promise = await getShopAddressApi(data).then(
res => {
@@ -717,7 +903,7 @@ export default {
}
);
},
- onLogo(id) {
+ onLogo (id) {
merchantLoginApi(id)
.then(res => {
Cookies.set("merchantToken", res.data.token);
@@ -728,30 +914,30 @@ export default {
});
},
// 选择时间
- selectChange(tab) {
+ selectChange (tab) {
this.tableFrom.date = tab;
this.timeVal = [];
this.tableFrom.page = 1;
this.getList("");
},
// 具体日期
- onchangeTime(e) {
+ onchangeTime (e) {
this.timeVal = e;
this.tableFrom.date = this.timeVal ? this.timeVal.join("-") : "";
this.tableFrom.page = 1;
this.getList("");
},
// 获取开启商户数
- getHeadNum() {
+ getHeadNum () {
merchantCountApi()
.then(res => {
this.headeNum[0]["count"] = res.data.valid;
this.headeNum[1]["count"] = res.data.invalid;
})
- .catch(res => {});
+ .catch(res => { });
},
// 商户分类；
- getMerCategory() {
+ getMerCategory () {
getMerCateApi()
.then(res => {
this.merCateList = res.data;
@@ -760,7 +946,7 @@ export default {
this.$message.error(res.message);
});
},
- getStoreType() {
+ getStoreType () {
getstoreTypeApi()
.then(res => {
this.storeType = res.data;
@@ -770,7 +956,7 @@ export default {
});
},
// 列表
- getList(num) {
+ getList (num) {
console.log(this.tableFrom);
this.listLoading = true;
this.tableFrom.page = num ? num : this.tableFrom.page;
@@ -787,16 +973,16 @@ export default {
this.$message.error(res.message);
});
},
- pageChange(page) {
+ pageChange (page) {
this.tableFrom.page = page;
this.getList("");
},
- handleSizeChange(val) {
+ handleSizeChange (val) {
this.tableFrom.limit = val;
this.getList(1);
},
// 修改状态
- onchangeIsShow(row) {
+ onchangeIsShow (row) {
const title = row.is_best === 0 ? "是否开启推荐商户" : "是否关闭推荐商户";
this.$modalSure(title).then(() => {
merchantStatuseApi(row.mer_id, row.is_best === 1 ? 0 : 1)
@@ -810,7 +996,7 @@ export default {
});
},
// 开启关闭
- onchangeIsClose(row) {
+ onchangeIsClose (row) {
merchantIsCloseApi(row.mer_id, row.status === 1 ? 0 : 1)
.then(({ message }) => {
this.$message.success(message);
@@ -821,13 +1007,23 @@ export default {
});
},
// 添加
- onAdd() {
+ onAdd () {
this.add = true;
this.popFormVisible = true;
+ this.form.auto_margin_rate = 0; //扣除
+ this.form.paid_margin = "0.00"; //支付的保证金
+ this.form.ot_margin = "0.00"; //总的保证金
+ this.form.margin = ""; //需支付的保证金
+ this.form.area_id = "";
+ this.form.street_id = "";
+ this.form.village_id = "";
+ this.form.info = "";
+ this.form.info1 = "";
+ this.form.info2 = "";
// this.$modalForm(merchantCreateApi()).then(() => this.getList(""));
},
// 编辑
- async onEdit(id) {
+ async onEdit (id) {
//调用获取商圈
this.popFormVisible = true; //开启编辑表单
this.add = false;
@@ -845,6 +1041,8 @@ export default {
this.form.mer_phone = res.mer_phone;
this.form.auto_margin_rate = res.auto_margin_rate; //扣除
this.form.paid_margin = res.paid_margin; //支付的保证金
+ this.form.ot_margin = res.ot_margin; //总的保证金
+ this.form.margin = res.margin; //需支付的保证金
this.form.area_id = res.geo_address.area_id;
this.form.street_id = res.geo_address.street_id;
this.form.village_id = res.geo_address.village_id;
@@ -894,7 +1092,7 @@ export default {
// this.$modalForm(merchantUpdateApi(id)).then(() => this.getList(""));
},
// 删除
- handleDelete(id) {
+ handleDelete (id) {
this.$modalSure(
"该商户下有相关数据信息，删除后不可恢复，您是否确定删除"
).then(() => {
@@ -910,16 +1108,16 @@ export default {
});
},
// 扣除保证金
- onDeduct(id) {
+ onDeduct (id) {
this.$modalForm(marginDeductionForm(id)).then(() => this.getList(""));
},
// 设置复制次数
- handleTimes(id) {
+ handleTimes (id) {
this.$modalForm(changeCopyApi(id)).then(() => this.getList(""));
},
// 修改密码表单
- onPassword(id) {
+ onPassword (id) {
this.$modalForm(merchantPasswordApi(id));
}
}