Merge branch 'fix/issue' into 'develop'
修复一些问题 1.我要咨询不跳转; 2.第三方登录重复发送验证码; 3. 加入购物页面,商品的图片被拉伸 See merge request !46
Showing
4 changed files
with
15 additions
and
4 deletions
@@ -20,7 +20,15 @@ var api = require('../api'), | @@ -20,7 +20,15 @@ var api = require('../api'), | ||
20 | var trim = $.trim; | 20 | var trim = $.trim; |
21 | var showErrTip = tip.show; | 21 | var showErrTip = tip.show; |
22 | 22 | ||
23 | +var requesting = false; | ||
24 | + | ||
23 | function nextStep(url, mobileNo, areaCode) { | 25 | function nextStep(url, mobileNo, areaCode) { |
26 | + if (requesting) { | ||
27 | + return false; | ||
28 | + } | ||
29 | + | ||
30 | + requesting = true; | ||
31 | + | ||
24 | $.ajax({ | 32 | $.ajax({ |
25 | type: 'POST', | 33 | type: 'POST', |
26 | url: '/passport/bind/sendBindMsg', | 34 | url: '/passport/bind/sendBindMsg', |
@@ -31,9 +39,13 @@ function nextStep(url, mobileNo, areaCode) { | @@ -31,9 +39,13 @@ function nextStep(url, mobileNo, areaCode) { | ||
31 | success: function(res) { | 39 | success: function(res) { |
32 | console.log(res.data); | 40 | console.log(res.data); |
33 | location.href = url; | 41 | location.href = url; |
42 | + | ||
43 | + requesting = false; | ||
34 | }, | 44 | }, |
35 | error: function() { | 45 | error: function() { |
36 | tip.show('出错了,请重试!'); | 46 | tip.show('出错了,请重试!'); |
47 | + | ||
48 | + requesting = false; | ||
37 | } | 49 | } |
38 | }); | 50 | }); |
39 | } | 51 | } |
@@ -65,7 +65,7 @@ if (navtabHammer) { | @@ -65,7 +65,7 @@ if (navtabHammer) { | ||
65 | 65 | ||
66 | if (gotoConsultHammer) { | 66 | if (gotoConsultHammer) { |
67 | gotoConsultHammer.on('tap', function() { | 67 | gotoConsultHammer.on('tap', function() { |
68 | - location.href = $(gotoConsultEle).data('href'); | 68 | + location.href = $(gotoConsultEle).find('a').attr('href'); |
69 | }); | 69 | }); |
70 | } | 70 | } |
71 | 71 |
@@ -93,9 +93,9 @@ | @@ -93,9 +93,9 @@ | ||
93 | {{#if consultsNum}} | 93 | {{#if consultsNum}} |
94 | {{> product/feedback-tab}} | 94 | {{> product/feedback-tab}} |
95 | {{else}} | 95 | {{else}} |
96 | - <div class="nodata tap-hightlight"> | 96 | + <div class="nodata tap-hightlight" id="goto-consult"> |
97 | <span>暂无商品评价和咨询</span> | 97 | <span>暂无商品评价和咨询</span> |
98 | - <a href="{{link}}" class="go-consult">我要咨询<span class="iconfont"></span></a> | 98 | + <a href="{{consultsUrl}}" class="go-consult">我要咨询<span class="iconfont"></span></a> |
99 | </div> | 99 | </div> |
100 | {{/if}} | 100 | {{/if}} |
101 | {{/if}} | 101 | {{/if}} |
-
Please register or login to post a comment