结算页功能完善

src/main/java/com/uas/platform/b2c/logistics/model/InvoiceFPurchase.java

@@ -162,13 +162,31 @@ public class InvoiceFPurchase extends Document implements Serializable {
 	private String currencyName;
 
 	/**
-	 * 价税合计
+	 * 运费
+	 */
+	@Column(name = "in_fare")
+	private Double fare;
+
+	/**
+	 * 适用的配送规则
+	 */
+	@Column(name = "in_rule")
+	private String jsonRule;
+
+	/**
+	 * 自提点信息
+	 */
+	@Column(name = "in_take_self")
+	private String jsonTakeSelf;
+
+	/**
+	 * 价税合计 （商品合计）
 	 */
 	@Column(name = "in_price")
 	private Double price;
 
 	/**
-	 * 确认金额（考虑商城打折的情况）
+	 * 确认金额（考虑商城打折的情况）(包括运费)
 	 */
 	@Column(name = "ensure_price")
 	private Double ensurePrice;
@@ -543,6 +561,30 @@ public class InvoiceFPurchase extends Document implements Serializable {
 		this.infpuRemark = infpuRemark;
 	}
 
+	public Double getFare() {
+		return fare;
+	}
+
+	public void setFare(Double fare) {
+		this.fare = fare;
+	}
+
+	public String getJsonRule() {
+		return jsonRule;
+	}
+
+	public void setJsonRule(String jsonRule) {
+		this.jsonRule = jsonRule;
+	}
+
+	public String getJsonTakeSelf() {
+		return jsonTakeSelf;
+	}
+
+	public void setJsonTakeSelf(String jsonTakeSelf) {
+		this.jsonTakeSelf = jsonTakeSelf;
+	}
+
 	/**
 	 * @Tip 对象初始化时必须给历史记录赋值
 	 */
@@ -571,5 +613,6 @@ public class InvoiceFPurchase extends Document implements Serializable {
 		this.storeid = purchase.getStoreid();
 		this.orid = purchase.getOrderid();
 		this.infpuRemark = purchase.getPurchaseRemark();
+		this.fare = purchase.getFare();
 	}
 }

src/main/java/com/uas/platform/b2c/logistics/service/impl/AddressServiceImpl.java

@@ -49,7 +49,8 @@ public class AddressServiceImpl implements AddressService {
 			}
 			if (!CollectionUtils.isEmpty(addresses) && addresses.size() > 0) {
 				if (addresses.size() == 1){
-					addresses.get(0).setNum(1);
+					Address add = addresses.get(0);
+					add.setNum(1);
 				}else {
 					int num = 0;
 					if (modifyNum == 1) {
@@ -87,7 +88,6 @@ public class AddressServiceImpl implements AddressService {
 		long modifyId = address.getId().longValue();
 		int modifyNum = address.getNum().intValue();
 		if (setTop){
-//			System.out.println("设为默认地址情况");
 			for (Address add : addresses) {
 				if (add.getId().longValue() == modifyId) {
 					add.setNum(1);
@@ -98,14 +98,12 @@ public class AddressServiceImpl implements AddressService {
 			}
 		}else {
 			if (modifyNum == 1){ //取消默认地址
-//				System.out.println("取消默认地址情况");
 				for (Address add : addresses) { //空出默认地址位置
 					add.setNum(++num);
 				}
 			}else {
 				int firstNum = addresses.get(0).getNum();
 				if (firstNum == 1){ //有默认地址情况
-//					System.out.println("有默认地址新增地址情况");
 					num++; //空出默认地址位置
 					for (Address add : addresses) {
 						if (add.getNum() != 1){
@@ -118,7 +116,6 @@ public class AddressServiceImpl implements AddressService {
 						}
 					}
 				}else { //没有默认地址情况
-//					System.out.println("没有默认地址新增地址情况");
 					num++; //空出默认地址位置
 					for (Address add : addresses) {
 						if (add.getId().longValue() != modifyId){
@@ -163,13 +160,14 @@ public class AddressServiceImpl implements AddressService {
 		}
 		Long modifyId = address.getId();
 		Address add = save(address);
-		System.out.println(address.getId());
+		//如果id为空，且num为1，则自动设为默认地址
+		if (modifyId == null && add.getNum().intValue() == 1){
+			isSetTop = true;
+		}
 		if(modifyId == null || isSetTop) { //只有新增加的地址 或者需要被置顶的地址 才需要重新排序。
-//			System.out.println("新增地址或设为默认地址");
 			setTop(add.getId(), isSetTop);
 		}
-		if (address.getNum() == 1 && !isSetTop) { //取消默认地址的时候需要重新排序
-//			System.out.println("取消默认地址");
+		if (address.getNum().intValue() == 1 && !isSetTop) { //取消默认地址的时候需要重新排序
 			setTop(add.getId(), isSetTop);
 		}
 		return add;

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFPurchaseServiceImpl.java

@@ -118,6 +118,14 @@ public class InvoiceFPurchaseServiceImpl implements InvoiceFPurchaseService {
 		Long uu = SystemSession.getUser().getUserUU();
 		Date date = new Date();
 		InvoiceFPurchase inFpu = new InvoiceFPurchase(purchase);
+
+		//保存适用配送规则和自提点信息
+		if (purchase.getJsonRule() != null){
+			inFpu.setJsonRule(purchase.getJsonRule());
+		}
+		if (purchase.getJsonTakeSelf() != null){
+			inFpu.setJsonTakeSelf(purchase.getJsonTakeSelf());
+		}
 		// 生成出货单号
 		String invoiceid = createNumberService.generateVoucherId(EncodingRulesConstant.INVOICE_FROMPURCHASE,
 				"trade$invoice_fmpu", 8);
@@ -166,6 +174,8 @@ public class InvoiceFPurchaseServiceImpl implements InvoiceFPurchaseService {
 		inFpu.setTaxes(taxes);
 		price = NumberUtil.pricesScaleTwo(price);
 		inFpu.setPrice(price);
+		//添加运费
+		ensurePrice = NumberUtil.add(ensurePrice, inFpu.getFare());
 		ensurePrice = NumberUtil.pricesScaleTwo(ensurePrice);
 		inFpu.setEnsurePrice(ensurePrice);
 		inFpu.setNumber(number);

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

@@ -27,6 +27,13 @@ define(['app/app'], function(app) {
 			603: true
 		};
 
+		//配送方式列表
+		$scope.deliveryMethod = {
+			1301 : '第三方配送',
+			1302 : '卖家配送',
+			1303 : '上门自提'
+		};
+
 		// TODO 暂时假设运费固定为0
 		$scope.freight = 0;
 
@@ -179,6 +186,14 @@ define(['app/app'], function(app) {
 				if ($scope.order.orderRemark){
 					$scope.remarkList = angular.fromJson($scope.order.orderRemark);
 				}
+				if ($scope.order.jsonRule){
+					$scope.rule = angular.fromJson($scope.order.jsonRule);
+				}
+				//自提点信息
+				if ($scope.order.jsonTakeSelf){
+					$scope.takeSelf = angular.fromJson($scope.order.jsonTakeSelf);
+					$scope.takeSelf.area = $scope.takeSelf.area.replace(/,/g,' ');
+				}
 				// 设置状态样式
 				$scope.stepStyle($scope.order.status);
 				// 获取物流信息

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

@@ -234,6 +234,9 @@ define(['app/app'], function(app) {
 			if ($scope.order.status == 501){
 				DistributionRule.findUsableRule({area:$scope.payment.address.area}, $scope.storeArray, function (data) {
 					if (data){
+						//更换地址后先清空数据
+						$scope.deliveryList = {};
+						$scope.fareList = {};
 						angular.forEach($scope.storeArray, function (item) {
 							$scope.ruleMap[item.uuid] = [];
 							var arr = data[item.uuid];
@@ -271,9 +274,15 @@ define(['app/app'], function(app) {
 			updateStoreArray(detail);
 			$q.all([updateFare($scope.ruleMap[detail.storeid], $scope.storePrice[detail.storeName]).$promise]).then(function (data) {
 				if (data){
+					var id = $scope.deliveryList[detail.storeid].id;
 					var arr = data[0];
 					$scope.ruleMap[detail.storeid] = arr;
-					$scope.deliveryList[detail.storeid] = arr[0];
+					angular.forEach(arr, function (item) {
+						if (item.id == id){
+							$scope.deliveryList[detail.storeid] = item;
+							$scope.fareList[detail.storeid] = item.fare;
+						}
+					});
 					$scope.calculateFare();
 				}
 			});
@@ -295,9 +304,15 @@ define(['app/app'], function(app) {
 			updateStoreArray(detail);
 			$q.all([updateFare($scope.ruleMap[detail.storeid], $scope.storePrice[detail.storeName]).$promise]).then(function (data) {
 				if (data){
+					var id = $scope.deliveryList[detail.storeid].id;
 					var arr = data[0];
 					$scope.ruleMap[detail.storeid] = arr;
-					$scope.deliveryList[detail.storeid] = arr[0];
+					angular.forEach(arr, function (item) {
+						if (item.id == id){
+							$scope.deliveryList[detail.storeid] = item;
+							$scope.fareList[detail.storeid] = item.fare;
+						}
+					});
 					$scope.calculateFare();
 				}
 			});
@@ -324,8 +339,7 @@ define(['app/app'], function(app) {
 		var updateFare = function (ruleList, price) {
 			return DistributionRule.findFareOfRule({price:price}, ruleList, function (data) {
 				if (data){
-					var rule = ruleList[0];
-					$scope.fareList[rule.uuid] = rule.fare;
+
 				}
 			}, function (error) {
 				// toaster.pop("error", error.data);
@@ -349,9 +363,15 @@ define(['app/app'], function(app) {
 			updateStoreArray(detail);
 			$q.all([updateFare($scope.ruleMap[detail.storeid], $scope.storePrice[detail.storeName]).$promise]).then(function (data) {
 				if (data){
+					var id = $scope.deliveryList[detail.storeid].id;
 					var arr = data[0];
 					$scope.ruleMap[detail.storeid] = arr;
-					$scope.deliveryList[detail.storeid] = arr[0];
+					angular.forEach(arr, function (item) {
+						if (item.id == id){
+							$scope.deliveryList[detail.storeid] = item;
+							$scope.fareList[detail.storeid] = item.fare;
+						}
+					});
 					$scope.calculateFare();
 				}
 			});
@@ -427,7 +447,7 @@ define(['app/app'], function(app) {
 			}
 			var validTakeSelf = checkTakeSelf();
 			if (!validTakeSelf){
-				toaster.pop("info", "当前无选择自提点信息ddd");
+				toaster.pop("info", "请选择一个自提点");
 				return ;
 			}
 			var orderInfos = [], orderInfo;

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

@@ -184,14 +184,14 @@ define([ 'app/app' ], function(app) {
         $scope.checkRuleNameSize = function () {
             if ($scope.modifyRule.ruleName){
                 var size = $scope.modifyRule.ruleName.replace(/[^x00-xFF]/g,'**').length;
-                if (size > 20) {
+                if (size > 50) {
                     $scope.nameError = true;
                 }else {
                     $scope.nameError = false;
                 }
             }
             if ($scope.nameError){
-                toaster.pop("error", "规则名称，最多可输入10个文字")
+                toaster.pop("error", "规则名称，最多可输入25个文字");
                 return;
             }
         };
@@ -329,7 +329,7 @@ define([ 'app/app' ], function(app) {
                 return false;
             }
             if($scope.nameError){
-                toaster.pop('error', "规则名称，最多可输入10个文字");
+                toaster.pop('error', "规则名称，最多可输入25个文字");
                 return false;
             }
             if($scope.repeatError){
@@ -717,7 +717,6 @@ define([ 'app/app' ], function(app) {
                 }
             };
 
-
             /**
              * 折叠或展开文件夹
              * @param item

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

@@ -52,7 +52,8 @@ define(['app/app'], function(app) {
         $scope.findAllKdnList();
 
         $scope.showText = function (data) {
-            $scope.logistics.companyName = data;
+            $scope.logistics.companyName = data.companyName;
+            $scope.companyObject = data;
             $scope.showCompanyName = false;
         };
 
@@ -125,6 +126,13 @@ define(['app/app'], function(app) {
                 $scope.checkinvoice.jsonSpAddress = angular.fromJson($scope.checkinvoice.jsonSpAddress);
                 $scope.checkinvoice.jsonSpAddress.area = $scope.checkinvoice.jsonSpAddress.area.replace(/,/g,' ');
                 $scope.checkinvoice.show = false;
+                if ($scope.checkinvoice.jsonRule){
+                    $scope.rule = angular.fromJson($scope.checkinvoice.jsonRule);
+                }
+                if ($scope.checkinvoice.jsonTakeSelf){
+                    $scope.takeSelf = angular.fromJson($scope.checkinvoice.jsonTakeSelf);
+                    $scope.takeSelf.area = $scope.takeSelf.area.replace(/,/g,' ');
+                }
                 //现在默认物公司
                 $scope.checkinvoice.deliveryType = 'logistics';
             }, function (response) {
@@ -463,7 +471,6 @@ define(['app/app'], function(app) {
                     toaster.pop('error', '注意', '请选择物流公司');
                     return false;
                 }
-                console.log($scope.logistics.companyName);
                 if ($scope.logistics.companyName == '请选择物流公司'){
                     toaster.pop('error', '注意', '请选择物流公司');
                     return false;

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

@@ -320,7 +320,8 @@
 				<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 style="margin-right: 0;" ng-if="order.status != 603"><font class="color999">取消原因：</font>{{order.unavailableReason.reason}}</em>
+						<em style="margin-right: 0;" ng-if="order.status == 603"><font class="color999">取消原因：</font>超时未付款自动取消</em>
 						<em><font class="color999">订单状态：</font>{{order.status | orderStatus}}</em>
 					</b>
 				</span>
@@ -414,11 +415,11 @@
 						</span>
 					</dd>
 					<dd class="line60">
-						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：第三方配送
-							<!--<i style="color: #666;">（满1000元包邮，未满足的订单收取运费20元）</i>-->
+						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[order.deliverytype]"></i>
+							<i style="color: #999;" ng-if="rule" ng-bind="'(' + rule.ruleName + ')'">（满1000元包邮，未满足的订单收取运费20元）</i>
 						</span>
 						<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-bind="order.fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em></p>
 								<p><strong>店铺合计：</strong>
 									<em ng-bind="order.ensurePrice | formateNumber : 2 | currencySysmbol : order.currency" style="font-weight: bold"></em>
 								</p>
@@ -429,10 +430,10 @@
 						<!--<span><em ng-bind="freight | number : 2 | currencySysmbol : purchase.currency">￥20.00</em></span>-->
 						<!--物流的价格先隐藏-->
 					</dd>
-					<dd class="line60">
+					<dd class="line60" ng-if="order.deliverytype == 1303 && takeSelf">
 						<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>
+							<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;" ng-bind="takeSelf.takename">自提点A</strong>营业时间：<i ng-bind="takeSelf.businesstime">周一至周五 8:30-18:00</i></i><br/>
+							<i class="fl">地址：<i ng-bind="takeSelf.area"></i>  <i ng-bind="takeSelf.detailAddress">科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></i>
 						</span>
 					</dd>
 					<!--<dd class="price">-->

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

@@ -622,7 +622,7 @@
 								</p>
 							</span>
 							<span style="line-height: 18px;">
-                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" maxlength="10" ng-model="detail.goodsnumber"></textarea>
+                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" maxlength="20" ng-model="detail.goodsnumber"></textarea>
                         		<div class="text-area" ng-if="order.status!=501 && detail.goodsnumber">
 									<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
 								</div>
@@ -658,7 +658,7 @@
 									<em class="color333" ng-if="deliveryList" ng-bind="deliveryMethod[deliveryList[details[0].storeid].method]"></em>
 								</em>
 								<i ng-if="order.status == 501">
-									<i style="margin-left: 0px;" ng-bind="deliveryList[details[0].storeid].ruleName"></i>
+									<i style="margin-left: 0px;" ng-if="deliveryList[details[0].storeid]" ng-bind="deliveryList[details[0].storeid].ruleName"></i>
 									<i style="margin-left: 0px;" ng-if="!payment.address">请选择收货地址</i>
 									<i style="margin-left: 0px;" ng-if="payment.address && ruleMap[details[0].storeid].length == 0">当前地址不支持配送，请与卖家协商处理</i>
 								</i>
@@ -699,7 +699,7 @@
 									</li>
 								</ul>
 						</div>
-						<dd class="line60" ng-if="order.status!=501">
+						<dd class="line60" ng-if="order.status!=501 && (takeList ? takeList[details[0].storeid] : takeSelf)">
 							<span class="user-address" style="padding-left: 40px;" ng-if="takeList && takeList[details[0].storeid]">
 								<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;" ng-bind="takeList[details[0].storeid].takename">自提点A</strong>
 								{{takeList[details[0].storeid].businesstime}}</i><br/>

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

@@ -354,7 +354,8 @@
 				<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 style="margin-right: 25px;" ng-if="purchase.status != 603"><font class="color999">取消原因：</font>{{purchase.unavailableReason.reason}}</em>
+						<em style="margin-right: 25px;" ng-if="purchase.status == 603"><font class="color999">取消原因：</font>超时未付款自动取消</em>
 						<em><font class="color999">订单状态：</font>{{purchase.status | purchaseStatus}}</em>
 					</b>
 				</span>
@@ -460,7 +461,7 @@
 					</dd>
 					<dd class="line60">
 						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[purchase.sendType]"></i>
-							<i style="color: #666;font-size: 12px" ng-bind="rule.ruleName">（满1000元包邮，未满足的订单收取运费20元）</i>
+							<i style="color: #999;font-size: 12px" ng-bind="rule.ruleName">（满1000元包邮，未满足的订单收取运费20元）</i>
 						</span>
 						<span class="total-price">
 								<p><strong>运费：</strong><em ng-bind="purchase.fare | formateNumber : 2 | currencySysmbol : purchase.currency.substring(0,3)" style="font-weight: bold"></em></p>

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

@@ -454,11 +454,14 @@
         height: 80px;
         margin-top: -10px;
     }
+    #oder-detail .line60.logistic-input.h125{
+        height: 125px;
+    }
     #oder-detail .line60.logistic-input span{
         height: 30px;
         line-height: 30px;
         float: left;
-        margin-top: 10px;
+        margin-top: 5px;
     }
     #oder-detail .line60.logistic-input span .form-control{
         border-radius: 2px;
@@ -630,7 +633,7 @@
                     <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>
+							<i class="fl" ng-bind="checkinvoice.purchaseRemark || '无'">用便宜的物流最好！</i>
                             <!--<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="order.orderRemark"/>-->
 						</span>
                     </dd>
@@ -638,10 +641,10 @@
 						<span class="wd02" style="width: 60%;text-align: left; margin-left: 40px;line-height: 30px; max-height: min-content;">
                             配送方式：<em class="color333">{{deliveryMethod[checkinvoice.sendType]}}</em>
                             <!--<em class="color333">上门自提</em>-->
-                            <!--<i style="color: #666;">（满1000元包邮，未满足的订单收取运费20元）</i>-->
+                            <i style="color: #666;font-size: 12px" ng-bind="rule.ruleName">（满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-bind="checkinvoice.fare | formateNumber : 2 | currencySysmbol : checkinvoice.currencyName.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>-->
@@ -659,26 +662,22 @@
                         <!--<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" ng-if="checkinvoice.sendType==1303">
-                            自提点A 营业时间：<em>周一至周五 8:30-18:00</em><br/>
-                            地址：<em>广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城    </em>
-                        </div>
-                        <div ng-if="checkinvoice.sendType==1301">
+                    <dd class="line60 logistic-input" ng-class="{'h125': checkinvoice.sendType==1303}">
+                        <div style="width: 100%;margin: 0 auto;height: 45px;">
                             <span style="width: 10%; margin-left: 22px;">物流公司 :&nbsp;</span>
                             <span class="input-ul">
                                 <input id="addr" style="border: #5078cb 1px solid;" type="text" class="form-control select-adder" ng-focus="getItemFocus()" ng-blur="onItemBlur()" ng-keydown="onKeyup()" ng-model="logistics.companyName" placeholder="请选择物流公司" autocomplete="off" maxlength="15" readonly="readonly" >
                                 <!--<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" class="dropdown-menu">
-                                    <li ng-click="showText('请选择物流公司')">请选择物流公司</li>
-                                    <li ng-click="showText(data.companyName)" ng-repeat="data in data_list" ng-class="{'active': $index==selectIndex}" ng-bind="data.companyName"></li>
+                                    <li ng-click="logistics.companyName = '请选择物流公司'">请选择物流公司</li>
+                                    <li ng-click="showText(data)" ng-repeat="data in data_list" ng-class="{'active': $index==selectIndex}" ng-bind="data.companyName"></li>
                                 </ul>
                             </span>
                             <span  style="width: 10%;"> 物流单号 :&nbsp;</span>
                             <span style="margin-right: 20px; width: 160px; float: left;">
                             <form name="myForm">
                                 <!--ng-pattern="/^[A-Za-z0-9]+$/"-->
-                            <input name="number" type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" maxlength="20" autocomplete="off"/>
+                            <input name="number" type="text" class="form-control" style="height: 32px" ng-model="logistics.number" placeholder="请输入物流单号" maxlength="20" autocomplete="off"/>
                             </form>
                         </span>
                             <em ng-if="companyObject.isKdn==0" style="color: #b0b0b0;
@@ -686,6 +685,10 @@
                             float: left;
                             line-height: 33px;"><i class="fa fa-info-circle"></i>系统无法提供此物流信息，请根据物流单号到相应的官网查询。</em>
                         </div>
+                        <div  class="logistic-input-01" ng-if="checkinvoice.sendType==1303">
+                            <i ng-bind="takeSelf.takename"></i> &nbsp;&nbsp;营业时间：<em ng-bind="takeSelf.businesstime">周一至周五 8:30-18:00</em><br/>
+                            地址：<em ng-bind="takeSelf.area">广东省  深圳市  南山区</em>&nbsp;&nbsp;<em ng-bind="takeSelf.detailAddress">科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</em>
+                        </div>
                     </dd>
                     <dd class="pay_price">
                         <div ng-if="checkinvoice.status==406">