From a171e587a48bb3d656faa53ad1f6158f1eb1f44f Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 3 Jun 2019 18:24:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=20=E5=9B=BE=E7=89=87=E5=8F=AF=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner/templates/add_partner.html        | 11 +++-
 .../templates/add_sub_partner_dialog.html     |  8 ++-
 .../partner/templates/partner_detail.html     | 66 +++++++------------
 .../partner/templates/partner_edit.html       |  4 ++
 4 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index dd3b64b72..9ba36bc1b 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -350,7 +350,7 @@
                             <div class="form-group"
                                  ng-if="partner.client_pay_type.indexOf('1')>=0">
                                 <label class="control-label col-sm-2">
-                                    *Online Scene Of Merchants</label>
+                                    *Online</label>
                                 <div class="col-sm-8">
                                     <button class="btn btn-default"
                                             ng-class="{active:partner.client_pay_desc.indexOf('1')>=0}"
@@ -382,7 +382,7 @@
                             <div ng-if="partner.client_pay_type.indexOf('2')>=0">
                                 <div class="form-group"
                                      ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">
-                                    <label class="control-label col-sm-2">*Offline Scene Of Merchants</label>
+                                    <label class="control-label col-sm-2">*Offline</label>
                                     <div class="col-sm-8">
                                         <button class="btn btn-default"
                                                 ng-class="{active:partner.client_pay_desc.indexOf('6')>=0}"
@@ -464,8 +464,11 @@
                                     </div>
                                     <uib-progressbar value="shopPhotoProgress.value"
                                                      ng-if="shopPhotoProgress"></uib-progressbar>
-                                    <img ng-src="{{partner.company_photo}}" ng-if="partner.company_photo"
+                                    <a target="_blank" ng-if="partner.company_photo" ng-href="{{partner.company_photo}}">
+                                    <img ng-src="{{partner.company_photo}}"
+                                         ng-if="partner.company_photo"
                                          class="thumbnail img-size col-sm-9">
+                                    </a>
                                 </div>
                                 <div class="col-sm-4">
                                     <div class="form-control-static"><em>2:</em>&nbsp;
@@ -476,8 +479,10 @@
                                     </div>
                                     <uib-progressbar value="storePhotoProgress.value"
                                                      ng-if="storePhotoProgress"></uib-progressbar>
+                                    <a target="_blank" ng-if="partner.store_photo" ng-href="{{partner.store_photo}}">
                                     <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo"
                                          class="thumbnail img-size col-sm-9">
+                                    </a>
                                 </div>
                             </div>
                         </div>
diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
index 12972d670..537a23227 100644
--- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
@@ -279,7 +279,7 @@
                                     <div class="form-group"
                                          ng-if="partner.client_pay_type.indexOf('1')>=0">
                                         <label class="control-label col-sm-2">
-                                            *Online Scene Of Merchants</label>
+                                            *Online</label>
                                         <div class="col-sm-8">
                                             <button class="btn btn-default"
                                                     ng-class="{active:partner.client_pay_desc.indexOf('1')>=0}"
@@ -311,7 +311,7 @@
                                     <div ng-if="partner.client_pay_type.indexOf('2')>=0">
                                         <div class="form-group"
                                              ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">
-                                            <label class="control-label col-sm-2">*Offline Scene Of Merchants</label>
+                                            <label class="control-label col-sm-2">*Offline</label>
                                             <div class="col-sm-8">
                                                 <button class="btn btn-default"
                                                         ng-class="{active:partner.client_pay_desc.indexOf('6')>=0}"
@@ -393,8 +393,10 @@
                                             </div>
                                             <uib-progressbar value="shopPhotoProgress.value"
                                                              ng-if="shopPhotoProgress"></uib-progressbar>
+                                            <a target="_blank" ng-if="partner.company_photo" ng-href="{{partner.company_photo}}">
                                             <img ng-src="{{partner.company_photo}}" ng-if="partner.company_photo"
                                                  class="thumbnail img-size col-sm-9">
+                                            </a>
                                         </div>
                                         <div class="col-sm-4">
                                             <div class="form-control-static"><em>2:</em>&nbsp;
@@ -405,8 +407,10 @@
                                             </div>
                                             <uib-progressbar value="storePhotoProgress.value"
                                                              ng-if="storePhotoProgress"></uib-progressbar>
+                                            <a target="_blank" ng-if="partner.store_photo" ng-href="{{partner.store_photo}}">
                                             <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo"
                                                  class="thumbnail img-size col-sm-9">
+                                            </a>
                                         </div>
                                     </div>
                                 </div>
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index 6bc62b8b0..23350d8ae 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -504,7 +504,7 @@
                         <div class="panel-body">
                             <div class="form-horizontal">
                                 <div class="form-group">
-                                    <label class="control-label col-sm-2">*
+                                    <label class="control-label col-sm-2">
                                         Merchant Payment Scenario Type</label>
                                     <div class="col-sm-8">
                                         <button class="btn btn-default"
@@ -520,7 +520,7 @@
                                 <div class="form-group"
                                      ng-if="partner.client_pay_type.indexOf('1')>=0">
                                     <label class="control-label col-sm-2">
-                                        *Online Scene Of Merchants</label>
+                                        Online</label>
                                     <div class="col-sm-8">
                                         <button class="btn btn-default"
                                                 ng-class="{active:partner.client_pay_desc.indexOf('1')>=0}">
@@ -547,7 +547,7 @@
                                 <div ng-if="partner.client_pay_type.indexOf('2')>=0">
                                     <div class="form-group"
                                          ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">
-                                        <label class="control-label col-sm-2">*Offline Scene Of Merchants</label>
+                                        <label class="control-label col-sm-2">Offline</label>
                                         <div class="col-sm-8">
                                             <button class="btn btn-default"
                                                     ng-class="{active:partner.client_pay_desc.indexOf('6')>=0}">
@@ -592,51 +592,35 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group" ng-if="partner.client_pay_type.indexOf('1')>=0"
-                                     ng-class="{'has-error':partnerForm.company_website.$invalid && partnerForm.company_website.$dirty}">
-                                    <label class="control-label col-sm-2" for="company_website-input">*
-                                        Website</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" name="company_website" class="form-control"
-                                               ng-model="partner.company_website"
-                                               id="company_website-input" required maxlength="200">
-                                        <div ng-messages="partnerForm.company_website.$error"
-                                             ng-if="partnerForm.company_website.$dirty">
-                                            <p class="small text-danger" ng-message="required">Required
-                                                Field</p>
-                                            <p class="small text-danger" ng-message="maxlength">Less
-                                                Than 200
-                                                Characters(including symbols and spaces)</p>
-                                        </div>
+                                <div class="form-group" ng-if="partner.client_pay_type.indexOf('1')>=0">
+                                    <label class="control-label col-sm-2">Website</label>
+
+                                    <div class="col-sm-10" style="padding-top: 7px;">
+                                        <a class="form-control-static" target="_blank" ng-bind="partner.company_website"
+                                           href="{{partner.company_website}}"></a>
                                     </div>
                                 </div>
                                 <div class="form-group" ng-if="partner.client_pay_type.indexOf('2')>=0">
-                                    <label class="control-label col-sm-2">* Shop Photo</label>
-                                    <div class="col-sm-4">
-                                        <div class="form-control-static"><em>1:</em>&nbsp;
-                                            <button class="btn btn-primary" type="button"
-                                                    ngf-select="uploadShopPhoto($file)" accept="image/*">
-                                                <i class="fa fa-upload"></i> Upload Shop Photo1
-                                            </button>
+                                    <div class="form-group" ng-if="partner.company_photo">
+                                        <label class="control-label col-sm-2">Shop Photo</label>
+                                        <div class="col-sm-3 col-xs-5"><em>1:</em>&nbsp;
+                                            <div>
+                                                <a class="thumbnail" target="_blank" ng-href="{{partner.company_photo}}">
+                                                    <img ng-src="{{partner.company_photo}}" style="max-height: 100px">
+                                                </a>
+                                            </div>
                                         </div>
-                                        <uib-progressbar value="shopPhotoProgress.value"
-                                                         ng-if="shopPhotoProgress"></uib-progressbar>
-                                        <img ng-src="{{partner.company_photo}}" ng-if="partner.company_photo"
-                                             class="thumbnail img-size col-sm-9">
-                                    </div>
-                                    <div class="col-sm-4">
-                                        <div class="form-control-static"><em>2:</em>&nbsp;
-                                            <button class="btn btn-primary" type="button"
-                                                    ngf-select="uploadStorePhoto($file)" accept="image/*">
-                                                <i class="fa fa-upload"></i> Upload Shop Photo2
-                                            </button>
+
+                                        <div class="col-sm-3 col-xs-5" ng-if="partner.store_photo"><em>2:</em>&nbsp;
+                                            <div>
+                                                <a class="thumbnail" target="_blank" ng-href="{{partner.store_photo}}">
+                                                    <img ng-src="{{partner.store_photo}}" style="max-height: 100px">
+                                                </a>
+                                            </div>
                                         </div>
-                                        <uib-progressbar value="storePhotoProgress.value"
-                                                         ng-if="storePhotoProgress"></uib-progressbar>
-                                        <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo"
-                                             class="thumbnail img-size col-sm-9">
                                     </div>
                                 </div>
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html
index d0fac0922..de7b9c929 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -436,8 +436,10 @@
                                     </div>
                                     <uib-progressbar value="shopPhotoProgress.value"
                                                      ng-if="shopPhotoProgress"></uib-progressbar>
+                                    <a target="_blank" ng-if="partner.company_photo" ng-href="{{partner.company_photo}}">
                                     <img ng-src="{{partner.company_photo}}" ng-if="partner.company_photo"
                                          class="thumbnail img-size col-sm-9">
+                                    </a>
                                 </div>
                                 <div class="col-sm-4">
                                     <div class="form-control-static"><em>2:</em>&nbsp;
@@ -448,8 +450,10 @@
                                     </div>
                                     <uib-progressbar value="storePhotoProgress.value"
                                                      ng-if="storePhotoProgress"></uib-progressbar>
+                                    <a target="_blank" ng-if="partner.store_photo" ng-href="{{partner.store_photo}}">
                                     <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo"
                                          class="thumbnail img-size col-sm-9">
+                                    </a>
                                 </div>
                             </div>
                         </div>