处理B2B合并bug

src/main/webapp/resources/js/admin/app.js

@@ -1014,7 +1014,7 @@
          		window.location.href = 'admin#/check/request_pay/' + data.sellerenuu
 			 }
              if (data.type == "CONFIRM_PAID_TYPE") {
-                 window.location.href = '/admin#/trade/order/' + enIdFilter(data.orderid)
+                 window.location.href = 'admin#/trade/order/' + enIdFilter(data.orderid)
              }
              if (data.type == "FINANCIAL_SETTLEMENT_TYPE") {
                  window.location.href = 'admin#/check/settlement'

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -359,7 +359,7 @@ define([ 'app/app' ], function(app) {
             };
             // 导出
             $scope.exportXls = function () {
-                window.location.href = '/store-service/export?startTime='+ $scope.startFormatDate + '&endTime=' + $scope.endFormatDate
+                window.location.href = 'store-service/export?startTime='+ $scope.startFormatDate + '&endTime=' + $scope.endFormatDate
             }
     }]);
 });

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/PurcInquiryCtrl.js

@@ -374,7 +374,7 @@ define(['app/app'], function(app) {
                                     toaster.pop('success', '提示', data.success);
                                     $timeout(function () {
                                         $rootScope.active = 'todo';
-                                        window.location.href = "/user#/inquiry_unapply";
+                                        window.location.href = "user#/inquiry_unapply";
                                     }, 500);
                                 }
                                 if (data.error) {
@@ -455,7 +455,7 @@ define(['app/app'], function(app) {
                                 if (data.success) {
                                     toaster.pop('success', '提示', data.success);
                                     $timeout(function () {
-                                        window.location.href = "/user#/purchaseinquiry";
+                                        window.location.href = "user#/purchaseinquiry";
                                     }, 500);
                                 }
                                 if (data.error) {

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/tender.js

@@ -547,7 +547,7 @@ define(['app/app'], function(app) {
             // sleep(1500); //当前方法暂停1.5秒
             $scope.loading = false;
             toaster.pop('success', '成功', '发布成功');
-            window.location.hash = '#/purc/tender';
+            window.location.href = 'user#/tender';
           }, function (response) {
             $scope.loading = false;
             toaster.pop('error', '发布失败', response.data);
@@ -559,7 +559,7 @@ define(['app/app'], function(app) {
             $scope.loading = false;
             // sleep(1500); //当前方法暂停1.5秒  给更新索引留点时间
             toaster.pop('success', '成功', '保存成功');
-            window.location.hash = '#/purc/tender';
+            window.location.href = 'user#/tender';
           }, function (response) {
             $scope.loading = false;
             toaster.pop('error', '保存失败', response.data);
@@ -580,7 +580,7 @@ define(['app/app'], function(app) {
     $scope.deleteThis = function (id) {
       PurcTender.deleteOne({id: id}, {}, function (data) {
         toaster.pop('info', '提示', '删除成功');
-        window.location.hash = '#/purc/tender';
+        window.location.href = 'user#/tender';
       });
     };
 

src/main/webapp/resources/js/usercenter/controllers/b2b/vendor/PurcVendorCtrl.js

@@ -49,13 +49,13 @@ define(['app/app'], function(app) {
         $scope.VendorDetail = function (id, uu) {
             $rootScope.vendorId = id;
             $rootScope.vendoruu = uu;
-            window.location.hash = "#/purc/vendor/" + $rootScope.vendorId;
+            window.location.href = "user#/purc/vendor/" + $rootScope.vendorId;
         }
 
         // 向企业购买
         $scope.purcByEn = function (businessCode) {
             $rootScope.businessCode = businessCode;
-            window.location.hash = "#/purc/addOrder";
+            window.location.href = "user#/purc/addOrder";
         }
 
     }]);