Merge branch 'function_vendor_modify' into vendor_logistics_v2

src/main/java/com/uas/platform/b2c/trade/order/controller/PurchaseController.java

@@ -9,12 +9,14 @@ import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.logistics.model.InvoiceFPurchase;
+import com.uas.platform.b2c.logistics.model.Logistics;
 import com.uas.platform.b2c.prod.store.service.StoreInService;
 import com.uas.platform.b2c.trade.order.model.Order;
 import com.uas.platform.b2c.trade.order.model.Purchase;
 import com.uas.platform.b2c.trade.order.model.PurchaseModifyingHistory;
 import com.uas.platform.b2c.trade.order.service.PurchaseDetailService;
 import com.uas.platform.b2c.trade.order.service.PurchaseService;
+import com.uas.platform.b2c.trade.presale.model.ValidTime;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
@@ -597,4 +599,16 @@ public class PurchaseController {
 	public String findOrderIdByPuId(@PathVariable("purchaseId") String purchaseId){
 		return purchaseService.findOrderIdByPuId(purchaseId);
 	}
+
+//	@RequestMapping(value = "/logistics")
+//	public Logistics findOneLogistics(){
+//		return null;
+//	}
+//
+//	@RequestMapping(value = "/modifyLogistics", method = RequestMethod.PUT)
+//	public Logistics updateLogistics(Long id){
+//		System.out.println("id=" + id);
+//		return null;
+//	}
+
 }

src/main/java/com/uas/platform/b2c/trade/order/model/OrderDetail.java

@@ -443,6 +443,12 @@ public class OrderDetail extends Document implements Serializable{
 	@Column(name = "detail_remark", length = 4000)
 	private String remark;
 
+	/**
+	 * 物料编号
+	 */
+	@Column(name = "detail_go_number")
+	private String goodsnumber;
+
 	/*******************************
 	 * 交货周期
 	 *******************************/
@@ -1377,6 +1383,14 @@ public class OrderDetail extends Document implements Serializable{
 		return this;
 	}
 
+	public String getGoodsnumber() {
+		return goodsnumber;
+	}
+
+	public void setGoodsnumber(String goodsnumber) {
+		this.goodsnumber = goodsnumber;
+	}
+
 	/****************************************************
 	 * others
 	 * @param uu the uu

src/main/java/com/uas/platform/b2c/trade/order/model/Purchase.java

@@ -456,6 +456,12 @@ public class Purchase extends Document implements Serializable {
 	@Column(name = "pu_remark")
 	private String purchaseRemark;
 
+	/**
+	 * 配送类型 --第三方配送 1301，卖家配送 1302，上门自提1303
+	 */
+	@Column(name = "pu_send_type")
+	private Integer sendType;
+
 	/**
 	 * 自己送货还是第三方物流送货
 	 */
@@ -574,6 +580,14 @@ public class Purchase extends Document implements Serializable {
 		this.statushistory = addStatusHistory(statushistory, uu, this.status);
 	}
 
+	public Integer getSendType() {
+		return sendType;
+	}
+
+	public void setSendType(Integer sendType) {
+		this.sendType = sendType;
+	}
+
 	/**
 	 * Sets status to be shipped.
 	 *

src/main/java/com/uas/platform/b2c/trade/order/model/PurchaseDetail.java

@@ -309,6 +309,12 @@ public class PurchaseDetail extends Document {
 	@Column(name = "detail_remark", length = 4000)
 	private String remark;
 
+	/**
+	 * 物料编号
+	 */
+	@Column(name = "detail_goodsnumber")
+	private String goodsnumber;
+
 	/**
 	 * 商城最长交期
 	 */
@@ -1068,6 +1074,14 @@ public class PurchaseDetail extends Document {
 		this.changeQty = changeQty;
 	}
 
+	public String getGoodsnumber() {
+		return goodsnumber;
+	}
+
+	public void setGoodsnumber(String goodsnumber) {
+		this.goodsnumber = goodsnumber;
+	}
+
 	/**
 	 * Instantiates a new Purchase detail.
 	 *
@@ -1105,6 +1119,7 @@ public class PurchaseDetail extends Document {
 		this.b2cMaxDelivery = oDetail.getB2cMaxDelivery();
 		this.b2cMinDelivery = oDetail.getB2cMinDelivery();
 		this.remark = oDetail.getRemark();
+		this.goodsnumber = oDetail.getGoodsnumber();
 	}
 
 	/**

src/main/java/com/uas/platform/b2c/trade/order/service/PurchaseService.java

@@ -398,4 +398,6 @@ public interface PurchaseService {
 	 * @return Logistics
 	 */
 	Logistics findByLgtId(Long lgtId);
+
+	Logistics modifyPurchaseLogistics(Long id);
 }

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -832,6 +832,7 @@ public class OrderServiceImpl implements OrderService {
                     detail.setNumber(detailInfo.getDouble("number"));
                     detail.setTaxUnitprice(detailInfo.getDouble("taxUnitprice"));
                     detail.setRemark(detailInfo.getString("remark"));
+                    detail.setGoodsnumber(detailInfo.getString("goodsnumber"));
                     String storeid = detailInfo.getString("storeid");
                     Goods goods = goodsDao.findByBatchCode(detail.getBatchCode());
                     if(!goods.getStoreid().equals(storeid)) {

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -385,6 +385,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 		Purchase purchase = new Purchase();
 		purchase.setCurrency(crName);
 		purchase.setPurchaseRemark(orderFromCust.getOrderRemark());//绑定评论
+		purchase.setSendType(orderFromCust.getDeliverytype());
 		purchase.setSellerenuu(enuu);
 		purchase.setStoreid(orderFromCust.getStoreid());
 		//如果是优软代售的。
@@ -1434,4 +1435,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 	public Logistics findByLgtId(Long lgtId) {
 		return logisticsDao.findOne(lgtId);
 	}
+
+	@Override
+	public Logistics modifyPurchaseLogistics(Long id) {
+		return null;
+	}
 }

src/main/webapp/resources/css/common.css

@@ -782,4 +782,27 @@ div.ng-table-pager a.page-a{
 #left-nav-fragment .user_left ul li a:focus,#left-nav-fragment .user_left p:hover{
 	color: #fff !important;
 }
-input:required:invalid, input:focus:invalid, textarea:required:invalid, textarea:focus:invalid{box-shadow: none;}
+input:required:invalid, input:focus:invalid, textarea:required:invalid, textarea:focus:invalid{box-shadow: none;}
+
+.color333{
+	color: #333 !important;
+}
+.color666{
+	color: #666 !important;
+}
+.color999{
+	color: #999 !important;
+}
+
+::-webkit-input-placeholder { /* WebKit, Blink, Edge */
+	color:    #999;
+}
+:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+	color:    #999;
+}
+::-moz-placeholder { /* Mozilla Firefox 19+ */
+	color:    #999;
+}
+:-ms-input-placeholder { /* Internet Explorer 10-11 */
+	color:    #999;
+}

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

@@ -188,6 +188,9 @@ define(['app/app'], function(app) {
 				//发票信息
 				$scope.order.invoiceInfo = angular.fromJson($scope.order.invoiceAddress);
 
+				// 取消原因
+				$scope.order.unavailableReason = angular.fromJson($scope.order.unavailableReason);
+
 				//收货地址
 				$scope.order.deliveryAddress = angular.fromJson($scope.order.jsonAddress);
 

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

@@ -166,6 +166,8 @@ define(['app/app'], function(app) {
 				$scope.purchase = result.data;
 				$scope.purchase.purchaseHistory = angular.fromJson($scope.purchase.statushistory);
 				$scope.purchase.currentTotal = $scope.purchase.price;
+				// 取消原因
+				$scope.purchase.unavailableReason = angular.fromJson($scope.purchase.unavailableReason)
 				// 设置状态样式
 				$scope.stepStyle($scope.purchase.status);
 				// 获取物流信息

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

@@ -4,12 +4,23 @@
  */
 define(['app/app'], function(app) {
     "use strict";
-    app.register.controller('vendorDeliveryCtrl', ['$scope', '$rootScope', 'InvoiceFPurchase', 'ChineseToPinYin', 'Order' , 'Purchase', '$modal', '$stateParams', 'ComponentActive','$window','$state', 'BaseService', 'ShippingAddress', 'Logistics', '$filter', 'toaster', 'KdnLogistics', '$q', '$timeout', function($scope, $rootScope, InvoiceFPurchase, ChineseToPinYin, Order , Purchase, $modal, $stateParams, ComponentActive, $window, $state, BaseService, ShippingAddress, Logistics, $filter, toaster, KdnLogistics, $q, $timeout) {
+    app.register.controller('vendorDeliveryCtrl', ['$scope', '$rootScope', 'InvoiceFPurchase', 'ChineseToPinYin', 'Order' , 'Purchase', '$modal', '$stateParams', 'ComponentActive','$window','$state', 'BaseService', 'ShippingAddress', 'Logistics', '$filter', 'toaster', 'KdnLogistics', '$q', '$timeout','Distributor', function($scope, $rootScope, InvoiceFPurchase, ChineseToPinYin, Order , Purchase, $modal, $stateParams, ComponentActive, $window, $state, BaseService, ShippingAddress, Logistics, $filter, toaster, KdnLogistics, $q, $timeout, Distributor) {
 
         $scope.logistics = {};
         $scope.jsonSdAddress = {};
         $scope.selfDeliveryPerson = {};
-        
+        // 获取已有物流配送商列表
+        $scope.initData = function () {
+            Distributor.findAllSelected({},function (data) {
+                if (data){
+                    $scope.data_list = data;
+                }
+                angular.forEach($scope.data_list, function (data) {
+                    data.isOpen = false;
+                })
+            })
+        };
+        $scope.initData();
 		// 获取快递鸟快递公司列表
         $scope.selectedName = ""; // 选中的物流公司名称
         var getKdnLogistics = function () {
@@ -576,7 +587,28 @@ define(['app/app'], function(app) {
             $scope.logistics.companyId = company.id;
             $scope.isCompany = false;
         };
-
+        // 新增配送商
+        $scope.addDistributor = function () {
+            $modal.open({
+                templateUrl : $rootScope.rootPath + '/static/view/vendor/modal/vendor_distributor_manage.html',
+                controller : 'vendorDistributorManageCtrl',
+                size : 'lg',
+                resolve : {
+                    allKdnList : function () {
+                        return $scope.kdnList;
+                    },
+                    selectedList : function () {
+                        return $scope.data_list;
+                    }
+                }
+            }).result.then(function(data){
+                if (data) {
+                    $scope.initData();
+                }
+            }, function(){
+                // toaster.pop('info', '提示 ' + '您已取消配送商的编辑');
+            });
+        }
     }]);
 
     //地址编辑模态框
@@ -656,6 +688,260 @@ define(['app/app'], function(app) {
         };
     }]);
 
+    app.register.controller('vendorDistributorManageCtrl', ['$scope','$rootScope','$modal','toaster','KdnLogistics','Distributor','BaseService','ngTableParams','allKdnList','selectedList','$modalInstance', function ($scope, $rootScope, $modal, toaster, KdnLogistics, Distributor, BaseService, ngTableParams, allKdnList, selectedList, $modalInstance) {
+        //获取快递鸟信息
+        $scope.$$kdnData = {};
+        $scope.allKdnList = allKdnList;
+        $scope.chooseList = [];
+        $scope.selectFlag = [];
+
+        $scope.initArrayData = function () {
+            angular.forEach(allKdnList, function (data) {
+                $scope.selectFlag[data.code] = {};
+                $scope.selectFlag[data.code].isChoosed = false;
+            });
+            angular.forEach(selectedList, function (data, index) {
+                $scope.chooseList[index] = {};
+                if (data.code){
+                    $scope.chooseList[index].code = data.code;
+                    $scope.selectFlag[data.code].isChoosed = true;
+                }
+                $scope.chooseList[index].companyName = data.companyName;
+            });
+        };
+        $scope.initArrayData();
+
+        $scope.distributorTableParams = new ngTableParams({
+            page : 1,
+            count : 30
+        },{
+            total : 0,
+            getData : function ($defer, params) {
+                var param = BaseService.parseParams(params.url());
+                KdnLogistics.findKdnPage(param, function (page) {
+                    $scope.$$kdnData.totalElements = page.totalElements;
+                    if(Number(page.totalElements) > 0) {
+                        $scope.$$kdnData.start = Number(page.size) * (Number(page.number) - 1) + 1;
+                    }else {
+                        $scope.$$kdnData.start = 0;
+                    }
+                    $scope.$$kdnData.end = Number(page.size) * (Number(page.number) - 1) + Number(page.numberOfElements);
+                    $scope.pageList = page.content;
+                    params.total(page.totalElements);
+                    $defer.resolve(page.content);
+                    //划分数据
+                    var row = Math.ceil(page.numberOfElements/6.0);
+                    $scope.showList = [];
+                    var count = 0;
+                    for (var i = 0; i<row; i++){
+                        $scope.showList[i] = [];
+                        for (var j = 0; j<6; j++){
+                            // var code = $scope.pageList[count].code;
+                            // $scope.pageList[count].isChoosed = $scope.selectFlag[code].isChoosed;
+                            $scope.showList[i].push($scope.pageList[count]);
+                            count++;
+                            if (count == page.numberOfElements){
+                                return;
+                            }
+                        }
+                    }
+                }, function () {
+                    toaster.pop('error', '获取快递鸟信息失败');
+                });
+            }
+        });
+
+        var countLength = function (string) {
+            return string.replace(/[^x00-xFF]/g,'**').length;
+        };
+
+        $scope.inputContent = function () {
+            for (var i=0; i<$scope.keyword.length;i++){
+                if (countLength($scope.keyword.substr(0, i)) >= 26){
+                    $scope.keyword = $scope.keyword.substr(0, i);
+                    break;
+                }
+            }
+            var addrPatt = new RegExp("^[A-Za-z0-9\u4e00-\u9fa5]+$");
+            if (!addrPatt.test($scope.keyword) && $scope.keyword.length > 0){
+                $scope.companyError = true;
+            }else {
+                $scope.companyError = false;
+            }
+            initIndex();
+            $scope.showDownFrame = true;
+            matchArray();
+            $scope.containsAttr($scope.keyword);
+        };
+
+        var initIndex = function () {
+            $scope.selectIndex = -1;
+            $scope.downIndex = 0;
+        };
+
+        $scope.getFocus = function() {
+            initIndex();
+        };
+
+        /**
+         * 根据输入内容获取匹配数据的长度
+         */
+        var matchArray = function () {
+            $scope.resultList = $scope.allKdnList.filter(function (data) {
+                if (data.companyName.indexOf($scope.keyword) >= 0){
+                    return data;
+                }
+            });
+            if ($scope.resultList.length > 0){
+                $scope.matchData = true;
+            }else{
+                $scope.matchData = false;
+            }
+        };
+
+        $scope.onBlur = function () {
+            setTimeout(function () {
+                $scope.showDownFrame = false;
+            }, 120);
+        };
+
+        $scope.onKeyDown = function () {
+            var dom = document.getElementById("ulContent");
+            // console.log(dom.scrollTop);
+            if ($scope.showDownFrame && $scope.matchData){
+                if(event.keyCode == 40) { //监听到按下键
+                    $scope.selectIndex ++;
+                    if ($scope.downIndex == 5){
+                        dom.scrollTop += 23;
+                    }
+                    if ($scope.downIndex <= 4){
+                        $scope.downIndex++;
+                    }
+                    if($scope.selectIndex >= $scope.resultList.length){
+                        $scope.selectIndex = 0;
+                        dom.scrollTop = 0;
+                        $scope.downIndex = 1;
+                    }
+                    $scope.inputObject = $scope.resultList[$scope.selectIndex];
+                    $scope.keyword = $scope.inputObject.companyName;
+                    $scope.containsAttr($scope.keyword);
+                } else if(event.keyCode == 38) { //监听到按上键
+                    $scope.selectIndex --;
+                    if ($scope.downIndex == 1){
+                        dom.scrollTop -= 22.67 ;
+                    }
+                    if ($scope.downIndex >= 2){
+                        $scope.downIndex--;
+                    }
+                    if($scope.selectIndex < 0){
+                        $scope.selectIndex = $scope.resultList.length - 1;
+                        dom.scrollTop = 2400;
+                        $scope.downIndex = 5;
+                    }
+                    $scope.inputObject = $scope.resultList[$scope.selectIndex];
+                    $scope.keyword = $scope.inputObject.companyName;
+                    $scope.containsAttr($scope.keyword);
+                } else if(event.keyCode == 13) { //确定键
+                    $scope.showDownFrame = false;
+                }
+            }
+        };
+
+        $scope.clickItem = function (data) {
+            // $scope.inputObject = data;
+            $scope.keyword = data.companyName;
+            $scope.containsAttr($scope.keyword);
+            $scope.showDownFrame = false;
+        };
+
+        /**
+         * 判断快递鸟是否包含输入的快递
+         * @param value
+         */
+        $scope.containsAttr = function (value) {
+            var key = 1;
+            if (value){
+                angular.forEach($scope.allKdnList, function (data) {
+                    if (data.companyName == value){
+                        key = 0;
+                        return;
+                    }
+                });
+                if (key == 1){
+                    $scope.containsItem = false;
+                }else {
+                    $scope.containsItem = true;
+                }
+            }
+        };
+
+        $scope.addItemInSelected = function () {
+            if ($scope.containsItem){
+                angular.forEach($scope.allKdnList, function (data) {
+                    if (data.companyName == $scope.keyword){
+                        if ($scope.selectFlag[data.code].isChoosed){
+                            var indexItem = null;
+                            if ($scope.chooseList){
+                                angular.forEach($scope.chooseList, function (item, index) {
+                                    if (item.code == data.code){
+                                        indexItem = index;
+                                    }
+                                });
+                            }
+                            $scope.chooseList.splice(indexItem, 1);
+                            $scope.selectFlag[data.code].isChoosed = !$scope.selectFlag[data.code].isChoosed;
+                        }
+                        $scope.ChooseDistributor(data);
+                    }
+                });
+            }else {
+                var indexItem = null;
+                angular.forEach($scope.chooseList, function (item, index) {
+                    if (item.companyName == $scope.keyword){
+                        indexItem = index;
+                    }
+                });
+                if (indexItem){
+                    $scope.chooseList.splice(indexItem, 1);
+                }
+                var item = {};
+                item.companyName = $scope.keyword;
+                $scope.chooseList.push(item);
+            }
+            $scope.keyword = "";
+        };
+
+        $scope.ChooseDistributor = function (data) {
+            if ($scope.selectFlag[data.code].isChoosed){
+                if ($scope.chooseList){
+                    angular.forEach($scope.chooseList, function (item, index) {
+                        if (item.code == data.code){
+                            $scope.index = index;
+                        }
+                    });
+                }
+                $scope.chooseList.splice($scope.index, 1);
+            }else {
+                $scope.chooseList.push(data);
+            }
+            $scope.selectFlag[data.code].isChoosed = !$scope.selectFlag[data.code].isChoosed;
+        };
+
+        $scope.saveChooseList = function () {
+            Distributor.saveDistributor({}, $scope.chooseList ,function (data) {
+                if(data){
+                    toaster.pop('success', '成功', '保存配送商成功');
+                }
+                $modalInstance.close(data);
+            },function (error) {
+                toaster.pop('error', '成功', '保存配送商失败');
+            });
+        };
+
+        $scope.cancel = function() {
+            $modalInstance.dismiss();
+        };
+    }]);
     app.register.controller('chooseAddrCtrl', ['$scope', 'selectedAddr', 'address', '$modalInstance', function ($scope, selectedAddr, address, $modalInstance) {
 
         $scope.address = address;

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

@@ -4,7 +4,7 @@
  */
 define(['app/app'], function (app) {
     "use strict";
-    app.register.controller('vendorOrderCtrl', ['$scope', '$rootScope', 'Purchase', 'ngTableParams', 'BaseService', 'toaster', '$state', '$filter', 'Return', 'Change', '$modal', 'PuExProcess', 'Recommendation', 'DateUtil', 'Loading', 'bankInfoService', function ($scope, $rootScope, Purchase, ngTableParams, BaseService, toaster, $state, $filter, Return, Change, $modal, PuExProcess, Recommendation, DateUtil, Loading, bankInfoService) {
+    app.register.controller('vendorOrderCtrl', ['$scope', '$rootScope', 'Purchase', 'ngTableParams', 'BaseService', 'toaster', '$state', '$filter', 'Return', 'Change', '$modal', 'PuExProcess', 'Recommendation', 'DateUtil', 'Loading', 'bankInfoService', 'Logistics', 'Distributor', function ($scope, $rootScope, Purchase, ngTableParams, BaseService, toaster, $state, $filter, Return, Change, $modal, PuExProcess, Recommendation, DateUtil, Loading, bankInfoService, Logistics, Distributor) {
         $rootScope.active = 'vendor_order';
 
         // 加密过滤器
@@ -169,6 +169,74 @@ define(['app/app'], function (app) {
             state: 'orderBycreatetimeDesc'
         };
 
+        $scope.findSelectedDistributor = function () {
+            Distributor.findAllSelected({},{},function (data) {
+                if (data){
+                    $scope.companyList = data;
+                }
+            })
+        };
+        $scope.findSelectedDistributor();
+
+        //配送方式类型
+        $scope.deliveryMethod = {
+            1301: '第三方配送',
+            1302: '卖家配送',
+            1303: '上门自提'
+        };
+      // 获取已有物流配送商列表
+        $scope.initData = function () {
+            Distributor.findAllSelected({},function (data) {
+                if (data){
+                    $scope.data_list = data;
+                    console.log($scope.data_list)
+                }
+            })
+        };
+        $scope.initData();
+        $scope.showNameUl = false;
+
+        $scope.showName = function () {
+            $scope.showNameUl = true;
+            console.log($scope.showNameUl)
+        };
+        // 选中物流
+        $scope.showText = function (name) {
+            $scope.logistics.companyName = name;
+            $scope.showNameUl = false;
+        };
+        $scope.modifyLogistic = function (purchase) {
+            purchase.showLogistics = !purchase.showLogistics;
+            angular.forEach($scope.purchases, function (data) {
+                if (data.id != purchase.id){
+                    data.showLogistics = false;
+                }
+            });
+            if (purchase.showLogistics){
+                Logistics.findLogisticsById({lgtid:purchase.lgtId}, {}, function (data) {
+                    if (data){
+                        $scope.logistics = data;
+                    }
+                    console.log($scope.logistics);
+                })
+            }
+        };
+
+        $scope.cancelModify = function (purchase) {
+            purchase.showLogistics = false;
+        };
+
+        $scope.ensureModifyLogistics = function (purchase) {
+            Logistics.updateLogistics({id : purchase.lgtId, invoiceFuid : purchase.inid}, $scope.logistics, function (data) {
+                if (data){
+                    if(data.success){
+                        toaster.pop("info", "修改物流信息成功");
+                        purchase.showLogistics = false;
+                    }
+                }
+            })
+        };
+
         $scope.changeOrderState = function (state) {
             if ($scope.sortingState.state === state) {
                 $scope.orderTableParams.sorting({createtime: 'DESC'});

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

@@ -17,7 +17,7 @@
 		width: 14%;
 	}
 	#oder-detail .oder_xq_list dl span.wd01{
-		width: 16%;
+		width: 13%;
 	}
 	#oder-detail .oder_xq_list dl span.wd02{
 		width: 25%;
@@ -89,7 +89,7 @@
 		padding: 5px;
 		width: 120px;
 		height: 60px;
-		border: #ccc 1px solid;
+		border: #fff 1px solid;
 		margin-top: 10px;
 	}
 	.oder_xq_list dl span a{
@@ -112,7 +112,7 @@
 	.oder-remark span em {
 		float: left;
 		color: #333 !important;
-		margin-left: 20px;
+		margin-left: 40px;
 	}
 	.oder_xq_list dl span.total-price{
 		float: right;
@@ -219,11 +219,44 @@
 		width: 60px;
 		height: 60px;
 	}
+	.logistics_list01.status{
+		margin-top: 0;
+	}
+	.color999{
+		color: #999 !important;
+	}
+	.log_menu span{
+		width: 97%;
+	}
+	.text-area{
+		width: 120px;
+		height: 60px;
+		background: #fff;
+		margin-top: 15px;
+		overflow-y: auto;
+		text-align: left;
+		padding: 0 3px;
+		margin-left: 5px;
+	}
+	.text-area i{
+		text-align: left;
+		position: relative;
+		top: 4px;
+		font-size: 12px;
+		color: #666;
+	}
+	.oder_xq_list dl span.user-address{
+		width: 100% !important;
+		line-height: 30px;
+		position: relative;
+		top: -23px;
+		background: #f1f6ff;
+	}
 </style>
 <div class="user_right fr">
 	<!--叮当详情-->
 	<div class="oder_detail" id="oder-detail">
-		<div class="logistics">
+		<div class="logistics" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
 			<ul>
 				<li ng-class="{ 'active' : (steps.step2 || steps.step3 || steps.step4 || steps.step5) }">
 					<p>拍下产品</p>
@@ -253,32 +286,41 @@
 			</ul>
 		</div>
 		<!--<div class="logistics_list01">-->
-			<!--<div class="log_menu">-->
-				<!--<span>收发货地址</span>-->
-			<!--</div>-->
-			<!--&lt;!&ndash;订单物流信息&ndash;&gt;-->
-			<!--<div class="com_log_list">-->
-				<!--<ul>-->
-					<!--<li class="log_line">收货人信息：</li>-->
-					<!--<li>-->
-						<!--<h4 ng-bind="::order.deliveryAddress.company">华商龙商务科技有限公司</h4>-->
-						<!--<p ng-if="order.deliveryAddress.area" ng-bind="::order.deliveryAddress.area + '，' + order.deliveryAddress.detailAddress" title="{{::order.deliveryAddress.area + '，' + order.deliveryAddress.detailAddress}}" class="text-more"></p>-->
-						<!--<p ng-if="!order.deliveryAddress.area">空</p>-->
-						<!--<span>{{order.deliveryAddress.tel || '空'}}&nbsp;&nbsp;{{order.deliveryAddress.name || '空'}}</span>-->
-					<!--</li>-->
-					<!--<li class="log_line" ng-if="order.sendAddress">发货人信息：</li>-->
-					<!--<li ng-if="order.sendAddress">-->
-						<!--<h4 ng-bind="order.sendAddress.company">华商龙商务科技有限公司</h4>-->
-						<!--<p ng-if="order.sendAddress.area" ng-bind="::order.sendAddress.area + '，' + order.sendAddress.detailAddress" title="{{::order.sendAddress.area + '，' + order.sendAddress.detailAddress}}" class="text-more"></p>-->
-						<!--<p ng-if="!order.sendAddress.area">空</p>-->
-						<!--<span>{{order.sendAddress.tel || '空'}}&nbsp;&nbsp;{{order.sendAddress.name || '空'}}</span>-->
-					<!--</li>-->
-				<!--</ul>-->
-			<!--</div>-->
+		<!--<div class="log_menu">-->
+		<!--<span>收发货地址</span>-->
+		<!--</div>-->
+		<!--&lt;!&ndash;订单物流信息&ndash;&gt;-->
+		<!--<div class="com_log_list">-->
+		<!--<ul>-->
+		<!--<li class="log_line">收货人信息：</li>-->
+		<!--<li>-->
+		<!--<h4 ng-bind="::order.deliveryAddress.company">华商龙商务科技有限公司</h4>-->
+		<!--<p ng-if="order.deliveryAddress.area" ng-bind="::order.deliveryAddress.area + '，' + order.deliveryAddress.detailAddress" title="{{::order.deliveryAddress.area + '，' + order.deliveryAddress.detailAddress}}" class="text-more"></p>-->
+		<!--<p ng-if="!order.deliveryAddress.area">空</p>-->
+		<!--<span>{{order.deliveryAddress.tel || '空'}}&nbsp;&nbsp;{{order.deliveryAddress.name || '空'}}</span>-->
+		<!--</li>-->
+		<!--<li class="log_line" ng-if="order.sendAddress">发货人信息：</li>-->
+		<!--<li ng-if="order.sendAddress">-->
+		<!--<h4 ng-bind="order.sendAddress.company">华商龙商务科技有限公司</h4>-->
+		<!--<p ng-if="order.sendAddress.area" ng-bind="::order.sendAddress.area + '，' + order.sendAddress.detailAddress" title="{{::order.sendAddress.area + '，' + order.sendAddress.detailAddress}}" class="text-more"></p>-->
+		<!--<p ng-if="!order.sendAddress.area">空</p>-->
+		<!--<span>{{order.sendAddress.tel || '空'}}&nbsp;&nbsp;{{order.sendAddress.name || '空'}}</span>-->
+		<!--</li>-->
+		<!--</ul>-->
+		<!--</div>-->
 		<!--</div>-->
 		<!--订单信息-->
-		<div class="logistics_list01">
-			<div class="log_menu"><span>订单信息<b>订单号：{{order.orderid}}<em><font style="color: #333">订单状态：</font>{{order.status | orderStatus}}</em></b></span></div>
+		<div class="logistics_list01" ng-class="{'status': order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315}">
+			<div class="log_menu">
+				<span ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">订单信息<b>订单号：{{order.orderid}}<em><font style="color: #333;">订单状态：</font>{{order.status | orderStatus}}</em></b></span>
+				<span ng-if="order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315">
+					<i class="f14">订单号：{{order.orderid}}</i>
+					<b>
+						<em style="margin-right: 0;"><font class="color999">取消原因：</font>{{order.unavailableReason.reason}}</em>
+						<em><font class="color999">订单状态：</font>{{order.status | orderStatus}}</em>
+					</b>
+				</span>
+			</div>
 			<div class="oder_xq clearfix" ng-if="address" style="background: #f8f8f8">
 				<p>
 					<b>收货人：</b>
@@ -301,6 +343,7 @@
 						<span class="wd01">单价</span>
 						<span style="width: 10%;">数量</span>
 						<span class="wd01">小计</span>
+						<span class="wd01">物料编码</span>
 						<span class="wd01">备注</span>
 					</dt>
 					<dd class="order-company">
@@ -314,7 +357,7 @@
 							<a href="javascript:void(0)" class="contact_btn" title="联系卖家">联系卖家</a>
 						</span>
 					</dd>
-					<div ng-class="{'limit-3': !open}">
+					<div ng-class="{'limit-3': !open}" style="width: 100%; margin: 0 auto; overflow: hidden;">
 						<dd class="oder_l" ng-repeat="detail in order.orderDetails">
                         <span class="wd02">
                             <a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank">
@@ -330,22 +373,29 @@
 								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.brName}}" target="_blank"></a>
 							</p>
                         </span>
-						<span class="wd01">交期：
+							<span class="wd01">交期：
 							<i ng-if="detail.b2cMinDelivery != detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery + '-' + detail.b2cMaxDelivery"></i>
 							<i ng-if="detail.b2cMinDelivery == detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery"></i>
 						</span>
-						<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : detail.currencyName">$1.23</span>
-						<span style="width: 10%;" ng-bind="detail.number">100</span>
-						<span class="wd01 red" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
-						<span class="wd01" style="line-height: 20px;">
+							<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : detail.currencyName">$1.23</span>
+							<span style="width: 10%;" ng-bind="detail.number">100</span>
+							<span class="wd01 red" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+							<!--物料编码-->
+							<span class="wd01" style="line-height: 18px;">
 							<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
-							<div style="width: 133px; height: 74px; background: #fff; margin-top: 7px; overflow-y: auto;" ng-if="detail.remark">
-								<i style="line-height: 20px; text-align: left; position: relative; top: 4px;" ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+							<div class="text-area">
+								<i>金石为开取数据五块钱叫稍微亲上加亲</i>
 							</div>
 						</span>
-					</dd>
+							<span class="wd01" style="line-height: 18px;">
+							<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
+							<div class="text-area" ng-if="detail.remark">
+								<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+							</div>
+						</span>
+						</dd>
 					</div>
-					<div class="open-more row" ng-class="{'none': order.orderDetails.length < 3}">
+					<div class="open-more row" ng-class="{'none': order.orderDetails.length <= 3}">
 						<a href="javascript:void(0)" ng-click="open=!open" ng-class="{'active': open}">
 							<em ng-bind="open ? '收起' : '查看所有产品'"></em>
 							<i class="fa fa-angle-up" ng-if="open"></i>
@@ -360,7 +410,7 @@
 						</span>
 					</dd>
 					<dd class="line60">
-						<span class="wd02" style="width: 60%; text-align: left; margin-left: 20px; line-height: 30px;">配送方式：第三方配送
+						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：第三方配送
 							<!--<i style="color: #666;">（满1000元包邮，未满足的订单收取运费20元）</i>-->
 						</span>
 						<span class="total-price">
@@ -375,8 +425,14 @@
 						<!--<span><em ng-bind="freight | number : 2 | currencySysmbol : purchase.currency">￥20.00</em></span>-->
 						<!--物流的价格先隐藏-->
 					</dd>
+					<dd class="line60">
+						<span class="user-address" style="padding-left: 40px;">
+							<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;">自提点A</strong>营业时间：周一至周五 8:30-18:00</i><br/>
+							<i class="fl">地址：广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i>
+						</span>
+					</dd>
 					<!--<dd class="price">-->
-						<!--<span style="width: 100%;">总计：<i  ng-bind="order.price | formateNumber : 2 | currencySysmbol : order.currency">￥820.00</i></span>-->
+					<!--<span style="width: 100%;">总计：<i  ng-bind="order.price | formateNumber : 2 | currencySysmbol : order.currency">￥820.00</i></span>-->
 					<!--</dd>-->
 				</dl>
 			</div>
@@ -401,28 +457,28 @@
 			</div>
 		</div>
 		<!--<div class="logistics_list01">-->
-			<!--<div class="log_menu">-->
-				<!--<span>收发货地址</span>-->
-			<!--</div>-->
-			<!--&lt;!&ndash;订单物流信息&ndash;&gt;-->
-			<!--<div class="com_log_list">-->
-				<!--<ul>-->
-					<!--<li class="log_line">收货人信息：</li>-->
-					<!--<li>-->
-						<!--<h4 ng-bind="::order.deliveryAddress.company">华商龙商务科技有限公司</h4>-->
-						<!--<p ng-if="order.deliveryAddress.area" ng-bind="::order.deliveryAddress.area + '，' + order.deliveryAddress.detailAddress"></p>-->
-						<!--<p ng-if="!order.deliveryAddress.area">空</p>-->
-						<!--<span>{{order.deliveryAddress.tel || '空'}}&nbsp;&nbsp;{{order.deliveryAddress.name || '空'}}</span>-->
-					<!--</li>-->
-					<!--<li class="log_line" ng-if="order.sendAddress">发货人信息：</li>-->
-					<!--<li ng-if="order.sendAddress">-->
-						<!--<h4 ng-bind="order.sendAddress.company">华商龙商务科技有限公司</h4>-->
-						<!--<p ng-if="order.sendAddress.area" ng-bind="::order.sendAddress.area + '，' + order.sendAddress.detailAddress"></p>-->
-						<!--<p ng-if="!order.sendAddress.area">空</p>-->
-						<!--<span>{{order.sendAddress.tel || '空'}}&nbsp;&nbsp;{{order.sendAddress.name || '空'}}</span>-->
-					<!--</li>-->
-				<!--</ul>-->
-			<!--</div>-->
+		<!--<div class="log_menu">-->
+		<!--<span>收发货地址</span>-->
+		<!--</div>-->
+		<!--&lt;!&ndash;订单物流信息&ndash;&gt;-->
+		<!--<div class="com_log_list">-->
+		<!--<ul>-->
+		<!--<li class="log_line">收货人信息：</li>-->
+		<!--<li>-->
+		<!--<h4 ng-bind="::order.deliveryAddress.company">华商龙商务科技有限公司</h4>-->
+		<!--<p ng-if="order.deliveryAddress.area" ng-bind="::order.deliveryAddress.area + '，' + order.deliveryAddress.detailAddress"></p>-->
+		<!--<p ng-if="!order.deliveryAddress.area">空</p>-->
+		<!--<span>{{order.deliveryAddress.tel || '空'}}&nbsp;&nbsp;{{order.deliveryAddress.name || '空'}}</span>-->
+		<!--</li>-->
+		<!--<li class="log_line" ng-if="order.sendAddress">发货人信息：</li>-->
+		<!--<li ng-if="order.sendAddress">-->
+		<!--<h4 ng-bind="order.sendAddress.company">华商龙商务科技有限公司</h4>-->
+		<!--<p ng-if="order.sendAddress.area" ng-bind="::order.sendAddress.area + '，' + order.sendAddress.detailAddress"></p>-->
+		<!--<p ng-if="!order.sendAddress.area">空</p>-->
+		<!--<span>{{order.sendAddress.tel || '空'}}&nbsp;&nbsp;{{order.sendAddress.name || '空'}}</span>-->
+		<!--</li>-->
+		<!--</ul>-->
+		<!--</div>-->
 		<!--</div>-->
 		<!--发票信息-->
 		<div class="logistics_list01">

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

@@ -22,7 +22,7 @@
 		width: 160px;
 	}
 	#pay-cart .oder_xq_list dl span.wd01{
-		width: 15%;
+		width: 14%;
 	}
 	#pay-cart .oder_xq_list dl span.wd02{
 		width: 22%;
@@ -30,7 +30,12 @@
 	.sure_oder .oder_xq_list dl span{
 		width: 13%;
 	}
-
+	.sure_oder .btn-wrap{
+		margin-left: 7px;
+	}
+	.sure_oder .oder_xq_list dl span textarea{
+		border: #fff 1px solid;
+	}
 	.payment .bill-radio {
 		font-size: 14px;
 		padding-top: 25px;
@@ -301,7 +306,7 @@
 	.oder_xq_list dl .price-step .dropdown-menu{
 		min-width: 330px;
 		top: 0;
-		left: -280px;
+		left: -310px;
 		padding-top: 0;
 		padding-bottom: 0;
 		border-bottom: none;
@@ -362,6 +367,56 @@
 	.oder_xq_list dl .price-step p a,.oder_xq_list dl .price-step p a:hover{
 		color: #5078cb;
 	}
+
+	/*自提点样式*/
+	.self-list{
+		width: 100%;
+		margin: 0 auto;
+		padding: 0 0 8px 0;
+		border-bottom: #5078CB 1px solid;
+		background: #f1f6ff;
+		position: relative;
+		top: -1px;
+	}
+	.check-act input{
+		display: none;
+	}
+	.check-act label{
+		width: 12px;
+		height: 12px;
+		margin-right: 5px;
+		display: inline-block;
+		background: url(static/img/icon/check-rule.png) no-repeat;
+		position: relative;
+		top: 7px;
+	}
+	.check-act label{
+		background-position: 0 0;
+	}
+	.check-act input:checked + label{
+		background-position: -15px 0;
+	}
+	.oder_xq_list dl .self-advice{
+		width: 100%;
+		margin: 0 auto;
+		display: inline-block;
+	}
+	.oder_xq_list dl .self-advice li{
+		text-align: left;
+		float: left;
+		padding-left: 40px;
+		font-size: 14px;
+		line-height: 20px;
+	}
+	.oder_xq_list dl .self-advice li strong{
+		font-weight: normal;
+		font-size: 14px;
+		margin-left: 40px;
+	}
+	.oder_xq_list dl .self-advice li strong i{
+		font-size: 14px;
+		margin-left: 0;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay-cart">
@@ -438,10 +493,11 @@
 				<dl class="clearfix">
 					<dt style="background: #f6f9ff;">
 						<span class="wd02">产品信息</span>
-						<span class="wd01">交期(天)</span>ss
+						<span class="wd01">交期(天)</span>
 						<span class="wd01">单价</span>
 						<span class="wd01">数量</span>
-						<span style="width: 18%">小计</span>
+						<span style="width: 10%">小计</span>
+						<span>物料编码</span>
 						<span>备注</span>
 					</dt>
 					<div ng-repeat="(key, details) in $$orderDetailsMap">
@@ -456,29 +512,35 @@
 						</dd>
 						<dd class="oder_l" ng-repeat="detail in details">
                         <span class="wd02">
-                            <a  href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank" href="javascript:void(0)"> <img ng-src="{{detail.img || 'static/img/store/common/default.png'}}"/></a>
+                            <a  href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}"/></a>
 							<div class="style-type">
-								<p title="{{detail.kiName}}"><a href="product/kind/{{detail.goodsHistory.kindUuid}}" target="_blank" style="color: #323232">类目：<b ng-bind="detail.kiName"></b></a></p>
-								<p><a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank" style="color: #323232">型号：<b ng-bind="detail.cmpCode" title="{{detail.cmpCode}}"></b></a></p>
-								<p><a href="product/brand/{{detail.branduuid}}/" target="_blank" style="color: #323232">品牌：<b ng-bind="detail.brName" style="color: #323232" title="{{detail.brName}}"></b></a></p>
+								<p>
+									<a href="product/kind/{{detail.goodsHistory.kindUuid}}" target="_blank" style="color: #323232">类目：<b ng-bind="detail.kiName" title="{{detail.kiName}}"></b></a>
+								</p>
+								<p>
+									<a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank" style="color: #323232">型号：<b ng-bind="detail.cmpCode" title="{{detail.cmpCode}}"></b></a>
+								</p>
+								<p>
+									<a href="product/brand/{{detail.branduuid}}/" target="_blank" style="color: #323232">品牌：<b ng-bind="detail.brName" style="color: #323232" title="{{detail.brName}}"></b></a>
+								</p>
 							</div>
                         </span>
-						<span class="wd01" ng-if="order.status == 501">
+							<span class="wd01" ng-if="order.status == 501">
 							交期 :
 							<i ng-if="detail.goodsHistory.b2cMinDelivery == detail.goodsHistory.b2cMaxDelivery" ng-bind="detail.goodsHistory.b2cMinDelivery"></i>
 							<i ng-if="detail.goodsHistory.b2cMinDelivery != detail.goodsHistory.b2cMaxDelivery" ng-bind="detail.goodsHistory.b2cMinDelivery + '-' + detail.goodsHistory.b2cMaxDelivery"></i>
-							<!--{{detail.goodsHistory.b2cMinDelivery}}-{{detail.goodsHistory.b2cMaxDelivery}}-->
+								<!--{{detail.goodsHistory.b2cMinDelivery}}-{{detail.goodsHistory.b2cMaxDelivery}}-->
 						</span>
-						<span class="wd01" ng-if="order.status != 501">
+							<span class="wd01" ng-if="order.status != 501">
 							交期 :
 						<i ng-if="detail.b2cMinDelivery == detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery"></i>
 						<i ng-if="detail.b2cMinDelivery != detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery + '-' + detail.b2cMaxDelivery"></i>
 						</span>
-						<span class="wd01" ng-bind="detail.rmbUnitPrice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.goodsHistory.currencyName.indexOf('RMB') > -1 && order.status == 501"></span>
-						<span class="wd01" ng-bind="detail.usdUnitPrice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.goodsHistory.currencyName.indexOf('USD') > -1 && order.status == 501"></span>
-						<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.currencyName.indexOf('RMB') > -1 && order.status != 501"></span>
-						<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.currencyName.indexOf('USD') > -1 && order.status != 501"></span>
-						<span class="wd01">
+							<span class="wd01" ng-bind="detail.rmbUnitPrice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.goodsHistory.currencyName.indexOf('RMB') > -1 && order.status == 501"></span>
+							<span class="wd01" ng-bind="detail.usdUnitPrice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.goodsHistory.currencyName.indexOf('USD') > -1 && order.status == 501"></span>
+							<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.currencyName.indexOf('RMB') > -1 && order.status != 501"></span>
+							<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.currencyName.indexOf('USD') > -1 && order.status != 501"></span>
+							<span class="wd01">
                             <div class="btn-wrap">
                             <span class="number add-minus" ng-if="order.status == 501">
                                 <a href="javascript:void(0)" class="reduce" ng-click="reduce(detail)" ng-disabled="detail.minusDisabled">-</a>
@@ -488,7 +550,7 @@
 							<span ng-if="order.status != 501" ng-bind="detail.number" class="number" style="border: none;"></span>
                             </div>
                         </span>
-							<span class="price-step"  style="width: 18%">
+							<span class="price-step"  style="width: 10%">
 								<em ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName" class="red"></em>
 								<p>
 									<a name="{{detail.id}}" ng-click="togglePrice(detail)" ng-if="detail.goodsHistory.prices.length > 1" ng-blur="togglePriceBlur(detail)" style="font-size: 12px">价格梯度</a>
@@ -507,35 +569,80 @@
 								</p>
 							</span>
 							<span>
-                            	<textarea ng-if="order.status==501" placeholder="可填写产品备注！例如物料编号" ng-model="detail.remark"></textarea>
+                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" ng-model="detail.remark"></textarea>
+                        		<em ng-if="order.status!=501" ng-bind="detail.remark" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>
+							</span>
+							<span>
+                            	<textarea ng-if="order.status==501" placeholder="可填写产品备注" ng-model="detail.remark"></textarea>
                         		<em ng-if="order.status!=501" ng-bind="detail.remark" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>
 							</span>
 						</dd>
 						<dd class="oder-remark">
-							<span style="width: 100%">
-								<em>订单备注：</em>
+							<span style="width: 100%;">
+								<em style="margin-left: 40px;">订单备注：</em>
 								<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]"/>
 							</span>
 						</dd>
 						<dd class="line60">
-							<span class="style01" style="width: 60%;">配送方式：
+							<span class="style01" style="width: 60%; padding-left: 40px;">配送方式：
 								<select ng-if="order.status == 501" class="select" ng-switch="order.deliverytype" style="opacity: 1;" >
 									<option ng-switch-when="1301">第三方配送</option>
-									<option ng-switch-when="1301">卖家配送</option>
-									<option ng-switch-when="1301">上门自提</option>
+									<!--<option ng-switch-when="1301">卖家配送</option>-->
+									<!--<option ng-switch-when="1301">上门自提</option>-->
 									<!--<option ng-switch-when="1302">上门自提</option>-->
 								</select>
 								<em ng-if="order.status != 501">物流配送</em>
 								<!--<i>满1000元包邮，未满足的订单收取运费20元</i>-->
 							</span>
-								<span class="total-price">
+							<span class="total-price">
 								<p><strong>运费：</strong><em ng-bind="0 | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em></p>
 								<p><strong>店铺合计：</strong>
 									<em ng-if="order.status==501" ng-bind="storePrice[key] | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
 									<em ng-if="order.status!=501" ng-bind="order.ensurePrice | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
 								</p>
 							</span>
-							</dd>
+						</dd>
+						<div class="self-list">
+							<!--自提点列表-->
+								<ul class="self-advice">
+									<li>
+										<label class="check-act">
+											<input type="radio" id="1" name="1"/>
+											<label for="1"></label>
+										</label>
+										<strong style="margin-left: 0">自提点A</strong>
+										<strong>地址：<i>广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></strong>
+										<strong>营业时间：<i>周一至周五 8:30-18:00</i></strong>
+									</li>
+									<li>
+										<label class="check-act">
+											<input type="radio" id="2" name="2"/>
+											<label for="2"></label>
+										</label>
+										<strong style="margin-left: 0">自提点A</strong>
+										<strong>地址：<i>广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></strong>
+										<strong>营业时间：<i>周一至周五 8:30-18:00</i></strong>
+									</li>
+									<li>
+										<label class="check-act">
+											<input type="radio" id="3" name="3"/>
+											<label for="3"></label>
+										</label>
+										<strong style="margin-left: 0">自提点A</strong>
+										<strong>地址：<i>广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></strong>
+										<strong>营业时间：<i>周一至周五 8:30-18:00</i></strong>
+									</li>
+									<li>
+										<label class="check-act">
+											<input type="radio" id="4" name="4"/>
+											<label for="4"></label>
+										</label>
+										<strong style="margin-left: 0">自提点A</strong>
+										<strong>地址：<i>广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></strong>
+										<strong>营业时间：<i>周一至周五 8:30-18:00</i></strong>
+									</li>
+								</ul>
+						</div>
 					</div>
 					<dd class="pay_price">
 						<div>

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

@@ -17,7 +17,7 @@
 		width: 14%;
 	}
 	#oder-detail .oder_xq_list dl span.wd01{
-		width: 16%;
+		width: 13%;
 	}
 	#oder-detail .oder_xq_list dl span.wd02{
 		width: 25%;
@@ -135,7 +135,7 @@
 		background: #f1f6ff;
 	}
 	.oder_xq_list dl .line60{
-		height: 50px;
+		height: 60px;
 		border-bottom: #5078cb 1px solid;
 	}
 	.oder-remark .form-control {
@@ -149,7 +149,7 @@
 	.oder-remark span em {
 		float: left;
 		color: #333 !important;
-		margin-left: 20px;
+		margin-left: 40px;
 	}
 	.oder_xq_list dl span.total-price{
 		float: right;
@@ -186,12 +186,6 @@
 		top: -23px;
 		background: #f1f6ff;
 	}
-	.oder_xq_list dl span.user-address i:nth-of-type(1){
-		margin-left: 20px;
-	}
-	.oder_xq_list dl span.user-address i:nth-of-type(2){
-		margin-left: 70px;
-	}
 	.open-more{
 		text-align: center;
 		background: #f6f9ff;
@@ -290,6 +284,29 @@
 		width: 60px;
 		height: 60px;
 	}
+	.color999{
+		color: #999 !important;
+	}
+	.log_menu span{
+		margin-left: 11px;
+	}
+	.text-area{
+		width: 120px;
+		height: 60px;
+		background: #fff;
+		margin-top: 15px;
+		overflow-y: auto;
+		text-align: left;
+		padding: 0 3px;
+		margin-left: 5px;
+	}
+	.text-area i{
+		text-align: left;
+		position: relative;
+		top: 4px;
+		font-size: 12px;
+		color: #666;
+	}
 </style>
 <div class="user_right fr">
 	<!--叮当详情-->
@@ -317,7 +334,7 @@
 					<p ng-bind="steps.time4 | date : 'yyyy-MM-dd HH:mm:ss'">2017-03-12 15:12:30</p>
 				</li>
 				<li>
-					<p>评价</p>
+					<p>评价</p>No
 					<em><i ng-class="{ 'active' : steps.step5 }"><b>5</b></i></em>
 					<p ng-bind="steps.time5 | date : 'yyyy-MM-dd HH:mm:ss'"></p>
 				</li>
@@ -325,7 +342,17 @@
 		</div>-->
 		<!--订单信息-->
 		<div class="logistics_list01" style="margin-top: 0;">
-			<div class="log_menu"><span>订单信息<b>订单号：{{purchase.orderid}} <em><font style="color: #333; margin-left: 20px">订单状态：</font>{{purchase.status | purchaseStatus}}</em></b></span></div>
+			<div class="log_menu">
+				<!--<span>订单信息<b>订单号：{{purchase.orderid}} <em><font style="color: #333; margin-left: 20px">订单状态：</font>{{purchase.status | purchaseStatus}}</em></b></span>-->
+				<span ng-if="purchase.status != 602 && purchase.status != 603 && purchase.status != 604 && purchase.status != 605 && purchase.status != 606 && purchase.status != 315">订单信息<b>订单号：{{purchase.orderid}}<em style="margin-left: 25px;"><font style="color: #333;">订单状态：</font>{{purchase.status | purchaseStatus}}</em></b></span>
+				<span ng-if="purchase.status == 602 || purchase.status == 603 || purchase.status == 604 || purchase.status == 605 || purchase.status == 606 || purchase.status == 315">
+					<i class="f14">订单号：{{purchase.orderid}}</i>
+					<b>
+						<em style="margin-right: 25px;"><font class="color999">取消原因：</font>{{purchase.unavailableReason.reason}}</em>
+						<em><font class="color999">订单状态：</font>{{purchase.status | purchaseStatus}}</em>
+					</b>
+				</span>
+			</div>
 			<div class="oder_xq clearfix" style="background: #f8f8f8; width: 98%;">
 				<p>
 					<b>收货人：</b>
@@ -349,6 +376,7 @@
 						<span class="wd01">单价</span>
 						<span style="width: 10%;">数量</span>
 						<span class="wd01">小计</span>
+						<span class="wd01">物料编码</span>
 						<span class="wd01">备注</span>
 					</dt>
 					<!--<dd>-->
@@ -357,51 +385,61 @@
 					<dd class="order-company">
 						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px;">
 							<i style="min-width: 315px; display: inline-block">
-								&nbsp;&nbsp;{{purchase.buyername}} <!--<a ng-if="purchase.pu_buyentername" name="{{purchase.id}}" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">|{{purchase.pu_buyentername}}</a>-->
+								<i ng-bind="purchase.buyername" style="color: #333; margin-left: 20px;"></i>
+                                <i style="color: #999; margin: 0 5px;">|</i>
+                                <i ng-bind="purchase.buyentername"></i>
+								<!--<a ng-if="purchase.pu_buyentername" name="{{purchase.id}}" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">|{{purchase.pu_buyentername}}</a>-->
 							</i>
 							<img src="static/img/common/songguo.png" style="margin-right:0; ">
 							<!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>-->
 							<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" >联系买家</a>
 						</span>
 					</dd>
-					<div ng-class="{'limit-3': !open}">
+					<div ng-class="{'limit-3': !open}" style="width: 100%; margin: 0 auto; overflow: hidden;">
 						<dd class="oder_l" ng-repeat="detail in purchase.purchaseDetails">
 						<span class="wd02">
 							<a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/user/images/pro02.jpg'}}"/></a>
 							<p class="style01" style="margin-top: 10px;">类目：
-								<a ng-bind="detail.kiName" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.kiName}}" target="_blank"></a>
+								<a ng-bind="detail.kiName" href="store/{{detail.storeid}}/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
 							<p class="style01">型号：
 								<a ng-bind="detail.cmpCode" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
 							<p class="style01">品牌：
-								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.brName}}" target="_blank"></a>
+								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.branduuid}}" title="{{detail.brName}}" target="_blank"></a>
 							</p>
 						</span>
-						<span class="wd01">交期：
+							<span class="wd01">交期：
 							<i ng-if="detail.b2cMinDelivery != detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery + '-' + detail.b2cMaxDelivery"></i>
 							<i ng-if="detail.b2cMinDelivery == detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery"></i>
 						</span>
-						<span class="wd01">
+							<span class="wd01">
 							<em  ng-show="!isChange" ng-bind="detail.taxUnitPrice | formateNumber : 6 | currencySysmbol : detail.currencyName" style="color: #333;"></em>
 							<em ng-show="isChange" class="price-style">
 								<em  ng-bind="'' | currencySysmbol : detail.currencyName"></em>
 								<input ng-model="detail.currentTaxUnitPrice" type="number" ng-change="updateTotal()"/>
 							</em>
 						</span>
-						<span style="width: 10%;" ng-bind="detail.number">100</span>
-						<span ng-show="!isChange" class="wd01 red" ng-bind="detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
-						<span ng-show="isChange" class="wd01 red" ng-bind="detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
-						<span class="wd01" style="line-height: 20px;">
+							<span style="width: 10%;" ng-bind="detail.number">100</span>
+							<span ng-show="!isChange" class="wd01 red" ng-bind="detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+							<span ng-show="isChange" class="wd01 red" ng-bind="detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+							<!--物料编码-->
+							<span class="wd01" style="line-height: 18px;">
+						<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
+							<div class="text-area">
+								<i>金石为开取数据五块钱叫稍微亲上加亲</i>
+							</div>
+						</span>
+							<span class="wd01" style="line-height: 18px;">
 							<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
-							<div style="width: 133px; height: 74px; background: #fff; margin-top: 7px; overflow-y: auto;" ng-if="detail.remark">
-								<i style="line-height: 20px; text-align: left; position: relative; top: 4px;" ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+							<div class="text-area" ng-if="detail.remark">
+								<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
 							</div>
 						</span>
-					</dd>
+						</dd>
 					</div>
-					<div class="open-more row" ng-class="{'none': purchase.purchaseDetails.length < 3}">
-						<a href="javascript:void(0)" ng-click="$open=!open" ng-class="{'active': open}">
+					<div class="open-more row" ng-class="{'none': purchase.purchaseDetails.length <= 3}">
+						<a href="javascript:void(0)" ng-click="open=!open" ng-class="{'active': open}">
 							<em ng-bind="open ? '收起' : '查看所有产品'"></em>
 							<i class="fa fa-angle-up" ng-if="open"></i>
 							<i class="fa fa-angle-down" ng-if="!open"></i>
@@ -415,7 +453,7 @@
 						</span>
 					</dd>
 					<dd class="line60">
-						<span class="wd02" style="width: 60%; text-align: left; margin-left: 20px; line-height: 30px;">配送方式：第三方配送
+						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：第三方配送
 							<!--<i style="color: #666;">（满1000元包邮，未满足的订单收取运费20元）</i>-->
 						</span>
 						<span class="total-price">
@@ -425,10 +463,7 @@
 									<em ng-if="isChange" ng-bind="purchase.currentTotal | formateNumber : 2 | currencySysmbol : purchase.currency" style="font-weight: bold"></em>
 								</p>
 						</span>
-						<!--<span class="user-address">-->
-							<!--<i class="fl"><strong style="font-weight: inherit">自提点：</strong>营业时间：周一至周五 8:30-18:00</i><br/>-->
-							<!--<i class="fl">地址：广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i>-->
-							<!--&lt;!&ndash;<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="order.orderRemark"/>&ndash;&gt;-->
+						<!--&lt;!&ndash;<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="order.orderRemark"/>&ndash;&gt;-->
 						<!--</span>-->
 						<!--<span ng-if="!noLogisticInfoArray[purchase.status]" class="wd02">物流：{{logistics.companyName || '空'}}</span>-->
 						<!--<span ng-if="!noLogisticInfoArray[purchase.status]" class="wd01">物流单号：{{logistics.number || '空'}}</span>-->
@@ -436,6 +471,12 @@
 						<!--<span ng-show="!canShowInfo" class="wd01">系统无法提供</span>-->
 						<!--<span><em ng-bind="freight | number : 2 | currencySysmbol : purchase.currency">￥20.00</em></span>-->
 					</dd>
+					<dd class="line60">
+						<span class="user-address" style="padding-left: 40px;">
+							<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;">自提点A</strong>营业时间：周一至周五 8:30-18:00</i><br/>
+							<i class="fl">地址：广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i>
+						</span>
+					</dd>
 					<dd class="change price">
 						<!--<span style="width: 100%">店铺合计：<i ng-bind="purchase.price | formateNumber : 2 | currencySysmbol : purchase.currency"></i></span>-->
 						<span class="change-price" ng-show="purchase.status == 501">

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

@@ -1,7 +1,7 @@
 <!--右侧主体部分-->
 <style type="text/css">
     em.title {
-        font-size: 16px;
+        font-size: 14px;
         font-weight: 600;
     }
 
@@ -11,8 +11,13 @@
 
     .taggle-address {
         vertical-align: baseline;
-        margin-left: 15px;
+        margin-left: 0;
         color: #5078cb;
+        font-size: 12px;
+    }
+    a.taggle-address:last-child{
+        color: #666;
+        margin-right: 10px;
     }
     .sell_oder .sure_oder .oder_xq_list dl span.wid01 p{
         text-overflow: ellipsis;
@@ -29,13 +34,26 @@
     }
     .pay_price div{
         border: none;
-        margin-top: -15px;
+        margin-top: -20px;
         height: 60px;
+        width: auto;
+        padding: 0;
+        margin-right: 0;
+        margin-bottom: 30px;
     }
     .pay_price a{
         width: 70px;
-        height: 32px;
+        height: 28px;
         font-size: 14px;
+        line-height: 28px;
+        margin-right: 10px;
+    }
+    .pay_price a:first-child{
+        margin-right: 0;
+    }
+    .pay_price a.add{
+        width: 90px;
+        background: #fc5902;
     }
     .pay_price a.cancel{
         background: #b4b5b9;
@@ -57,7 +75,7 @@
         border-radius: 3px;
     }
     .sell_oder .sure_oder .oder_xq_list dl span .dropdown-menu{
-        top: 49%;
+        top: 95%;
         line-height: 23px;
         max-height: 240px;
         overflow-y: auto;
@@ -97,32 +115,402 @@
         left: 3px;
         top: 5px;
     }
-    ::-webkit-scrollbar-track-piece {
+    .input-ul ::-webkit-scrollbar-track-piece {
         background: #d4d4d4;
     }
-    ::-webkit-scrollbar {
+    .input-ul ::-webkit-scrollbar {
         width: 20px;
         height: 5px;
     }
-    ::-webkit-scrollbar-thumb {
+    .input-ul ::-webkit-scrollbar-thumb {
         background: #b1abab;
         padding-left: 0;!important;
         -webkit-border-radius: 0;
     }
-    ::-webkit-scrollbar-thumb:hover{
+    .input-ul ::-webkit-scrollbar-thumb:hover{
         background: #9b9b9b;
         cursor: pointer;
     }
+    /*修改部分*/
+    .logistics_list_xq dl dd:last-child em{
+        background: #5078cb;
+    }
+    #oder-detail .oder_xq_list dl .oder_l p{
+        font-size: 14px;
+        text-align: left;
+        width: 100%;
+        position: relative;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        word-break: normal;
+        overflow: hidden;
+    }
+    #oder-detail .oder_xq_list dl span{
+        width: 14%;
+    }
+    #oder-detail .oder_xq_list dl span.wd01{
+        width: 13%;
+    }
+    #oder-detail .oder_xq_list dl span.wd02{
+        width: 25%;
+    }
+    #oder-detail .oder_xq_list dl .oder_l p.style01{
+        width: 160px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        word-break: normal;
+        overflow: hidden;
+    }
+    #oder-detail .oder_xq_list dl .oder_l img{
+        margin-left: 20px;
+    }
+    #oder-detail .oder_xq_list dl .change-price span{
+        width: 74px;
+        height: 30px;
+        display: inline-block;
+        text-align: center;
+        background: #5078cb;
+        line-height: 30px;
+        color: #fff;
+        font-size: 14px;
+        margin-right: 5px;
+        float: right;
+    }
+    #oder-detail .oder_xq_list dl .change-price span:hover{
+        cursor: pointer;
+    }
+    .oder_xq_list dl .change{
+        height: 70px;
+    }
+    .oder_xq_list dl .change span{
+        height: 40px;
+        line-height: 40px;
+        margin-top: 10px;
+    }
+    .oder_xq_list dl .change .change-price{
+        width: 100% !important;
+        margin-top: 0;
+        padding-right: 30px;
+    }
+    #oder-detail .oder_xq_list dl .change-price span:hover{
+        background: #3f7ae3;
+        color: #fff !important;
+    }
+    #oder-detail .oder_xq_list dl .change-price span.off{
+        background: #fa5a02;
+    }
+    .oder_xq_list dl .price span i {
+        margin-right: 35px;
+        font-weight: bold;
+    }
+    .no-record{
+        height: 60px;
+        text-align: center;
+        line-height: 60px;
+        background: #fff;
+        font-size: 14px;
+    }
+    .logistics_list01 .oder_xq p{
+        display: inline-block;
+        margin-left: 10px;
+    }
+    .red{
+        color: #f00;
+    }
+    #oder-detail .oder_xq_list dl dd.line60 span{
+        width: 20%;
+    }
+    #oder-detail .oder_xq_list dl dd.line60 span.wd001{
+        width: 35%;
+        margin-left: 25px;
+    }
+    /*订单详情修改*/
+    .logistics_list01{
+        background: #fff;
+    }
+    .oder_xq_list dl dt{
+        border: #f1f6ff 1px solid;
+        height: 40px;
+        border-bottom: #769be9 2px solid !important;
+        background: #f6f9ff;
+        margin-top: 10px;
+    }
+    .oder_xq_list dl .oder_l {
+        background: #f6f9ff;
+        border-bottom: #fff 1px solid;
+    }
+    .oder_xq_list dl dd{
+        border-bottom: none;
+    }
+    .oder_xq_list dl dd.order-company{
+        height: 50px;
+        line-height: 50px;
+        border-bottom: #f1f6ff 1px solid;
+    }
+    .oder_xq_list dl .oder_l span.wd02{
+        margin-top: 0;
+    }
+    .oder_xq_list dl .oder_l span.wd02 a img{
+        margin-top: 15px;
+    }
+    .oder_xq_list dl .oder_l span textarea {
+        padding: 5px;
+        width: 120px;
+        height: 60px;
+        border: #ccc 1px solid;
+        margin-top: 10px;
+    }
+    .oder_xq_list dl span a{
+        color: #333;
+    }
+    .oder-remark,.oder_xq_list dl .line60{
+        background: #f1f6ff;
+    }
+    .oder_xq_list dl .line60{
+        height: 50px;
+        border-bottom: #5078cb 1px solid;
+    }
+    .oder-remark .form-control {
+        width: 546px;
+        height: 30px;
+        border-radius: 2px;
+        float: left;
+        margin-top: 5px;
+        margin-left: 4px;
+    }
+    .oder-remark span em {
+        float: left;
+        color: #333 !important;
+        margin-left: 20px;
+    }
+    .oder_xq_list dl span.total-price{
+        float: right;
+        width: auto !important;
+        position: relative;
+        bottom: 10px;
+        margin-right: 20px;
+    }
+    .oder_xq_list dl span.total-price p{
+        line-height: 25px;
+        font-size: 14px;
+        text-align: right;
+        font-weight: bold;
+        display: flex;
+    }
+    .oder_xq_list dl span.total-price p:first-child em{
+        color: #333;
+    }
+    .oder_xq_list dl span.total-price p:last-child{
+        color: #e64040;
+    }
+    .oder_xq_list dl span.total-price p em{
+        color: #e64040;
+    }
+    .oder_xq_list dl span.total-price strong {
+        width: 70px;
+        display: inline-block;
+        float: left;
+    }
+    .oder_xq_list dl span.user-address{
+        width: 100% !important;
+        line-height: 30px;
+        position: relative;
+        top: -23px;
+        background: #f1f6ff;
+    }
+    .oder_xq_list dl span.user-address i:nth-of-type(1){
+        margin-left: 20px;
+    }
+    .oder_xq_list dl span.user-address i:nth-of-type(2){
+        margin-left: 70px;
+    }
+    .open-more{
+        text-align: center;
+        background: #f6f9ff;
+        height: 2px;
+    }
+    .oder-remark.length3{
+        border-top: #a5d6f7 1px dashed
+    }
+    .open-more a{
+        font-size: 12px;
+        width: 200px;
+        height: 15px;
+        display: inline-block;
+        border: #5e9fcb 1px dashed;
+        border-top: 0;
+        font-weight: inherit;
+        background: #f6f9ff;
+        border-bottom-left-radius: 50px;
+        border-bottom-right-radius: 50px;
+        line-height: 15px;
+        text-decoration: none;
+        position: relative;
+        top: 0;
+    }
+    .open-more a i{
+        margin-right: 5px;
+        font-size: 20px;
+        vertical-align: middle;
+        position: relative;
+        top: -5px;
+        color: #ff8423;
+    }
+    .open-more a.active{
+        border-top-left-radius: 50px;
+        border-top-right-radius: 50px;
+        position: relative;
+        top: -12px;
+        border-bottom: none;
+        border-top: #5e9fcb 1px dashed;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+        background: #f1f6ff;
+    }
+    .open-more a.active em{
+        top: 3px;
+    }
+    .open-more a.active i{
+        top: 0;
+    }
+    .open-more a em{
+        position: relative;
+        top: -4px;
+        color: #ff8423;
+    }
+    .open-more a:hover em,.open-more a:hover i{
+        color: #5078cb;
+        text-decoration: none;
+    }
+    .limit-3{
+        width: 100%;
+        margin: 0 auto;
+        max-height: 270px;
+        overflow: hidden;
+    }
+    .open-more.none{
+        display: none;
+    }
+    .logistics_list01 .oder_xq p b{
+        color: #959595;
+    }
+    .logistics_list01 .oder_xq{
+        width: 97%;
+    }
+    .oder_xq_list dl .price-style em{
+        width: 18px;
+        height: 28px;
+        background: #5078cb;
+        text-align: center;
+        line-height: 28px;
+        border-top-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+        color: #fff;
+        display: inline-block;
+    }
+    .oder_xq_list dl .price-style input{
+        width: 100px;
+        border: #5078cb 1px solid;
+        font-size: 14px;
+        position: relative;
+        height: 28px;
+        left: -6px;
+        top: -1px;
+        text-align: center;
+    }
+    .oder_xq_list dl .oder_l img{
+        width: 60px;
+        height: 60px;
+    }
+    .color999{
+        color: #999 !important;
+    }
+    .log_menu span{
+        margin-left: 11px;
+    }
+    .text-area{
+        width: 120px;
+        height: 60px;
+        background: #fff;
+        margin-top: 15px;
+        overflow-y: auto;
+        text-align: left;
+        padding: 0 3px;
+        margin-left: 5px;
+    }
+    .text-area i{
+        text-align: left;
+        position: relative;
+        top: 4px;
+        font-size: 12px;
+        color: #666;
+    }
+
+    #oder-detail .line60.logistic-input{
+        position: relative;
+        top: -15px;
+        height: 80px;
+    }
+    #oder-detail .line60.logistic-input span{
+        height: 30px;
+        line-height: 30px;
+        float: left;
+        margin-top: 10px;
+    }
+    #oder-detail .line60.logistic-input span .form-control{
+        border-radius: 2px;
+        border: #ccc 1px solid;
+    }
+    #oder-detail .line60.logistic-input span.input-ul{
+        width: 170px;
+        margin-right: 55px;
+        float: left
+    }
+    #oder-detail .line60.logistic-input span.input-ul input{
+        vertical-align: middle;
+        width:170px;
+        margin-top: -1px;
+        height: 32px;
+    }
+    #oder-detail .line60.logistic-input span.input-ul em{
+    }
+    #oder-detail .line60.logistic-input .logistic-input-01{
+        font-size: 14px;
+        margin-left: 40px;
+        line-height: 30px;
+    }
+    .com_log_list ul li p{
+        max-height: 40px;
+        overflow: hidden;
+        margin-bottom: 10px;
+        margin-top: 25px;
+        line-height: 20px;
+    }
+    .com_log_list{
+        height: 160px;
+    }
+    .com_log_list ul li span.adderss-name{
+        max-height: 40px;
+        overflow: hidden;
+    }
+    .com_log_list ul li{
+        width: 282px;
+        height: 124px;
+        background: url("static/img/user/images/adress_bg02.jpg") no-repeat;
+    }
+    .com_log_list ul li.active{
+        background-position: -283px 0;
+    }
 </style>
 <div class="user_right fr">
     <!--订单发货-->
-    <div class="sell_oder payment">
+    <div class="sell_oder payment" id="oder-detail">
         <!--确认订单信息-->
         <div class="sure_oder">
             <div class="log_menu">
                 <span><em class="title">订单信息</em>
-                    <b>订单号：<em ng-bind="::checkinvoice.orid" style="padding-right: 15px; width: 162px;"></em>
-                        <em><font class="gray">订单状态：</font>
+                    <b>订单号：<em ng-bind="::checkinvoice.orid" style="padding-right: 15px;" class="color333"></em>
+                        <em><font style="color: #333;">订单状态：</font>
                             <em ng-bind="checkinvoice.status | statusAndTypeFilter"></em>
                         </em>
                     </b>
@@ -132,19 +520,19 @@
                 <ul>
                     <li class="log_line">收货人信息：</li>
                     <li>
-                        <h4 ng-bind="checkinvoice.jsonSpAddress.company || '空'"></h4>
-                        <p class="textmore"><em ng-bind="::checkinvoice.jsonSpAddress.area"></em>,<em ng-bind="::checkinvoice.jsonSpAddress.detailAddress"></em></p>
-                        <span><em ng-bind="checkinvoice.jsonSpAddress.tel"></em>&nbsp;&nbsp;<em ng-bind="checkinvoice.buyerentername"></em></span>
+                        <!--<h4 ng-bind="checkinvoice.jsonSpAddress.company || '空'"></h4>-->
+                        <p class="" title=""><em ng-bind="::checkinvoice.jsonSpAddress.area"></em> <em ng-bind="::checkinvoice.jsonSpAddress.detailAddress"></em></p>
+                        <span class="adderss-name"><em ng-bind="checkinvoice.jsonSpAddress.tel"></em>&nbsp;&nbsp;<em ng-bind="checkinvoice.buyerentername"></em></span>
                     </li>
                     <li class="log_line">发货人信息：</li>
                     <li ng-if="jsonSdAddress.area">
-                        <h4 ng-bind="jsonSdAddress.company"></h4>
-                        <p class="textmore">{{jsonSdAddress.area}},{{jsonSdAddress.detailAddress}}</p>
-                        <span><em ng-bind="jsonSdAddress.tel"></em>&nbsp;&nbsp;<em ng-bind="jsonSdAddress.name"></em>
-                            <div>
-                                <a ng-if="checkinvoice.status!=404" class="taggle-address edit-address" ng-click="editAddr(jsonSdAddress)"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;编辑</a>
-                                <a ng-if="checkinvoice.status!=404" class="taggle-address" ng-click="taggleAddress(jsonSdAddress)"><i class="fa fa-refresh" aria-hidden="true"></i>&nbsp;切换</a>
-                                <a ng-if="checkinvoice.status!=404" class="taggle-address" ng-click="editAddr()"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;新建</a>
+                        <!--<h4 ng-bind="jsonSdAddress.company"></h4>-->
+                        <p class="">{{jsonSdAddress.area}},{{jsonSdAddress.detailAddress}}</p>
+                        <span class="adderss-name"><em ng-bind="jsonSdAddress.tel"></em>&nbsp;&nbsp;<em ng-bind="jsonSdAddress.name"></em>
+                            <div style="float: right; color: #ccc;">
+                                <a ng-if="checkinvoice.status!=404" class="taggle-address edit-address" ng-click="editAddr(jsonSdAddress)">编辑</a> |
+                                <!--<a ng-if="checkinvoice.status!=404" class="taggle-address" ng-click="taggleAddress(jsonSdAddress)"><i class="fa fa-refresh" aria-hidden="true"></i>&nbsp;切换</a>-->
+                                <a ng-if="checkinvoice.status!=404" class="taggle-address" ng-click="editAddr()">新增</a>
                             </div>
                         </span>
                     </li>
@@ -153,69 +541,215 @@
                     </li>
                 </ul>
             </div>
+            <!--订单列表-->
             <div class="oder_xq_list">
                 <dl class="clearfix">
                     <dt>
-                        <span class="wid01">产品型号</span>
-                        <span class="wid01">属性</span>
-                        <span>数量</span>
-                        <span>单价/币种</span>
-                        <span>小计</span>
-                        <span>备注</span>
+                        <span class="wd02">产品信息</span>
+                        <span class="wd01">交期(天)</span>
+                        <span class="wd01">单价</span>
+                        <span style="width: 10%;">数量</span>
+                        <span class="wd01">小计</span>
+                        <span class="wd01">物料编码</span>
+                        <span class="wd01">备注</span>
                     </dt>
-                    <dd>
-                        <span style="width: 100%; text-align: left;">买家：<em class="de_color" ng-bind="checkinvoice.buyerentername">HKJKLJKL</em></span>
+                    <!--<dd>-->
+                    <!--<span style="width: 100%; text-align: left; padding-left: 20px;" class="ng-binding"><img src="static/img/user/images/shop_home01.png">{{purchase.buyentername}}</span>-->
+                    <!--</dd>-->
+                    <dd class="order-company">
+						<span style="white-space: nowrap; width: 100%; text-align: left;">
+							<i style="min-width: 315px; display: inline-block">
+                                <i ng-bind="checkinvoice.buyername" style="color: #333; margin-left: 20px;"></i>
+                                <i style="color: #999; margin: 0 5px;">|</i>
+                                <i href="store/{{checkinvoice.storeid}}#/home" ng-bind="checkinvoice.buyerentername"></i>
+								<!--<a ng-if="purchase.pu_buyentername" name="{{purchase.id}}" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">|{{purchase.pu_buyentername}}</a>-->
+							</i>
+							<img src="static/img/common/songguo.png" style="margin-right:0; ">
+                            <!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>-->
+							<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" >联系买家</a>
+						</span>
                     </dd>
-                    <dd class="oder_l" ng-repeat="detail in checkinvoice.invoiceFPurchaseDetails">
-                            <span class="wid01">
-                                <a href="javascript:void(0)"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="42" height="42"/></a>
-                                <p ng-bind="detail.cmpCode"></p>
-                            </span>
-                        <span  class="wid01" ng-bind="detail.kiName"></span>
-                        <span ng-bind="detail.number | number"></span>
-                        <span ng-bind="detail.taxUnitPrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
-                        <span><em ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></em></span>
-                        <!--<span><font class="gray">无</font></span>-->
+                    <div ng-class="{'limit-3': !open}" style="width: 100%; margin: 0 auto; overflow: hidden;">
+                        <dd class="oder_l" ng-repeat="detail in checkinvoice.invoiceFPurchaseDetails">
+						<span class="wd02">
+							<a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/user/images/pro02.jpg'}}"/></a>
+							<p class="style01" style="margin-top: 10px;">类目：
+								<a ng-bind="detail.kiName" href="store/{{detail.storeid}}/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
+							</p>
+							<p class="style01">型号：
+								<a ng-bind="detail.cmpCode" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
+							</p>
+							<p class="style01">品牌：
+								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.branduuid}}" title="{{detail.brName}}" target="_blank"></a>
+							</p>
+						</span>
+                            <span class="wd01">交期：
+                                1-5
+							<!--<i ng-if="detail.b2cMinDelivery != detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery + '-' + detail.b2cMaxDelivery"></i>-->
+							<!--<i ng-if="detail.b2cMinDelivery == detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery"></i>-->
+						</span>
+                            <span class="wd01">
+							<em  ng-show="!isChange" ng-bind="detail.taxUnitPrice | formateNumber : 6 | currencySysmbol : detail.currencyName" style="color: #333;"></em>
+							<em ng-show="isChange" class="price-style">
+								<em  ng-bind="'' | currencySysmbol : detail.currencyName"></em>
+								<input ng-model="detail.currentTaxUnitPrice" type="number" ng-change="updateTotal()"/>
+							</em>
+						</span>
+                            <span style="width: 10%;" ng-bind="detail.number">100</span>
+                            <span ng-show="!isChange" class="wd01 red" ng-bind="detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+                            <span ng-show="isChange" class="wd01 red" ng-bind="detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+                            <!--物料编码-->
+                            <span class="wd01" style="line-height: 18px;">
+						<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
+                                <div class="text-area">
+                                    <i>金石为开取数据五块钱叫稍微亲上加亲</i>
+                                </div>
+						    </span>
+                            <span class="wd01" style="line-height: 18px;">
+							<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
+							<div class="text-area" ng-if="detail.remark">
+								<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+							</div>
+						</span>
+                        </dd>
+                    </div>
+                    <div class="open-more row" ng-class="{'none': checkinvoice.invoiceFPurchaseDetails.length <= 3}">
+                        <a href="javascript:void(0)" ng-click="$open=!open" ng-class="{'active': open}">
+                            <em ng-bind="open ? '收起' : '查看所有产品'"></em>
+                            <i class="fa fa-angle-up" ng-if="open"></i>
+                            <i class="fa fa-angle-down" ng-if="!open"></i>
+                        </a>
+                    </div>
+                    <dd class="oder-remark" ng-class="{'length3': checkinvoice.invoiceFPurchaseDetails.length > 3}">
+						<span style="width: 100%; padding-left: 20px;">
+							<em>订单备注：</em>
+							<i class="fl" ng-bind="purchase.purchaseRemark || '无'">用便宜的物流最好！</i>
+                            <!--<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="order.orderRemark"/>-->
+						</span>
                     </dd>
-                    <dd class="line60">
-                        <span style="width: 165px; text-align: left;padding-left: 10px;">配送方式：<b>物流配送</b></span>
-                        <span style="width: 5%;"> 物流 :&nbsp;</span>
-                        <span style="width: 170px;top: 50%;margin-top: -15px; margin-right: 55px;">
-                             <!--<input type="text" style="vertical-align: middle;width:170px; margin-top: -2px;" class="form-control" ng-model="logistics.companyName" placeholder="请输入物流公司" autocomplete="off" typeahead="log.companyName as log.companyName for log in logisticsInfo | filter:$viewValue | limitTo : 10" typeahead-on-select="onAssociateKindClick($item)" typeahead-min-length="0" />-->
-                            <input id="addr" type="text" class="form-control" ng-change="textChange()" ng-blur="onBlur()" ng-focus="getFocus()" ng-keydown="onKeyup()" ng-model="logistics.companyName"  placeholder="请输入物流公司" autocomplete="off" style="vertical-align: middle;width:170px; margin-top: -2px;" maxlength="15">
+                    <dd class="line60" style="border-bottom: none;">
+						<span class="wd02" style="width: 60%;text-align: left; margin-left: 40px;line-height: 30px; max-height: min-content;">
+                            配送方式：<em class="color333">第三方配送</em>
+                            <em class="color333">上门自提</em>
+                            <!--<i style="color: #666;">（满1000元包邮，未满足的订单收取运费20元）</i>-->
+						</span>
+                        <span class="total-price">
+								<p><strong>运费：</strong><em ng-bind="0 | formateNumber : 2 | currencySysmbol : purchase.currency.substring(0,3)" style="font-weight: bold"></em></p>
+								<p><strong>店铺合计：</strong>
+									<!--<em ng-if="!isChange" ng-bind="purchase.price | formateNumber : 2 | currencySysmbol : purchase.currency" style="font-weight: bold"></em>-->
+									<!--<em ng-if="isChange" ng-bind="purchase.currentTotal | formateNumber : 2 | currencySysmbol : purchase.currency" style="font-weight: bold"></em>-->
+                                    <em ng-bind="checkinvoice.ensurePrice  | formateNumber : 2 | currencySysmbol : checkinvoice.currencyName" style="font-weight: bold"></em>
+								</p>
+						</span>
+                        <!--<span class="user-address">-->
+                        <!--<i class="fl"><strong style="font-weight: inherit">自提点：</strong>营业时间：周一至周五 8:30-18:00</i><br/>-->
+                        <!--<i class="fl">地址：广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i>-->
+                        <!--&lt;!&ndash;<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="order.orderRemark"/>&ndash;&gt;-->
+                        <!--</span>-->
+                        <!--<span ng-if="!noLogisticInfoArray[purchase.status]" class="wd02">物流：{{logistics.companyName || '空'}}</span>-->
+                        <!--<span ng-if="!noLogisticInfoArray[purchase.status]" class="wd01">物流单号：{{logistics.number || '空'}}</span>-->
+                        <!--<span ng-show="!canShowInfo && !noLogisticInfoArray[purchase.status]" class="wd01 wd001"><em style="color: #b0b0b0; font-size: 12px;"><i class="fa fa-info-circle"></i>系统无法提供此物流信息，请根据物流单号到相应的官网查询。</em></span>-->
+                        <!--<span ng-show="!canShowInfo" class="wd01">系统无法提供</span>-->
+                        <!--<span><em ng-bind="freight | number : 2 | currencySysmbol : purchase.currency">￥20.00</em></span>-->
+                    </dd>
+                    <dd class="line60 logistic-input">
+                        <div  class="logistic-input-01" style="display: none;">
+                            自提点A 营业时间：<em>周一至周五 8:30-18:00</em><br/>
+                            地址：<em>广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城    </em>
+                        </div>
+                        <div>
+                            <span style="width: 10%; margin-left: 22px;"> 物流公司 :&nbsp;</span>
+                            <span class="input-ul">
+                            <input id="addr" type="text" class="form-control" ng-change="textChange()" ng-blur="onBlur()" ng-focus="getFocus()" ng-keydown="onKeyup()" ng-model="logistics.companyName"  placeholder="请输入物流公司" autocomplete="off"  maxlength="15">
                             <em name="companyName" ng-click="changeShowLogistics()" class="btn-position"><i class="fa fa-caret-down" aria-hidden="true"></i></em>
                             <ul id="ulContent" ng-if="showCompanyName && matchData" class="dropdown-menu">
-                                <li ng-click="showText(companyName)" ng-repeat="companyName in resultList" ng-class="{'active': $index==selectIndex}" ng-bind="companyName"></li>
+                            <li ng-click="showText(data.companyName)" ng-repeat="data in data_list" ng-class="{'active': $index==selectIndex}" ng-bind="data.companyName"></li>
                             </ul>
                         </span>
-
-                        <span style="margin-right: 20px; width: 160px;">
+                            <span  style="width: 10%;"> 物流单号 :&nbsp;</span>
+                            <span style="margin-right: 20px; width: 160px; float: left;">
                             <form name="myForm">
-                                <input name="number" type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" style="margin-top: 13px;" ng-pattern="/^[A-Za-z0-9]+$/" maxlength="20"/>
-                                <!--<span ng-show="myForm.number.$invalid && myForm.number.$dirty">请输入正确的</span>-->
+                            <input name="number" type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" ng-pattern="/^[A-Za-z0-9]+$/" maxlength="20"/>
                             </form>
-                            <!--<input type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" style="margin-top: 13px;" ng-pattern="/^[A-Za-z0-9]+$/"/>-->
                         </span>
-                        <em ng-if="showTip" style="color: #b0b0b0; font-size: 12px;"><i class="fa fa-info-circle"></i>系统无法提供此物流信息，请根据物流单号到相应的官网查询。</em>
-                        <!--<span style="width: 22%"><em>￥20.00</em></span>-->
-                    </dd>
-                    <dd class="price">
-                        <span style="width: 90%;">总计：<i ng-bind="checkinvoice.ensurePrice  | formateNumber : 2 | currencySysmbol : checkinvoice.currencyName"></i></span>
+                            <em ng-if="showTip" style="color: #b0b0b0;
+                            font-size: 12px;
+                            float: left;
+                            line-height: 33px;"><i class="fa fa-info-circle"></i>系统无法提供此物流信息，请根据物流单号到相应的官网查询。</em>
+                        </div>
                     </dd>
                     <dd class="pay_price">
-                        <p>
-                            <div ng-if="checkinvoice.status==406">
-                                <a href="javascript:void(0)" ng-click="saveCheck()" class="confirm">确认</a>
-                                <a href="vendor#/order/center" class="cancel">取消</a>
-                            </div>
-                            <div ng-if="checkinvoice.status==404">
-                                <a href="javascript:void(0)" ng-click="upateLogistic(checkinvoice)" class="confirm">确认</a>
-                                <a href="vendor#/order/center" class="cancel">取消</a>
-                            </div>
-                        </p>
+                        <div ng-if="checkinvoice.status==406">
+                            <a href="javascript:void(0)" ng-click="saveCheck()" class="confirm">确认发货</a>
+                            <a href="vendor#/order/center" class="cancel">取消</a>
+                            <a ng-click="addDistributor()" class="add">新增配送商</a>
+                        </div>
                     </dd>
                 </dl>
             </div>
+            <!--<div class="oder_xq_list">-->
+                <!--<dl class="clearfix">-->
+                    <!--<dt>-->
+                        <!--<span class="wid01">产品型号</span>-->
+                        <!--<span class="wid01">属性</span>-->
+                        <!--<span>数量</span>-->
+                        <!--<span>单价/币种</span>-->
+                        <!--<span>小计</span>-->
+                        <!--<span>备注</span>-->
+                    <!--</dt>-->
+                    <!--<dd>-->
+                        <!--<span style="width: 100%; text-align: left;">买家：<em class="de_color" ng-bind="checkinvoice.buyerentername">HKJKLJKL</em></span>-->
+                    <!--</dd>-->
+                    <!--<dd class="oder_l" ng-repeat="detail in checkinvoice.invoiceFPurchaseDetails">-->
+                            <!--<span class="wid01">-->
+                                <!--<a href="store/{{::detail.storeid}}/{{::detail.batchCode}}"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="42" height="42"/></a>-->
+                                <!--<p><a href="store/{{detail.storeid}}/{{::detail.batchCode}}" ng-bind="detail.cmpCode" title="{{detail.cmpCode}}" class="text-more" style="width: 160px;margin-top: 3px;"></a></p>-->
+                            <!--</span>-->
+                        <!--<span  class="wid01" ng-bind="detail.kiName"></span>-->
+                        <!--<span ng-bind="detail.number | number"></span>-->
+                        <!--<span ng-bind="detail.taxUnitPrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>-->
+                        <!--<span><em ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></em></span>-->
+                        <!--&lt;!&ndash;<span><font class="gray">无</font></span>&ndash;&gt;-->
+                    <!--</dd>-->
+                    <!--<dd class="line60">-->
+                        <!--<span style="width: 165px; text-align: left;padding-left: 10px;">配送方式：<b>物流配送</b></span>-->
+                        <!--<span style="width: 5%;"> 物流 :&nbsp;</span>-->
+                        <!--<span style="width: 170px;top: 50%;margin-top: -15px; margin-right: 55px;">-->
+                             <!--&lt;!&ndash;<input type="text" style="vertical-align: middle;width:170px; margin-top: -2px;" class="form-control" ng-model="logistics.companyName" placeholder="请输入物流公司" autocomplete="off" typeahead="log.companyName as log.companyName for log in logisticsInfo | filter:$viewValue | limitTo : 10" typeahead-on-select="onAssociateKindClick($item)" typeahead-min-length="0" />&ndash;&gt;-->
+                            <!--<input id="addr" type="text" class="form-control" ng-change="textChange()" ng-blur="onBlur()" ng-focus="getFocus()" ng-keydown="onKeyup()" ng-model="logistics.companyName"  placeholder="请输入物流公司" autocomplete="off" style="vertical-align: middle;width:170px; margin-top: -2px;" maxlength="15">-->
+                            <!--<em name="companyName" ng-click="changeShowLogistics()" class="btn-position"><i class="fa fa-caret-down" aria-hidden="true"></i></em>-->
+                            <!--<ul id="ulContent" ng-if="showCompanyName && matchData" class="dropdown-menu">-->
+                                <!--<li ng-click="showText(companyName)" ng-repeat="companyName in resultList" ng-class="{'active': $index==selectIndex}" ng-bind="companyName"></li>-->
+                            <!--</ul>-->
+                        <!--</span>-->
+
+                        <!--<span style="margin-right: 20px; width: 160px;">-->
+                            <!--<form name="myForm">-->
+                                <!--<input name="number" type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" style="margin-top: 13px;" ng-pattern="/^[A-Za-z0-9]+$/" maxlength="20"/>-->
+                                <!--&lt;!&ndash;<span ng-show="myForm.number.$invalid && myForm.number.$dirty">请输入正确的</span>&ndash;&gt;-->
+                            <!--</form>-->
+                            <!--&lt;!&ndash;<input type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" style="margin-top: 13px;" ng-pattern="/^[A-Za-z0-9]+$/"/>&ndash;&gt;-->
+                        <!--</span>-->
+                        <!--<em ng-if="showTip" style="color: #b0b0b0; font-size: 12px;"><i class="fa fa-info-circle"></i>系统无法提供此物流信息，请根据物流单号到相应的官网查询。</em>-->
+                        <!--&lt;!&ndash;<span style="width: 22%"><em>￥20.00</em></span>&ndash;&gt;-->
+                    <!--</dd>-->
+                    <!--<dd class="price">-->
+                        <!--<span style="width: 90%;">总计：<i ng-bind="checkinvoice.ensurePrice  | formateNumber : 2 | currencySysmbol : checkinvoice.currencyName"></i></span>-->
+                    <!--</dd>-->
+                    <!--<dd class="pay_price">-->
+                        <!--<p>-->
+                            <!--<div ng-if="checkinvoice.status==406">-->
+                                <!--<a href="javascript:void(0)" ng-click="saveCheck()" class="confirm">确认</a>-->
+                                <!--<a href="vendor#/order/center" class="cancel">取消</a>-->
+                            <!--</div>-->
+                            <!--<div ng-if="checkinvoice.status==404">-->
+                                <!--<a href="javascript:void(0)" ng-click="upateLogistic(checkinvoice)" class="confirm">确认</a>-->
+                                <!--<a href="vendor#/order/center" class="cancel">取消</a>-->
+                            <!--</div>-->
+                        <!--</p>-->
+                    <!--</dd>-->
+                <!--</dl>-->
+            <!--</div>-->
         </div>
     </div>
 </div>

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

@@ -298,7 +298,7 @@
 					<span style="width: 70px;">优先级排序</span>
 					<input type="text" class="form-control sort" ng-model="modifyRule.num" ng-blur="inputNum(modifyRule)">
 					<span><strong>*</strong>规则名称</span>
-					<input type="text" class="form-control rule" style="text-align: left;" ng-blur="checkRuleName()" ng-model="modifyRule.ruleName">
+					<input type="text" class="form-control rule" style="text-align: left;" ng-blur="checkRuleName()" ng-model="modifyRule.ruleName" placeholder="会在购物车中显示">
 				</div>
 				<div class="row radio-1">
 					<span>是否生效</span>

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

@@ -608,6 +608,93 @@
 	.border-bt-16:nth-of-type(1){
 		border-top: none;
 	}
+
+
+	.edit-logistic-box{
+		position: absolute;
+		width: 295px;
+		height: 184px;
+		box-shadow: 1px 1px 2px #ccc;
+		background: #fff;
+		right: 200px;
+		top: 30px;
+		border: #E8E8E8 1px solid;
+	}
+	.edit-logistic-box .title{
+		width: 100%;
+		height: 10px;
+		line-height: 25px;
+		position: relative;
+	}
+	.edit-logistic-box .title a{
+		position: absolute;
+		top: -3px;
+		right: 3px;
+		float: right;
+		color: #999 !important;
+		font-size: 16px !important;
+		text-decoration: none !important;
+	}
+	.edit-logistic-box .content{
+		width: 100%;
+		margin: 0 auto;
+		margin: 0 18px;
+	}
+	.edit-logistic-box .content .row{
+		line-height: 30px;
+		font-size: 14px;
+		text-align: left;
+		margin: 0;
+		margin-bottom: 14px;
+	}
+	.edit-logistic-box .content .row em{
+		display: inline-block;
+		width: 178px;
+		height: 30px;
+		position: absolute;
+		margin-left: 15px;
+	}
+	.edit-logistic-box .content .row em.btn-position{
+		position: absolute;
+		top: 1px;
+		right: 0px;
+		height: 30px;
+		width: 20px;
+		text-align: center;
+		display: inline-block;
+		font-size: 24px;
+		color: #fff;
+		background: #5078cb;
+		cursor: pointer;
+		border-bottom-right-radius: 3px;
+		border-top-right-radius: 3px;
+	}
+	.edit-logistic-box .content .row em input{
+		display: inline-block;
+		height: 30px;
+	}
+	.edit-logistic-box .edit-deal a{
+		width: 70px;
+		height: 30px;
+		display: inline-block;
+		text-align: center;
+		line-height: 30px;
+		font-size: 14px;
+		text-decoration: none !important;
+	}
+	.edit-logistic-box .edit-deal a.off{
+		background: #cdcccc;
+		color: #666;
+		margin-right: 8px;
+	}
+	.edit-logistic-box .edit-deal a.ok{
+		background: #5078cb;
+		color: #fff;
+	}
+	.edit-logistic-box .edit-deal a:hover{
+		background: #337ab7;
+		color: #fff !important;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
@@ -806,11 +893,12 @@
                                 <a class="oder_d action-link" href="vendor#/logistics/query/{{purchase.purchaseid | EncryptionFilter}}" ng-if="purchase.status == 404 || purchase.status == 520 || purchase.status == 405 || purchase.status == 503 || purchase.status == 514" target="_blank">查看物流</a>
                             </div>
                         </span>
-						<span class="click_shop">
+						<span class="click_shop" style="position: relative">
                             <div ng-if="$index == 0">
                                 <a class="order-operation" href="javascript:void(0)" ng-if="(purchase.status == 502 || purchase.status == 406)&&(purchase.uasPurcid == null)" ng-click="toBeShiped(purchase)">点击发货</a>
 								<a ng-if="purchase.uasPurcid" style="text-decoration: none;color: #323232;">来源UAS</a>
-                                <a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>
+                                <!--<a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>-->
+								<a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="modifyLogistic(purchase)" style="position: relative;">修改物流</a>
                                 <div class="seller-ship-tip" ng-if="purchase.status == 404 && purchase.lgtId &&!purchase.uasPurcid" style="position: relative;">
                                     <img src="static/img/common/notice-tip.png" ng-mouseover="purchase.noticeTip = true" ng-mouseleave="purchase.noticeTip = false"/>
                                     <div class="ship-notify" ng-if="purchase.noticeTip">
@@ -818,6 +906,53 @@
                                       <div class="content">若物流信息填写有误，请重新填写</div>
                                     </div>
                                 </div>
+								<!--修改物流-->
+								<div class="edit-logistic-box" ng-if="purchase.showLogistics">
+									<div class="title"><a ng-click="cancelModify(purchase)">&times;</a></div>
+									<div class="content">
+										<div class="row">配送方式: <em>{{deliveryMethod[purchase.sendType]}}</em></div>
+										<div class="row">物流公司:
+											<em>
+												<input type="text" class="form-control" ng-model="logistics.companyName"/>
+												<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>
+                            					</ul>
+											</em>
+										</div>
+										<div class="row">物流单号: <em>
+											<input type="text" class="form-control" ng-model="logistics.number"/>
+										</em></div>
+										<div class="edit-deal">
+											<a ng-click="cancelModify(purchase)" class="off">取消</a>
+											<a ng-click="ensureModifyLogistics(purchase)" class="ok">确认</a>
+										</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>

src/main/webapp/resources/view/vendor/modal/vendor_distributor_manage.html

@@ -395,7 +395,7 @@
             </tr>
             <tr class="record-num">
                 <td colspan="6">
-                    <span class="count-tip">显示<span ng-bind="$$kdnData.start">23</span>-<span ng-bind="$$kdnData.end">10</span>，共：<span ng-bind="$$kdnData.totalElements" style="color: #5078cb;">23</span>个</span>
+                    <span class="count-tip">显示 <span ng-bind="$$kdnData.start">23</span>-<span ng-bind="$$kdnData.end">10</span> ，共：<span ng-bind="$$kdnData.totalElements" style="color: #5078cb;">23</span> 个</span>
                 </td>
             </tr>
         </table>