diff --git a/components/diy/binding.vue b/components/diy/binding.vue
new file mode 100644
index 00000000..e2e15ea1
--- /dev/null
+++ b/components/diy/binding.vue
@@ -0,0 +1,512 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ match_item.title }}
+
+
+
+ ¥
+ {{ match_item.estimate_price }}
+
+
+
+
+ ¥
+ {{ match_item.estimate_discount_price || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ match_item.title }}
+
+
+
+ ¥
+ {{ match_item.estimate_price }}
+
+
+
+
+ ¥
+ {{ match_item.estimate_discount_price || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+ {{ item.show_price_symbol }}
+ {{ item.price }}
+ {{ item.show_price_unit }}
+
+
+
+
+ {{ item.show_price_symbol }}
+ {{ item.discount_price || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+ {{ item.show_price_symbol }}
+ {{ item.price }}
+ {{ item.show_price_unit }}
+
+
+
+
+ {{ item.show_price_symbol }}
+ {{ item.discount_price || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ match_item.is_home_show_goods ? '收起' : '展开'}}{{ match_item.type_name }}商品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index e914127b..811e6af3 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -41,6 +41,7 @@
+
@@ -129,6 +130,7 @@
import componentDiySeckill from '@/components/diy/seckill';
import componentDiyRealstore from '@/components/diy/realstore';
import componentDiyShop from '@/components/diy/shop';
+ import componentDiyBinding from '@/components/diy/binding';
import componentDiyTabsCarousel from '@/components/diy/tabs-carousel';
import componentDataTabs from '@/components/diy/data-tabs';
import componentGoodsList from '@/components/goods-list/goods-list';
@@ -190,6 +192,7 @@
componentDiySeckill,
componentDiyRealstore,
componentDiyShop,
+ componentDiyBinding,
componentDiyTabsCarousel,
componentDataTabs,
componentGoodsList,
diff --git a/components/diy/modules/img-or-icon-or-text.vue b/components/diy/modules/img-or-icon-or-text.vue
index b9d58e10..e1297fd1 100644
--- a/components/diy/modules/img-or-icon-or-text.vue
+++ b/components/diy/modules/img-or-icon-or-text.vue
@@ -1,16 +1,16 @@
-
+
-
+
- {{ type_text }}
+ {{ type_text }}
@@ -82,4 +82,18 @@
width: 100%;
height: 100%;
}
+ .discount-icon {
+ animation: gradient 5s ease infinite;
+ }
+ @keyframes gradient {
+ 0% {
+ background-position: 0% 50%;
+ }
+ 50% {
+ background-position: 100% 50%;
+ }
+ 100% {
+ background-position: 0% 50%;
+ }
+ }
diff --git a/components/diy/realstore.vue b/components/diy/realstore.vue
index d91676c0..420e9b70 100644
--- a/components/diy/realstore.vue
+++ b/components/diy/realstore.vue
@@ -32,9 +32,9 @@
-
+
-
+
{{ item.status_info.msg }}
|
{{ item.status_info.time }}
@@ -93,9 +93,9 @@
{{ item.name }}
-
+
- {{ item.status_info.msg }}
+ {{ item.status_info.msg }}
@@ -197,23 +197,6 @@
const new_form = this.propValue.content || null;
const new_style = this.propValue.style || null;
if (new_form != null && new_style != null) {
- const default_list = {
- name: '测试门店标题',
- province_name: '测试地址',
- alias: '上海门店',
- city_name: '',
- county_name: '',
- address: '',
- logo: '',
- new_cover: [],
- distance: '12km',
- status_info: {
- msg: '营业中',
- time: '7:00-22:00',
- status: 1,
- type: 0,
- },
- };
let new_list = [];
// 指定商品并且指定商品数组不为空
if (!isEmpty(new_form.data_list) && new_form.data_type == '0') {
@@ -225,10 +208,7 @@
} else if (!isEmpty(new_form.data_auto_list) && new_form.data_type == '1') {
// 筛选商品并且筛选商品数组不为空
new_list = new_form.data_auto_list;
- } else {
- new_list = Array(4).fill(default_list);
}
- console.log(new_list);
// 最外层不同风格下的显示
const flex = ['0', '2'].includes(new_form.theme) ? 'flex-col ' : 'flex-row ';
const wrap = new_form.theme == '3' ? '' : 'flex-wrap ';
@@ -272,6 +252,7 @@
new_style: new_style,
outer_class: flex + wrap + 'oh',
onter_style: `gap: ${new_style.content_outer_spacing * 2 + 'rpx'};`,
+ content_outer_spacing_magin: new_style.content_outer_spacing * 2 + 'rpx',
list: new_list,
new_scale: scale,
content_radius: radius_computer(new_style.realstore_radius), // 圆角设置
@@ -431,4 +412,13 @@
diff --git a/components/diy/shop.vue b/components/diy/shop.vue
index ac79d244..6775b0d6 100644
--- a/components/diy/shop.vue
+++ b/components/diy/shop.vue
@@ -18,9 +18,11 @@
-
-
-
+
+
+
+
+
{{ item.name }}
@@ -35,7 +37,7 @@
-
+
@@ -51,9 +53,11 @@
-
-
-
+
+
+
+
+
{{ item.name }}
@@ -152,13 +156,6 @@
const new_form = this.propValue.content || null;
const new_style = this.propValue.style || null;
if (new_form != null && new_style != null) {
- const default_list = {
- name: '测试商户标题',
- describe: '测试商户描述',
- icon_list: [{ icon: `http://shopxo.com/static/diy/images/components/model-shop/auth.png`}, { icon: ''}],
- logo: '',
- new_cover: [],
- };
let new_list = [];
// 指定商品并且指定商品数组不为空
if (!isEmpty(new_form.data_list) && new_form.data_type == '0') {
@@ -170,8 +167,6 @@
} else if (!isEmpty(new_form.data_auto_list) && new_form.data_type == '1') {
// 筛选商品并且筛选商品数组不为空
new_list = new_form.data_auto_list;
- } else {
- new_list = Array(4).fill(default_list);
}
// 最外层不同风格下的显示
const flex = ['0', '2'].includes(new_form.theme) ? 'flex-col ' : 'flex-row ';
@@ -216,6 +211,7 @@
new_style: new_style,
outer_class: flex + wrap + 'oh',
onter_style: `gap: ${new_style.content_outer_spacing * 2 + 'rpx'};`,
+ content_outer_spacing_magin: new_style.content_outer_spacing * 2 + 'rpx',
list: new_list,
new_scale: scale,
content_radius: radius_computer(new_style.shop_radius), // 圆角设置
@@ -359,4 +355,7 @@
.title-img {
object-fit: contain;
}
+ .gap-10 {
+ gap: 20rpx;
+ }