Merge remote-tracking branch 'origin/release-201815-liusw' into release-201815-liusw

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

@@ -603,16 +603,6 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                   $scope.offerCount = 0;
                   $scope.replaceOfferCount = 0;
               }
-              if (seek.qutations && seek.qutations.length && $scope.isInit) {
-                  for (var i = 0; i < seek.qutations.length; i++) {
-                      if (seek.qutations[i].isReplace == 1) {
-                          $scope.replaceOfferCount++;
-                      } else {
-                          $scope.offerCount++;
-                      }
-                  }
-                  $scope.isInit = false;
-              }
             // $scope.offerCount = seek.offerAmount;
             $scope.currentSeek = seek;
               if (!seek.$status || seek.$status != 1) {
@@ -630,7 +620,17 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                     } else {
                         $scope.offer = seek.qutations;
                         clearSeekStatus();
-                        seek.$status = status;
+                        if (seek.qutations && seek.qutations.length && $scope.isInit) {
+                            for (var i = 0; i < seek.qutations.length; i++) {
+                                if (seek.qutations[i].isReplace == 1) {
+                                    $scope.replaceOfferCount++;
+                                } else {
+                                    $scope.offerCount++;
+                                }
+                            }
+                        }
+                        seek.$status = $scope.isInit ? $scope.offerCount == 0 ? 3 : 2 : status;
+                        $scope.isInit = false;
                     }
                 });
             } else if (status == 1 && $scope.goodsCount != 0) {// 查看现货

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

@@ -71,7 +71,7 @@
     .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block ul.similar-list {
         position: absolute;
         top: 23px;
-        left: 105px;
+        left: 110px;
         background: #fff;
         border: 1px solid #b5b5b5;
         z-index: 1;
@@ -246,7 +246,7 @@
     }
     .seek-purchase .seek-purchase-content >table >tbody.active .operate-seek,
     .seek-purchase .seek-purchase-content >table >tbody.active .expand-row > td {
-        border-right: 2px solid #f7a986;
+        border-right: 2px solid #f7a986 !important;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row:hover {
         background: #f1f5ff;
@@ -1068,7 +1068,7 @@
                 <th width="140">操作</th>
             </tr>
             </thead>
-            <tbody ng-repeat="seek in seekListData.content" ng-class="{'active': seek.$status && (seek.$status == 1 || seek.$status == 2)}">
+            <tbody ng-repeat="seek in seekListData.content" ng-class="{'active': seek.$status && (seek.$status == 1 || seek.$status == 2 || seek.$status == 3)}">
             <tr class="default-row" ng-mouseover="pauseTimer($index)" ng-mouseleave="startTimer($index)">
                 <td>
                     <div class="row-wrap">
@@ -1116,7 +1116,7 @@
                     <div class="row-wrap">
                         <span ng-if="seek.offerAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></span>
                         <span ng-if="seek.goodsAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">商城现货&nbsp;<i class="fa fa-angle-double-down"></i></span>
-                        <span ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
+                        <span ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2 || seek.$status == 3)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
                         <div class="sharecode" ng-mouseover="setShowShare(seek,$index)" ng-mouseleave="hideShare($index)">
                             <div class="sharecodeT">分<br/>享</div>
                             <div class="sharecodeBtn">

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

@@ -333,6 +333,7 @@
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div > div {
         display: inline-block;
         text-align: left;
+        width: 100%;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div > div:nth-child(1) {
         /*float: left;*/
@@ -374,6 +375,7 @@
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price:hover .say-price-history {
         height: 210px;
         opacity: 1;
+        overflow-y: auto;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate >img {
         position: absolute;
@@ -738,13 +740,13 @@
                             <div>
                                 <div>
                                     <div class="replace-param" ng-if="seek.isReplace == 1">
-                                        <span>替代物料品牌：</span><span ng-bind="seek.replaceBrand || '-'"></span>
+                                        <span>品牌：</span><span ng-bind="seek.replaceBrand || '-'"></span>
                                     </div>
                                     <div class="replace-param" ng-if="seek.isReplace == 1">
-                                        <span>替代物料型号：</span><span ng-bind="seek.replaceCmpCode || '-'"></span>
+                                        <span>型号：</span><span ng-bind="seek.replaceCmpCode || '-'"></span>
                                     </div>
                                     <div class="replace-param" ng-if="seek.isReplace == 1">
-                                        <span>替代物料规格：</span><span ng-bind="seek.replaceSpec || '-'"></span>
+                                        <span>规格：</span><span ng-bind="seek.replaceSpec || '-'"></span>
                                     </div>
                                     <span>交期：</span><span class="red-text" ng-bind="seek.leadtime + '天'">6 天</span>
                                 </div>

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

@@ -712,6 +712,7 @@
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price:hover .say-price-history {
         opacity: 1;
         height: 210px;
+        overflow-y: auto;
     }
     .say-price-box .switch-say {
         text-align: center;
@@ -907,13 +908,13 @@
                                 <p class="price-title">{{seek.quotation.isReplace == 1 ? '替代型号报价' : '当前型号报价'}}</p>
                                 <div>
                                     <div class="replace-param" ng-if="seek.quotation.isReplace == 1">
-                                        <span>替代物料品牌：</span><span ng-bind="seek.quotation.replaceBrand || '-'"></span>
+                                        <span>品牌：</span><span ng-bind="seek.quotation.replaceBrand || '-'"></span>
                                     </div>
                                     <div class="replace-param" ng-if="seek.quotation.isReplace == 1">
-                                        <span>替代物料型号：</span><span ng-bind="seek.quotation.replaceCmpCode || '-'"></span>
+                                        <span>型号：</span><span ng-bind="seek.quotation.replaceCmpCode || '-'"></span>
                                     </div>
                                     <div class="replace-param" ng-if="seek.quotation.isReplace == 1">
-                                        <span>替代物料规格：</span><span ng-bind="seek.quotation.replaceSpec || '-'"></span>
+                                        <span>规格：</span><span ng-bind="seek.quotation.replaceSpec || '-'"></span>
                                     </div>
                                     <div class="replace-param">
                                         <span>交期：</span><span class="red-text" ng-bind="seek.quotation.leadtime + '天'"></span>