修改物流、订单详情调整。

src/main/webapp/resources/css/vendor/sell.css

@@ -1806,7 +1806,7 @@ body {
     width:100%;
     margin:0 auto;
     background: #fff;
-    padding-top: 10px;
+    padding: 10px 0;
 }
 .logistics_list01 .oder_xq p {
     line-height:30px;

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

@@ -200,6 +200,9 @@ define(['app/app'], function (app) {
             $scope.showNameUl = true;
             console.log($scope.showNameUl)
         };
+        $scope.onFocus = function () {
+            $scope.showNameUl = true;
+        };
         // 选中物流
         $scope.showText = function (name) {
             $scope.logistics.companyName = name;
@@ -217,7 +220,6 @@ define(['app/app'], function (app) {
                     if (data){
                         $scope.logistics = data;
                     }
-                    console.log($scope.logistics);
                 })
             }
         };
@@ -227,10 +229,16 @@ define(['app/app'], function (app) {
         };
 
         $scope.ensureModifyLogistics = function (purchase) {
+            if (!$scope.logistics.companyName) {
+                toaster.pop("error", "请选择物流公司");
+            }
+            if (!$scope.logistics.number) {
+                toaster.pop("error", "请填写物流单号");
+            }
             Logistics.updateLogistics({id : purchase.lgtId, invoiceFuid : purchase.inid}, $scope.logistics, function (data) {
                 if (data){
                     if(data.success){
-                        toaster.pop("info", "修改物流信息成功");
+                        toaster.pop("success", "修改物流信息成功");
                         purchase.showLogistics = false;
                     }
                 }

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

@@ -210,7 +210,8 @@
 		display: none;
 	}
 	.logistics_list01 .oder_xq{
-		width: 97%;
+		width: 98%;
+		padding: 10px 0;
 	}
 	.logistics ul li p:last-child{
 		font-size: 12px;
@@ -226,7 +227,8 @@
 		color: #999 !important;
 	}
 	.log_menu span{
-		width: 97%;
+		padding-left: 15px;
+		margin-left: 10px;
 	}
 	.text-area{
 		width: 120px;

src/main/webapp/resources/view/usercenter/modal/cancelOrder_modal.html

@@ -12,12 +12,12 @@
 	}
 
 	#choice {
-		width: 290px;
+		width: 250px;
 		margin-left: 100px;
 	}
 
 	div.modal-dialog.modal-md {
-		width: 500px !important;
+		width: 440px !important;
 		position: fixed !important;
 		top: 150px !important;
 		left: 400px !important;
@@ -37,7 +37,7 @@
 	}
 
 	.modal-header {
-		background-color: #3A76E4;
+		background-color: #5078cb;
 		line-height: 31px;
 		padding: 0px !important;
 		height: 31px;
@@ -51,16 +51,16 @@
 	}
 
 	.modal-footer .confirm {
-		width: 90px;
+		width: 70px;
 		padding: 5px 10px;
-		background-color: #3A76E4;
+		background-color: #5078cb;
 		border: none;
 		color: white;
 		font-size: 14px;
 	}
 
 	.modal-footer .cancle-button {
-		width: 90px;
+		width: 70px;
 		padding: 5px 10px;
 		background-color: #D9D5CE;
 		border: none;
@@ -75,7 +75,7 @@
 <div class="modal-header">
 	<a title="关闭" class="cancle-close" ng-click="cancel()">×</a>
 </div>
-<div class="modal-body" style="height: 240px">
+<div class="modal-body" style="height: 150px">
 	<div class="row" >
 		<div class="text-inverse attention"><img src="static/img/common/pay-attention.png" style="margin-right: 5px;"/>您确认需要取消该订单吗？取消订单后，不能恢复!</div>
 		<div id="reason" class="col-md-12 form-inline">

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

@@ -695,6 +695,31 @@
 		background: #337ab7;
 		color: #fff !important;
 	}
+
+	/*选择物流*/
+	.edit-logistic-box .dropdown-menu{
+		top: 95%;
+		line-height: 23px;
+		max-height: 240px;
+		overflow-y: auto;
+		width: 190px;
+		overflow-x: hidden;
+		border-radius: 0;
+		width: 179px;
+		z-index: 10;
+	}
+	.edit-logistic-box .dropdown-menu.active{
+		display: inline-block;
+	}
+	.edit-logistic-box .dropdown-menu li{
+		font-size: 14px;
+		cursor: pointer;
+		padding-left: 13px;
+	}
+	.edit-logistic-box .dropdown-menu li:hover{
+		background: #5078cb;
+		color: #fff;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
@@ -913,7 +938,7 @@
 										<div class="row">配送方式: <em>{{deliveryMethod[purchase.sendType]}}</em></div>
 										<div class="row">物流公司:
 											<em>
-												<input type="text" class="form-control" ng-model="logistics.companyName"/>
+												<input type="text" class="form-control" ng-model="logistics.companyName" ng-focus="onFocus()"/>
 												<em name="companyName" class="btn-position" ng-click="showName()"><i class="fa fa-caret-down"></i></em>
 												<ul class="dropdown-menu" ng-class="{'active': showNameUl}">
                             						<li ng-click="showText(data.companyName)" ng-repeat="data in data_list" ng-bind="data.companyName"></li>
@@ -929,30 +954,6 @@
 										</div>
 									</div>
 								</div>
-								<style>
-									.edit-logistic-box .dropdown-menu{
-										top: 95%;
-										line-height: 23px;
-										max-height: 240px;
-										overflow-y: auto;
-										width: 190px;
-										overflow-x: hidden;
-										border-radius: 0;
-										width: 179px;
-									}
-									.edit-logistic-box .dropdown-menu.active{
-										display: inline-block;
-									}
-									.edit-logistic-box .dropdown-menu li{
-										font-size: 14px;
-										cursor: pointer;
-										padding-left: 13px;
-									}
-									.edit-logistic-box .dropdown-menu li:hover{
-										background: #5078cb;
-										color: #fff;
-									}
-								</style>
                             </div>
                         </span>
 					</dd>