Merge branch 'master' of ssh://119.23.72.7:22611/q578953158/php_frq_api

# Conflicts:
#	resources/views/pdf/sale.blade.php

resources/views/pdf/sale.blade.php

@@ -19,7 +19,7 @@
         .footer{position: relative;}
         .footer .pr30{position: relative;left:80px;}
         .footer .pr60{position: relative;left:107px;}
-        .footer img{position: absolute;left: 731px;top: 40px;}
+        .footer img{position: absolute;left: 550px;top:-40px;}
       
         .table2 td{height:auto;
 		overflow:hidden;
@@ -106,19 +106,7 @@
             </table>
         </div>
         <div class="footer" style="padding-top: 20px;">
-            <img src="http://api.ichunt.com/public/img/contract.png" width='150' height='150' style="top:<?php
-               switch (count($itemsArr)){
-                   case 3:
-                       echo "-10px;";
-                       break;
-                   case 4:
-                       echo "40px;";
-                       break;
-                   default:
-                       echo "0px";
-                       break;
-               }
-            ?>">
+
             <b style="font-size: 18px;font-weight: bold;color:#000;"> 条款和说明：<br>
             Terms and conditions:</b>
             <br>1.> <span class="pr30">付款方式：月结30天</span>
@@ -127,7 +115,20 @@
             <br><b class="pr60">Leadtime is for reference only, order actual delivery date is subjected to Supplier’s final confirmation. </b>
             <br>3.> <span class="pr30">所有库存均以我司确认为准。</span>
             <br><b class="pr60">Available to sell stock is open to all customers based on our confirmation. </b>
-            <br>4.> <b class="pr30">Subject to ICHUNT TECHNOLOGY' terms </b>
+            <br>4.> <b class="pr30">Subject to ICHUNT TECHNOLOGY' terms <img src="http://api.ichunt.com/public/img/contract.png" width='110'
+                                                                             height='110' style="top:<?php
+                        switch (count($itemsArr)){
+                            case 1:
+                                echo "-160px;";
+                                break;
+                            case 2:
+                                echo "-20px;";
+                                break;
+                            default:
+                                echo "-60px;";
+                                break;
+                        }
+                ?>;"></b>
         </div>
     </div>