merge code

@@ -105,7 +105,7 @@ exports.getGoods = cate => {
             let skn = product.productSkn;
             let imgSrc = url.parse(product.defaultImages);
 
-            product.defaultImages = ['//', imgSrc.hostname, imgSrc.pathname].join(''); 
+            product.defaultImages = ['//', imgSrc.hostname, imgSrc.pathname].join('');
 
             product.url = helpers.appUrlFormat(product.url, 'go.productDetail', {
                 product_skn: skn

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

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

@@ -13,7 +13,7 @@ var $allProductCell = $('.allproduct'),
 
 require('../common');
 
-//初始化container高度
+// 初始化container高度
 (function() {
     var $header = $('.yoho-header');
     var h = $(window).height() - $header.outerHeight() - $allProductCell.outerHeight();
@@ -65,4 +65,4 @@ $allProductCell.on('touchstart', function() {
     $(this).addClass('highlight');
 }).on('touchend touchcancel', function() {
     $(this).removeClass('highlight');
-});
\ No newline at end of file
+});

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

@@ -65,4 +65,4 @@ module.exports = {
             'window.jQuery': 'yoho-jquery'
         })
     ]
-};
\ No newline at end of file
+};