diff --git a/app.json b/app.json index 8faae3a..1f53ff1 100644 --- a/app.json +++ b/app.json @@ -5,6 +5,7 @@ "index/searchbar", "index/passCar", "index/user", + "pages/searchbar/searchbar", "pages/integralmall/integraHistory/index", "pages/integralmall/payIntegcouponStatus/index", "pages/integralmall/payIntegcoupondetail/index", diff --git a/config/config.js b/config/config.js index 480214f..18be5cc 100755 --- a/config/config.js +++ b/config/config.js @@ -276,10 +276,6 @@ var config = { * 专题详情 */ topicFindById:"/topic/findById", - /** - * 积分兑换 - */ - addIntegral: "/credit/add", /** * 积分券详情 */ diff --git a/iconfont.wxss b/iconfont.wxss new file mode 100644 index 0000000..7c75e4e --- /dev/null +++ b/iconfont.wxss @@ -0,0 +1,21 @@ +@font-face {font-family: "iconfont"; + src: url('iconfont.eot?t=1568701793152'); /* IE9 */ + src: url('iconfont.eot?t=1568701793152#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAL4AAsAAAAABrwAAAKqAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAqBSIFaATYCJAMICwYABCAFhG0HMBsABsgekkQC4ByegcrDAoAQCLRWZuAQ1ROBA7RA4BAKaNmybtVXtY7IAcnq3VqzIggboUqyiugVQ3aPc4szdQ+sCRogwMz8/1xO764CCmR+oFzmmnTUCzDeGuBe2CYrkAC8ZXjVpa2DPg8B2ImSQTRM1jYTBTQwTQBiyuVniULOi0bLCSsCc81ajbhIFqs8lC+BC+H3xR/ysoLEpICSto0vE703YYraMK4c+gi8+cyAvAkUkAE0iK7aaIs0QiYr7NEMcdhXoYDvTYbh6xF7/fMQZiDfCUAE5d4Tz+Xfao0EQHPv/VVgcNQDwORyOm3e9deXcM/79Y3jUPfb1cDbt9vv3u28ebP1+vUxF29G7Kzn7dvDo1b3tY2rXSInFmNx8vuXPoyor9T//xe4DlwNf38Nrm8r19Ln5+lryPJZnvWqepGyWMnrz758+lTuI4uyvZB88lTtMxaLVtXnD9y0otW6mLp5Uy7mMy1i+PFhWCaT6UkAxjd1S8X82t+wmf+so7de8d/q0AB8uP/fH04wvmlUDGC9AZuAH8nrWactAeikNni1SUkV0w2K7RgAA3D6fR2rDN11UmAldO92C5EpKKwkoJqUASYcFIAZK9VgJ13zZgcBC9IIbQPS7BIQeD0AiZvnoPB6hWrSFzAR9g/MeFNgp6fAng6SGi/VSzzTeAnnK3AvKGLcoEtR4TpyE5zJrCCkbKNUbgDaWTnFxBQjlHMsUJZ3tGbAJIUwIZdhEBDEkjy80A1H67jbzB6pe1PjgsJEiXoSOqOhS2DAChh3gUSY31wrlT6/DnFG4IxswTWZtyFJcQcHubLk9ECn0qgX7l6uWWRxHUs0BoyQSAg0ETMKMErAXP0oD7qgNYyNCMe6slmjkb7Sxvry8Ou2AHZAJQUOU5gXyShDiQQAAA==') format('woff2'), + url('iconfont.woff?t=1568701793152') format('woff'), + url('iconfont.ttf?t=1568701793152') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ + url('iconfont.svg?t=1568701793152#iconfont') format('svg'); /* iOS 4.1- */ +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-sousuo:before { + content: "\e646"; +} + diff --git a/index/searchbar.js b/index/searchbar.js index 34a8720..62534fd 100644 --- a/index/searchbar.js +++ b/index/searchbar.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 44) const Http = require("../utils/HttpBasics"); const imgurl = require("../utils/imgurl"); const config = require("../config/config"); @@ -33,6 +33,11 @@ Page({ }) that.getList(1, that.data.businessId); }, + goSearchBar(){ + wx.navigateTo({ + url: '/pages/searchbar/searchbar', + }) + }, /** * 跳转到门店列表的详情页面 */ @@ -63,7 +68,7 @@ Page({ wx.getSystemInfo({ success: function (res) { that.setData({ - windowHeight: res.windowHeight + parseInt(navigationBarHeight) + windowHeight: res.windowHeight + navigationBarHeight }) }, }) diff --git a/index/searchbar.wxml b/index/searchbar.wxml index b7956c2..4f67ed6 100644 --- a/index/searchbar.wxml +++ b/index/searchbar.wxml @@ -1,9 +1,10 @@ - +搜索门店 + - + @@ -18,7 +19,7 @@ - +