-
Status changed to merged
-
mentioned in commit b9e65043166d0457f97ebdc3cb792ae1c62b997a
Showing
7 changed files
components/diy_service/diy_service.js
@@ -26,7 +26,7 @@ Component({ | @@ -26,7 +26,7 @@ Component({ | ||
26 | var iurl=getApp().globalData.setting.imghost; | 26 | var iurl=getApp().globalData.setting.imghost; |
27 | var ob={}; | 27 | var ob={}; |
28 | var txt="object.title_img"; | 28 | var txt="object.title_img"; |
29 | - ob[txt] = iurl +'/miniapp/images/logo.png'; | 29 | + ob[txt] = iurl +'/miniapp/images/logo.png?v=1'; |
30 | this.setData(ob); | 30 | this.setData(ob); |
31 | }, | 31 | }, |
32 | 32 |
components/diy_title/diy_title.js
@@ -22,7 +22,7 @@ Component({ | @@ -22,7 +22,7 @@ Component({ | ||
22 | var iurl=getApp().globalData.setting.imghost; | 22 | var iurl=getApp().globalData.setting.imghost; |
23 | var ob={}; | 23 | var ob={}; |
24 | var txt="object.title_img"; | 24 | var txt="object.title_img"; |
25 | - ob[txt] = iurl +'/miniapp/images/logo.png'; | 25 | + ob[txt] = iurl +'/miniapp/images/logo.png?v=1'; |
26 | this.setData(ob); | 26 | this.setData(ob); |
27 | } | 27 | } |
28 | } | 28 | } |
components/diy_title/diy_title.wxml
@@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
19 | <view class="font_right_rim"> | 19 | <view class="font_right_rim"> |
20 | <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view> | 20 | <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view> |
21 | </view> | 21 | </view> |
22 | - <view class="aa">></view> | 22 | + <view class="aa"></view> |
23 | </view> | 23 | </view> |
24 | </view> | 24 | </view> |
25 | </block> | 25 | </block> |
components/diy_title/diy_title.wxss
@@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
5 | height: auto; | 5 | height: auto; |
6 | display: flex; | 6 | display: flex; |
7 | padding: 10rpx 0; | 7 | padding: 10rpx 0; |
8 | + align-items: center; | ||
8 | } | 9 | } |
9 | 10 | ||
10 | /* 图片边框 */ | 11 | /* 图片边框 */ |
@@ -43,7 +44,8 @@ | @@ -43,7 +44,8 @@ | ||
43 | .right_rim { | 44 | .right_rim { |
44 | min-width: 200rpx; | 45 | min-width: 200rpx; |
45 | width: auto; | 46 | width: auto; |
46 | - display: inline-block; | 47 | + display: flex; |
48 | + align-items: center; | ||
47 | } | 49 | } |
48 | 50 | ||
49 | /* 右侧文字边框 */ | 51 | /* 右侧文字边框 */ |
@@ -75,3 +77,12 @@ | @@ -75,3 +77,12 @@ | ||
75 | vertical-align: top; | 77 | vertical-align: top; |
76 | margin-top: 12rpx | 78 | margin-top: 12rpx |
77 | } | 79 | } |
80 | +.aa::after{ | ||
81 | + content: ''; | ||
82 | + display: inline-block; | ||
83 | + width: 25rpx; | ||
84 | + height: 25rpx; | ||
85 | + border-top:1rpx solid #aaa; | ||
86 | + border-right: 1rpx solid #aaa; | ||
87 | + transform: rotate(45deg); | ||
88 | +} |
components/diy_voice/diy_voice.js
@@ -53,7 +53,7 @@ Component({ | @@ -53,7 +53,7 @@ Component({ | ||
53 | var v_logo=vo.logo; | 53 | var v_logo=vo.logo; |
54 | if (!(vo.logo.indexOf("/public/static/images/model/logo.png"))){ | 54 | if (!(vo.logo.indexOf("/public/static/images/model/logo.png"))){ |
55 | this.setData({ | 55 | this.setData({ |
56 | - voice_logo:"https://mshopimg.yolipai.net/miniapp/images/logo.png" | 56 | + voice_logo:"https://mshopimg.yolipai.net/miniapp/images/logo.png?v=1" |
57 | }) | 57 | }) |
58 | }else{ | 58 | }else{ |
59 | this.setData({ | 59 | this.setData({ |
pages/goods/search/search.js
@@ -101,6 +101,7 @@ Page({ | @@ -101,6 +101,7 @@ Page({ | ||
101 | //扫一扫过来,显示搜索的内容 | 101 | //扫一扫过来,显示搜索的内容 |
102 | var s_key = t.s_key; | 102 | var s_key = t.s_key; |
103 | if (s_key){ | 103 | if (s_key){ |
104 | + s_key=s_key.trim(); | ||
104 | this.search(s_key); this.openSearchModal(); | 105 | this.search(s_key); this.openSearchModal(); |
105 | return; | 106 | return; |
106 | } | 107 | } |
@@ -190,10 +191,16 @@ Page({ | @@ -190,10 +191,16 @@ Page({ | ||
190 | }); | 191 | }); |
191 | }, | 192 | }, |
192 | submitSearch: function(t) { | 193 | submitSearch: function(t) { |
193 | - console.log(111); | ||
194 | - this.search(t.detail.value.word); | ||
195 | - | ||
196 | - | 194 | + console.log(111,t); |
195 | + var val=t.detail.value.word; | ||
196 | + if(!val) val=t.detail.value; | ||
197 | + val=val.trim(); | ||
198 | + if(!val){ | ||
199 | + a.showWarning("请输入搜索关键词"); | ||
200 | + } | ||
201 | + | ||
202 | + this.search(val); | ||
203 | + | ||
197 | }, | 204 | }, |
198 | 205 | ||
199 | //热搜关键字 | 206 | //热搜关键字 |
@@ -282,13 +289,29 @@ Page({ | @@ -282,13 +289,29 @@ Page({ | ||
282 | 289 | ||
283 | historyRecord() { | 290 | historyRecord() { |
284 | let self = this; | 291 | let self = this; |
285 | - let keyword = this.data.key_str; | 292 | + let keyword = this.data.key_str.trim(); |
286 | let searchRecord = this.data.searchRecord; | 293 | let searchRecord = this.data.searchRecord; |
287 | if(!searchRecord || searchRecord.length==0) searchRecord=wx.getStorageSync('searchRecord') || []; | 294 | if(!searchRecord || searchRecord.length==0) searchRecord=wx.getStorageSync('searchRecord') || []; |
288 | 295 | ||
289 | if(keyword) { | 296 | if(keyword) { |
290 | - if(searchRecord.indexOf(keyword) > -1) { | 297 | + |
298 | + var index=searchRecord.indexOf(keyword); | ||
299 | + if(index > -1) { | ||
291 | // 已经存在该值 | 300 | // 已经存在该值 |
301 | + searchRecord.splice(index,1); | ||
302 | + searchRecord.unshift(keyword); | ||
303 | + | ||
304 | + // 将历史记录添加到缓存中 | ||
305 | + wx.setStorage({ | ||
306 | + key: 'searchRecord', | ||
307 | + data: searchRecord, | ||
308 | + success: function(res) { | ||
309 | + self.setData({ | ||
310 | + searchRecord, | ||
311 | + }) | ||
312 | + } | ||
313 | + }) | ||
314 | + | ||
292 | return; | 315 | return; |
293 | } else { | 316 | } else { |
294 | if(searchRecord.length >= 10) { | 317 | if(searchRecord.length >= 10) { |
pages/goods/search/search.wxml
@@ -162,7 +162,7 @@ | @@ -162,7 +162,7 @@ | ||
162 | <view class="search-modal"> | 162 | <view class="search-modal"> |
163 | <view class="search-bar"> | 163 | <view class="search-bar"> |
164 | <form bindsubmit="submitSearch"> | 164 | <form bindsubmit="submitSearch"> |
165 | - <input autoFocus class="search-input" name="word" placeholder="搜索商品" bindinput="getInput"></input> | 165 | + <input autoFocus class="search-input" name="word" placeholder="搜索商品" bindconfirm="submitSearch" bindinput="getInput"></input> |
166 | <button class="search-btn" formType="submit"> | 166 | <button class="search-btn" formType="submit"> |
167 | <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image> | 167 | <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image> |
168 | </button> | 168 | </button> |