From 8e0d916897443122f9bbde5af08500bd4d04a7b5 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 11:27:35 +0800
Subject: [PATCH] add client_partner_detail googleMap

---
 src/main/ui/static/payment/partner/partner.js       |  7 +++++++
 .../partner/templates/client_partner_detail.html    | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index 275b1190e..e4cdb0451 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -70,6 +70,13 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
         $scope.partner = partner.data;
         $scope.partner.partner_type = $scope.partner.website ? 'website' : 'photo';
 
+        $scope.getMerchantLocation = function () {
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) {
+                $scope.merchant_location = resp.data;
+            });
+        };
+        $scope.getMerchantLocation();
+
         $scope.uploadLogo = function (file) {
             if (file != null) {
                 if (file.size > 1 * 1024 * 1024) {
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
index 9c8ebcfa4..44ee74b66 100644
--- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
@@ -303,6 +303,19 @@
                                 </div>
                             </div>
                         </div>
+                        <span id="merchant_location" hidden>{{merchant_location}}</span>
+                        <div class="panel panel-default">
+                            <div class="panel-heading" style="font-size: larger">Location
+                                <span id="editmap" hidden>false</span>
+                                <span id="add_view" hidden>false</span>
+                            </div>
+                            <div class="form-group">
+                                <div class="embed-responsive" style="height: 300px;">
+                                    <iframe id="merchant_detail" name="merchant_detail" class="embed-responsive-item"
+                                            src="one_locations.html"></iframe>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <div ng-show="partner.source == 4 && (partner.approve_result !=3 && partner.approve_result !=1)">
                         <form class="form-horizontal" novalidate name="partnerForm">