Merge remote-tracking branch 'origin/release-201813-yc' into release-201813-yc

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

@@ -553,7 +553,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                       toaster.pop('refuse', '已拒绝报价');
                       $scope.setShowCurrentRefuseOffer(false);
                       $scope.currentRefuseOffer.agreed = 0;
-                      $scope.refusedreason =  choice
+                      $scope.currentRefuseOffer.refusereason =  choice
                       // $scope.seekPurchaseTableParams.reload();
                   }).error(function (response) {
                       toaster.pop('error', response ? response.message : '该单据可能已被操作，请刷新后重试');

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

@@ -1242,7 +1242,7 @@
                                                 </div>
                                             </div>
                                             <b class="refused-show" ng-if="of.agreed == 0">拒绝原因 <img src="static/img/seekPurchase/refu.png" alt="">
-                                                <a class="say-price-history" ng-bind="refusedreason"></a>
+                                                <a class="say-price-history" ng-bind="of.refusereason"></a>
                                             </b>
                                             <img ng-if="of.agreed == 1" src="static/img/seekPurchase/recieved.png" alt="" class="ng-scope">
                                             <img ng-if="of.agreed == 0" src="static/img/seekPurchase/refused.png" alt="" class="ng-scope">