Merge remote-tracking branch 'origin/master'

 {
 {
   "name": "yohobuy-node",
   "name": "yohobuy-node",
-  "version": "5.1.3",
+  "version": "5.1.4",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
@@ -53,7 +53,7 @@
     "request-ip": "^1.2.2",
     "request-ip": "^1.2.2",
     "serve-favicon": "^2.3.0",
     "serve-favicon": "^2.3.0",
     "uuid": "^2.0.2",
     "uuid": "^2.0.2",
-    "yoho-node-lib": "0.1.29",
+    "yoho-node-lib": "0.1.30",
     "yoho-zookeeper": "^1.0.4"
     "yoho-zookeeper": "^1.0.4"
   },
   },
   "devDependencies": {
   "devDependencies": {

@@ -162,6 +162,7 @@ function clearSelectUl($a, code) {
         $input.val($a.html());
         $input.val($a.html());
     }
     }
     $ul.empty();
     $ul.empty();
+    $ul.addClass('hide');
     $wrap.removeClass('active');
     $wrap.removeClass('active');
 }
 }
 
 
@@ -227,6 +228,7 @@ function loadSelectLi(jsonData, param) {
             if (data.code === 200) {
             if (data.code === 200) {
                 fnJson[jsonData.keyData] = data.data;
                 fnJson[jsonData.keyData] = data.data;
                 jsonData.$ul.html(provFn(fnJson));
                 jsonData.$ul.html(provFn(fnJson));
+                jsonData.$ul.removeClass('hide');
             } else if (data.code === 403) {
             } else if (data.code === 403) {
                 location.href = data.data.url;
                 location.href = data.data.url;
             }
             }
@@ -426,6 +428,7 @@ $stuYear.on('click', function() {
         for (i = year - 7; i <= year; i++) {
         for (i = year - 7; i <= year; i++) {
             yearArr.push(i);
             yearArr.push(i);
         }
         }
+        $ul.removeClass('hide');
         $ul.html(provFn({
         $ul.html(provFn({
             yearData: yearArr
             yearData: yearArr
         }));
         }));

@@ -170,6 +170,10 @@ exports.processProductList = (list, options) => {
         // 判别默认的商品是否将默认的图片URL赋值到skn
         // 判别默认的商品是否将默认的图片URL赋值到skn
         let flag = false;
         let flag = false;
 
 
+        _.remove(product.goods_list, function(n) {
+            return !+n.status;
+        });
+
         // 如果设置了默认图片，就取默认的图片
         // 如果设置了默认图片，就取默认的图片
         _.forEach(product.goods_list, (goods) => {
         _.forEach(product.goods_list, (goods) => {
             if (flag) {
             if (flag) {