Merge branch 'origin/Xfy' into Xfy

pages/index/index.js

@@ -198,7 +198,6 @@ Page({
     app.updateCurrentTab('index');
     app.globalData.showTabBar = true;
     this.checkAndRestoreLoginStatus()
-    this.refreshGoodsList()
   },
 
   onPullDownRefresh: function() {

pages/index/index.wxml

@@ -224,12 +224,11 @@
                   <view class="product-title">{{item.name}}</view>
                   <view class="product-spec">{{item.specification || '无'}}<text wx:if="{{item.yolk && item.yolk !== '无'}}"> | {{item.yolk}}</text></view>
                   <view class="product-status-row">
-                    <view class="status-tag supply-{{item.supplyStatus === '预售' ? 'presale' : 'spot'}}">{{item.supplyStatus || ''}}</view>
                     <view class="status-tag source-{{item.sourceType === '三方认证' ? 'third' : (item.sourceType === '平台货源' ? 'platform' : 'unverified')}}">{{item.sourceType || ''}}</view>
                     <view class="status-tag negotiate-{{item.negotiateStatus === '可议价' ? 'yes' : 'no'}}">{{item.negotiateStatus}}</view>
                   </view>
                   <view class="product-meta">
-                    <text class="sales-count">已售{{item.sales || item.reservedCount || 0}}件</text>
+                    <text class="sales-count">已有{{item.reservedCount || 0}}人收藏</text>
                     <text class="product-location">{{item.region || ''}}</text>
                   </view>
                 </view>
@@ -276,18 +275,16 @@
                     data-item="{{item}}"
                     data-index="0"
                   ></image>
-                  <view wx:if="{{item.supplyStatus === '预售'}}" class="promo-tag presale">预售</view>
                 </view>
                 <view class="product-info">
                   <view class="product-title">{{item.name}}</view>
                   <view class="product-spec">{{item.specification || '无'}}<text wx:if="{{item.yolk && item.yolk !== '无'}}"> | {{item.yolk}}</text></view>
                   <view class="product-status-row">
-                    <view class="status-tag supply-{{item.supplyStatus === '预售' ? 'presale' : 'spot'}}">{{item.supplyStatus || ''}}</view>
                     <view class="status-tag source-{{item.sourceType === '三方认证' ? 'third' : (item.sourceType === '平台货源' ? 'platform' : 'unverified')}}">{{item.sourceType || ''}}</view>
                     <view class="status-tag negotiate-{{item.negotiateStatus === '可议价' ? 'yes' : 'no'}}">{{item.negotiateStatus}}</view>
                   </view>
                   <view class="product-meta">
-                    <text class="sales-count">已售{{item.sales || item.reservedCount || 0}}件</text>
+                    <text class="sales-count">已有{{item.reservedCount || 0}}人收藏</text>
                     <text class="product-location">{{item.region || ''}}</text>
                   </view>
                 </view>