From e734b44f9ab9c49b574d4d8375584115de541271 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Wed, 17 Jan 2018 10:11:25 +0800
Subject: [PATCH] finish merge referrer & cityPartner

---
 src/main/ui/static/analysis/org/templates/analysis_org.html | 4 ----
 src/main/ui/static/config/orgcommission/orgcommission.js    | 6 +++---
 .../templates/referrer_commission_detail.html               | 1 -
 .../templates/referrer_commission_month.html                | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/ui/static/analysis/org/templates/analysis_org.html b/src/main/ui/static/analysis/org/templates/analysis_org.html
index 8c6029ad3..c1a6666b3 100644
--- a/src/main/ui/static/analysis/org/templates/analysis_org.html
+++ b/src/main/ui/static/analysis/org/templates/analysis_org.html
@@ -8,10 +8,6 @@
             <li ui-sref-active-eq="active" ng-if="('orgcommission'|withModule)">
                 <a ui-sref="analysis_org.commission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a>
             </li>
-            <li ui-sref-active-eq="active">
-                <a ui-sref="analysis_org.referrercommission"><i class="fa fa-users"></i></i>推荐人提成|Referrer Commissions</a>
-            </li>
-
         </ul>
     </div>
 </div>
diff --git a/src/main/ui/static/config/orgcommission/orgcommission.js b/src/main/ui/static/config/orgcommission/orgcommission.js
index 3f8e07b0f..448e79b29 100644
--- a/src/main/ui/static/config/orgcommission/orgcommission.js
+++ b/src/main/ui/static/config/orgcommission/orgcommission.js
@@ -44,7 +44,7 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                     return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr);
                 }]
             }
-        }).state('analysis_org.commission.org.month.orgdetail', {
+        }).state('analysis_org.commission.month.org.orgdetail', {
             url: '/citypartners/{orgId}',
             templateUrl: '/static/config/orgcommission/templates/org_commission_detail.html',
             controller: 'orgCommissionOrgDetailCtrl',
@@ -53,8 +53,8 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                     return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId);
                 }]
             }
-        }).state('analysis_org.commission.referrer.month.detail', {
-            url: '/referrer_commissions/citypartners/{orgId}',
+        }).state('analysis_org.commission.month.referrer.referrerdetail', {
+            url: '/referrer_commissions/{orgId}',
             templateUrl: '/static/config/referrercommission/templates/referrer_commission_detail.html',
             controller: 'referrerCommissionOrgDetailCtrl',
             resolve: {
diff --git a/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html b/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html
index 1b4d4a8b6..986b21930 100644
--- a/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html
+++ b/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html
@@ -5,7 +5,6 @@
     }
 
 </style>
-
 <div class="box box-warning" ng-if="detail">
     <div class="box-header">Analysis</div>
     <div class="box-body nowrap">
diff --git a/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html b/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html
index 0553ffaeb..a405a1425 100644
--- a/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html
+++ b/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html
@@ -1,4 +1,4 @@
-<div>
+<div ui-view>
     <div class="box box-warning">
         <div class="box-header">Analysis</div>
         <div class="box-body">
@@ -34,7 +34,7 @@
                     <td ng-bind="log.gross_amount|currency:'AUD'"></td>
                     <td ng-bind="log.org_charge|currency:'AUD'"></td>
                     <td>
-                        <a ui-sref=".orgdetail({orgId:log.org_id})">
+                        <a ui-sref=".referrerdetail({orgId:log.org_id})">
                             <i class="fa fa-search"></i>
                         </a>
                     </td>