From 0cc49d7113546dea31c066b05236fad36cac0a76 Mon Sep 17 00:00:00 2001
From: liuxinxin <xinxin.liu@geekforbest.com>
Date: Mon, 26 Aug 2019 14:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/contract_for_compliance.html    | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/contract_for_compliance.html b/src/main/ui/static/payment/partner/templates/contract_for_compliance.html
index 57b963bc0..37d79d57e 100644
--- a/src/main/ui/static/payment/partner/templates/contract_for_compliance.html
+++ b/src/main/ui/static/payment/partner/templates/contract_for_compliance.html
@@ -13,8 +13,10 @@
 
     td {text-align:center}
 
+    img[src=""],img:not([src]){opacity:0;}
+
     .card-boxs {
-        padding: 20px 50px 20px 50px;
+        padding: 20px 1% 20px 1%;
         min-height: 150px;
         border: 1px solid #e2e2e2;
         border-radius: 3px;
@@ -55,29 +57,24 @@
             <div class="container-fluid">
                 <div class="card-boxs widget-box-two widget-two-custom" style="overflow-x: auto;">
 
-                    <div id="dg" style="z-index: 9999; position: fixed ! important; left: 85%; top: 50%;">
-                        <table width=""100% style="position: absolute; width:260px; right: 0px; top: 0px;">
-                            <button class="btn btn-success" type="button"
-                                    ng-click="goBottom()">
-                                前去签订
-                            </button><i class="fa fa-back"></i>
+                    <div id="dg" style="z-index: 9999; position: fixed ! important; left: 83%; top: 50%;">
+                            <button class="btn btn-success" type="button" ng-click="goBottom()">
+                                前去签订</button>
                             <br/>
-                            <p style="margin-top: 30px;">
-                                <button class="btn btn-success" type="button" ng-click="submitContract()">确认签署</button>
-                            </p>
-                        </table>
+
+                            <button class="btn btn-success" type="button" ng-click="submitContract()">确认签署</button>
+
                     </div>
 
-                    <div id="back" style="z-index: 9999; position: fixed ! important; right: 82%;top: 13.2%;">
-                        <button class="btn-warning" style="float: right;line-height: 46px;font-size: 40px;
-    padding: 10px 50px;" ui-sref="basic.compliance_to_perfect"><i class="fa fa-reply"></i> 返回</button>
+                    <div id="back" style="z-index: 9999; position: fixed ! important; right: 84%;top: 20%;">
+                        <button class="btn-warning" type="button"  ui-sref="basic.compliance_to_perfect"><i class="fa fa-reply"></i> 返回</button>
                     </div>
 
 
 
                     <!--Title Start-->
                     <div>
-                        <p><img class="col-sm-12" ng-src="https://file.royalpay.com.au/open/2019/08/23/1566528847626_ZRvrievyWEayhByRpkCDwV1P0k7FXt.png"></p>
+                        <p><img class="col-sm-12" ng-src="https://file.royalpay.com.au/open/2019/08/23/1566528847626_ZRvrievyWEayhByRpkCDwV1P0k7FXt.png" style="width:100%; height:100%"></p>
                         <h1 style="opacity:0">1</h1>
                         <h1 style="opacity:0">1</h1>
                         <h1 style="opacity:0">1</h1>
@@ -889,7 +886,7 @@
                                 <p><strong><strong>Financial Support</strong></strong></p>
                             </td>
                             <td width="476">
-                                <p><strong><strong>Email: </strong>accountofficer</strong>@royalpay.com.au</strong></strong></p>
+                                <p><strong><strong>Email: </strong></strong><a href="mailto:accountofficer@royalpay.com.au">accountofficer@royalpay.com.au</a></p>
                                 <p><strong><strong>Contact: </strong>Account Officer</strong></strong></p>
                             </td>
                         </tr>
@@ -1063,7 +1060,7 @@
                                 </td>
                                 <td width="38%">
 
-                                    <p><img class="col-sm-12" ng-src="https://file.royalpay.com.au/open/2019/08/23/1566540856776_hjRNzXzTMDmQb3y6GT2pEJtVsh08Tc.png" oncontextmenu="return false;" onselectstart="return false;"></p>
+                                    <p><img class="col-sm-12" ng-src="https://file.royalpay.com.au/open/2019/08/23/1566540856776_hjRNzXzTMDmQb3y6GT2pEJtVsh08Tc.png" oncontextmenu="return false;" onselectstart="return false;" style="width:100%; height:100%"></p>
 
                                 </td>
                                 <td width="39%">
@@ -1122,7 +1119,7 @@
                                     <p><strong><strong>Signature of Director/Secretary:</strong></strong></p>
                                 </td>
                                 <td width="38%">
-                                    <p><img id="img1" src="" class="col-sm-12"/></p>
+                                    <img id="img1" src="" class="col-sm-12" style="width:100%; height:100%"  oncontextmenu="return false;" onselectstart="return false;"/>
                                 </td>
                                 <td width="38%">
                                     <p></p>
@@ -1134,7 +1131,7 @@
                                     <span style="color:#f39c12">（请在此输入全名）</span>
                                 </td>
                                 <td>
-                                    <input ng-bind="aggregateFileInfo.full_name" style="width:100%"/>
+                                    <input ng-bind="aggregateFileInfo.full_name" style="border: none;overflow: hidden;height: 100%;width: 70%;"/>
                                 </td>
                                 <td>
                                     <p></p>
@@ -1173,10 +1170,14 @@
             <div class="container-fluid">
                 <div class="card-boxs widget-box-two widget-two-custom" style="overflow-x: auto;">
                     <span style="color:#f39c12">（请在此签名）</span>
-                    <div id="signatureparent" class="sign" >
-                        <div id="signature" style="background-color: grey; lineWidth:5; color: black"></div>
+                    <div id="signatureparent" class="sign">
+                        <div id="signature" style="border:1px solid black;background-color: white; lineWidth:5; color: black "></div>
+                        <div style="float:right">
+                            <button class="btn-warning" onclick="ok()">ok</button>&nbsp;
+                            <button class="btn-warning" onclick="reset()" >重置</button>
+                        </div>
                     </div>
-                    <button onclick="reset()">重置</button><button onclick="ok()">ok</button>
+
                 </div>
             </div>
         </div>
@@ -1191,6 +1192,7 @@
 
   function reset() {
       $("#signature").jSignature('reset');
+      document.getElementById("img1").src='';
   }
 
   function ok() {