Merge branch 'gray' into 'master'

Gray



See merge request !862

@@ -79,6 +79,7 @@ module.exports = () => {
             }
         }
 
+        res.locals.isLogin = Boolean(req.user.uid); // 用户是否登录
         next();
     };
 };

@@ -72,6 +72,10 @@
                 var s = document.getElementsByTagName("script")[0];
                 s.parentNode.insertBefore(hm, s);
             })();
+
+            {{#if @root.isLogin}}
+                _hmt.push(['_setCustomVar', 1, 'login', true, 2]);
+            {{/if}}
         }, 1000);
     }());
 

 {
   "name": "m-yohobuy-node",
-  "version": "6.0.13",
+  "version": "6.0.14",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -425,3 +425,23 @@
         }
     }
 }
+
+.is-mars-app {
+    .chose-panel {
+        .block {
+            &.chosed {
+                background-color: #89b374;
+                color: #fff;
+                border-color: #89b374;
+            }
+        }
+
+        .btn-wrap {
+            .btn-sure,
+            .btn-sure-addtocart {
+                background-color: #89b374 !important;
+                color: #fff;
+            }
+        }
+    }
+}