wxd / MShopWeApp

Commit 5a00be0b06f5942d93d7c9ae0ad7607cfb4b2dae

Authored by 后端研发-苏明海
2 parents 782b2ead 5907bbc0

Merge branch 'dev' into 'test' 

Dev

See merge request !666
Inline Side-by-side
Showing 7 changed files with 46 additions and 12 deletions
components/diy_service/diy_service.js
  View file @5a00be0
... ... @@ -26,7 +26,7 @@ Component({
26 26 var iurl=getApp().globalData.setting.imghost;
27 27 var ob={};
28 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 30 this.setData(ob);
31 31 },
32 32  
... ...
components/diy_title/diy_title.js
  View file @5a00be0
... ... @@ -22,7 +22,7 @@ Component({
22 22 var iurl=getApp().globalData.setting.imghost;
23 23 var ob={};
24 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 26 this.setData(ob);
27 27 }
28 28 }
... ...
components/diy_title/diy_title.wxml
  View file @5a00be0
... ... @@ -19,7 +19,7 @@
19 19 <view class="font_right_rim">
20 20 <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view>
21 21 </view>
22   - <view class="aa">></view>
  22 + <view class="aa"></view>
23 23 </view>
24 24 </view>
25 25 </block>
... ...
components/diy_title/diy_title.wxss
  View file @5a00be0
... ... @@ -5,6 +5,7 @@
5 5 height: auto;
6 6 display: flex;
7 7 padding: 10rpx 0;
  8 + align-items: center;
8 9 }
9 10  
10 11 /* 图片边框 */
... ... @@ -43,7 +44,8 @@
43 44 .right_rim {
44 45 min-width: 200rpx;
45 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 77 vertical-align: top;
76 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
  View file @5a00be0
... ... @@ -53,7 +53,7 @@ Component({
53 53 var v_logo=vo.logo;
54 54 if (!(vo.logo.indexOf("/public/static/images/model/logo.png"))){
55 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 58 }else{
59 59 this.setData({
... ...
pages/goods/search/search.js
  View file @5a00be0
... ... @@ -101,6 +101,7 @@ Page({
101 101 //扫一扫过来，显示搜索的内容
102 102 var s_key = t.s_key;
103 103 if (s_key){
  104 + s_key=s_key.trim();
104 105 this.search(s_key); this.openSearchModal();
105 106 return;
106 107 }
... ... @@ -190,10 +191,16 @@ Page({
190 191 });
191 192 },
192 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 289  
283 290 historyRecord() {
284 291 let self = this;
285   - let keyword = this.data.key_str;
  292 + let keyword = this.data.key_str.trim();
286 293 let searchRecord = this.data.searchRecord;
287 294 if(!searchRecord || searchRecord.length==0) searchRecord=wx.getStorageSync('searchRecord') || [];
288 295  
289 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 315 return;
293 316 } else {
294 317 if(searchRecord.length >= 10) {
... ...
pages/goods/search/search.wxml
  View file @5a00be0
... ... @@ -162,7 +162,7 @@
162 162 <view class="search-modal">
163 163 <view class="search-bar">
164 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 166 <button class="search-btn" formType="submit">
167 167 <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image>
168 168 </button>
... ...