From 641ddf669ad57fb544e13a6433aa5905551b3bba Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期三, 22 九月 2021 09:04:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project

---
 CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
index 9b177a7..3314bc6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
@@ -31,15 +31,25 @@
                     </select>
                 </td>
                  <td align="center">
-                    <div class="xialap">
-                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
-                    <div class="xialapb">
-                        <div class="xialapr">5000</div> 
-                        <div class="xialapr">10000</div>
-                        <div class="xialapr">20000</div>
-                        <div class="xialapr">50000</div>
-                    </div>
-                    </div>
+                     <table>
+                        <tr>
+                            <td>
+                                <div class="xialap">
+                                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
+                                    <div class="xialapb">
+                                        <div class="xialapr">5000</div> 
+                                        <div class="xialapr">10000</div>
+                                        <div class="xialapr">20000</div>
+                                        <div class="xialapr">50000</div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+                            </td>
+                        </tr>
+                    </table>
+                    
                 </td>
                 <td>
                     <select class="selectLaber"  id="pRoomCard" name="paper0">

--
Gitblit v1.9.1