diff --git a/components/diy_service/diy_service.js b/components/diy_service/diy_service.js index fddd65b..f873374 100644 --- a/components/diy_service/diy_service.js +++ b/components/diy_service/diy_service.js @@ -26,7 +26,7 @@ Component({ var iurl=getApp().globalData.setting.imghost; var ob={}; var txt="object.title_img"; - ob[txt] = iurl +'/miniapp/images/logo.png'; + ob[txt] = iurl +'/miniapp/images/logo.png?v=1'; this.setData(ob); }, diff --git a/components/diy_title/diy_title.js b/components/diy_title/diy_title.js index c6b3b9a..20d76fc 100644 --- a/components/diy_title/diy_title.js +++ b/components/diy_title/diy_title.js @@ -22,7 +22,7 @@ Component({ var iurl=getApp().globalData.setting.imghost; var ob={}; var txt="object.title_img"; - ob[txt] = iurl +'/miniapp/images/logo.png'; + ob[txt] = iurl +'/miniapp/images/logo.png?v=1'; this.setData(ob); } } diff --git a/components/diy_title/diy_title.wxml b/components/diy_title/diy_title.wxml index e36c911..92f7796 100644 --- a/components/diy_title/diy_title.wxml +++ b/components/diy_title/diy_title.wxml @@ -19,7 +19,7 @@ {{object.title_right}} - > + diff --git a/components/diy_title/diy_title.wxss b/components/diy_title/diy_title.wxss index bfec612..e84db04 100644 --- a/components/diy_title/diy_title.wxss +++ b/components/diy_title/diy_title.wxss @@ -5,6 +5,7 @@ height: auto; display: flex; padding: 10rpx 0; + align-items: center; } /* 图片边框 */ @@ -43,7 +44,8 @@ .right_rim { min-width: 200rpx; width: auto; - display: inline-block; + display: flex; + align-items: center; } /* 右侧文字边框 */ @@ -75,3 +77,12 @@ vertical-align: top; margin-top: 12rpx } +.aa::after{ + content: ''; + display: inline-block; + width: 25rpx; + height: 25rpx; + border-top:1rpx solid #aaa; + border-right: 1rpx solid #aaa; + transform: rotate(45deg); +} diff --git a/components/diy_voice/diy_voice.js b/components/diy_voice/diy_voice.js index da8f733..acd05a5 100644 --- a/components/diy_voice/diy_voice.js +++ b/components/diy_voice/diy_voice.js @@ -53,7 +53,7 @@ Component({ var v_logo=vo.logo; if (!(vo.logo.indexOf("/public/static/images/model/logo.png"))){ this.setData({ - voice_logo:"https://mshopimg.yolipai.net/miniapp/images/logo.png" + voice_logo:"https://mshopimg.yolipai.net/miniapp/images/logo.png?v=1" }) }else{ this.setData({ diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index ad9f3be..de66ca8 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -101,6 +101,7 @@ Page({ //扫一扫过来,显示搜索的内容 var s_key = t.s_key; if (s_key){ + s_key=s_key.trim(); this.search(s_key); this.openSearchModal(); return; } @@ -190,10 +191,16 @@ Page({ }); }, submitSearch: function(t) { - console.log(111); - this.search(t.detail.value.word); - - + console.log(111,t); + var val=t.detail.value.word; + if(!val) val=t.detail.value; + val=val.trim(); + if(!val){ + a.showWarning("请输入搜索关键词"); + } + + this.search(val); + }, //热搜关键字 @@ -282,13 +289,29 @@ Page({ historyRecord() { let self = this; - let keyword = this.data.key_str; + let keyword = this.data.key_str.trim(); let searchRecord = this.data.searchRecord; if(!searchRecord || searchRecord.length==0) searchRecord=wx.getStorageSync('searchRecord') || []; if(keyword) { - if(searchRecord.indexOf(keyword) > -1) { + + var index=searchRecord.indexOf(keyword); + if(index > -1) { // 已经存在该值 + searchRecord.splice(index,1); + searchRecord.unshift(keyword); + + // 将历史记录添加到缓存中 + wx.setStorage({ + key: 'searchRecord', + data: searchRecord, + success: function(res) { + self.setData({ + searchRecord, + }) + } + }) + return; } else { if(searchRecord.length >= 10) { diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml index 8bdaf46..c80f0c4 100644 --- a/pages/goods/search/search.wxml +++ b/pages/goods/search/search.wxml @@ -162,7 +162,7 @@
- +