Commit 54b4bf1e6171d605311d42d3c78babfcc0411ba1
Merge branch 'dev' into 'test'
没有阶梯的活动首页回退 See merge request !921
Showing
4 changed files
with
14 additions
and
3 deletions
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.wxml
| @@ -292,7 +292,7 @@ | @@ -292,7 +292,7 @@ | ||
| 292 | <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}"> | 292 | <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}"> |
| 293 | <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> | 293 | <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> |
| 294 | <view class="no-data-title">暂无相关商品</view> | 294 | <view class="no-data-title">暂无相关商品</view> |
| 295 | - <navigator class="lookat" url="/pages/index/index/index">回到首页</navigator> | 295 | + <navigator bindtap="go_url" class="lookat" data-url="/pages/index/index/index">回到首页</navigator> |
| 296 | </view> | 296 | </view> |
| 297 | </view> | 297 | </view> |
| 298 | <view hidden="{{!openFilterModal}}"> | 298 | <view hidden="{{!openFilterModal}}"> |
| @@ -337,6 +337,6 @@ | @@ -337,6 +337,6 @@ | ||
| 337 | <view class="no-data"> | 337 | <view class="no-data"> |
| 338 | <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> | 338 | <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> |
| 339 | <view class="no-data-title">{{err_txt}}</view> | 339 | <view class="no-data-title">{{err_txt}}</view> |
| 340 | - <navigator class="lookat" url="/pages/index/index/index">回到首页</navigator> | 340 | + <navigator bindtap="go_url" class="lookat" data-url="/pages/index/index/index">回到首页</navigator> |
| 341 | </view> | 341 | </view> |
| 342 | </view> | 342 | </view> |
| 343 | \ No newline at end of file | 343 | \ No newline at end of file |
pages/goods/search/search.js
| @@ -451,4 +451,9 @@ Page({ | @@ -451,4 +451,9 @@ Page({ | ||
| 451 | searchRecord: [] | 451 | searchRecord: [] |
| 452 | }); | 452 | }); |
| 453 | }, | 453 | }, |
| 454 | + | ||
| 455 | + go_url:function (e) { | ||
| 456 | + var url=e.currentTarget.dataset.url; | ||
| 457 | + getApp().goto(url); | ||
| 458 | + } | ||
| 454 | }); | 459 | }); |
| 455 | \ No newline at end of file | 460 | \ No newline at end of file |
pages/goods/search/search.wxml
| @@ -120,7 +120,7 @@ | @@ -120,7 +120,7 @@ | ||
| 120 | <view class="no-data" wx:if="{{!requestData||requestData.length==0}}"> | 120 | <view class="no-data" wx:if="{{!requestData||requestData.length==0}}"> |
| 121 | <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image> | 121 | <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image> |
| 122 | <view class="no-data-title">没有相关的数据</view> | 122 | <view class="no-data-title">没有相关的数据</view> |
| 123 | - <navigator class="lookat" url="/pages/index/index/index"> 去逛逛 </navigator> | 123 | + <navigator bindtap="go_url" class="lookat" data-url="/pages/index/index/index"> 去逛逛 </navigator> |
| 124 | </view> | 124 | </view> |
| 125 | </view> | 125 | </view> |
| 126 | <view hidden="{{!openFilterModal}}"> | 126 | <view hidden="{{!openFilterModal}}"> |