Merge branch 'qCloud'

@@ -27,6 +27,11 @@ const app = express();
 app.locals.devEnv = app.get('env') === 'development';
 app.locals.devEnv = app.get('env') === 'development';
 app.locals.version = pkg.version;
 app.locals.version = pkg.version;
 
 
+// zookeeper
+if (config.zookeeperServer) {
+    require('yoho-zookeeper')(config.zookeeperServer, 'wap', app.locals.wap = {});
+}
+
 // 访问域名层级
 // 访问域名层级
 app.set('subdomain offset', 3);
 app.set('subdomain offset', 3);
 
 

@@ -27,6 +27,13 @@ app.use(global.yoho.hbs({
     helpers: Object.assign({}, global.yoho.helpers, helpers)
     helpers: Object.assign({}, global.yoho.helpers, helpers)
 }));
 }));
 
 
+// for zookeeper, inject locals
+app.use((req, res, next) => {
+    req.app.locals.wap = app.locals.wap;
+
+    next();
+});
+
 // router
 // router
 app.use(require('./router'));
 app.use(require('./router'));
 
 

@@ -15,6 +15,13 @@ app.on('mount', function(parent) {
     Object.assign(app.locals, parent.locals);
     Object.assign(app.locals, parent.locals);
 });
 });
 
 
+// for zookeeper, inject locals
+app.use((req, res, next) => {
+    req.app.locals.wap = app.locals.wap;
+
+    next();
+});
+
 // router
 // router
 app.use(require('./router'));
 app.use(require('./router'));
 
 

@@ -4,27 +4,21 @@
  * @date: 2016/05/09
  * @date: 2016/05/09
  */
  */
 
 
-var express = require('express'),
-    path = require('path');
+var express = require('express');
 
 
 var app = express();
 var app = express();
 
 
-// set view engin
-var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
-
 app.on('mount', function(parent) {
 app.on('mount', function(parent) {
     delete parent.locals.settings; // 不继承父 App 的设置
     delete parent.locals.settings; // 不继承父 App 的设置
     Object.assign(app.locals, parent.locals);
     Object.assign(app.locals, parent.locals);
 });
 });
 
 
-// app.use(global.yoho.hbs({
-//     extname: '.hbs',
-//     defaultLayout: 'layout',
-//     layoutsDir: doraemon,
-//     partialsDir: path.join(__dirname, 'views/partial'),
-//     views: path.join(__dirname, 'views/action'),
-//     helpers: global.yoho.helpers
-// }));
+// for zookeeper, inject locals
+app.use((req, res, next) => {
+    req.app.locals.wap = app.locals.wap;
+
+    next();
+});
 
 
 // router
 // router
 app.use(require('./router'));
 app.use(require('./router'));

@@ -26,6 +26,13 @@ app.use(global.yoho.hbs({
     helpers: global.yoho.helpers
     helpers: global.yoho.helpers
 }));
 }));
 
 
+// for zookeeper, inject locals
+app.use((req, res, next) => {
+    req.app.locals.wap = app.locals.wap;
+
+    next();
+});
+
 // router
 // router
 app.use(require('./router'));
 app.use(require('./router'));
 
 

@@ -26,6 +26,13 @@ app.use(global.yoho.hbs({
     helpers: global.yoho.helpers
     helpers: global.yoho.helpers
 }));
 }));
 
 
+// for zookeeper, inject locals
+app.use((req, res, next) => {
+    req.app.locals.wap = app.locals.wap;
+
+    next();
+});
+
 // router
 // router
 app.use(require('./router'));
 app.use(require('./router'));
 
 

@@ -42,7 +42,7 @@ exports.address = (req, res, next) => {
  */
  */
 exports.addressAct = (req, res, next) => {
 exports.addressAct = (req, res, next) => {
     addressModel.address({
     addressModel.address({
-        id: decodeURIComponent(req.params.id),
+        id: decodeURIComponent(req.query.id),
         uid: req.user.uid
         uid: req.user.uid
     }).then(result => {
     }).then(result => {
         let responseData = {
         let responseData = {
@@ -114,7 +114,7 @@ exports.saveAddress = (req, res, next) => {
         area_code: req.body.area_code,
         area_code: req.body.area_code,
         consignee: req.body.consignee,
         consignee: req.body.consignee,
         email: req.body.email,
         email: req.body.email,
-        id: req.body.id,
+        id: decodeURIComponent(req.body.id),
         mobile: req.body.mobile,
         mobile: req.body.mobile,
         zip_code: req.body.zip_code
         zip_code: req.body.zip_code
     }).then(result => {
     }).then(result => {
@@ -130,7 +130,7 @@ exports.saveAddress = (req, res, next) => {
  */
  */
 exports.delAddress = (req, res, next) => {
 exports.delAddress = (req, res, next) => {
     addressModel.delAddress({
     addressModel.delAddress({
-        id: req.body.id,
+        id: decodeURIComponent(req.body.id),
         uid: req.user.uid
         uid: req.user.uid
     }).then(result => {
     }).then(result => {
         res.json(result);
         res.json(result);

@@ -26,6 +26,13 @@ app.use(global.yoho.hbs({
     helpers: global.yoho.helpers
     helpers: global.yoho.helpers
 }));
 }));
 
 
+// for zookeeper, inject locals
+app.use((req, res, next) => {
+    req.app.locals.wap = app.locals.wap;
+
+    next();
+});
+
 // router
 // router
 app.use(require('./router'));
 app.use(require('./router'));
 
 

@@ -100,14 +100,14 @@ const address = (params) => {
 
 
             /* 加密地址 ID */
             /* 加密地址 ID */
             _.forEach(selfAddress.data, (value, key) => {
             _.forEach(selfAddress.data, (value, key) => {
-                selfAddress.data[key].address_id = crypto.encryption(null, selfAddress.data[key].address_id);
+                selfAddress.data[key].address_id = encodeURIComponent(crypto.encryption(null, selfAddress.data[key].address_id));
             });
             });
 
 
             /* 如果有 ID 是地址编辑页面 */
             /* 如果有 ID 是地址编辑页面 */
             if (params.id) {
             if (params.id) {
                 return {
                 return {
                     address: camelCase(_.find(selfAddress.data, o => {
                     address: camelCase(_.find(selfAddress.data, o => {
-                        return o.address_id === params.id;
+                        return decodeURIComponent(o.address_id) === params.id;
                     })),
                     })),
                     addressList: camelCase(result[1] ? result[1].data : []),
                     addressList: camelCase(result[1] ? result[1].data : []),
                     navTitle: '编辑地址'
                     navTitle: '编辑地址'

@@ -6,7 +6,7 @@
                 <span class="tel">{{mobile}}</span>
                 <span class="tel">{{mobile}}</span>
                 <p class="address-info">{{area}} {{address}}</p>
                 <p class="address-info">{{area}} {{address}}</p>
                 <div class="action iconfont">
                 <div class="action iconfont">
-                    <a class="edit" href="/home/addressAct/{{addressId}}">&#xe61e;</a>
+                    <a class="edit" href="/home/addressAct?id={{addressId}}">&#xe61e;</a>
                     <span class="del" data-id="{{addressId}}">&#xe621;</span>
                     <span class="del" data-id="{{addressId}}">&#xe621;</span>
                 </div>
                 </div>
             </div>
             </div>

@@ -28,6 +28,12 @@ app.use(global.yoho.hbs({
     helpers: global.yoho.helpers
     helpers: global.yoho.helpers
 }));
 }));
 
 
+// for zookeeper, inject locals
+app.use((req, res, next) => {
+    req.app.locals.wap = app.locals.wap;
+
+    next();
+});
 
 
 require('./auth');
 require('./auth');
 app.use(passport.initialize());
 app.use(passport.initialize());

@@ -27,6 +27,13 @@ app.use(global.yoho.hbs({
     helpers: global.yoho.helpers
     helpers: global.yoho.helpers
 }));
 }));
 
 
+// for zookeeper, inject locals
+app.use((req, res, next) => {
+    req.app.locals.wap = app.locals.wap;
+
+    next();
+});
+
 // router
 // router
 app.use(require('./router'));
 app.use(require('./router'));
 
 

@@ -83,7 +83,8 @@ module.exports = {
             appID: 'wx75e5a7c0c88e45c2',
             appID: 'wx75e5a7c0c88e45c2',
             appSecret: 'ce21ae4a3f93852279175a167e54509b'
             appSecret: 'ce21ae4a3f93852279175a167e54509b'
         }
         }
-    }
+    },
+    zookeeperServer: false // '10.66.1.97:2181'
 };
 };
 
 
 if (isProduction) {
 if (isProduction) {

@@ -2,5 +2,7 @@
     <a href="{{@root.cartUrl}}">
     <a href="{{@root.cartUrl}}">
         <span class="iconfont">&#xe62c;</span>
         <span class="iconfont">&#xe62c;</span>
     </a>
     </a>
+    {{#unless @root.wap.common.removeCartCount}}
     <span class="cart-count hide">0</span>
     <span class="cart-count hide">0</span>
+    {{/unless}}
 </div>
 </div>

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "5.0.12",
+  "version": "11.11.3",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
@@ -38,7 +38,8 @@
     "request-promise": "^3.0.0",
     "request-promise": "^3.0.0",
     "serve-favicon": "^2.3.0",
     "serve-favicon": "^2.3.0",
     "uuid": "^2.0.3",
     "uuid": "^2.0.3",
-    "yoho-node-lib": "0.1.23"
+    "yoho-node-lib": "0.1.23",
+    "yoho-zookeeper": "^1.0.3"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.3.7",
     "autoprefixer": "^6.3.7",

@@ -350,7 +350,7 @@ function givePoint(parameter) {
  */
  */
 (function() {
 (function() {
     var channel = cookie('_Channel');
     var channel = cookie('_Channel');
-    var header = $('#yoho-header');
+    var header = $('#yoho-header, .homebuttom');
 
 
     if (!/^\/home/.test(location.pathname)) {
     if (!/^\/home/.test(location.pathname)) {
         switch (channel) {
         switch (channel) {

@@ -927,13 +927,12 @@ $nav2.on('touchstart', 'li', function(e) {
 //     // stopPropagation(e);
 //     // stopPropagation(e);
 // });
 // });
 
 
-$('#shop-category').click(function() {
-    var subGroup = $('.sub-group');
-
+$('.shop-foot-wrapper .buriedpoint').click(function() {
+    var subGroup = $(this).find('.sub-group');
     if (subGroup.hasClass('hide')) {
     if (subGroup.hasClass('hide')) {
-        $('.sub-group').removeClass('hide');
+        subGroup.removeClass('hide');
     } else {
     } else {
-        $('.sub-group').addClass('hide');
+        subGroup.addClass('hide');
     }
     }
 });
 });