Merge remote-tracking branch 'origin/release-201824-wangcz' into release-201824-wangcz

src/main/webapp/resources/js/sso/controllers/ssoAddressCtrl.js

@@ -186,6 +186,7 @@ define(['app/app'], function (app) {
                     }, address, function () {
                         toaster.pop('success', '成功 ', '保存收货地址成功');
                         $scope.loadAddresses();
+                        $scope.newAddr = {};
                     }, function (res) {
                         toaster.pop('error', '保存收货地址失败 ', res.data);
                     });

src/main/webapp/resources/js/usercenter/controllers/forstore/pay_center_ctrl.js

@@ -166,7 +166,7 @@ define(['app/app'], function(app) {
 			// }
 			$event.preventDefault();
 			$event.stopPropagation();
-			openParam == 0 ? $scope.condition[1].open = false : $scope.condition[0].open = falsremitteeTypee;
+			openParam == 0 ? $scope.condition[1].open = false : $scope.condition[0].open = false;
 			item[openParam].open = !item[openParam].open;
 		};
 
@@ -270,13 +270,13 @@ define(['app/app'], function(app) {
 					$scope.startDate = null;
 					$scope.endDate = null;
 				} else if (val == 'oneMonth') {
-					$scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
+					$scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
 					$scope.endDate = endDate;
 				} else if (val == 'threeMonth') {
-					$scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000);
+					$scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
 					$scope.endDate = endDate;
 				} else if (val == 'sixMonth') {
-					$scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000);
+					$scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
 					$scope.endDate = endDate;
 				} else {
 					$scope.startDate = null;

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -18,7 +18,18 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           }
           $rootScope.ShaRETimer = {}
 
-            // 筛选
+          var clearSeekStatus = function () {
+            // if ($scope.seekListData) {}
+            angular.forEach($scope.seekListData.content, function (item) {
+              item.$status = 0;
+            })
+          }
+          var enIdFilter = $filter('EncryptionFilter');
+            if ($location.search().seekType === '1') {
+                $scope.tab = 'offered'
+            } else {
+                $scope.tab = 'waitOffer';
+            }
             var _formatDate = function (date, fmt) {
                 if (!date) {
                     return null;
@@ -49,21 +60,14 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             var _getClearDay = function (date) {
                 return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
             }
-          var clearSeekStatus = function () {
-            // if ($scope.seekListData) {}
-            angular.forEach($scope.seekListData.content, function (item) {
-              item.$status = 0;
-            })
-          }
-          var enIdFilter = $filter('EncryptionFilter');
-            if ($location.search().seekType === '1') {
-                $scope.tab = 'offered'
-            } else {
-                $scope.tab = 'waitOffer';
+            var init = function () {
+                // 发布时间
+                $scope.dateArea = 'sevenDay';
+                var currentTime = _getClearDay(new Date());
+                $scope.startDate = new Date(currentTime - 6 * 24 * 60 * 60 * 1000);
+                $scope.endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
             }
-
-          // 发布时间
-          $scope.dateArea = 'sevenDay';
+            init()
 
           // 更换待报价状态
           $scope.vendorType = 'self'
@@ -82,13 +86,13 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                         $scope.startDate = null;
                         $scope.endDate = null;
                     } else if (val == 'oneDay') {
-                        $scope.startDate = new Date(currentTime - 24 * 60 * 60 * 1000);
+                        $scope.startDate = new Date(currentTime);
                         $scope.endDate = endDate;
                     } else if (val == 'threeDay') {
-                        $scope.startDate = new Date(currentTime - 3 * 24 * 60 * 60 * 1000);
+                        $scope.startDate = new Date(currentTime - 2 * 24 * 60 * 60 * 1000);
                         $scope.endDate = endDate;
                     } else if (val == 'sevenDay') {
-                        $scope.startDate = new Date(currentTime - 7 * 24 * 60 * 60 * 1000);
+                        $scope.startDate = new Date(currentTime - 6 * 24 * 60 * 60 * 1000);
                         $scope.endDate = endDate;
                     } else {
                         $scope.startDate = null;
@@ -1221,8 +1225,5 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             })
           }
           });
-
-
-
         }]);
 });

src/main/webapp/resources/js/vendor/controllers/forstore/pay_center_ctrl.js

@@ -204,13 +204,13 @@ define(['app/app'], function(app) {
                     $scope.startDate = null;
                     $scope.endDate = null;
                 } else if (val == 'oneMonth') {
-                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else if (val == 'threeMonth') {
-                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else if (val == 'sixMonth') {
-                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else {
                     $scope.startDate = null;

src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -44,7 +44,7 @@ define(['app/app'], function (app) {
                 // 发布时间
                 $scope.dateArea = 'sevenDay';
                 var currentTime = _getClearDay(new Date());
-                $scope.startDate = new Date(currentTime - 7 * 24 * 60 * 60 * 1000);
+                $scope.startDate = new Date(currentTime - 6 * 24 * 60 * 60 * 1000);
                 $scope.endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
             }
 
@@ -325,13 +325,13 @@ define(['app/app'], function (app) {
                           $scope.startDate = null;
                           $scope.endDate = null;
                       } else if (val == 'oneDay') {
-                          $scope.startDate = new Date(currentTime - 24 * 60 * 60 * 1000);
+                          $scope.startDate = new Date(currentTime);
                           $scope.endDate = endDate;
                       } else if (val == 'threeDay') {
-                          $scope.startDate = new Date(currentTime - 3 * 24 * 60 * 60 * 1000);
+                          $scope.startDate = new Date(currentTime - 2 * 24 * 60 * 60 * 1000);
                           $scope.endDate = endDate;
                       } else if (val == 'sevenDay') {
-                          $scope.startDate = new Date(currentTime - 7 * 24 * 60 * 60 * 1000);
+                          $scope.startDate = new Date(currentTime - 6 * 24 * 60 * 60 * 1000);
                           $scope.endDate = endDate;
                       } else {
                           $scope.startDate = null;

src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -479,12 +479,12 @@
 <div class="user_right fr" id="pay_center">
 	<!--支付中心-->
 	<div class="pay_record oder">
-		<!--<div class="oder01" style="margin-bottom: 16px;">
+		<div class="oder01" style="margin-bottom: 16px;">
 			<ul>
-				<li ng-class="{'active' : status=='pay-history'}" ng-click="toggleStatus('pay-history')"><a href="javascript:void(0)">交易记录</a></li>
-				<li ng-class="{'active' : status=='pay-info'}" ng-click="toggleStatus('pay-info')"><a href="javascript:void(0)">付款账户</a></li>
+				<!--<li ng-class="{'active' : status=='pay-history'}" ng-click="toggleStatus('pay-history')"><a href="javascript:void(0)">交易记录</a></li>-->
+				<li class="active"><a href="javascript:void(0)">应付对账</a></li>
 			</ul>
-		</div>-->
+		</div>
 		<!--支付中心列表-->
 		<div class="ticket_record_list">
 			<!-- 支付信息-->

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -364,13 +364,13 @@
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate > span {
         display: inline-block;
-        width: 39px;
         height: 24px;
         line-height: 24px;
         text-align: center;
         background: #4290f7;
         color: #fff;
-        margin-left: 13px;
+        padding: 0 5px;
+        margin: 0 5px;
         cursor: pointer;
         font-size: 12px;
         border-radius: 2px;

src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -677,12 +677,12 @@
 <div class="user_right fr" id="pay_center">
     <!--支付中心-->
     <div class="pay_record oder">
-      <!--  <div class="oder01">
+      <div class="oder01">
             <ul>
-                <li ng-click="setTab('paymentRecord')" ng-class="{'active' : tab == 'paymentRecord'}"><a href="javascript:void(0)">交易记录</a></li>
-                <li ng-click="setTab('accountTab')" ng-class="{'active' : tab == 'accountTab'}"><a href="javascript:void(0)">收款帐户</a></li>
+                <!--<li ng-click="setTab('paymentRecord')" ng-class="{'active' : tab == 'paymentRecord'}"><a href="javascript:void(0)">交易记录</a></li>-->
+                <li ng-class="{'active' : tab == 'accountTab'}"><a href="javascript:void(0)">应收对账</a></li>
             </ul>
-        </div>-->
+        </div>
         <!--支付中心列表-->
         <div class="ticket_record_list">
             <!-- 交易记录-->