Skip to content

Z
zsh
Commit ef6f58d8 authored by wuwz's avatar wuwz
Browse files
Options

chongtu

parents e79b33f5 ebfda643
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 402 additions and 200 deletions
WebRoot/WEB-INF/templates/zh_cn/shop/area_list.html
View file @ ef6f58d8
...@@ -49,21 +49,54 @@ jQuery(document).ready(function(){ ...@@ -49,21 +49,54 @@ jQuery(document).ready(function(){
#if($!config.websiteLogo) <a href="$!webPath/index.htm"><img src="$!imageWebServer/$!config.websiteLogo.path/$!config.websiteLogo.name" border="0" /></a>#else<a href="$!webPath/index.htm"><img src="$!imageWebServer/resources/style/system/front/default/images/logo.png" border="0" /></a>#end #if($!config.websiteLogo) <a href="$!webPath/index.htm"><img src="$!imageWebServer/$!config.websiteLogo.path/$!config.websiteLogo.name" border="0" /></a>#else<a href="$!webPath/index.htm"><img src="$!imageWebServer/resources/style/system/front/default/images/logo.png" border="0" /></a>#end
</div> </div>
</div> </div>
<table> <div>
#foreach($obj in $area) #foreach($obj in $area)
<tr> <div class="content-province">
<td>$obj.areaName</td> <div class="content-province-title">$obj.areaName</div>
<td> | </td> <div class="content-cities">
#foreach($objc in $obj.childs) #foreach($objc in $obj.childs)
<td><a href="$!webPath/index.htm?id=$objc.id">$objc.areaName</a></td> <span class="cityName"><a href="$!webPath/index.htm?id=$objc.id">$objc.areaName</a></span>
#end #end
</tr> </div>
#end </div>
#end
</table> </div>
$!uc_logout_js $!uc_logout_js
</div> </div>
$!httpInclude.include("/footer.htm") $!httpInclude.include("/footer.htm")
</body> </body>
<style>
.main{
height:2000px;
}
.content-province{
float: left;
width: 1158px;
border: solid 1px #eee;
margin-bottom:5px;
}
.content-province-title{
float: left;
width: 128px;
height: 45px;
line-height: 45px;
padding-left: 16px;
border-width: 1px;
border-color: #eee;
color: #333;
font-size: 15px;
}
.content-cities{
float: left;
width: 1000px;
line-height: 40px;
border-left:solid 1px #eee;
padding-left:10px
}
.cityName{
margin-right:5px;
}
</style>
</html> </html>
WebRoot/WEB-INF/templates/zh_cn/shop/head.html
View file @ ef6f58d8
...@@ -59,7 +59,7 @@ function search_form(){ ...@@ -59,7 +59,7 @@ function search_form(){
</a> </a>
#end #end
</div> </div>
<div> <div class="city">
$!cityName <a href="$!webPath/area_list.htm">切换城市</a> $!cityName <a href="$!webPath/area_list.htm">切换城市</a>
</div> </div>
<div class="searchForm"> <div class="searchForm">
...@@ -104,3 +104,10 @@ function search_form(){ ...@@ -104,3 +104,10 @@ function search_form(){
</div> </div>
</div> </div>
</div> </div>
<style>
.city{
float: left;
line-height: 100px;
}
</style>
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/account_nav.html
View file @ ef6f58d8
...@@ -50,7 +50,11 @@ jQuery(document).ready(function(){ ...@@ -50,7 +50,11 @@ jQuery(document).ready(function(){
<li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li> <li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li>
#end #end
<<<<<<< HEAD
<!-- <li op="zsh_buyer_cash"><a href="$!webPath/buyer/contract_list.htm">装修订单</a></li> --> <!-- <li op="zsh_buyer_cash"><a href="$!webPath/buyer/contract_list.htm">装修订单</a></li> -->
=======
<li op="zsh_buyer_cash"><a href="$!webPath/buyer/contract_list.htm">装修订单</a></li>
>>>>>>> ebfda64361cc95cb48601d7ac63431d56c46800e
</ul> </ul>
</li> </li>
</ul> </ul>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/add_detailed.html
View file @ ef6f58d8
...@@ -55,43 +55,46 @@ $!httpInclude.include("/top.htm") ...@@ -55,43 +55,46 @@ $!httpInclude.include("/top.htm")
<div class="productmain"> <div class="productmain">
<form action="$!webPath/buyer/add_detailed_save.htm" method="post" name="theForm" id="theForm"> <form action="$!webPath/buyer/add_detailed_save.htm" method="post" name="theForm" id="theForm">
<div class="ordercon"> <div class="ordercon">
<div class="operation"> <div class="operation order">
<table width="800" border="0" cellspacing="0" cellpadding="0" id="opertable" > <div style="border-bottom:1px solid #ccc;text-align:center;padding:15px">
<tr>
<td></td>
<td></td>
<td>
装修计划表 装修计划表
</td> </div>
<<td></td> <div style="padding:30px">
<td></td> <div style="margin-bottom:30px">
</tr> <span style="font-weight:600">分佣比例:</span>&nbsp;&nbsp;&nbsp;
<tr> <input name="commission" type="number" id="commission" /> &nbsp;&nbsp;&nbsp;%
<td>分佣比例::</td> </div>
<td><input name="commission" type="number" id="commission" />%</td>
</tr> <div class="clearfix">
<tr> <div style="float:left">
<td>装修工期</td> <span style="font-weight:600;margin-right:20px">装修工期:</span>
<td>水电验收工期：</td> </div>
<td><input name="hydropower" type="text" id="hydropower" /></td> <div style="float:left">
<td>泥木工验收工期：</td> <div style="margin-bottom:20px">
<td><input name="mudwood" type="text" id="mudwood" /></td> <span>水电验收工期：</span>
</tr> <input name="hydropower" type="text" id="hydropower" />&nbsp;&nbsp;&nbsp;&nbsp;
<tr> <span>泥木工验收工期：</span>
<td></td> <input name="mudwood" type="text" id="mudwood" />
<td>油漆验收工期：</td> </div>
<td><input name="paint" type="text" id="paint" /></td> <div>
<td>竣工工验收工期：</td> <span>油漆验收工期：</span>
<td><input name="completed" type="text" id="completed" /></td> <input name="paint" type="text" id="paint" />&nbsp;&nbsp;&nbsp;&nbsp;
</tr> <span>竣工工验收工期：</span>
<input name="completed" type="text" id="completed" />
<tr> </div>
<td class="px10"><span class="setsub"> </div>
<input type="hidden" name="id" id="id" value="$!id" /> </div>
<input type="button" onclick="saveForm();" value="保存" style="cursor:pointer;"/>
</span></td>
</tr>
</table> <div class="px10 px11">
<span class="setsub">
<input type="hidden" name="id" id="id" value="$!id" />
<input type="button" onclick="saveForm();" value="提交" style="cursor:pointer;"/>
</span>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -102,4 +105,23 @@ $!httpInclude.include("/top.htm") ...@@ -102,4 +105,23 @@ $!httpInclude.include("/top.htm")
$!httpInclude.include("/footer.htm") $!httpInclude.include("/footer.htm")
</div> </div>
</body> </body>
<style>
.clearfix:after{/*伪元素是行内元素 正常浏览器清除浮动方法*/
content: "";
display: block;
height: 0;
clear:both;
visibility: hidden;
}
.clearfix{
*zoom: 1;/*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
}
.order{
border:1px solid #ccc;
margin:20px 0 0 30px;
}
.px11{
text-align:center;
}
</style>
</html> </html>
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/contract_list.html
View file @ ef6f58d8
...@@ -33,13 +33,15 @@ $!httpInclude.include("/top.htm") ...@@ -33,13 +33,15 @@ $!httpInclude.include("/top.htm")
<tr> $!httpInclude.include("/buyer/account_nav.htm?op=buyer_cash") <tr> $!httpInclude.include("/buyer/account_nav.htm?op=buyer_cash")
<td id="centerbg" valign="top"> <td id="centerbg" valign="top">
<div class="buyer_position"> <div class="buyer_position">
<div class="buyer_p_box"><a href="$!webPath/buyer/account.htm">我的账户</a> > <span>装修订单列表</span></div> <div class="buyer_p_box"><a href="$!webPath/buyer/account.htm">我的账户</a> > <span>装修订单列表</span>
#if($!CommUtil.indexOf("$!user.userRole","ADMIN")>=0) #if($!CommUtil.indexOf("$!user.userRole","ADMIN")>=0)
<span class="allmen size7"> <p class="allmen size7 new">
<a href="$!webPath/buyer/contract_add_detailed.htm" class="blue">新增</a> <a href="$!webPath/buyer/contract_add_detailed.htm" class="blue">新增</a>
</span> </p>
#end #end
</div>
</div> </div>
<div class="productmain"> <div class="productmain">
...@@ -110,4 +112,10 @@ $!httpInclude.include("/top.htm") ...@@ -110,4 +112,10 @@ $!httpInclude.include("/top.htm")
$!httpInclude.include("/footer.htm") $!httpInclude.include("/footer.htm")
</div> </div>
</body> </body>
<style>
.new{
display:inline-block;
margin-left:450px
}
</style>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment