Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -87,7 +87,7 @@ if (isProduction) {
         domains: {
         domains: {
             api: 'http://api.yoho.yohoops.org/',
             api: 'http://api.yoho.yohoops.org/',
             service: 'http://service.yoho.yohoops.org/',
             service: 'http://service.yoho.yohoops.org/',
-            singleApi: 'http://api_single.yoho.cn/'
+            singleApi: 'http://single.yoho.cn/'
         },
         },
         memcache: {
         memcache: {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],

@@ -203,18 +203,23 @@ gulp.task('webpack-dev-server', () => {
         }
         }
     });
     });
 
 
-    // webpackDashboardPlugin
+    devConfig.output.publicPath = 'http://localhost:5004/';
+
+    // 开发环境插件
+    devConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
+
     if (useDashboard) {
     if (useDashboard) {
-        const dashboard = new Dashboard();
+        const dashboard = new Dashboard(); // webpackDashboardPlugin
 
 
         devConfig.plugins.push(new DashboardPlugin(dashboard.setData));
         devConfig.plugins.push(new DashboardPlugin(dashboard.setData));
     }
     }
 
 
-    devConfig.entry.libs.unshift('webpack-dev-server/client?http://localhost:5004/');
+    devConfig.entry.libs.unshift(`webpack-dev-server/client?${devConfig.output.publicPath}`, 'webpack/hot/dev-server');
 
 
     new WebpackDevServer(webpack(devConfig), {
     new WebpackDevServer(webpack(devConfig), {
         contentBase: '.',
         contentBase: '.',
-        publicPath: '//localhost:5004/',
+        publicPath: devConfig.output.publicPath,
+        hot: true,
         inline: true,
         inline: true,
         quiet: useDashboard,
         quiet: useDashboard,
         stats: {
         stats: {
@@ -227,7 +232,7 @@ gulp.task('webpack-dev-server', () => {
         if (err) {
         if (err) {
             throw new gutil.PluginError('webpack-dev-server', err);
             throw new gutil.PluginError('webpack-dev-server', err);
         }
         }
-        gutil.log('[webpack-serve]', 'http://localhost:5004/');
+        gutil.log('[webpack-serve]', devConfig.output.publicPath);
     });
     });
 });
 });
 
 

@@ -90,7 +90,8 @@
                             title: result.shopName,
                             title: result.shopName,
                             des: shareSubTitle,
                             des: shareSubTitle,
                             url: shareUrl,
                             url: shareUrl,
-                            img: result.shopLogo ? result.shopLogo.replace(/{width}/g, 120).replace(/{height}/g, 80) : '',
+                            img: result.shopLogo ? result.shopLogo.split('?')[0] +
+                                '?imageMogr2/thumbnail/300x300/format/jpg/quality/90' : '',
                             isBlkShop: result.isBlkShop,
                             isBlkShop: result.isBlkShop,
                             domain: locationQuery.domain,
                             domain: locationQuery.domain,
                             brandName: result.brandName,
                             brandName: result.brandName,