wxd / MShopWeApp

Commit d18d66d27815bea4e9cc11b788ce1007ddaebbc7

Authored by taiyuan
2 parents 13d4b1eb 55ba473e

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
packageA/pages/distribution/goods/goods.js
  View file @d18d66d
... ... @@ -467,7 +467,7 @@ Page({
467 467 };
468 468 case 3: {
469 469 // if(data.orderType) delete data.orderType;
470   - data.orderField = 'shop_price';
  470 + data.orderField = 'prom_price';
471 471 data.dis_type = 1;
472 472 break;
473 473 };
... ...
pages/goods/goodsList/goodsList.wxml
  View file @d18d66d
... ... @@ -28,9 +28,9 @@
28 28 </view>
29 29  
30 30 </navigator>
31   - <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">
  31 + <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">
32 32 价格
33   - <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
  33 + <view class="ico-dg" wx:if="{{tabname=='prom_price'}}">
34 34 <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
35 35 <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
36 36 </view>
... ...
pages/goods/search/search.wxml
  View file @d18d66d
... ... @@ -13,8 +13,8 @@
13 13 <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
14 14 </view>
15 15 </navigator>
16   - <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">价格
17   - <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
  16 + <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">价格
  17 + <view class="ico-dg" wx:if="{{tabname=='prom_price'}}">
18 18 <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
19 19 <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
20 20 </view>
... ...