From ade4bc8f860e3d905370db56f81723910e7f19e8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 14:33:10 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/matCode/matCode.html |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index e3c6c4c..c99c587 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -140,7 +140,7 @@
             <legend>鎵撳嵃棰勮</legend>
             <div id="template-container" style="margin: 20px;text-align: center">
                 <!-- 棰勮鍥� 1 -->
-                <div id="template-preview-1" class="template-preview">
+                <div id="template-preview-1" class="template-preview" style="display: none">
 <!--                    <table class="contain" height="317" width="317" style="overflow: hidden">-->
 <!--                        <tr>-->
 <!--                            <td width="20%" align="right" scope="col">瀹㈡埛</td>-->
@@ -175,7 +175,7 @@
                     <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
                         <tr>
                             <td colspan="1" align="right" scope="col">鏉$爜</td>
-                            <td class="barcode"colspan="3" align="left" scope="col">
+                            <td class="barcode" colspan="3" align="left" scope="col">
                                 <img class="template-qrcode" src="" width="80%">
                                 <div style="letter-spacing: 2px;margin-top: 3px">xxxxxx</div>
                             </td>
@@ -194,10 +194,34 @@
                         </tr>
                     </table>
                 </div>
+
                 <!-- 棰勮鍥� 2 -->
-                <div class="template-preview"></div>
+                <div id="template-preview-2" class="template-preview" style="display: inline-block">
+                    <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
+                        <tr>
+                            <td colspan="1" align="right" scope="col">鏉$爜</td>
+                            <td class="barcode" colspan="3" align="left" scope="col">
+                                <img class="template-qrcode" src="" width="80%">
+                                <div style="letter-spacing: 2px;margin-top: 3px">xxxxxx</div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td align="right" width="25%">鐗╂枡缂栫爜</td>
+                            <td align="right" width="25%">xxxxxx-xx/xx</td>
+                            <td align="right" width="25%">鐗╂枡鍚嶇О</td>
+                            <td align="right" width="25%">xxxxxxx</td>
+                        </tr>
+                        <tr>
+                            <td align="right" width="25%">鐗╂枡鍗曚綅</td>
+                            <td align="right" width="25%">xxxxxxxx</td>
+                            <td align="right" width="25%">鐗╂枡瑙勬牸</td>
+                            <td align="right" width="25%">xxxxxxx</td>
+                        </tr>
+                    </table>
+                </div>
+
                 <!-- 棰勮鍥� 3 -->
-                <div class="template-preview"></div>
+                <div id="template-preview-3" class="template-preview"></div>
             </div>
         </fieldset>
 
@@ -219,8 +243,8 @@
     <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
         <tr>
             <td colspan="1" align="right" scope="col">鏉$爜</td>
-            <td class="barcode"colspan="3" align="left" scope="col">
-                <img class="qrcode" src="/macCode/barcode/auth?param={{this.barcodeUrl}}" width="80%">
+            <td class="barcode" colspan="3" align="left" scope="col">
+                <img class="qrcode" src="{{this.barcodeUrl}}" width="80%">
                 <div style="letter-spacing: 2px;margin-top: 3px">{{this.barcode}}</div>
             </td>
         </tr>

--
Gitblit v1.9.1