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

src/main/webapp/resources/js/admin/controllers/trade/TradeOrderDetailCtrl.js

@@ -191,6 +191,7 @@ define([ 'app/app' ], function(app) {
                 toaster.pop('error', '确认付款失败', response.data);
             })
         };
+
         /**
          * 当用户点击审核不通过时，弹出模态框
          * @param order
@@ -198,5 +199,27 @@ define([ 'app/app' ], function(app) {
         $scope.showAuditFailureModal = function (order) {
             order.dislayModal = true;
         }
+
+        /**
+         * 订单审核不通过
+         */
+        $scope.auditFailure = function (order) {
+            if(!order.auditFailureReason) {
+                toaster.pop('info', '请输入审核不通过的原因');
+                return ;
+            }
+            Order.auditFailure({orderId :order.orderid},{reason : order.auditFailureReason}, function (data) {
+                if(data.code != 1) {
+                    toaster.pop('info', '保存失败：' + data.message);
+                }else {
+                    toaster.pop('info', '保存成功');
+                    order.dislayModal = false;
+                    window.location.reload();
+                }
+            }, function (res) {
+                console.log(res);
+                toaster.pop('error', '系统出现错误，');
+            });
+        }
 	}]);
 });

src/main/webapp/resources/view/sso/staffManagement.html

@@ -915,11 +915,11 @@
             <div class="auth-info-header">
                 <div class="addUser-group">
                     <!--<i class="fa fa-user-plus fa-fw"></i>-->
-                    <div class="addUser-btn" ng-click="setAdding(!adding)" ng-mouseenter="setInSelect(true)" ng-mouseleave="setInSelect(false)">
+                    <div class="addUser-btn" ng-mouseenter="setInSelect(true)" ng-mouseleave="setInSelect(false)">
                         <img src="static/img/vendor/images/addUser.png" alt="">
                         <span>新增用户</span>
                     </div>
-                    <div class="addUser-expand" ng-show="adding" ng-mouseenter="setInSelect(true)" ng-mouseleave="setInSelect(false)">
+                    <div class="addUser-expand" ng-show="inSelect" ng-mouseenter="setInSelect(true)" ng-mouseleave="setInSelect(false)">
                         <div ng-click="setAddingUser(true)">
                             <i class="fa fa-plus-circle"></i>
                             <span>添加未注册用户</span>

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

@@ -59,9 +59,9 @@
     font-weight: 500;
     user-select:inherit;
   }
-  .seek-purchase-content tbody tr:nth-last-of-type(1) {
-    border-bottom: 0;
-  }
+  /*.seek-purchase-content tbody tr:nth-last-of-type(1) {*/
+    /*border-bottom: 0;*/
+  /*}*/
   .seek-purchase-content tbody .Attend_btn a{
     color: #5078cb;
   }

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

@@ -733,7 +733,7 @@
                 <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
                 <td class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>
-                <td class="operate" ng-switch="seek.agreed">
+                <td class="operate" ng-switch="seek.agreed" style="border-right: 1px solid #dae5fd">
                     <a ng-click="setLinkBoxIndex($index)">联系买家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
                     <div class="is-say-price" ng-if="seek.agreed != 1 && seek.agreed != 0 || seek.replies">已报价 <img src="static/img/seekPurchase/check.png" alt="">
                         <div class="say-price-history">