Merge remote-tracking branch 'origin/feature/import' into feature/import

@@ -7,7 +7,6 @@
 page {
 page {
   height: 100%;
   height: 100%;
   color: #444;
   color: #444;
-  background-color: #eee;
 }
 }
 
 
 .empty-cart {
 .empty-cart {
@@ -128,7 +127,6 @@ page {
 
 
 .footer-wrap {
 .footer-wrap {
   height: 130rpx;
   height: 130rpx;
-  background-color: #eee;
 }
 }
 
 
 .footer-fixed {
 .footer-fixed {

@@ -6,9 +6,9 @@
           <text class="{{item.showArrow ? '' : 'disable-text'}}">{{item.statusString}}</text>
           <text class="{{item.showArrow ? '' : 'disable-text'}}">{{item.statusString}}</text>
           <text class="iconfont icon-right" wx:if="{{item.showArrow}}"></text>
           <text class="iconfont icon-right" wx:if="{{item.showArrow}}"></text>
         </view>
         </view>
-        <image src="https://img12.static.yhbimg.com/sns/2018/07/03/16/0262ef3b8c6fb54d49b2cac5a97ae05193.png?imageView/1/w/24/h/24" class="img-icon" wx:if="{{item.isGift}}"></image>
-        <image src="https://img11.static.yhbimg.com/sns/2018/07/03/16/010c781087b51cdde0b1855d4d5fa51acd.png?imageView/1/w/24/h/24" class="img-icon" wx:else></image>
-        <text class="giftOrPriceTitle">32131231{{item.title}}</text>
+        <image src="/static/images/gift.png" class="img-icon" wx:if="{{item.isGift}}"></image>
+        <image src="/static/images/price-gift.png" class="img-icon" wx:else></image>
+        <text class="giftOrPriceTitle">{{item.title}}</text>
       </view>
       </view>
       <view class="split-line"></view>
       <view class="split-line"></view>
     </view>
     </view>