Merge branch 'gray' into 'master'

Gray



See merge request !1288

@@ -14,12 +14,12 @@ exports.index = (req, res) => {
     req.yoho.captchaShow = false;
     res.locals.useGeetest = true;
 
-    if (_.has(res, 'locals.loadJs')) {
-        res.locals.loadJs.push({
+    if (_.has(res, 'locals.loadJsBefore')) {
+        res.locals.loadJsBefore.push({
             src: global.yoho.config.geetestJs
         });
     } else {
-        res.locals.loadJs = [
+        res.locals.loadJsBefore = [
             {
                 src: global.yoho.config.geetestJs
             }

@@ -26,12 +26,12 @@ const load = (req, res, next) => {
 
         res.locals.useGeetest = !req.yoho.captchaShow;
 
-        if (_.has(res, 'locals.loadJs')) {
-            res.locals.loadJs.push({
+        if (_.has(res, 'locals.loadJsBefore')) {
+            res.locals.loadJsBefore.push({
                 src: global.yoho.config.geetestJs
             });
         } else {
-            res.locals.loadJs = [
+            res.locals.loadJsBefore = [
                 {
                     src: global.yoho.config.geetestJs
                 }

@@ -13,10 +13,10 @@ const isTest = process.env.NODE_ENV === 'test';
 
 const domains = {
 
-    // api: 'http://api.yoho.cn/',
-    // service: 'http://service.yoho.cn/',
-    // liveApi: 'http://testapi.live.yohops.com:9999/',
-    // singleApi: 'http://api-test3.yohops.com:9999/',
+    api: 'http://api.yoho.cn/',
+    service: 'http://service.yoho.cn/',
+    liveApi: 'http://testapi.live.yohops.com:9999/',
+    singleApi: 'http://api-test3.yohops.com:9999/',
 
     // gray
     // singleApi: 'http://single.gray.yohops.com/',
@@ -25,10 +25,10 @@ const domains = {
     // platformApi: 'http://172.16.6.210:8088/',
 
 
-    api: 'http://api-test3.yohops.com:9999/',
-    service: 'http://service-test3.yohops.com:9999/',
-    liveApi: 'http://testapi.live.yohops.com:9999/',
-    singleApi: 'http://api-test3.yohops.com:9999/',
+    // api: 'http://api-test3.yohops.com:9999/',
+    // service: 'http://service-test3.yohops.com:9999/',
+    // liveApi: 'http://testapi.live.yohops.com:9999/',
+    // singleApi: 'http://api-test3.yohops.com:9999/',
 
     imSocket: 'ws://socket.yohobuy.com:10240',
     imCs: 'http://im.yohobuy.com/api',

@@ -132,6 +132,9 @@
                 var STATIC_RESOURCE_HASH = '{{startTime}}';
                 var STATIC_RESOURCE_PATH = '//{{devHost}}:{{port}}';
                 window.jsFiles = [
+                    {{#loadJsBefore}}
+                    '{{src}}',
+                    {{/loadJsBefore}}
                     '//{{devHost}}:{{port}}/libs.js?t={{startTime}}',
                     '//{{devHost}}:{{port}}/{{module}}.{{page}}.js?t={{startTime}}'
                     {{#loadJs}}
@@ -144,6 +147,9 @@
                 var STATIC_RESOURCE_HASH = '{{startTime}}';
                 var STATIC_RESOURCE_PATH = '//cdn.yoho.cn/yohobuywap-node/{{version}}';
                 window.jsFiles = [
+                    {{#loadJsBefore}}
+                    '{{src}}',
+                    {{/loadJsBefore}}
                     '//cdn.yoho.cn/yohobuywap-node/{{version}}/libs.js?t={{startTime}}',
                     '//cdn.yoho.cn/yohobuywap-node/{{version}}/{{module}}.{{page}}.js?t={{startTime}}'
                     {{#loadJs}}