wxd / MShopWeApp

Commit 00ef6b5a335d6818fb41c0708d522b1439a5c51a

Authored by taiyuan
2 parents d582f224 7f1c74a2

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

Inline Side-by-side
Showing 4 changed files with 4 additions and 4 deletions
packageA/pages/distribution/goods/goods.js
  View file @00ef6b5
... ... @@ -472,7 +472,7 @@ Page({
472 472 };
473 473 case 3: {
474 474 // if(data.orderType) delete data.orderType;
475   - data.orderField = 'prom_price';
  475 + data.orderField = 'final_price';
476 476 data.dis_type = 1;
477 477 break;
478 478 };
... ...
pages/goods/goodsList/goodsList.wxml
  View file @00ef6b5
... ... @@ -30,7 +30,7 @@
30 30 </navigator>
31 31 <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">
32 32 价格
33   - <view class="ico-dg" wx:if="{{tabname=='prom_price'}}">
  33 + <view class="ico-dg" wx:if="{{tabname=='final_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 @00ef6b5
... ... @@ -14,7 +14,7 @@
14 14 </view>
15 15 </navigator>
16 16 <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">价格
17   - <view class="ico-dg" wx:if="{{tabname=='prom_price'}}">
  17 + <view class="ico-dg" wx:if="{{tabname=='final_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>
... ...
pages/index/index/index.js
  View file @00ef6b5
... ... @@ -594,7 +594,7 @@ Page({
594 594 console.log("---首页---分享--");
595 595 var title="商城首页"
596 596 //分享
597   - if(getApp().globalData.config.store_name){
  597 + if(getApp().globalData.config && getApp().globalData.config.store_name){
598 598 title=getApp().globalData.config.store_name;
599 599 }else if(getApp().globalData.setting.appName){
600 600 title=getApp().globalData.setting.appName;
... ...