fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by 邱骏
Commit a4475cd4124f00343993950dfe8c819d3a04ad67 2 parents 06403019 b1462189

Merge branch 'develop' of http://git.yoho.cn/fe/yoho-limited-sell-miniapp into develop

Inline Side-by-side
Showing 6 changed files with 23 additions and 30 deletions
@@ -33,5 +33,5 @@ @@ -33,5 +33,5 @@
33 border-radius: 70rpx; 33 border-radius: 70rpx;
34 background-color: white; 34 background-color: white;
35 left: 50%; 35 left: 50%;
36 - transform: translate(-50%, -45%); 36 + transform: translate(-50%, -42%);
37 } 37 }
@@ -77,7 +77,6 @@ const QUEUE_SUCCESS = { @@ -77,7 +77,6 @@ const QUEUE_SUCCESS = {
77 FULL: 3 77 FULL: 3
78 }; 78 };
79 79
80 -const YB_SHARE_RESULT_L = 'YB_SHARE_RESULT_L';  
81 const YB_TO_ASSIST_C = 'YB_TO_ASSIST_C'; 80 const YB_TO_ASSIST_C = 'YB_TO_ASSIST_C';
82 const YB_ASSIST_SUCCESS_L = 'YB_ASSIST_SUCCESS_L'; 81 const YB_ASSIST_SUCCESS_L = 'YB_ASSIST_SUCCESS_L';
83 const YB_INVITE_ASSIST_C = 'YB_INVITE_ASSIST_C'; 82 const YB_INVITE_ASSIST_C = 'YB_INVITE_ASSIST_C';
@@ -195,8 +194,6 @@ Page(Object.assign({ @@ -195,8 +194,6 @@ Page(Object.assign({
195 }, 194 },
196 onShareAppMessage: function(res) { 195 onShareAppMessage: function(res) {
197 let params = { 196 let params = {
198 - FROM: res.from,  
199 - SHARE_RESULT: 0,  
200 TITLE: this.data.productName, 197 TITLE: this.data.productName,
201 DESC: '我在有货限定频道发现一个不错的商品赶快来看看吧！' 198 DESC: '我在有货限定频道发现一个不错的商品赶快来看看吧！'
202 }; 199 };
@@ -209,12 +206,8 @@ Page(Object.assign({ @@ -209,12 +206,8 @@ Page(Object.assign({
209 path: `/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}`, 206 path: `/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}`,
210 imageUrl: this.data.snapData.default_image, 207 imageUrl: this.data.snapData.default_image,
211 success: function() { 208 success: function() {
212 - params.SHARE_RESULT = 1;  
213 - yas.report(YB_SHARE_RESULT_L, params);  
214 }, 209 },
215 fail: function() { 210 fail: function() {
216 - params.SHARE_RESULT = 2;  
217 - yas.report(YB_SHARE_RESULT_L, params);  
218 } 211 }
219 }; 212 };
220 } else if (res.from === 'button') { 213 } else if (res.from === 'button') {
@@ -226,12 +219,8 @@ Page(Object.assign({ @@ -226,12 +219,8 @@ Page(Object.assign({
226 path: `/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`, 219 path: `/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`,
227 imageUrl: this.data.snapData.default_image, 220 imageUrl: this.data.snapData.default_image,
228 success: function() { 221 success: function() {
229 - params.SHARE_RESULT = 1;  
230 - yas.report(YB_SHARE_RESULT_L, params);  
231 }, 222 },
232 fail: function() { 223 fail: function() {
233 - params.SHARE_RESULT = 2;  
234 - yas.report(YB_SHARE_RESULT_L, params);  
235 } 224 }
236 }; 225 };
237 } 226 }
@@ -73,8 +73,8 @@ @@ -73,8 +73,8 @@
73 <view class="top-assist-action"> 73 <view class="top-assist-action">
74 <view class="top-title" >你的好友邀请你为ta助力</view> 74 <view class="top-title" >你的好友邀请你为ta助力</view>
75 <view class="top-action"> 75 <view class="top-action">
76 - <view class="as-bottom ok width200" bindtap="assistAction">帮ta助力</view>  
77 - <view class="as-bottom cancel width200" bindtap="assistCancel">取消</view> 76 + <view class="as-bottom ok width130" bindtap="assistAction">帮ta助力</view>
  77 + <view class="as-bottom cancel width130" bindtap="assistCancel">取消</view>
78 </view> 78 </view>
79 </view> 79 </view>
80 </action-bar> 80 </action-bar>
@@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
199 <block wx:if="{{productSourceType === 1}}"> 199 <block wx:if="{{productSourceType === 1}}">
200 <action-bar wx:if="{{queueStatus === 1}}"> 200 <action-bar wx:if="{{queueStatus === 1}}">
201 <view class="bottom1-action"> 201 <view class="bottom1-action">
202 - <view class="as-bottom cancel">即将开售</view> 202 + <view class="as-bottom cancel">活动尚未开始</view>
203 <view class="help-wrapper" bindtap="goHelp"> 203 <view class="help-wrapper" bindtap="goHelp">
204 <image class="help" src="../../../static/images/XD_q_ic@3x.png"></image> 204 <image class="help" src="../../../static/images/XD_q_ic@3x.png"></image>
205 </view> 205 </view>
@@ -244,7 +244,7 @@ @@ -244,7 +244,7 @@
244 <block wx:if="{{productSourceType === 2}}"> 244 <block wx:if="{{productSourceType === 2}}">
245 <action-bar wx:if="{{queueStatus === 1}}"> 245 <action-bar wx:if="{{queueStatus === 1}}">
246 <view class="bottom1-action"> 246 <view class="bottom1-action">
247 - <view class="as-bottom cancel">即将开售</view> 247 + <view class="as-bottom cancel">活动尚未开始</view>
248 <view class="help-wrapper" bindtap="goHelp"> 248 <view class="help-wrapper" bindtap="goHelp">
249 <image class="help" src="../../../static/images/XD_q_ic@3x.png"></image> 249 <image class="help" src="../../../static/images/XD_q_ic@3x.png"></image>
250 </view> 250 </view>
@@ -255,8 +255,8 @@ @@ -255,8 +255,8 @@
255 <view class="top-assist-action"> 255 <view class="top-assist-action">
256 <view class="top-title" >你的好友邀请你为ta助力排队</view> 256 <view class="top-title" >你的好友邀请你为ta助力排队</view>
257 <view class="top-action"> 257 <view class="top-action">
258 - <view class="as-bottom ok width150" bindtap="queueAction">帮ta助力</view>  
259 - <view class="as-bottom cancel width150" bindtap="queueCancel">取消</view> 258 + <view class="as-bottom ok width130" bindtap="queueAction">帮ta助力</view>
  259 + <view class="as-bottom cancel width130" bindtap="queueCancel">取消</view>
260 </view> 260 </view>
261 </view> 261 </view>
262 </action-bar> 262 </action-bar>
@@ -347,11 +347,11 @@ @@ -347,11 +347,11 @@
347 </view> 347 </view>
348 348
349 <view class="modal-btn"> 349 <view class="modal-btn">
350 - <view class="modal-ok" bindtap="restartSelfShare"> 350 + <view class="modal-ok btn-info" bindtap="restartSelfShare">
351 我也要参加 351 我也要参加
352 </view> 352 </view>
353 353
354 - <view class="modal-cancel" bindtap="goQueueList"> 354 + <view class="modal-cancel btn-info" bindtap="goQueueList">
355 查看详情 355 查看详情
356 </view> 356 </view>
357 </view> 357 </view>
@@ -369,11 +369,11 @@ @@ -369,11 +369,11 @@
369 </view> 369 </view>
370 370
371 <view class="modal-btn"> 371 <view class="modal-btn">
372 - <view class="modal-ok" bindtap="restartSelfShare"> 372 + <view class="modal-ok btn-info" bindtap="restartSelfShare">
373 我也要参加 373 我也要参加
374 </view> 374 </view>
375 375
376 - <view class="modal-cancel" bindtap="goQueueList"> 376 + <view class="modal-cancel btn-info" bindtap="goQueueList">
377 查看详情 377 查看详情
378 </view> 378 </view>
379 </view> 379 </view>
@@ -391,11 +391,11 @@ @@ -391,11 +391,11 @@
391 </view> 391 </view>
392 392
393 <view class="modal-btn"> 393 <view class="modal-btn">
394 - <view class="modal-ok" bindtap="restartSelfShare"> 394 + <view class="modal-ok btn-info" bindtap="restartSelfShare">
395 我也要参加 395 我也要参加
396 </view> 396 </view>
397 397
398 - <view class="modal-cancel" bindtap="goQueueList"> 398 + <view class="modal-cancel btn-info" bindtap="goQueueList">
399 查看详情 399 查看详情
400 </view> 400 </view>
401 </view> 401 </view>
@@ -157,6 +157,11 @@ @@ -157,6 +157,11 @@
157 width: 250rpx; 157 width: 250rpx;
158 } 158 }
159 159
  160 +.width130 {
  161 + width: 130rpx;
  162 + padding: 0 0 !important;
  163 +}
  164 +
160 .as-bottom { 165 .as-bottom {
161 font-size: 28rpx; 166 font-size: 28rpx;
162 height: 50rpx; 167 height: 50rpx;
@@ -236,4 +241,9 @@ @@ -236,4 +241,9 @@
236 .banner-image { 241 .banner-image {
237 width:750rpx; 242 width:750rpx;
238 height:234rpx; 243 height:234rpx;
  244 +}
  245 +
  246 +.modal-content .btn-info {
  247 + padding: 0 0;
  248 + width: 200rpx;
239 } 249 }
@@ -256,8 +256,6 @@ Page(Object.assign({ @@ -256,8 +256,6 @@ Page(Object.assign({
256 IMG: decodeURIComponent(this.data.shareInfo.default_image) 256 IMG: decodeURIComponent(this.data.shareInfo.default_image)
257 }; 257 };
258 258
259 - params.SHARE_RESULT = 1;  
260 - yas.report('YB_SHARE_RESULT_L', params);  
261 259
262 // 用户点击右上角分享 260 // 用户点击右上角分享
263 return { 261 return {
@@ -266,10 +264,8 @@ Page(Object.assign({ @@ -266,10 +264,8 @@ Page(Object.assign({
266 path: params.PATH, // 分享路径 264 path: params.PATH, // 分享路径
267 imageUrl: params.IMG, 265 imageUrl: params.IMG,
268 success: function() { 266 success: function() {
269 - params.SHARE_RESULT = 1;  
270 }, 267 },
271 fail: function() { 268 fail: function() {
272 - params.SHARE_RESULT = 2;  
273 } 269 }
274 }; 270 };
275 }, 271 },
@@ -155,8 +155,6 @@ Page(Object.assign({ @@ -155,8 +155,6 @@ Page(Object.assign({
155 IMG: decodeURIComponent(this.data.shareInfo.default_image) 155 IMG: decodeURIComponent(this.data.shareInfo.default_image)
156 }; 156 };
157 157
158 - params.SHARE_RESULT = 1;  
159 - yas.report('YB_SHARE_RESULT_L', params);  
160 158
161 // 用户点击右上角分享 159 // 用户点击右上角分享
162 return { 160 return {