merge code

@@ -20,7 +20,7 @@ var shareData = {
 };
 };
 
 
 if (/QQ/i.test(navigator.userAgent)) {
 if (/QQ/i.test(navigator.userAgent)) {
-    console.log('hi')
+    console.log('hi');
     $.ajax({
     $.ajax({
         url: '//qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js',
         url: '//qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js',
         dataType: 'script',
         dataType: 'script',

@@ -449,7 +449,7 @@ var jQuery = require('yoho-jquery');
                             reader.onload = function(e) {
                             reader.onload = function(e) {
 
 
                                 // Set some file builder variables
                                 // Set some file builder variables
-                                var boundary = '-------------------------' + (new Date).getTime(),
+                                var boundary = '-------------------------' + (new Date()).getTime(),
                                     dashes = '--',
                                     dashes = '--',
                                     eol = '\r\n',
                                     eol = '\r\n',
                                     binFile = '';
                                     binFile = '';

@@ -13,7 +13,7 @@ var $allProductCell = $('.allproduct'),
 
 
 require('../common');
 require('../common');
 
 
-//初始化container高度
+// 初始化container高度
 (function() {
 (function() {
     var $header = $('.yoho-header');
     var $header = $('.yoho-header');
     var h = $(window).height() - $header.outerHeight() - $allProductCell.outerHeight();
     var h = $(window).height() - $header.outerHeight() - $allProductCell.outerHeight();

@@ -916,7 +916,7 @@ $nav2.on('touchstart', 'li', function(e) {
 //     // stopPropagation(e);
 //     // stopPropagation(e);
 // });
 // });
 
 
-$('#shop-category').click(function () {
+$('#shop-category').click(function() {
     let subGroup = $('.sub-group');
     let subGroup = $('.sub-group');
 
 
     if (subGroup.hasClass('hide')) {
     if (subGroup.hasClass('hide')) {