{{ item.title }}
-
+
-
+
@@ -166,6 +174,12 @@ const dialog_title = computed(() => {
name = '插件';
} else if (props.type[0] == 'coupon') {
name = '优惠券';
+ } else if (props.type[0] == 'binding') {
+ name = '组合搭配';
+ } else if (props.type[0] == 'merchant') {
+ name = '多商户';
+ } else if (props.type[0] == 'realstore') {
+ name = '多门店';
}
return name + '选择';
} else {
diff --git a/src/components/model-realstore/index.vue b/src/components/model-realstore/index.vue
index ec1d155a..2ea86fed 100644
--- a/src/components/model-realstore/index.vue
+++ b/src/components/model-realstore/index.vue
@@ -12,18 +12,14 @@
-
-
- ![]()
- {{ item.title }}
-
+ {{ item.name }}
- {{ item.state }}
- |
- {{ item.business_hours }}
+ {{ item.status_info.msg }}
+ |
+ {{ item.status_info.time }}
-
-
+
-
-
+
+
+ 距您{{ item.distance }}
-
@@ -73,20 +75,16 @@
+
+
+ 距您{{ item.distance }}
-
([]);
-const new_url_list = computed(() => {
- return (title_url: url[]) => {
- return title_url.filter(item1 => !isEmpty(item1.url));
- }
-});
-// 标题图片样式
-const title_img_style = computed(() => {
- return (title_url: url[], index: number) => {
- const { realstore_title_img_width = 0, realstore_title_img_height = 0, realstore_title_img_radius, realstore_title_img_inner_spacing, realstore_title_img_outer_spacing} = new_style.value;
- let style = `width: ${realstore_title_img_width || 0 }px;height: ${ realstore_title_img_height || 0 }px;${ radius_computer(realstore_title_img_radius) }`;
- const list = title_url.filter(item1 => !isEmpty(item1.url));
- if (index < list.length - 1) {
- style += `margin-right: ${ realstore_title_img_inner_spacing || 0}px;`;
- } else {
- style += `margin-right: ${ realstore_title_img_outer_spacing || 0}px;`;
- }
- return style;
- }
-});
// 初始化的时候执行
onMounted(() => {
// 指定商品并且指定商品数组不为空
@@ -209,29 +202,30 @@ onMounted(() => {
});
const get_products = () => {
- const { category_ids, brand_ids, number, order_by_type, order_by_rule, keywords } = form.value;
+ const { category_ids, is_goods_list, number, order_by_type, order_by_rule, keywords } = form.value;
const params = {
- goods_keywords: keywords,
- goods_category_ids: category_ids,
- goods_brand_ids: brand_ids,
- goods_order_by_type: order_by_type,
- goods_order_by_rule: order_by_rule,
- goods_number: number,
+ realstore_keywords: keywords,
+ realstore_category_ids: category_ids,
+ realstore_order_by_type: order_by_type,
+ realstore_order_by_rule: order_by_rule,
+ realstore_number: number,
+ realstore_is_goods_list: is_goods_list,
};
- list.value = Array(4).fill(default_list);
- // 获取商品列表
- // ShopAPI.getShopLists(params).then((res: any) => {
- // if (!isEmpty(res.data)) {
- // list.value = res.data;
- // } else {
- // list.value = Array(4).fill(default_list);
- // }
- // });
+ // 获取商户列表
+ RealstoreAPI.getAutoList(params).then((res: any) => {
+ if (!isEmpty(res.data)) {
+ list.value = res.data;
+ } else {
+ list.value = Array(4).fill(default_list);
+ }
+ }).catch(() => {
+ list.value = Array(4).fill(default_list);
+ });
};
// 取出监听的数据
const watch_data = computed(() => {
- const { category_ids, brand_ids, number, order_by_type, order_by_rule, data_type, data_list, keywords } = form.value;
- return { category_ids: category_ids, brand_ids: brand_ids, number: number, order_by_type: order_by_type, order_by_rule: order_by_rule, data_type: data_type, data_list: data_list, keyword: keywords };
+ const { category_ids, number, order_by_type, order_by_rule, data_type, data_list, keywords, is_goods_list } = form.value;
+ return { category_ids, number, order_by_type, order_by_rule, data_type, data_list, keywords, is_goods_list };
})
// 初始化的时候不执行, 监听数据变化
watch(() => watch_data.value, (val, oldVal) => {
@@ -241,7 +235,7 @@ watch(() => watch_data.value, (val, oldVal) => {
if (!isEmpty(val.data_list)) {
list.value = cloneDeep(val.data_list).map((item: any) => ({
...item.data,
- title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
+ name: !isEmpty(item.new_title) ? item.new_title : item.data.name,
new_cover: item.new_cover,
}));
} else {
diff --git a/src/components/model-realstore/model-realstore-content.vue b/src/components/model-realstore/model-realstore-content.vue
index 88f5acec..e8c6fb6c 100644
--- a/src/components/model-realstore/model-realstore-content.vue
+++ b/src/components/model-realstore/model-realstore-content.vue
@@ -192,16 +192,6 @@ const url_value_dialog_call_back = (item: any[]) => {
};
}
};
-// 标题浮起之后博客标题的颜色和字体更新
-const switch_chage = (val: string | number | boolean) => {
- if (val == '1') {
- data.value.name_color = '#fff';
- data.value.name_weight = '400';
- } else {
- data.value.name_color = '#333';
- data.value.name_weight = 'bold';
- }
-};
-
- ![]()
- {{ item.title }}
-
+ {{ item.name }}