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

taiyuan
2 parents d582f224 7f1c74a2
Showing 4 changed files with 4 additions and 4 deletions
packageA/pages/distribution/goods/goods.js
pages/goods/goodsList/goodsList.wxml
pages/goods/search/search.wxml
pages/index/index/index.js
@@ -472,7 +472,7 @@ Page({
 			};
 			case 3: {
 				// if(data.orderType) delete data.orderType;
-				data.orderField = 'prom_price';
+				data.orderField = 'final_price';
 				data.dis_type = 1;
 				break;
 			};
@@ -30,7 +30,7 @@
     </navigator>
     <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">
       价格
-      <view class="ico-dg" wx:if="{{tabname=='prom_price'}}">
+      <view class="ico-dg" wx:if="{{tabname=='final_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>
@@ -14,7 +14,7 @@
       </view>
     </navigator>
     <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">价格
-      <view class="ico-dg" wx:if="{{tabname=='prom_price'}}">
+      <view class="ico-dg" wx:if="{{tabname=='final_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>
@@ -594,7 +594,7 @@ Page({
 	console.log("---首页---分享--");
 	var title="商城首页"
     //分享	
-	if(getApp().globalData.config.store_name){
+	if(getApp().globalData.config && getApp().globalData.config.store_name){
 		 title=getApp().globalData.config.store_name;
 	}else if(getApp().globalData.setting.appName){
 		 title=getApp().globalData.setting.appName;