fe / yoho-brand-shop · Commits

Go to a project

Authored by yyq
Commit 805c784296e09c6f7f952b20b4cb2f3c7d0c7234 2 parents 7cf1aa4f 526375a3

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

Inline Side-by-side
Showing 12 changed files with 28 additions and 30 deletions
1 .detail-banner { 1 .detail-banner {
2 position: relative; 2 position: relative;
3 - width: 750rpx; 3 + width: 100%rpx;
4 } 4 }
5 5
6 .detail-banner .swiper-wrapper { 6 .detail-banner .swiper-wrapper {
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 35
36 .detail-banner .product-name { 36 .detail-banner .product-name {
37 height: 80rpx; 37 height: 80rpx;
38 - width: 750rpx; 38 + width: 100%rpx;
39 position: absolute; 39 position: absolute;
40 bottom: 0; 40 bottom: 0;
41 left: 0; 41 left: 0;
@@ -57,21 +57,11 @@ @@ -57,21 +57,11 @@
57 height: 28rpx; 57 height: 28rpx;
58 justify-content: center; 58 justify-content: center;
59 display: flex; 59 display: flex;
60 - border-bottom-style:solid;  
61 - border-bottom-width: 1rpx;  
62 - border-bottom-color: black;  
63 - border-top-style:solid;  
64 - border-top-width: 1rpx;  
65 - border-top-color: black;  
66 - border-right-style:solid;  
67 - border-right-width: 1rpx;  
68 - border-right-color: black;  
69 - border-left-style:solid;  
70 - border-left-width: 1rpx;  
71 - border-left-color: black; 60 + border: 1rpx solid #000;
72 border-radius: 6rpx; 61 border-radius: 6rpx;
73 margin-left: 30rpx; 62 margin-left: 30rpx;
74 margin-top: 2px; 63 margin-top: 2px;
  64 + line-height: 28rpx;
75 } 65 }
76 .header .leftView .textTelView .textTelButton .buttontext{ 66 .header .leftView .textTelView .textTelButton .buttontext{
77 font-size: 21rpx; 67 font-size: 21rpx;
@@ -13,7 +13,7 @@ let timer; @@ -13,7 +13,7 @@ let timer;
13 13
14 Page({ 14 Page({
15 data: { 15 data: {
16 - windowHeight: windowHeight + 48, 16 + windowHeight,
17 orderType: 1, 17 orderType: 1,
18 ordersList: [], 18 ordersList: [],
19 reason: [], 19 reason: [],
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <image src="../../../static/images/empty@2x.png" style="width:220rpx;height:220rpx"></image> 26 <image src="../../../static/images/empty@2x.png" style="width:220rpx;height:220rpx"></image>
27 <br /> 27 <br />
28 <view style="font-size:30rpx;text-align:center;margin-top:20rpx">您还没有任何订单，赶快去逛逛吧</view> 28 <view style="font-size:30rpx;text-align:center;margin-top:20rpx">您还没有任何订单，赶快去逛逛吧</view>
29 - <button bindtap="goShopping" class="loginBtn">去逛逛</button> 29 + <button bindtap="goShopping" class="shopping-btn">去逛逛</button>
30 </view> 30 </view>
31 </view> 31 </view>
32 <copyright class="copyright"></copyright> 32 <copyright class="copyright"></copyright>
@@ -140,10 +140,11 @@ a { @@ -140,10 +140,11 @@ a {
140 text-decoration: none; 140 text-decoration: none;
141 } 141 }
142 142
143 -.loginBtn { 143 +.shopping-btn {
144 width: 65%; 144 width: 65%;
145 height: 90rpx; 145 height: 90rpx;
146 font-size: 30rpx; 146 font-size: 30rpx;
  147 + line-height: 90rpx;
147 text-align: center; 148 text-align: center;
148 margin-top: 150rpx; 149 margin-top: 150rpx;
149 background-color: #444444; 150 background-color: #444444;
@@ -165,10 +165,9 @@ image { @@ -165,10 +165,9 @@ image {
165 .order .order-opt { 165 .order .order-opt {
166 position: relative; 166 position: relative;
167 height: 100rpx; 167 height: 100rpx;
168 - padding-right: 27rpx; 168 + padding-right: 30rpx;
169 border-top: 1rpx solid #e0e0e0; 169 border-top: 1rpx solid #e0e0e0;
170 text-align: right; 170 text-align: right;
171 - margin-right: 20rpx;  
172 display: flex; 171 display: flex;
173 flex-direction:row; 172 flex-direction:row;
174 justify-content:flex-end; 173 justify-content:flex-end;
@@ -72,11 +72,6 @@ Page({ @@ -72,11 +72,6 @@ Page({
72 className: 'action-class', 72 className: 'action-class',
73 loading: false, 73 loading: false,
74 openType: 'share' 74 openType: 'share'
75 - },  
76 - {  
77 - name: '生成卡片并分享',  
78 - className: 'action-class',  
79 - loading: false  
80 } 75 }
81 ] 76 ]
82 }, 77 },
@@ -84,7 +79,8 @@ Page({ @@ -84,7 +79,8 @@ Page({
84 shopRecList: [], 79 shopRecList: [],
85 preferList: [], 80 preferList: [],
86 81
87 - showBackTop: false 82 + showBackTop: false,
  83 + showBottomTipView: false
88 }, 84 },
89 onLoad: function (options) { 85 onLoad: function (options) {
90 let productSkn = options.productSkn ? options.productSkn : ''; 86 let productSkn = options.productSkn ? options.productSkn : '';
@@ -310,7 +306,7 @@ Page({ @@ -310,7 +306,7 @@ Page({
310 pickerData: pickData, 306 pickerData: pickData,
311 storage_sum: res.data.storage_sum, 307 storage_sum: res.data.storage_sum,
312 snapshootShareData: snapData, 308 snapshootShareData: snapData,
313 - shopId: res.data.shop_id 309 + shopId: res.data.shop_id,
314 // 暂时没用 310 // 暂时没用
315 // brand_id: res.data.brand_id, 311 // brand_id: res.data.brand_id,
316 // isLimitBuy:res.data.isLimitBuy, 312 // isLimitBuy:res.data.isLimitBuy,
@@ -329,6 +325,7 @@ Page({ @@ -329,6 +325,7 @@ Page({
329 // 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', 325 // 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',
330 // productOnlyProvideByYohoStore: res.data.store_show_status === 3 || res.data.store_show_status === 4, 326 // productOnlyProvideByYohoStore: res.data.store_show_status === 3 || res.data.store_show_status === 4,
331 // productNotForSale: res.data.attribute===2, 327 // productNotForSale: res.data.attribute===2,
  328 + showBottomTipView: true
332 }); 329 });
333 330
334 this.shopRecList(res.data.shop_id); 331 this.shopRecList(res.data.shop_id);
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 <product-list list="{{preferList}}"></product-list> 105 <product-list list="{{preferList}}"></product-list>
106 </view> 106 </view>
107 </block> 107 </block>
108 - <view class='bottom-tip-view' style="display:{{storage_sum===0?'flex':'none'}}"> 108 + <view class='bottom-tip-view' wx:if="{{showBottomTipView}}" style="display:{{storage_sum===0?'flex':'none'}}">
109 <text class="bottom-tip-view-title" style="display:{{is_supplyed?'flex':'none'}}">此商品已售罄，请等待后续备货!</text> 109 <text class="bottom-tip-view-title" style="display:{{is_supplyed?'flex':'none'}}">此商品已售罄，请等待后续备货!</text>
110 <text class="bottom-tip-view-title" style="display:{{is_supplyed?'none':'flex'}}">已售罄</text> 110 <text class="bottom-tip-view-title" style="display:{{is_supplyed?'none':'flex'}}">已售罄</text>
111 </view> 111 </view>
@@ -19,7 +19,7 @@ Page({ @@ -19,7 +19,7 @@ Page({
19 urlParams: {}, 19 urlParams: {},
20 showBackTop: false, 20 showBackTop: false,
21 noResult: false, 21 noResult: false,
22 - windowHeight: windowHeight + 48, 22 + windowHeight
23 }, 23 },
24 onLoad:function (options) { 24 onLoad:function (options) {
25 let title = decodeURIComponent(options.title) || '默认标题'; 25 let title = decodeURIComponent(options.title) || '默认标题';
@@ -18,7 +18,8 @@ Page({ @@ -18,7 +18,8 @@ Page({
18 noResult: false, 18 noResult: false,
19 showLoading: false, 19 showLoading: false,
20 showNoMore: false, 20 showNoMore: false,
21 - showBackTop: false 21 + showBackTop: false,
  22 + windowHeight: windowHeight
22 }, 23 },
23 onReachBottom: function () { 24 onReachBottom: function () {
24 if (this.data.currentPage < this.data.totalPage) { 25 if (this.data.currentPage < this.data.totalPage) {
1 -<view class="search-container"> 1 +<view class="search-container" style="min-height:{{windowHeight}}px;">
2 <view class="top-search"> 2 <view class="top-search">
3 <input class="search-input" value="{{query}}" confirm-type="search" placeholder="潮流单品搜一下" 3 <input class="search-input" value="{{query}}" confirm-type="search" placeholder="潮流单品搜一下"
4 bindconfirm="confirmQuery" bindinput="bindQueryInput" 4 bindconfirm="confirmQuery" bindinput="bindQueryInput"
@@ -20,5 +20,6 @@ @@ -20,5 +20,6 @@
20 </product-list> 20 </product-list>
21 </view> 21 </view>
22 </view> 22 </view>
  23 + <copyright wx:if="{{searched}}" class="copy-right"></copyright>
23 <quick-navigation show-back-top="{{showBackTop}}" bindbacktop="backTop"></quick-navigation> 24 <quick-navigation show-back-top="{{showBackTop}}" bindbacktop="backTop"></quick-navigation>
24 </view> 25 </view>
1 .search-container { 1 .search-container {
2 position: relative; 2 position: relative;
  3 + box-sizing: border-box;
  4 + padding-bottom: 180rpx;
  5 +}
  6 +
  7 +.copy-right {
  8 + position: absolute;
  9 + bottom: 0;
  10 + right: 0;
  11 + left: 0;
3 } 12 }
4 13
5 .top-search { 14 .top-search {