Merge branch 'release/wap-optim' into 'master'

个人中心-订单详情-取消样式

个人中心，订单详情，取消样式未添加修复。

See merge request !129

@@ -46,6 +46,7 @@ exports.order = (req, res, next) => {
                 backUrl: helpers.urlFormat('/home')
                 backUrl: helpers.urlFormat('/home')
             }),
             }),
             title: 'Yoho!Buy 有货',
             title: 'Yoho!Buy 有货',
+            localCss: true,
             pageFooter: true,
             pageFooter: true,
             order: result[0] || [],
             order: result[0] || [],
             walkwayUrl: result[1] && result[1].length ? '' : '//m.yohobuy.com/product/new',
             walkwayUrl: result[1] && result[1].length ? '' : '//m.yohobuy.com/product/new',

@@ -6,7 +6,7 @@
             "instances": "3",
             "instances": "3",
             "exec_mode": "cluster",
             "exec_mode": "cluster",
             "merge_logs": true,
             "merge_logs": true,
-            "log_date_format": "YYYY-MM-DD HH:mm Z",
+            "log_date_format": "YYYY-MM-DD HH:mm:ss Z",
             "error_file": "/Data/logs/node/yohobuywap-node-err.log",
             "error_file": "/Data/logs/node/yohobuywap-node-err.log",
             "out_file": "/Data/logs/node/yohobuywap-node-out.log",
             "out_file": "/Data/logs/node/yohobuywap-node-out.log",
             "env": {
             "env": {

@@ -39,6 +39,8 @@ var firstScreen = $('.firstscreen-orders').children().size() > 0;
 
 
 require('../common');
 require('../common');
 
 
+require('../../scss/home/order-list.page.css');
+
 // 减少计时
 // 减少计时
 function downCount(item) {
 function downCount(item) {
     var hoursItem = item.find('.hours');
     var hoursItem = item.find('.hours');

+@import "../layout/swiper";
 @import "order";
 @import "order";
 @import "order-detail";
 @import "order-detail";
 
 

+@import 'order';

@@ -26,19 +26,19 @@ module.exports = {
                 if (query.indexOf('imageView2') === 0) {
                 if (query.indexOf('imageView2') === 0) {
                     if (params.q && query.indexOf('/q/') > 0) {
                     if (params.q && query.indexOf('/q/') > 0) {
                         query = query.replace(/\/q\/\d+/g, '/q/' + params.q);
                         query = query.replace(/\/q\/\d+/g, '/q/' + params.q);
-                    } else {
+                    } else if (params.q) {
                         query += '/q/' + params.q;
                         query += '/q/' + params.q;
                     }
                     }
                 } else if (query.indexOf('imageMogr2') === 0) {
                 } else if (query.indexOf('imageMogr2') === 0) {
                     if (params.q && query.indexOf('/quality/') > 0) {
                     if (params.q && query.indexOf('/quality/') > 0) {
                         query = query.replace(/\/quality\/\d+/g, '/quality/' + params.q);
                         query = query.replace(/\/quality\/\d+/g, '/quality/' + params.q);
-                    } else {
+                    } else if (params.q) {
                         query += '/quality/' + params.q;
                         query += '/quality/' + params.q;
                     }
                     }
                 } else if (query.indexOf('imageView/') === 0){
                 } else if (query.indexOf('imageView/') === 0){
                     if (params.q && query.indexOf('/q/') > 0) {
                     if (params.q && query.indexOf('/q/') > 0) {
                         query = query.replace(/\/q\/\d+/g, '/q/' + params.q);
                         query = query.replace(/\/q\/\d+/g, '/q/' + params.q);
-                    } else {
+                    } else if (params.q) {
                         query += '/q/' + params.q;
                         query += '/q/' + params.q;
                     }
                     }