Merge branch 'feature/promotion-list' into release/5.4

@@ -143,3 +143,7 @@ public/bundle/*
 .vscode/
 .vscode/
 .DS_Store
 .DS_Store
 .devhost
 .devhost
+
+### foreman ###
+Procfile
+.env

@@ -99,10 +99,19 @@ router.get('/passport/reg/index', reg.index);
 // NOTE: 该接口的存在只是为了兼容前端 ajax 请求
 // NOTE: 该接口的存在只是为了兼容前端 ajax 请求
 router.post('/passport/reg/checkmobile', reg.fakeCheckMobile);
 router.post('/passport/reg/checkmobile', reg.fakeCheckMobile);
 
 
-router.post('/passport/reg/piccaptcha', reg.checkCode, reg.picCaptcha);
 router.post('/passport/reg/msgcaptcha', reg.checkMobileMiddleware, reg.msgCaptcha);
 router.post('/passport/reg/msgcaptcha', reg.checkMobileMiddleware, reg.msgCaptcha);
-router.post('/passport/reg/sendBindMsg', reg.checkMobileMiddleware, reg.checkCode, reg.sendBindMsg);
-router.post('/passport/reg/mobileregister', reg.checkMobileMiddleware, reg.checkPassword, reg.checkCode, reg.mobileRegister); //eslint-disable-line
+
+router.post('/passport/reg/sendBindMsg',
+    captcha.requiredAPI,
+    reg.checkMobileMiddleware,
+    reg.sendBindMsg);
+
+router.post('/passport/reg/mobileregister',
+    captcha.requiredAPI,
+    reg.checkMobileMiddleware,
+    reg.checkPassword,
+    reg.mobileRegister);
+
 router.get('/passport/reg/success', reg.success);
 router.get('/passport/reg/success', reg.success);
 
 
 /**
 /**

@@ -349,7 +349,7 @@ const _getSkuDataByProductBaseInfo = (data) => {
                 goodsId: size.size_id,
                 goodsId: size.size_id,
                 notify: size.notify,
                 notify: size.notify,
                 soldOut: _.parseInt(size.storage_number) === 0,
                 soldOut: _.parseInt(size.storage_number) === 0,
-                info: _.get(size, 'size_info', '').replace(/:/ig, '/').replace(/ /ig, '  ')
+                info: _.get(size, 'size_info', '').replace(/ /ig, '／').replace(/:/ig, ' ')
             });
             });
 
 
             // 单个sku商品的总数
             // 单个sku商品的总数
@@ -1491,7 +1491,8 @@ const getDetailHeader = (pid, uid, isStudent, vipLevel, dataMd5, cookie) => {
  * 是否支持退换货,true 支持,false 不支持
  * 是否支持退换货,true 支持,false 不支持
  */
  */
 const saleReturn = (skn) => {
 const saleReturn = (skn) => {
-    return productAPI.isSupportReturnedSale(skn).then(result => _.get(result, `data.${skn}`, 'N') === 'N' ? 'Y' : 'N');
+    return productAPI.isSupportReturnedSale(skn)
+        .then(result => _.get(result, `data.${skn}`, 'N') === 'N' ? 'Y' : 'N');
 };
 };
 
 
 /**
 /**