Merge remote-tracking branch 'origin/dev' into dev

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

@@ -509,7 +509,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                 of.agreed = 1;
               // $scope.seekPurchaseTableParams.reload();
             }).error(function (response) {
-              toaster.pop('error', response ? response.message : '出现异常，处理失败');
+              toaster.pop('error', response ? response.message : '该单据可能已被操作，请刷新后重试');
             });
           }
 
@@ -545,7 +545,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                       $scope.currentRefuseOffer.agreed = 0;
                       // $scope.seekPurchaseTableParams.reload();
                   }).error(function (response) {
-                      toaster.pop('error',  response ? response.message : '出现异常，处理失败');
+                      toaster.pop('error', response ? response.message : '该单据可能已被操作，请刷新后重试');
                   });
               }