Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuywap-node into release/4.6

@@ -31,6 +31,8 @@ app.locals.version = pkg.version;
 
 // 指定libray目录
 global.library = path.resolve('./library/');
+global.middleware = path.resolve('./doraemon/middleware');
+global.utils = path.resolve('./utils');
 
 app.set('view engine', '.hbs');
 app.set('views', './doraemon/views');
@@ -75,16 +77,17 @@ app.use((req, res, next) => {
 });
 
 const logger = require('./library/logger');
-const user = require('./doraemon/middleware/user');
-const setChannel = require('./doraemon/middleware/set-channel');
-const errorHanlder = require('./doraemon/middleware/error-hanlder');
-
-// YOHO 前置中间件
-app.use(user());
-app.use(setChannel());
 
 // dispatcher
 try {
+    const user = require('./doraemon/middleware/user');
+    const setChannel = require('./doraemon/middleware/set-channel');
+    const errorHanlder = require('./doraemon/middleware/error-hanlder');
+
+    // YOHO 前置中间件
+    app.use(user());
+    app.use(setChannel());
+
     require('./dispatch')(app);
 
     app.all('*', errorHanlder.notFound()); // 404

@@ -21,7 +21,7 @@ exports.index = (req, res) => {
     });
 
     let categoryId = req.query.category_id;
-    let yhChannel = req.query.yh_channel || 1;
+    let yhChannel = req.query.yh_channel || 0;
     let contentcode = req.query.content_code;
 
     outletModel.getContent(categoryId, yhChannel, contentcode).then(result => {

@@ -26,6 +26,12 @@
             {{# isSoonSoldOut}}
                 <p class="few-tag">即将售罄</p>
             {{/ isSoonSoldOut}}
+
+            {{#if noStorage}}
+                <div class="no-storage">
+                    <div class="no-storage-img"></div>
+                </div>
+            {{/if}}
         </div>
         <div class="good-detail-text">
             <div class="name">

@@ -77,6 +77,7 @@ if ($('.outlet-category-nav').length > 0) {
     }).goto(0);
 }
 
+//更多活动按钮
 if ($('.back-ground-white').length > 10) {
     $('.more-activity').show();
     $('.back-ground-white').each(function(index, e) {

@@ -94,6 +94,28 @@
         font-size: 18px;
         line-height: 28px;
     }
+
+    .no-storage {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        background-color: #000;
+        opacity: 0.4;
+        z-index: 10;
+        position: absolute;
+        top: 0;
+
+        .no-storage-img {
+            display: block;
+            width: 90px;
+            height: 90px;
+            margin-left: 93px;
+            margin-top: 139px;
+            background-image: resolve("product/bag_moren.png");
+            background-repeat: no-repeat;
+            background-size: contain;
+        }
+    }
 }
 
 .good-detail-text {

@@ -43,6 +43,11 @@ exports.processProductList = (list, options) => {
             return;
         }
 
+        //如果库存为0,显示已抢完
+        if (product.storageNum === 0){
+            product.noStorage = true;
+        }
+
         // 市场价和售价一样，则不显示市场价
         if (product.marketPrice === product.salesPrice) {
             product.marketPrice = false;
@@ -103,7 +108,7 @@ exports.processProductList = (list, options) => {
 
         pruductList.push(product);
     });
-
+    console.log(pruductList);
     return pruductList;
 };