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

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

@@ -150,7 +150,7 @@ define([ 'app/app' ], function(app) {
 						$scope.receiveBankInfo = angular.fromJson(data.jsonReceive);
 						$scope.pamentBankInfo = angular.fromJson(data.jsonPament);
 						$scope.transferTime = data.transferTime;
-						$scope.imgUrl = data.imgUrl;
+						$scope.imgUrls = data.imgUrl.split(',');
 					});
 				}
 				getBankInfo();

src/main/webapp/resources/view/admin/trade/trade_order_detail.html

@@ -400,7 +400,7 @@
 		</div>
 		<div class="row-fluid" ng-if="orderDetailInfo.banktfid != null">
 			<div class="col-md-3">
-				<span><a target="_blank"  href="{{imgUrl}}"><image alt="付款截图" ng-src="{{imgUrl}}" height="30px" width="60px"></image></a></span>
+				<span ng-repeat="item in imgUrls"><a target="_blank"  href="{{item}}"><image alt="付款截图" ng-src="{{item}}" height="30px" width="60px"></image></a></span>
 			</div>
 			<div class="col-md-3">
 				<span>付款方：</span><span ng-bind="orderDetailInfo.buyername"></span><span ng-if="orderDetailInfo.buyerentername" ng-bind="' | '+orderDetailInfo.buyerentername"></span>

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

@@ -678,11 +678,6 @@
                         <th width="80">操作</th>
                     </tr>
                     </thead>
-                    <tbody class="bottom-no">
-                    <tr style="height: 14px;">
-                        <td colspan="10" class="hei16"></td>
-                    </tr>
-                    </tbody>
                     <tbody>
                     <tr class="edit-form tr-bg" ng-repeat="commodity in currenctGoods">
                         <td class="middle padding0 check-input">