fe / yohobuywap-node · Commits

Go to a project

Authored by lijing
Commit e15b9a1d946720f46a2cb7f0f187c8cc4906a766 1 parent 14b0c532

测试bug

Inline Side-by-side
Showing 3 changed files with 71 additions and 57 deletions
@@ -15,7 +15,7 @@ exports.activity = (req, res, next) => { @@ -15,7 +15,7 @@ exports.activity = (req, res, next) => {
15 uid: req.user.uid 15 uid: req.user.uid
16 }).then((result) => { 16 }).then((result) => {
17 res.render('raffle/activity', Object.assign(result, { 17 res.render('raffle/activity', Object.assign(result, {
18 - title: 'Yoho!Buy 有货', 18 + title: '免单抽奖',
19 width750: true, 19 width750: true,
20 localCss: true 20 localCss: true
21 })); 21 }));
@@ -98,7 +98,7 @@ exports.enter = (req, res) => { @@ -98,7 +98,7 @@ exports.enter = (req, res) => {
98 exports.lucky = (req, res, next) => { 98 exports.lucky = (req, res, next) => {
99 raffleModel.lucky({ 99 raffleModel.lucky({
100 lotteryId: req.body.lotteryId, 100 lotteryId: req.body.lotteryId,
101 - userId: req.body.userId, 101 + userId: req.user.uid,
102 orderCode: req.body.orderCode 102 orderCode: req.body.orderCode
103 }).then(result => { 103 }).then(result => {
104 res.json(result); 104 res.json(result);
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="logo"></div> 3 <div class="logo"></div>
4 <div class="title"> 4 <div class="title">
5 {{# lottery}} 5 {{# lottery}}
6 - <p>{{name}}</p> 6 + <p>{{{name}}}</p>
7 {{/ lottery}} 7 {{/ lottery}}
8 </div> 8 </div>
9 <div class="kind"></div> 9 <div class="kind"></div>
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <div class="rule-list-c"> 19 <div class="rule-list-c">
20 <ul> 20 <ul>
21 {{# lottery}} 21 {{# lottery}}
22 - <li>{{remark}}</li> 22 + <li>{{{remark}}}</li>
23 {{/ lottery}} 23 {{/ lottery}}
24 </ul> 24 </ul>
25 </div> 25 </div>
@@ -202,59 +202,63 @@ orderHammer.on('tap', function(e) { @@ -202,59 +202,63 @@ orderHammer.on('tap', function(e) {
202 $reaMask.data('orderId', id); 202 $reaMask.data('orderId', id);
203 203
204 if ($cur.closest('.raffle-btn').length > 0) { 204 if ($cur.closest('.raffle-btn').length > 0) {
205 - userId = $cur.closest('.raffle-btn').attr('data-uid');  
206 - orderCode = $cur.closest('.raffle-btn').attr('data-code');  
207 - $.ajax({  
208 - type: 'POST',  
209 - url: '/activity/raffle/lucky',  
210 - data: {  
211 - lotteryId: 20,  
212 - userId: userId,  
213 - orderCode: orderCode  
214 - },  
215 - success: function(data) {  
216 - var luck = data.data.orderLotteryCode;  
217 - var $diaMain = $('.dia-main');  
218 - switch(luck){  
219 - case 0:  
220 - break;  
221 - case 1:  
222 - lucky(data);  
223 - break;  
224 - case 2:  
225 - unlucky();  
226 - break;  
227 - case 3:  
228 - tip.show('用户抽奖不能多个客户端一起抽奖');  
229 - break;  
230 - case 4:  
231 - unlucky();  
232 - break;  
233 - }  
234 - // 中奖  
235 - function lucky(data) {  
236 - var message = data.data.orderLotteryMessage;  
237 - var bgPic = data.data.prize.image;  
238 - $('.lucky').show();  
239 - $('.dia-c').show();  
240 - $diaMain.find('p').show();  
241 - var dia_h = $diaMain.height() / 2;  
242 - $diaMain.css('margin-top', '-' + dia_h + 'px');  
243 - $diaMain.find('.message').text(message);  
244 - $diaMain.find('.lucky').css("background-image","url(" + bgPic + ")");  
245 - }  
246 - // 未中奖  
247 - function unlucky() {  
248 - $('.unlucky').show();  
249 - $('.dia-c').show();  
250 - var dia_h = $diaMain.height() / 2;  
251 - $diaMain.css('margin-top', '-' + dia_h + 'px'); 205 + if (isWeiXin()) {
  206 + userId = $cur.closest('.raffle-btn').attr('data-uid');
  207 + orderCode = $cur.closest('.raffle-btn').attr('data-code');
  208 + $.ajax({
  209 + type: 'POST',
  210 + url: '/activity/raffle/lucky',
  211 + data: {
  212 + lotteryId: 20,
  213 + orderCode: orderCode
  214 + },
  215 + success: function(data) {
  216 + var luck = data.data.orderLotteryCode;
  217 + var $diaMain = $('.dia-main');
  218 + switch(luck){
  219 + case 0:
  220 + break;
  221 + case 1:
  222 + lucky(data);
  223 + break;
  224 + case 2:
  225 + unlucky();
  226 + break;
  227 + case 3:
  228 + tip.show('用户抽奖不能多个客户端一起抽奖');
  229 + break;
  230 + case 4:
  231 + unlucky();
  232 + break;
  233 + }
  234 + // 中奖
  235 + function lucky(data) {
  236 + var message = data.data.orderLotteryMessage;
  237 + var bgPic = data.data.prize.image;
  238 + $('.lucky').show();
  239 + $('.dia-c').show();
  240 + $diaMain.find('p').show();
  241 + var dia_h = $diaMain.height() / 2;
  242 + $diaMain.css('margin-top', '-' + dia_h + 'px');
  243 + $diaMain.find('.message').text(message);
  244 + $diaMain.find('.lucky').css("background-image","url(" + bgPic + ")");
  245 + }
  246 + // 未中奖
  247 + function unlucky() {
  248 + $('.unlucky').show();
  249 + $('.dia-c').show();
  250 + var dia_h = $diaMain.height() / 2;
  251 + $diaMain.css('margin-top', '-' + dia_h + 'px');
  252 + }
  253 + },
  254 + error: function(data) {
  255 + tip.show(data.message);
252 } 256 }
253 - },  
254 - error: function(data) {  
255 - tip.show(data.message);  
256 - }  
257 - }); 257 + });
  258 + } else {
  259 + tip.show('请在微信端打开，才能参加抽奖');
  260 + }
  261 +
258 } 262 }
259 263
260 if ($cur.closest('.del').length > 0) { 264 if ($cur.closest('.del').length > 0) {
@@ -447,4 +451,14 @@ $('.dia-c .close').on('click', function() { @@ -447,4 +451,14 @@ $('.dia-c .close').on('click', function() {
447 451
448 $('.dia-main a').on('click', function () { 452 $('.dia-main a').on('click', function () {
449 window.location.href = '//m.yohobuy.com/activity/raffle/orders' 453 window.location.href = '//m.yohobuy.com/activity/raffle/orders'
450 -});  
  454 +});
  455 +
  456 +// 判断是否是微信
  457 +function isWeiXin(){
  458 + var ua = window.navigator.userAgent.toLowerCase();
  459 + if(ua.match(/MicroMessenger/i) == 'micromessenger'){
  460 + return true;
  461 + } else {
  462 + return false;
  463 + }
  464 +}