Merge remote-tracking branch 'origin/master'

src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts

@@ -143,7 +143,7 @@ export class OrderCouponListComponent implements OnInit {
    * @param whereObject 条件
    */
   search(whereObject: object) {
-    if (whereObject['createTime'] != null) {
+    if (whereObject['createTime'] != null && whereObject['createTime'].length > 0) {
       whereObject['createTimeS'] = new Date(whereObject['createTime'][0]).getTime();
       whereObject['createTimeE'] = new Date(whereObject['createTime'][1]).getTime();
     } else {
@@ -151,7 +151,7 @@ export class OrderCouponListComponent implements OnInit {
       whereObject['createTimeE'] = null;
     }
 
-    if (whereObject['payTime'] != null) {
+    if (whereObject['payTime'] != null && whereObject['payTime'].length > 0) {
       whereObject['payTimeS'] = new Date(whereObject['payTime'][0]).getTime();
       whereObject['payTimeE'] = new Date(whereObject['payTime'][1]).getTime();
     } else {
@@ -159,7 +159,7 @@ export class OrderCouponListComponent implements OnInit {
       whereObject['payTimeE'] = null;
     }
 
-    if (whereObject['finishTime'] != null) {
+    if (whereObject['finishTime'] != null && whereObject['finishTime'].length > 0) {
       whereObject['finishTimeS'] = whereObject['finishTime'][0].getTime();
       whereObject['finishTimeE'] = whereObject['finishTime'][1].getTime();
     } else {

src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts

@@ -100,7 +100,7 @@ export class OrderIntegralRechargeComponent implements OnInit {
    * @param whereObject 条件
    */
   search(whereObject: object) {
-    if (whereObject['createTime'] != null) {
+    if (whereObject['createTime'] != null && whereObject['createTime'].length > 0) {
       whereObject['createTimeS'] = new Date(whereObject['createTime'][0]).getTime();
       whereObject['createTimeE'] = new Date(whereObject['createTime'][1]).getTime();
     } else {
@@ -108,7 +108,7 @@ export class OrderIntegralRechargeComponent implements OnInit {
       whereObject['createTimeE'] = null;
     }
 
-    if (whereObject['payTime'] != null) {
+    if (whereObject['payTime'] != null && whereObject['payTime'].length > 0) {
       whereObject['payTimeS'] = new Date(whereObject['payTime'][0]).getTime();
       whereObject['payTimeE'] = new Date(whereObject['payTime'][1]).getTime();
     } else {
@@ -116,7 +116,7 @@ export class OrderIntegralRechargeComponent implements OnInit {
       whereObject['payTimeE'] = null;
     }
 
-    if (whereObject['finishTime'] != null) {
+    if (whereObject['finishTime'] != null && whereObject['finishTime'].length > 0) {
       whereObject['finishTimeS'] = new Date(whereObject['finishTime'][0]).getTime();
       whereObject['finishTimeE'] = new Date(whereObject['finishTime'][1]).getTime();
     } else {

src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.ts

@@ -271,7 +271,7 @@ export class OrderOilListComponent implements OnInit {
    * @param whereObject 条件
    */
   search(whereObject: object) {
-    if (whereObject['createTimeArray'] != null) {
+    if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length > 0) {
       whereObject['createTimeS'] = new Date(whereObject['createTimeArray'][0]).getTime();
       whereObject['createTimeE'] = new Date(whereObject['createTimeArray'][1]).getTime();
     } else {
@@ -279,7 +279,7 @@ export class OrderOilListComponent implements OnInit {
       whereObject['createTimeE'] = null;
     }
 
-    if (whereObject['payTimeArray'] != null) {
+    if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length > 0) {
       whereObject['payTimeS'] = new Date(whereObject['payTimeArray'][0]).getTime();
       whereObject['payTimeE'] = new Date(whereObject['payTimeArray'][1]).getTime();
     } else {
@@ -287,7 +287,7 @@ export class OrderOilListComponent implements OnInit {
       whereObject['payTimeE'] = null;
     }
 
-    if (whereObject['refundTimeArray'] != null) {
+    if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length > 0) {
       whereObject['refundTimeS'] = new Date(whereObject['refundTimeArray'][0]).getTime();
       whereObject['refundTimeE'] = new Date(whereObject['refundTimeArray'][1]).getTime();
     } else {

src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts

@@ -98,7 +98,7 @@ export class OrderRefundListComponent implements OnInit {
    * @param whereObject 条件
    */
   search(whereObject: object) {
-    if (whereObject['createTime'] != null) {
+    if (whereObject['createTime'] != null && whereObject['createTime'].length > 0) {
       whereObject['createTimeS'] = whereObject['createTime'][0].getTime();
       whereObject['createTimeE'] = whereObject['createTime'][1].getTime();
     } else {
@@ -106,7 +106,7 @@ export class OrderRefundListComponent implements OnInit {
       whereObject['createTimeE'] = null;
     }
 
-    if (whereObject['refundTime'] != null) {
+    if (whereObject['refundTime'] != null && whereObject['refundTime'].length > 0) {
       whereObject['refundTimeS'] = whereObject['refundTime'][0].getTime();
       whereObject['refundTimeE'] = whereObject['refundTime'][1].getTime();
     } else {