From 904c8a34df5f0d0af8fabf8104541cf05da6b7d4 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Fri, 8 Nov 2024 16:22:34 +0800 Subject: [PATCH] =?UTF-8?q?icon=E5=A4=84=E7=90=86=EF=BC=8C=E9=97=A8?= =?UTF-8?q?=E5=BA=97=E9=A6=96=E9=A1=B5=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/diy/search.vue | 2 +- components/realstore-list/realstore-list.vue | 8 ++-- components/search/search.vue | 30 ++++++------ pages/buy/buy.vue | 2 +- pages/plugins/realstore/detail/detail.vue | 4 +- pages/plugins/realstore/index/index.css | 10 ++-- pages/plugins/realstore/index/index.vue | 47 ++++++++++--------- pages/plugins/realstore/search/search.vue | 26 +++++----- .../components/shop-header/shop-header.vue | 2 +- pages/user/user.vue | 4 +- static/icon/iconfont.css | 32 +++++++------ 11 files changed, 89 insertions(+), 78 deletions(-) diff --git a/components/diy/search.vue b/components/diy/search.vue index 948a6953..c804b5d5 100644 --- a/components/diy/search.vue +++ b/components/diy/search.vue @@ -11,7 +11,7 @@ diff --git a/components/realstore-list/realstore-list.vue b/components/realstore-list/realstore-list.vue index c80638aa..fffe4021 100644 --- a/components/realstore-list/realstore-list.vue +++ b/components/realstore-list/realstore-list.vue @@ -13,7 +13,7 @@ - + {{ item.status_info.msg }} @@ -26,7 +26,7 @@ - + {{ item.province_name }}{{ item.city_name }}{{ item.county_name }}{{ item.address }} @@ -35,11 +35,11 @@ - + - + diff --git a/components/search/search.vue b/components/search/search.vue index 0ca25f78..c2009f1c 100644 --- a/components/search/search.vue +++ b/components/search/search.vue @@ -40,18 +40,18 @@ propFormName: { type: String, default: 'keywords', - }, - propDefaultValue: { - type: String, - default: '', + }, + propDefaultValue: { + type: String, + default: '', }, propPlaceholder: { type: String, default: '', - }, - propPlaceholderValue: { - type: String, - default: '', + }, + propPlaceholderValue: { + type: String, + default: '', }, propPlaceholderClass: { type: String, @@ -95,7 +95,7 @@ }, propIcon: { type: String, - default: 'icon-index-search', + default: 'icon-search-max', }, propIconColor: { type: String, @@ -173,7 +173,7 @@ // 搜索确认事件 search_submit_confirm_event() { - // 是否验证必须要传值 + // 是否验证必须要传值 var value = this.input_value || this.propPlaceholderValue; if (this.propIsRequired && value === '') { app.globalData.showToast(this.$t('search.search.ic9b89')); @@ -187,11 +187,11 @@ // 进入搜索页面 app.globalData.url_open(this.propUrl + '?' + this.propFormName + '=' + value); } - }, - - // 搜索确认（外部调用直接跳转搜索） - search_submit_confirm(value = '') { - app.globalData.url_open(this.propUrl + '?' + this.propFormName + '=' + value); + }, + + // 搜索确认（外部调用直接跳转搜索） + search_submit_confirm(value = '') { + app.globalData.url_open(this.propUrl + '?' + this.propFormName + '=' + value); }, // icon事件 diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index e700e121..0eb65d05 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -24,7 +24,7 @@ - + {{ address.province_name || '' }}{{ address.city_name || '' }}{{ address.county_name || '' }}{{ address.address || '' }} diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue index 9febeae9..d9b5e07c 100644 --- a/pages/plugins/realstore/detail/detail.vue +++ b/pages/plugins/realstore/detail/detail.vue @@ -38,7 +38,7 @@ - + @@ -68,7 +68,7 @@ - + {{ info.province_name }}{{ info.city_name }}{{ info.county_name }}{{ info.address }} diff --git a/pages/plugins/realstore/index/index.css b/pages/plugins/realstore/index/index.css index 9363becc..753de303 100644 --- a/pages/plugins/realstore/index/index.css +++ b/pages/plugins/realstore/index/index.css @@ -44,12 +44,16 @@ page { .user-choice-realstore .logo { width: 100rpx; } -.user-choice-realstore .base-right .title { - max-width: calc(100% - 180rpx); -} .user-choice-realstore .address-content { max-width: calc(100% - 100rpx); } +.user-choice-realstore .checked { + top: 0; + right: 0; + width: 50rpx; + height: 38rpx; + border-bottom-left-radius: 100rpx; +} /** diff --git a/pages/plugins/realstore/index/index.vue b/pages/plugins/realstore/index/index.vue index 0a78bdf3..3e5571c8 100644 --- a/pages/plugins/realstore/index/index.vue +++ b/pages/plugins/realstore/index/index.vue @@ -8,48 +8,49 @@ - - 请先选择门店 + + {{data_base.home_not_choice_realstore_msg}} - - + + + + + - - + + {{ user_choice_realstore.alias }} {{ user_choice_realstore.name }} - - {{$t('detail.detail.dor2v9')}}{{ user_choice_realstore.status_info.time }} - {{$t('extraction-address.extraction-address.42v8tv')}}{{ user_choice_realstore.distance }} - - - - - - - - + + {{ user_choice_realstore.province_name }}{{ user_choice_realstore.city_name }}{{ user_choice_realstore.county_name }}{{ user_choice_realstore.address }} - {{$t('detail.detail.688i26')}} + {{$t('detail.detail.688i26')}} + + + {{$t('detail.detail.dor2v9')}}{{ user_choice_realstore.status_info.time }} + {{$t('extraction-address.extraction-address.42v8tv')}}{{ user_choice_realstore.distance }} + + + - 当前选择的门店 + {{data_base.home_already_choice_realstore_msg}} @@ -59,7 +60,7 @@ - + @@ -134,12 +135,12 @@ import componentRealstoreList from '@/components/realstore-list/realstore-list'; import componentTitle from '@/components/title/title'; import componentChoiceLocation from '@/components/choice-location/choice-location'; - var realstore_static_url = app.globalData.get_static_url('realstore', true); + var plugins_static_url = app.globalData.get_static_url('realstore', true); export default { data() { return { theme_view: app.globalData.get_theme_value_view(), - realstore_static_url: realstore_static_url, + plugins_static_url: plugins_static_url, screen_width: parseInt(app.globalData.get_system_info('windowWidth', 0, true)), data_list_loding_status: 1, data_list_loding_msg: '', @@ -153,6 +154,7 @@ icon_list: [], data_list: [], // 用户选择的门店 + not_choice_realstore_images: plugins_static_url+'app/index/not-choice-realstore-images.png', user_choice_realstore: null, // 强制选择门店 is_force_choice_realstore: 0, @@ -269,6 +271,7 @@ slider_list: data.slider_list || [], icon_list: data.icon_list || [], data_list: data_list, + not_choice_realstore_images: data_base.home_not_choice_realstore_images || this.not_choice_realstore_images, is_force_choice_realstore: parseInt(data_base.is_home_force_choice_one_realstore_mode || 0), is_force_auto_choice_realstore: parseInt(data_base.is_home_force_choice_one_realstore_mode_auto_lately_realstore || 0), force_auto_choice_realstore_distance: parseFloat(data_base.home_force_choice_one_realstore_mode_auto_lately_distance || 0), diff --git a/pages/plugins/realstore/search/search.vue b/pages/plugins/realstore/search/search.vue index f1458408..72601cbe 100644 --- a/pages/plugins/realstore/search/search.vue +++ b/pages/plugins/realstore/search/search.vue @@ -95,9 +95,9 @@ show_type_mode: 0, // 地图 is_search_map: 0, - map_location_icon: plugins_static_url+'app/map/location-icon.png', - markers_icon: plugins_static_url+'app/map/markers-icon.png', - markers_icon_active: plugins_static_url+'app/map/markers-icon-active.png', + map_location_icon: plugins_static_url+'app/search/location-icon.png', + markers_icon: plugins_static_url+'app/search/markers-icon.png', + markers_icon_active: '', map_scale: 12, latitude: 39.909, longitude: 116.39742, @@ -191,7 +191,7 @@ is_search_map: parseInt(data_base.is_search_map || 0), map_scale: parseInt(data_base.search_map_scale || 12), markers_icon: data_base.search_map_store_icon || this.markers_icon, - markers_icon_active: data_base.search_map_store_icon_active || this.markers_icon_active, + markers_icon_active: data_base.search_map_store_icon_active || '', map_location_icon: data_base.search_map_location_icon || this.map_location_icon, }); @@ -434,15 +434,6 @@ // 用户和覆盖物选中处理 data_markers_active_handle(index) { - // 覆盖物 - var temp_markers = this.markers; - for(var i in temp_markers) { - if(i == index) { - temp_markers[i]['iconPath'] = this.markers_icon_active; - } else { - temp_markers[i]['iconPath'] = this.markers_icon; - } - } // 列表数据 var temp_data_list = this.data_list; for(var i in temp_data_list) { @@ -452,6 +443,15 @@ temp_data_list[i]['active'] = ''; } } + // 覆盖物 + var temp_markers = this.markers; + for(var i in temp_markers) { + if(i == index) { + temp_markers[i]['iconPath'] = this.markers_icon_active || temp_data_list[temp_markers[i]['id']]['logo']; + } else { + temp_markers[i]['iconPath'] = this.markers_icon; + } + } // 设置数据 this.setData({ markers_active_index: index, diff --git a/pages/plugins/shop/components/shop-header/shop-header.vue b/pages/plugins/shop/components/shop-header/shop-header.vue index dfe3c5d2..5e456241 100644 --- a/pages/plugins/shop/components/shop-header/shop-header.vue +++ b/pages/plugins/shop/components/shop-header/shop-header.vue @@ -5,7 +5,7 @@ - +