Merge branch 'develop' of git.yoho.cn:fe/yoho-brand-shop into develop

-Component({});
+Component({
+    properties: {
+        delayShow: {
+            type: Boolean,
+            value: false
+        }
+    },
+    ready: function () {
+        setTimeout(() => {
+            this.setData({
+                delayShow: true
+            });
+        }, 2000);
+    }
+});

 <view class="bottom-copyright">
-    <image class="image" src="../../../static/images/yoho!buy@2x.png"></image>
+    <image wx:if="delayShow" class="image" src="../../../static/images/yoho!buy@2x.png"></image>
 </view>

@@ -200,20 +200,16 @@ Page({
         this.getOrders(type);
     },
     refundOrder(e) {
-        let that = this;
-
         this.refundOrderCode = e.currentTarget.dataset.code;
-
         wx.showModal({
             content: '申请退款后，本单享有的优惠可能会一并取消，确定申请吗？',
             cancelText: '取消',
             confirmText: '确定',
-            confirmColor: '#FF0000',
-            success(res) {
-                if (res.confirm) {
-                    that.loadRefundReason();
-                    that.setData({showReason: true});
-                }
+            confirmColor: '#FF0000'
+        }).then(res => {
+            if (res.confirm) {
+                this.loadRefundReason();
+                this.setData({showReason: true});
             }
         });
     },

@@ -134,17 +134,6 @@ image {
     border: 0;
 }
 
-.button {
-    height: 54rpx;
-    line-height: 54rpx;
-    width: 130rpx;
-    padding-left: 1rpx;
-    padding-right: 1rpx;
-    font-size: 25rpx;
-    text-align: center;
-    margin-right: 1rpx;
-}
-
 a {
     outline: none;
     color: #444444;

@@ -33,9 +33,6 @@
                             </view>
                         </view>
                     </view>
-                    <block wx:if="{{good.expect_arrival_time}}">
-                        <text class="order-tip" >上市期:{{good.expect_arrival_time}}</text>
-                    </block>
                 </view>
             </block>
         </view>
@@ -54,7 +51,6 @@
             </block>
 
             <form bindsubmit="submitFormId" report-submit='true'>
-
                 <block wx:for="{{item.links}}" wx:for-item="link" wx:key="order_code">
                     <block wx:if="{{link == 'closeOrder'}}">
                         <button class="btn cancel" formType="submit" catchtap="cancelOrder"
@@ -62,8 +58,7 @@
                     </block>
                     <block wx:if="{{link == 'buyNow'}}">
                         <view class="btn pay" catchtap="payNow" data-code="{{item.order_code}}"
-                              data-amount="{{item.amount}}">立即付款
-                        </view>
+                              data-amount="{{item.amount}}">立即付款</view>
                     </block>
                     <block wx:if="{{link == 'delOrder'}}">
                         <view class="btn cancel" catchtap="delOrder" data-code="{{item.order_code}}">删除订单</view>
@@ -72,14 +67,12 @@
                         <view class="btn cancel" catchtap="expressDetail" data-code="{{item.order_code}}">查看物流</view>
                     </block>
                     <block wx:if="{{link == 'confirm'}}">
-                        <button class="button pay confirm" formType="submit" catchtap="confirmReceive" data-code="{{item.order_code}}">确认收货</button>
+                        <button class="btn confirm" formType="submit" catchtap="confirmReceive" 
+                                data-code="{{item.order_code}}">确认收货</button>
                     </block>
                     <block wx:if="{{link == 'refundApply'}}">
-                        <button class="button refund" formType="submit" plain='true' catchtap="refundApply" plain="true" data-code="{{item.order_code}}">申请退款</button>
-                    </block>
-                    <block wx:if="{{link == 'refundApply'}}">
-                        <view class="button cancel" catchtap="refundOrder" data-code="{{item.order_code}}">申请退款
-                        </view>
+                        <button class="btn refund" formType="submit" plain='true' catchtap="refundOrder" plain="true" 
+                                data-code="{{item.order_code}}">申请退款</button>
                     </block>
                 </block>
                 <input type="text" name="orderCode" class="hide-code" value="{{item.order_code}}"/>

@@ -246,6 +246,15 @@ a {
     border: 1rpx solid #d0021b;
 }
 
+.order .order-opt .confirm {
+    background: #d0021b;
+    color: #fff;
+    margin-left: 20rpx;
+    border: none;
+    line-height: 58rpx;
+    border: 1rpx solid #d0021b;
+}
+
 .btn.cancel,
 .btn.refund,
 .btn.confirm {
@@ -253,3 +262,7 @@ a {
     padding: 0;
     margin: 0;
 }
+
+.btn.refund {
+    margin-left: 20rpx;
+}

@@ -29,7 +29,9 @@ Page({
     },
     onLoad: function () {
         this.productList({ page: 1, limit: 20});
-
+        yas.pageOpenReport();
+    },
+    onReady: function () {
         setTimeout(() => {
             let query = wx.createSelectorQuery();
 
@@ -39,12 +41,10 @@ Page({
                 this.setData({
                     filterInitialTop: res[0].top,
                     topSearchHeight: res[1].bottom - res[1].top,
-                    resetListScrollPos: res[0].top - (res[1].bottom - res[1].top)  
+                    resetListScrollPos: res[0].top - (res[1].bottom - res[1].top)
                 });
             })
-        }, 2000);
-
-        yas.pageOpenReport();
+        }, 1000);
     },
     onShow: function () {
         yas.report('YB_MAIN_TAB_C', {TAB_ID:1})

 {
   "navigationBarTitleText": "品类",
     "usingComponents": {
-        "view-title": "/components/layout/view-title/view-title"
+        "view-title": "/components/layout/view-title/view-title",
+        "copyright": "/components/layout/copyright/copyright"
     }
 }

@@ -46,5 +46,6 @@
         </view>
         <view class="category-line"></view>
     </block>
+    <copyright></copyright>
 </view>
 

@@ -5,6 +5,7 @@
       "product-list": "/components/product/list",
       "snapshot": "/components/product/detail/snapshot",
       "view-title": "/components/layout/view-title/view-title",
+      "copyright": "/components/layout/copyright/copyright",
       "quick-navigation": "/components/layout/quick-navigation/quick-navigation"
     }
 }

@@ -109,7 +109,7 @@
         <text class="bottom-tip-view-title" style="display:{{is_supplyed?'flex':'none'}}">此商品已售罄，请等待后续备货!</text>
         <text class="bottom-tip-view-title" style="display:{{is_supplyed?'none':'flex'}}">已售罄</text>
     </view>
-    <view class="gap"></view>
+    <copyright></copyright>
 </view>
 <view class="bottom-action">
     <view class='buy-btn' bindtap="buyImmediate">立即购买</view>
@@ -117,7 +117,6 @@
 <quick-navigation show-menu="{{true}}" show-back-top="{{showBackTop}}" show="{{true}}"
                   bindbacktop="backTop" margin-bottom="{{150}}"></quick-navigation>
 
-<snapshot isShow="{{showSnapshootShare}}" sourceType="product" shareData="{{snapshootShareData}}"
-          bind:hiddenSheet="hideSnap"></snapshot>
+<snapshot isShow="{{showSnapshootShare}}" sourceType="product" shareData="{{snapshootShareData}}" bind:hiddenSheet="hideSnap"></snapshot>
 <template is="Picker" data="{{pickerData, loadingForPayment}}"/>
 <template is="zan-actionsheet" data="{{...actionSheet}}"/>

@@ -20,7 +20,6 @@ const apiNames = [
     'checkSession',
     'setStorage',
     'showToast',
-    'showModal',
     'getSystemInfo',
     'setClipboardData'
 ];