Merge branch 'master' into release/5.3.1

@@ -4,14 +4,28 @@
  */
  */
 'use strict';
 'use strict';
 const wechatModel = require('../models/wechat');
 const wechatModel = require('../models/wechat');
+const conf = {
+    'community': { //此处是社区分享
+        appId: 'wx96121aa89f31c5ea',
+        secret: '7669da1a8842ed1df4c5e1b53868f3ca'
+    },
+    'default': { //此处使用的是 女生志 的appId
+        appId: 'wxb52ec6a352f0b090',
+        secret: '9fe6bedb0b7f30986a168c7fc44f34c0'
+    }
+};
 
 
 exports.wechatShare = (req, res, next) => {
 exports.wechatShare = (req, res, next) => {
     let params = {
     let params = {
-        appId: req.query.appId || 'wxb52ec6a352f0b090', //此处使用的是 女生志 的appId
-        secret: req.query.secret || '9fe6bedb0b7f30986a168c7fc44f34c0',
         url: req.query.url || 'http://www.yohobuy.com/'
         url: req.query.url || 'http://www.yohobuy.com/'
     };
     };
 
 
+    if (req.query.confType) {
+        params = Object.assign(conf[req.query.confType], params);
+    } else {
+        params = Object.assign(conf.default, params);
+    }
+
     wechatModel.calcSignature(params).then((result) => {
     wechatModel.calcSignature(params).then((result) => {
         res.jsonp(result);
         res.jsonp(result);
     }).catch(next);
     }).catch(next);

@@ -104,7 +104,7 @@ const postcssPlugin = (et) => {
 
 
     plugins = [
     plugins = [
         require('postcss-import')({
         require('postcss-import')({
-            resolve (id) {
+            resolve(id) {
                 let name = path.basename(id);
                 let name = path.basename(id);
 
 
                 if (!/^_/.test(name)) {
                 if (!/^_/.test(name)) {
@@ -272,10 +272,6 @@ gulp.task('webpack', ['assets'], (done) => {
             plugins: postcssPlugin(env.pro),
             plugins: postcssPlugin(env.pro),
             options: {
             options: {
                 parser: scss
                 parser: scss
-            },
-            autoprefixer: false,
-            loaders: {
-                css: ExtractTextPlugin.extract(['css?-url'])
             }
             }
         }
         }
     });
     });