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

 .detail-banner {
     position: relative;
-    width: 750rpx;
+    width: 100%rpx;
 }
 
 .detail-banner .swiper-wrapper {
@@ -35,7 +35,7 @@
 
 .detail-banner .product-name {
     height: 80rpx;
-    width: 750rpx;
+    width: 100%rpx;
     position: absolute;
     bottom: 0;
     left: 0;

@@ -57,21 +57,11 @@
    height: 28rpx;
    justify-content: center;
    display: flex;
-   border-bottom-style:solid;
-   border-bottom-width: 1rpx;
-   border-bottom-color: black;
-   border-top-style:solid;
-   border-top-width: 1rpx;
-   border-top-color: black;
-   border-right-style:solid;
-   border-right-width: 1rpx;
-   border-right-color: black;
-   border-left-style:solid;
-   border-left-width: 1rpx;
-   border-left-color: black;
+   border: 1rpx solid #000;
    border-radius: 6rpx;
    margin-left: 30rpx;
    margin-top: 2px;
+   line-height: 28rpx;
 }
 .header .leftView .textTelView .textTelButton .buttontext{
    font-size: 21rpx;

@@ -13,7 +13,7 @@ let timer;
 
 Page({
     data: {
-        windowHeight: windowHeight + 48,
+        windowHeight,
         orderType: 1,
         ordersList: [],
         reason: [],

@@ -26,7 +26,7 @@
                 <image src="../../../static/images/empty@2x.png" style="width:220rpx;height:220rpx"></image>
                 <br />
                 <view style="font-size:30rpx;text-align:center;margin-top:20rpx">您还没有任何订单，赶快去逛逛吧</view>
-                <button bindtap="goShopping" class="loginBtn">去逛逛</button>
+                <button bindtap="goShopping" class="shopping-btn">去逛逛</button>
             </view>
         </view>
         <copyright class="copyright"></copyright>

@@ -140,10 +140,11 @@ a {
     text-decoration: none;
 }
 
-.loginBtn {
+.shopping-btn {
     width: 65%;
     height: 90rpx;
     font-size: 30rpx;
+    line-height: 90rpx;
     text-align: center;
     margin-top: 150rpx;
     background-color: #444444;

@@ -165,10 +165,9 @@ image {
 .order .order-opt {
     position: relative;
     height: 100rpx;
-    padding-right: 27rpx;
+    padding-right: 30rpx;
     border-top: 1rpx solid #e0e0e0;
     text-align: right;
-    margin-right: 20rpx;
     display: flex;
     flex-direction:row;
     justify-content:flex-end;

@@ -72,11 +72,6 @@ Page({
                     className: 'action-class',
                     loading: false,
                     openType: 'share'
-                },
-                {
-                    name: '生成卡片并分享',
-                    className: 'action-class',
-                    loading: false
                 }
             ]
         },
@@ -84,7 +79,8 @@ Page({
         shopRecList: [],
         preferList: [],
         
-        showBackTop: false
+        showBackTop: false,
+        showBottomTipView: false
     },
     onLoad: function (options) {
         let productSkn = options.productSkn ? options.productSkn : '';
@@ -310,7 +306,7 @@ Page({
                         pickerData: pickData,
                         storage_sum: res.data.storage_sum,
                         snapshootShareData: snapData,
-                        shopId: res.data.shop_id
+                        shopId: res.data.shop_id,
                         // 暂时没用
                         // brand_id: res.data.brand_id,
                         // isLimitBuy:res.data.isLimitBuy,
@@ -329,6 +325,7 @@ Page({
                         // productOnlyProvideByYohoAPP: res.data.is_secKill === 'Y' || res.data.is_advance === 'Y' || res.data.attribute === 3 || res.data.attribute === 4 || res.data.isLimitBuy || res.data.is_deposit_advance==='Y',
                         // productOnlyProvideByYohoStore: res.data.store_show_status === 3 || res.data.store_show_status === 4,
                         // productNotForSale: res.data.attribute===2,
+                        showBottomTipView: true
                     });
 
                     this.shopRecList(res.data.shop_id);

@@ -105,7 +105,7 @@
             <product-list list="{{preferList}}"></product-list>
         </view>
     </block>
-    <view class='bottom-tip-view' style="display:{{storage_sum===0?'flex':'none'}}">
+    <view class='bottom-tip-view' wx:if="{{showBottomTipView}}" style="display:{{storage_sum===0?'flex':'none'}}">
         <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>

@@ -19,7 +19,7 @@ Page({
         urlParams: {},
         showBackTop: false,
         noResult: false,
-        windowHeight: windowHeight + 48,
+        windowHeight
     },
     onLoad:function (options) {
         let title = decodeURIComponent(options.title) || '默认标题';

@@ -18,7 +18,8 @@ Page({
         noResult: false,
         showLoading: false,
         showNoMore: false,
-        showBackTop: false
+        showBackTop: false,
+        windowHeight: windowHeight
     },
     onReachBottom: function () {
         if (this.data.currentPage < this.data.totalPage) {

-<view class="search-container">
+<view class="search-container" style="min-height:{{windowHeight}}px;">
     <view class="top-search">
         <input class="search-input" value="{{query}}" confirm-type="search" placeholder="潮流单品搜一下"
                bindconfirm="confirmQuery" bindinput="bindQueryInput"
@@ -20,5 +20,6 @@
             </product-list>
         </view>
     </view>
+    <copyright wx:if="{{searched}}" class="copy-right"></copyright>
     <quick-navigation show-back-top="{{showBackTop}}" bindbacktop="backTop"></quick-navigation>
 </view>

 .search-container {
     position: relative;
+    box-sizing: border-box;
+    padding-bottom: 180rpx;
+}
+
+.copy-right {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    left: 0;
 }
 
 .top-search {