Authored by 毕凯

Merge branch 'gray'

1 { 1 {
2 "name": "yohobuywap-node", 2 "name": "yohobuywap-node",
3 - "version": "6.5.30", 3 + "version": "6.5.31",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {

1.92 KB | W: | H:

2.06 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2 KB | W: | H:

1.92 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.08 KB | W: | H:

2.02 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -32,7 +32,7 @@ let goodObj = { @@ -32,7 +32,7 @@ let goodObj = {
32 $('.good-item').on('click', '.edit-size-info', function(e) { 32 $('.good-item').on('click', '.edit-size-info', function(e) {
33 self.sizeInfoClick(e); 33 self.sizeInfoClick(e);
34 }); 34 });
35 - $('.good-item').on('click', '.name,.color-size-row,.img', function(e) { 35 + $('.good-item').on('touchend', '.name,.color-size-row,.img', function(e) {
36 self.goodClick(e); 36 self.goodClick(e);
37 }); 37 });
38 $('.good-item').on('click', '.bottom .re-add', function(e) { 38 $('.good-item').on('click', '.bottom .re-add', function(e) {
@@ -301,8 +301,10 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() { @@ -301,8 +301,10 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
301 $(this).removeClass('highlight'); 301 $(this).removeClass('highlight');
302 }); 302 });
303 303
304 -$('.nav-home').on('touchstart', function() { 304 +$('.nav-home').on('touchstart', function(e) {
305 $('.homebuttom').toggleClass('hide'); 305 $('.homebuttom').toggleClass('hide');
  306 + e.preventDefault();
  307 + e.stopPropagation();
306 }); 308 });
307 309
308 // 点击关闭头部菜单 310 // 点击关闭头部菜单
@@ -46,6 +46,9 @@ class NewQrcode extends Page { @@ -46,6 +46,9 @@ class NewQrcode extends Page {
46 reload() { 46 reload() {
47 this.ajax({ 47 this.ajax({
48 url: '/home/newQrcode/reload', 48 url: '/home/newQrcode/reload',
  49 + data: {
  50 + app_version: this.qs.app_version
  51 + }
49 }).then(result => { 52 }).then(result => {
50 if (result) { 53 if (result) {
51 this.qrText = result; 54 this.qrText = result;
@@ -39,7 +39,7 @@ html { @@ -39,7 +39,7 @@ html {
39 39
40 .level { 40 .level {
41 width: 60px; 41 width: 60px;
42 - height: 25px; 42 + height: 38px;
43 position: absolute; 43 position: absolute;
44 bottom: -12px; 44 bottom: -12px;
45 left: 20px; 45 left: 20px;