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

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

@@ -415,7 +415,7 @@ define([ 'app/app' ], function(app) {
           speed = 100
           clearInterval($scope.AnimationCanvas)
           $scope.showCanvas = false
-            if ($scope.needShowTip) {
+            if ($scope.needShowTip && $rootScope.$$productOn.tab !== 'bathOnPerson') {
                 $scope.relTableParams.page(1);
                 $scope.relTableParams.reload();
                 //$scope.result.success = 0;//设置成0，让前端用户不能点击

src/main/webapp/resources/view/common/footer.html

@@ -131,6 +131,7 @@ a:hover {
 		<a href="http://www.hiways.com" target="_blank" title="深圳市海威思科技">深圳市海威思科技</a>|
 		<a href="http://www.huashangweitai.com" target="_blank" title="深圳市华商维泰显示科技">深圳市华商维泰显示科技</a>|
 		<a href="http://www.ufct.com.cn/" target="_blank" title="联合创泰科技">联合创泰科技</a>
+		<a href="http://www.hi-mantech.com/" target="_blank" title="怡海能达">怡海能达</a>
 	</div>
 	<ul class="list-unstyled footer-bottom">
 		<li>客服电话：400-830-1818</li>

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

@@ -893,10 +893,10 @@
 			<div class="pay_com">
 				<span>发票信息详情
 					<!--<a ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<em ng-if="!bill.name">新增发票</em><em ng-if="bill.name">修改发票</em></a>-->
-					<span ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&(order.status == 501 || order.status == 503 || order.status == 504)"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<button ng-if="!bill.name">新增发票</button><button ng-if="bill.name">修改发票</button></span>
+					<span ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<button ng-if="!bill.name">新增发票</button><button ng-if="bill.name">修改发票</button></span>
 				</span>
 			</div>
-			<p class="bill-radio" ng-if="order.status == '501' || order.status == 503 || order.status == 504">
+			<p class="bill-radio" ng-if="order.status == '501'">
 				<span  ng-click="selectBill('1207')">
 					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1207'"/>
 					<label></label><em>暂不开票</em>
@@ -916,7 +916,7 @@
 			<div class="pay_oder_xq_list no-need-bill notice" ng-if="order.invoicetype!='1207' && !bill.name">
 				还没有对应的发票信息，请新增相应的发票信息
 			</div>
-			<div class="pay_oder_xq_list" ng-if="order.invoicetype&&order.invoicetype != '1207'&&bill.name">
+			<div class="pay_oder_xq_list" ng-if="order.invoicetype&&order.invoicetype != '1207'&& bill.name">
 				<p><em>发票类型：</em><span ng-bind="order.invoicetype | billTypeFilter "></span></p>
 				<p><em>发票抬头：</em><span ng-bind="bill.head || '空'"></span></p>
 				<p ng-if="order.invoicetype == '1205'"><em>单位地址：</em><span ng-bind="bill.companyAddress || '空'"></span></p>
@@ -928,6 +928,7 @@
 				<p><em>联系电话：</em><span ng-bind="bill.telephone || '空'"></span></p>
 				<p><em>详细地址：</em><span>{{bill.area}}, {{bill.detailAddress}}</span></p>
 			</div>
+			<div class="pay_oder_xq_list" ng-if="order.invoicetype === 1207 && !bill.name" style="font-size: 16px;line-height: 40px;text-align: center">暂无发票信息</div>
 		</div>
 		<!-- 付款金额 -->
 		<div class="sure_oder" style="margin-top: 10px">