From b4ec6d4773ccf60224afb5b0d38cbadbea0a8198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=8F=AF?= <1284707383@qq.com> Date: Sat, 16 Oct 2021 18:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=20=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api.js | 2 + common/styles/iconfont.css | 18 ++- components/lf-nav/lf-nav.vue | 35 +++-- pages.json | 6 + pages/goodsDetail/index.vue | 2 +- pages/index/index.vue | 2 +- pages/recommList/index.vue | 12 +- pages/search/search.vue | 123 +++++++++++++-- pages/search/searchList.vue | 77 +++++++-- pages/shopmap/index.vue | 294 +++++++++++++++++++++++++++++++++++ 10 files changed, 525 insertions(+), 46 deletions(-) create mode 100644 pages/shopmap/index.vue diff --git a/common/api.js b/common/api.js index 47f4c8b..ffa18eb 100644 --- a/common/api.js +++ b/common/api.js @@ -12,6 +12,8 @@ export const API_WXLOGIN = '/api/login'; //登录 export const API_INDEX = '/api/index'; //首页 export const API_FAVOURITE = '/api/agent_product/guess'; //猜你喜欢 +export const API_SEARCHTARGET = '/api/agent_product/travel_search'; //猜你喜欢 + export const API_CHANNEL = '/api/channel/list'; //全部频道列表 export const API_MYCHANNEL = '/api/user_channel/list'; //我的频道列表 export const API_EDITCHANNEL = '/api/user_channel/update'; //编辑频道 diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css index 2d3fa34..493405b 100644 --- a/common/styles/iconfont.css +++ b/common/styles/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "lf-iconfont"; /* Project id 2651793 */ - src: url('//at.alicdn.com/t/font_2651793_2rvexfo9ayn.woff2?t=1631096351657') format('woff2'), - url('//at.alicdn.com/t/font_2651793_2rvexfo9ayn.woff?t=1631096351657') format('woff'), - url('//at.alicdn.com/t/font_2651793_2rvexfo9ayn.ttf?t=1631096351657') format('truetype'); + src: url('//at.alicdn.com/t/font_2651793_o7fen3k0lq.woff2?t=1634315157253') format('woff2'), + url('//at.alicdn.com/t/font_2651793_o7fen3k0lq.woff?t=1634315157253') format('woff'), + url('//at.alicdn.com/t/font_2651793_o7fen3k0lq.ttf?t=1634315157253') format('truetype'); } .lf-iconfont { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.lf-icon-dingwei:before { + content: "\ec32"; +} + +.lf-icon-dianhuaben:before { + content: "\e62a"; +} + +.lf-icon-cuo1:before { + content: "\e60b"; +} + .lf-icon-dizhi:before { content: "\e814"; } diff --git a/components/lf-nav/lf-nav.vue b/components/lf-nav/lf-nav.vue index b988266..24bd4fa 100644 --- a/components/lf-nav/lf-nav.vue +++ b/components/lf-nav/lf-nav.vue @@ -9,8 +9,10 @@ - - + + + 地图 + @@ -89,6 +91,11 @@ url: '/pages/search/search' }) }, + goMap() { + uni.navigateTo({ + url: '/pages/shopmap/index' + }) + }, // 获取手机高度 getSystemInfo(){ let result = uni.getSystemInfoSync(); @@ -161,27 +168,27 @@ } .head .head-nav{ position: absolute; - left: 2vw; + left: 3vw; cursor: pointer; - width: 130rpx; - background-color: #FFFFFF; - border: 1rpx solid #dcd3d5; + width: 156rpx; + background-color: #1998FE; + // border: 1rpx solid #dcd3d5; border-radius: 30rpx; height: 60rpx; box-sizing: border-box; display: flex; - justify-content: space-between; + justify-content: center; align-items: center; padding: 0 12rpx; } .head .head-nav::after{ - position: absolute; - content: ''; - width: 2rpx; - height: 40rpx; - background-color: #f7f7f7; - left: 50%; - top: calc(50% - 20rpx); + // position: absolute; + // content: ''; + // width: 2rpx; + // height: 40rpx; + // background-color: #f7f7f7; + // left: 50%; + // top: calc(50% - 20rpx); } .title-box{ max-width: 49%; diff --git a/pages.json b/pages.json index 49b4014..2a9737e 100644 --- a/pages.json +++ b/pages.json @@ -26,6 +26,12 @@ "navigationBarTitleText": "搜索" } }, + { + "path": "pages/shopmap/index", + "style": { + "navigationBarTitleText": "多门店" + } + }, { "path": "pages/search/searchList", "style": { diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue index 48bf18c..b33b3ea 100644 --- a/pages/goodsDetail/index.vue +++ b/pages/goodsDetail/index.vue @@ -40,7 +40,7 @@ - + 出发地 diff --git a/pages/index/index.vue b/pages/index/index.vue index edf917a..0781734 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,6 @@