Merge branch 'feature/3party' into feature/shop

@@ -70,23 +70,26 @@ exports.orderEnsure = (req, res, next) => {
         addressModel.addressData(uid)
         addressModel.addressData(uid)
     ];
     ];
 
 
-    if (_.isUndefined(req.cookies._isNewUser)) {
-        allPromise.push(orderModel.isNewUser(uid));
-    }
+    /* tar note 170426 品众去除 */
+    // if (_.isUndefined(req.cookies._isNewUser)) {
+    //     allPromise.push(orderModel.isNewUser(uid));
+    // }
 
 
     return Promise.all(allPromise).then(result => {
     return Promise.all(allPromise).then(result => {
         let order = result[0];
         let order = result[0];
         let userProfile = result[1];
         let userProfile = result[1];
         let address = result[2];
         let address = result[2];
-        let isNewUser = result[3];
 
 
-        if (!_.isUndefined(isNewUser)) {
-            if (isNewUser) {
-                res.cookie('_isNewUser', true, actCkOpthn);
-            } else {
-                res.cookie('_isNewUser', false, actCkOpthn);
-            }
-        }
+        /* tar note 170426 品众去除 */
+        // let isNewUser = result[3];
+
+        // if (!_.isUndefined(isNewUser)) {
+        //     if (isNewUser) {
+        //         res.cookie('_isNewUser', true, actCkOpthn);
+        //     } else {
+        //         res.cookie('_isNewUser', false, actCkOpthn);
+        //     }
+        // }
 
 
         if (order.cartUrl) {
         if (order.cartUrl) {
             logger.info(`orderEnsure: order cartUrl has value:${order.cartUrl}, order data is null`);
             logger.info(`orderEnsure: order cartUrl has value:${order.cartUrl}, order data is null`);

@@ -75,8 +75,8 @@
         }, 1000);
         }, 1000);
     }());
     }());
 
 
-    /* tar add 190222 */
-    window._fxcmd = window._fxcmd || [];
+    /* tar add 170426 品众代码去除 */
+    {{!--window._fxcmd = window._fxcmd || [];
     _fxcmd.sid = 'bb3b16fa1106a6ab8619da0095755f32';
     _fxcmd.sid = 'bb3b16fa1106a6ab8619da0095755f32';
     _fxcmd.trackAll = false;
     _fxcmd.trackAll = false;
     // 参数配置(可选)...
     // 参数配置(可选)...
@@ -89,7 +89,7 @@
         _pzfx.src = '//static.w3t.cn/fx/1/1/fx.js';
         _pzfx.src = '//static.w3t.cn/fx/1/1/fx.js';
         var sc = document.getElementsByTagName('script')[0];
         var sc = document.getElementsByTagName('script')[0];
         sc.parentNode.insertBefore(_pzfx,sc);
         sc.parentNode.insertBefore(_pzfx,sc);
-    }, 1000);
+    }, 1000);--}}
     
     
 
 
 </script>
 </script>

@@ -323,15 +323,15 @@ function submitOrder() {
                 }, true);
                 }, true);
             }
             }
 
 
-            /* tar add 190222 */
-            if (window._fxcmd) {
-                window._fxcmd.push(['trackOrder', {
-                    oid: res.data.order_code,
-                    otp: res.data.order_amount,
-                    u_info: cookie.get('_UID'),
-                    u_type: cookie.get('_isNewUser') ? 1 : 0
-                }, []]);
-            }
+            /* tar add 170426 品众代码去除 */
+            // if (window._fxcmd) {
+            //     window._fxcmd.push(['trackOrder', {
+            //         oid: res.data.order_code,
+            //         otp: res.data.order_amount,
+            //         u_info: cookie.get('_UID'),
+            //         u_type: cookie.get('_isNewUser') ? 1 : 0
+            //     }, []]);
+            // }
 
 
             cookie.remove(['order-info', 'activity-info']);
             cookie.remove(['order-info', 'activity-info']);
             window.location.href = url;
             window.location.href = url;

@@ -53,6 +53,8 @@ body {
 
 
 .goods-container {
 .goods-container {
     overflow: hidden;
     overflow: hidden;
+    background-color: #fff;
+    padding-left: 15px;
 
 
     .goods-box {
     .goods-box {
         .no-result {
         .no-result {