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

taiyuan
2 parents 13d4b1eb 55ba473e
Showing 3 changed files with 5 additions and 5 deletions
packageA/pages/distribution/goods/goods.js
pages/goods/goodsList/goodsList.wxml
pages/goods/search/search.wxml
@@ -467,7 +467,7 @@ Page({
 			};
 			case 3: {
 				// if(data.orderType) delete data.orderType;
-				data.orderField = 'shop_price';
+				data.orderField = 'prom_price';
 				data.dis_type = 1;
 				break;
 			};
@@ -28,9 +28,9 @@
       </view>
     </navigator>
-    <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">
+    <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">
       价格
-      <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
+      <view class="ico-dg" wx:if="{{tabname=='prom_price'}}">
         <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
         <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
       </view>
@@ -13,8 +13,8 @@
         <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
       </view>
     </navigator>
-    <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">价格
-      <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
+    <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">价格
+      <view class="ico-dg" wx:if="{{tabname=='prom_price'}}">
         <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
         <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
       </view>