Merge remote-tracking branch 'origin/liusw-seekpurchae-v2.0.1.13' into liusw-seekpurchae-v2.0.1.13

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

@@ -555,6 +555,7 @@ define(['app/app'], function (app) {
 
           $scope.showUseFlag = false;
           $scope.setShowUseFlag = function (flag, offer) {
+            $scope.purchaseQuantity = null;
             if (flag) {
               $scope.currentOffer = offer;
             }
@@ -606,7 +607,7 @@ define(['app/app'], function (app) {
               file: file,
               method: 'POST'
             }).success(function(data) {
-              window.open("http://10.1.51.90:3000/applyPurchase/" + data.data);
+              window.open("applyPurchase/" + data.data);
             }).error(function(response) {
             });
           };

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

@@ -509,7 +509,7 @@
                 </td>
                 <td ng-bind="seek.encapsulation || '-'" title="{{seek.encapsulation}}">盘装</td>
                 <td ng-bind="seek.produceDate || '-'" title="{{seek.produceDate}}">2012-12-12</td>
-                <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" class="red-text"></span>&nbsp;天&nbsp;<span ng-bind="getHours(seek.remainingTime)" class="red-text">5</span>&nbsp;小时</td>
+                <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span style="color: red;">已截止</span></td>
                 <td ng-switch="seek.status">
                     <span ng-switch-when="200" style="color:red;">待报价</span>

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

@@ -699,7 +699,7 @@
                 </td>
                 <td ng-bind="seek.encapsulation || '-'" title="{{seek.encapsulation}}">盘装</td>
                 <td ng-bind="seek.produceDate || '-'" title="{{seek.produceDate}}">2012-12-12</td>
-                <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" class="red-text"></span>&nbsp;天&nbsp;<span ng-bind="getHours(seek.remainingTime)" class="red-text">5</span>&nbsp;小时</td>
+                <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span style="color: red;">已截止</span></td>
                 <td ng-switch="seek.status">
                     <span ng-switch-when="200" style="color:red;">待报价</span>

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

@@ -536,7 +536,7 @@
                 <td class="unit-price">
                     <span>{{seek.currency + seek.unitPrice | currencyStr}}</span>
                 </td>
-                <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)"></span>&nbsp;天&nbsp;<span ng-bind="getHours(seek.remainingTime)">5</span>&nbsp;小时</td>
+                <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
                 <td class="operate" ng-switch="seek.status">
                     <a>联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>

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

@@ -470,7 +470,7 @@
                     <td class="unit-price">
                         <span>{{seek.currency + seek.unitPrice | currencyStr}}</span>
                     </td>
-                    <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)"></span>&nbsp;天&nbsp;<span ng-bind="getHours(seek.remainingTime)">5</span>&nbsp;小时</td>
+                    <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                     <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
                     <td class="operate">
                         <a>联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>