diff --git a/components/recommend-hot/recommend-hot.vue b/components/magic-list/magic-list.vue similarity index 100% rename from components/recommend-hot/recommend-hot.vue rename to components/magic-list/magic-list.vue diff --git a/components/search/search.vue b/components/search/search.vue index bb5de300..16642aab 100644 --- a/components/search/search.vue +++ b/components/search/search.vue @@ -2,7 +2,7 @@ - + - + + @onicon="search_icon_event" + propIcon="icon-mendian-sousuosm" + :propIsIconOnEvent="true" + + > @@ -140,9 +150,9 @@ - - - + + + @@ -295,7 +305,7 @@ import componentGoodsList from '../../components/goods-list/goods-list'; import componentUserBase from '../../components/user-base/user-base'; import componentBindingList from '../../components/binding-list/binding-list'; - import componentRecommedHot from '@/components/recommend-hot/recommend-hot'; + import componentMagicList from '../../components/magic-list/magic-list'; var common_static_url = app.globalData.get_static_url('common'); var seckill_static_url = app.globalData.get_static_url('seckill', true) + 'app/'; @@ -378,6 +388,8 @@ plugins_shop_data: null, // 组合搭配插件 plugins_binding_data: null, + // 魔方插件 + plugins_magic_data: null, }; }, @@ -400,7 +412,7 @@ componentGoodsList, componentUserBase, componentBindingList, - componentRecommedHot, + componentMagicList, }, props: {}, @@ -488,6 +500,7 @@ plugins_realstore_data: data.plugins_realstore_data || null, plugins_shop_data: data.plugins_shop_data || null, plugins_binding_data: data.plugins_binding_data || null, + plugins_magic_data: data.plugins_magic_data || null, }); // 轮播数据处理 @@ -619,7 +632,17 @@ this.top_content_search_bg_color = 'background: linear-gradient(180deg, ' + this.theme_color + ' 0%, #f5f5f5 460%);'; } }, - }, + + // 搜索icon扫码事件 + search_icon_event(e) { + console.log(1) + uni.scanCode({ + success: function (res) { + console.log(res.result) + }, + }); + } + } };