Merge branch 'dev' into release-20170915

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -11,7 +11,7 @@ define(['app/app'], function (app) {
         var enIdFilter = $filter('EncryptionFilter');
         // 默认状态为所有订单
         if (SessionService.getCookie('status')){
-            $scope.status = SessionService.get('status');
+            $scope.status = SessionService.getCookie('status');
             SessionService.removeCookie('status');
         }else {
             $scope.status = 'all';