diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index c4bb42d..5e19fa8 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -90,6 +90,13 @@
+
+
+
+
+
+
+
+
+
-
-
import { merCategoryListApi } from '@/api/product'
-import {getstoreTypeApi, merchantUpdate, merchantCreate, merchantListApi} from "@/api/merchant";
+import {getstoreTypeApi, merchantUpdate, merchantCreate, merchantListApi, brandListApi} from "@/api/merchant";
export default {
props: {
merData: {
@@ -397,6 +404,7 @@ export default {
}
}
return {
+ brand_list: {},
mer_list: {},
mar_type_name: '商户',
loading: false,
@@ -430,6 +438,7 @@ export default {
this.mar_type_name = this.defaultMerchantType == 1 ? '酒道馆' : (this.defaultMerchantType == 2 ? '供应商' :'商户');
this.selectMerList();
+ this.selectBrandList('');
},
deep: true
}
@@ -517,7 +526,22 @@ export default {
}).catch(res => {
this.$message.error(res.message);
});
+ },
+ // 搜索品牌列表
+ selectBrandList(query){
+ let _this = this;
+ let params = {
+ page: 1,
+ limit: 100,
+ title: query,
+ };
+ brandListApi(params).then(res => {
+ _this.brand_list = res.data.list || {};
+ }).catch(res => {
+ this.$message.error(res.message);
+ });
}
+
},
};
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index f62af03..a64e257 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -106,19 +106,11 @@
添加商户
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}
-
-
-
+
+