Merge branch 'feature-yc-201813' into dev

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

@@ -497,6 +497,9 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           // 采纳报价
           $scope.adopt = function (of) {
             $http({
+                headers:{
+                    'content-Type':'application/x-www-form-urlencoded'
+                },
               method: 'POST',
               dataType: 'json',
               url: seekUrl + '/inquiry/buyer/adopt',
@@ -529,6 +532,9 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
               // 选择理由
               $scope.refuse = function (choice) {
                   $http({
+                      headers:{
+                          'content-Type':'application/x-www-form-urlencoded'
+                      },
                       method: 'POST',
                       dataType: 'json',
                       url: seekUrl + '/inquiry/buyer/refuse',

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

@@ -712,7 +712,7 @@
                 <td class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>
                 <td class="operate" ng-switch="seek.agreed">
                     <a ng-click="setLinkBoxIndex($index)">联系买家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                    <div class="is-say-price" ng-if="seek.agreed != 1 &&seek.agreed != 0">已报价 <img src="static/img/seekPurchase/check.png" alt="">
+                    <div class="is-say-price" ng-if="seek.agreed != 1 && seek.agreed != 0 || seek.replies">已报价 <img src="static/img/seekPurchase/check.png" alt="">
                         <div class="say-price-history">
                             <p class="price-title">历史报价</p>
                             <div>