Skip to content

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

chongtu

parents e79b33f5 ebfda643
Show 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(){
#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>
<table>
<div>
#foreach($obj in $area)
<tr>
<td>$obj.areaName</td>
<td> | </td>
<div class="content-province">
<div class="content-province-title">$obj.areaName</div>
<div class="content-cities">
#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
</tr>
</div>
</div>
#end
</table>
</div>
$!uc_logout_js
</div>
$!httpInclude.include("/footer.htm")
</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>
WebRoot/WEB-INF/templates/zh_cn/shop/head.html
View file @ ef6f58d8
......@@ -59,7 +59,7 @@ function search_form(){
</a>
#end
</div>
<div>
<div class="city">
$!cityName <a href="$!webPath/area_list.htm">切换城市</a>
</div>
<div class="searchForm">
......@@ -104,3 +104,10 @@ function search_form(){
</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(){
<li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li>
#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>
>>>>>>> ebfda64361cc95cb48601d7ac63431d56c46800e
</ul>
</li>
</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")
<div class="productmain">
<form action="$!webPath/buyer/add_detailed_save.htm" method="post" name="theForm" id="theForm">
<div class="ordercon">
<div class="operation">
<table width="800" border="0" cellspacing="0" cellpadding="0" id="opertable" >
<tr>
<td></td>
<td></td>
<td>
<div class="operation order">
<div style="border-bottom:1px solid #ccc;text-align:center;padding:15px">
装修计划表
</td>
<<td></td>
<td></td>
</tr>
<tr>
<td>分佣比例::</td>
<td><input name="commission" type="number" id="commission" />%</td>
</tr>
<tr>
<td>装修工期</td>
<td>水电验收工期：</td>
<td><input name="hydropower" type="text" id="hydropower" /></td>
<td>泥木工验收工期：</td>
<td><input name="mudwood" type="text" id="mudwood" /></td>
</tr>
<tr>
<td></td>
<td>油漆验收工期：</td>
<td><input name="paint" type="text" id="paint" /></td>
<td>竣工工验收工期：</td>
<td><input name="completed" type="text" id="completed" /></td>
</tr>
</div>
<div style="padding:30px">
<div style="margin-bottom:30px">
<span style="font-weight:600">分佣比例:</span>&nbsp;&nbsp;&nbsp;
<input name="commission" type="number" id="commission" /> &nbsp;&nbsp;&nbsp;%
</div>
<div class="clearfix">
<div style="float:left">
<span style="font-weight:600;margin-right:20px">装修工期:</span>
</div>
<div style="float:left">
<div style="margin-bottom:20px">
<span>水电验收工期：</span>
<input name="hydropower" type="text" id="hydropower" />&nbsp;&nbsp;&nbsp;&nbsp;
<span>泥木工验收工期：</span>
<input name="mudwood" type="text" id="mudwood" />
</div>
<div>
<span>油漆验收工期：</span>
<input name="paint" type="text" id="paint" />&nbsp;&nbsp;&nbsp;&nbsp;
<span>竣工工验收工期：</span>
<input name="completed" type="text" id="completed" />
</div>
</div>
</div>
<tr>
<td class="px10"><span class="setsub">
<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></td>
</tr>
</table>
<input type="button" onclick="saveForm();" value="提交" style="cursor:pointer;"/>
</span>
</div>
</div>
</div>
</div>
</div>
......@@ -102,4 +105,23 @@ $!httpInclude.include("/top.htm")
$!httpInclude.include("/footer.htm")
</div>
</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>
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/contract_add_detailed.html
View file @ ef6f58d8
......@@ -292,7 +292,7 @@ $!httpInclude.include("/top.htm")
<table width="1000" border="0" cellspacing="0" cellpadding="0" class="user_table">
<tr> $!httpInclude.include("/buyer/account_nav.htm?op=buyer_cash")
<td id="centerbg" valign="top">
<div class="buyer_position"><div class="buyer_p_box"><a href="$!webPath/buyer/account.htm">我的账户</a> > <span>添加</span></div></div>
<div class="buyer_position"><div class="buyer_p_box"><a href="$!webPath/buyer/account.htm">我的账户</a> > <span>装修订单</span></div></div>
<div class="productmain">
<form action="$!webPath/buyer/contract_detailed_save.htm" method="post" name="theForm" id="theForm">
<div class="ordercon">
......@@ -303,37 +303,38 @@ $!httpInclude.include("/top.htm")
<td>
<input name="contractName" type="text" id="contractName" />
</td>
<td>合同编号:</td>
<td style="padding-left: 90px;">合同编号:</td>
<td>
<input name="contractNumber" type="text" id="contractNumber" />
</td>
</tr>
<tr>
<td>合同金额:</td>
<td><input name="contractAmount" type="text" id="contractAmount" /></td>
<td>支付方式:</td>
<td><input name="contractAmount" type="text" id="contractAmount" style="width:130px" />&nbsp &nbsp元</td>
<td style="padding-left: 90px;">支付方式:</td>
<td>
分期付款：<input type="radio" value="0" name="payWay" checked="checked"/>
全额付款：<input type="radio" value="1" name="payWay" checked="checked"/>
<input type="radio" value="0" name="payWay" checked="checked"/>分期付款&nbsp&nbsp&nbsp
<input type="radio" value="1" name="payWay" checked="checked"/>全额付款
</td>
</tr>
<tr>
<td>甲方联系人:</td>
<td><input name="partyA" type="text" id="partyA" /></td>
<td>联系方式:</td>
<td style="padding-left: 90px;">联系方式:</td>
<td><input name="partyAPhone" type="text" id="partyAPhone" /></td>
</tr>
<tr>
<td>乙方联系人:</td>
<td><input name="partyB" type="text" id="partyB" /></td>
<td>联系方式:</td>
<td style="padding-left: 90px;">联系方式:</td>
<td><input name="partyBPhone" type="text" id="partyBPhone" /></td>
</tr>
<tr>
<td>合同图片</td>
<td class="px10">
<td style="font-weight:600">合同上传</td>
<td class="px10" colspan=3>
<div id="uploader" class="wu-example">
<div class="queueList">
<div class="queueList quess">
<div id="dndArea" class="placeholder">
<div id="filePicker"></div>
<p>或将照片拖到这里</p>
......@@ -377,72 +378,92 @@ $!httpInclude.include("/top.htm")
<input type="hidden" name="imgIds" id="imgIds"></input>
<input name="main_img" type="hidden" id="main_img" value="" />
</tr>
<tr>
<td>绑定关系</td>
</table>
<div class="clearfix box1">
<div style="font-weight:600;float: left">绑定关系</div>
<div class="clearfix box2">
<div style="float:left;margin-right:150px;">
<div id="refereetr">
<td class="login_nameu">装修公司ID：</td>
<td><span class="login_user_input input_size" id="refereespan">
<span class="login_nameu">装修公司ID：</span>
<span class="login_user_input input_size" id="refereespan">
<input type="text" id="refereetext" autocomplete="off" />
<input name="decorate" type="text" id="refereeId" autocomplete="off"/>
<setect id="typenum">
</setect>
</span>
</td>
<td class="login_nameu2">推荐人手机号码</td>
<div class="login_nameu2">推荐人手机号码</div>
</div>
</tr>
<tr>
</div>
<div style="float:left">
<div id="refereetr2">
<td class="login_nameu">城市合伙人ID：</td>
<td><span class="login_user_input input_size" id="refereespan">
<span class="login_nameu">城市合伙人ID：</span>
<div><span class="login_user_input input_size" id="refereespan">
<input type="text" id="refereetext2" autocomplete="off" />
<input name="partner" type="text" id="refereeId2" autocomplete="off"/>
<setect id="typenum2">
</setect>
</td>
<td class="login_nameu2">推荐人手机号码</td>
</span>
</div>
</tr>
<tr>
<td></td>
<div class="login_nameu2">推荐人手机号码</div>
</div>
</div>
<div style="float:left;margin-right:150px;margin-top:5px">
<div id="refereetr3">
<td class="login_nameu">业主ID：</td>
<td><span class="login_user_input input_size" id="refereespan">
<span class="login_nameu">业主ID：</span>
<div><span class="login_user_input input_size" id="refereespan">
<input type="text" id="refereetext3" autocomplete="off" />
<input name="user" type="text" id="refereeId3" autocomplete="off"/>
<setect id="typenum3">
</setect>
</td>
<td class="login_nameu2">推荐人手机号码</td>
</span>
</div>
</tr>
<tr>
<div class="login_nameu2">推荐人手机号码</div>
</div>
</div>
<div style="float:left;margin-top:5px">
<div id="refereetr4">
<td class="login_nameu">带单人ID：</td>
<td><span class="login_user_input input_size" id="refereespan">
<span class="login_nameu">带单人ID：</span>
<div><span class="login_user_input input_size" id="refereespan">
<input type="text" id="refereetext4" autocomplete="off" />
<input name="tape" type="text" id="refereeId4" autocomplete="off"/>
<setect id="typenum4">
</setect>
</td>
<td class="login_nameu2">推荐人手机号码</td>
</span>
</div>
</tr>
<tr>
<td class="px10"><span class="setsub">
<div class="login_nameu2">推荐人手机号码</div>
</div>
</div>
<div>
<div class="px10">
<span class="setsub">
<input type="button" onclick="saveForm();" value="保存" style="cursor:pointer;"/>
</span></td>
</tr>
</table>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</td>
</tr>
......@@ -451,4 +472,35 @@ $!httpInclude.include("/top.htm")
$!httpInclude.include("/footer.htm")
</div>
</body>
<style>
.clearfix:after{/*伪元素是行内元素 正常浏览器清除浮动方法*/
content: "";
display: block;
height: 0;
clear:both;
visibility: hidden;
}
.clearfix{
*zoom: 1;/*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
}
.box1{
margin-top:20px;
margin-left:20px
}
.box2{
float:left;
width:600px;
margin-left:20px
}
#opertable td{
border-top: 1px solid #fff;
}
#uploader .queueList.filled{
padding:10px;
border:3px dashed #e6e6e6;
}
#opertable{
border-bottom: 2px solid #fff;
}
</style>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/contract_detailed.html
View file @ ef6f58d8
......@@ -72,179 +72,215 @@ $!httpInclude.include("/top.htm")
<div class="ordercon">
<div class="operation">
<table width="800" border="0" cellspacing="0" cellpadding="0" id="opertable" >
<tr>
<td>合同名称:</td>
<td>$!objs.contractName</td>
<td>合同编号:</td>
<td>$!objs.contractNumber</td>
</tr>
<tr>
<td>合同金额:</td>
<td>$!objs.contractAmount</td>
<td>支付方式:</td>
<td>
<div class="clearfix box">
<div style='float:left;width:350px' >
<span>合同名称:&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span>$!objs.contractName</span>
</div>
<div style='float:left'>
<span>合同编号:&nbsp;&nbsp;&nbsp;</span>
<span>$!objs.contractNumber</span>
</div>
</div>
<div class="clearfix box">
<div style='float:left;width:350px' >
<span>合同金额:&nbsp;&nbsp;&nbsp;</span>
<span> $!objs.contractAmount 元</span>
</div>
<div style='float:left'>
<span>支付方式:&nbsp;&nbsp;</span>
<span>
#if($!objs.payWay == 0)
分期付款
#else
全额付款
#end
</td>
</tr>
<tr>
<td>甲方联系人:</td>
<td>$!objs.partyA</td>
<td>联系方式:</td>
<td>$!objs.partyAPhone</td>
</tr>
<tr>
<td>乙方联系人:</td>
<td>$!objs.partyB</td>
<td>联系方式:</td>
<td>$!objs.partyBPhone</td>
</tr>
<tr>
<td>合同图片</td>
</span>
</div>
</div>
<div class="clearfix box">
<div style='float:left;width:350px' >
<span>甲方联系人:&nbsp;&nbsp;</span>
<span>$!objs.partyA</span>
</div>
<div style='float:left'>
<span>联系方式:&nbsp;&nbsp;</span>
<span>$!objs.partyAPhone</span>
</div>
</div>
<div class="clearfix box">
<div style='float:left;width:350px' >
<span>乙方联系人:&nbsp;&nbsp;</span>
<span>$!objs.partyB</span>
</div>
<div style='float:left'>
<span>联系方式:&nbsp;&nbsp;</span>
<span>$!objs.partyBPhone</span>
</div>
</div>
<div class="clearfix box">
<div style="float:left">
<span style="font-weight:600;valign="top"">合同图片&nbsp;&nbsp;</span>
</div>
<div style="float:left;padding-left:10px;width:600px">
#foreach($obj in $objs.accessory)
<td>
<img class="img-d" src="$webPath/$obj.path/$obj.name" style="with:200px;height:160px;"/>
</td>
<img class="img-d" src="$webPath/$obj.path/$obj.name" style="width:100px;height:100px;margin-right:20px"/>
#end
</tr>
<tr>
<td>装修工期</td>
<td>水电验收工期：</td>
<td>$!objs.hydropower</td>
<td>泥木工验收工期：</td>
<td>$!objs.mudwood</td>
</tr>
<tr>
<td></td>
<td>油漆验收工期：</td>
<td>$!objs.paint</td>
<td>竣工工验收工期：</td>
<td>$!objs.completed</td>
</tr>
<tr>
<td>订单进度</td>
<td>
</div>
</div>
<div style="margin-top:20px;margin-left:20px" class="clearfix">
<div style="font-weight:600;float: left;">装修工期</div>
<div style="float: left;padding-left:30px">
<div>
<span>水电验收工期：</span>
<span>$!objs.hydropower</span>
<span style="padding-left:200px">泥木工验收工期：</span>
<span>$!objs.mudwood</span>
</div>
<div style="margin-top:20px">
<span>油漆验收工期：</span>
<span>$!objs.paint</span>
<span style="padding-left:200px">竣工工验收工期：</span>
<span>$!objs.completed</span>
</div>
</div>
</div>
<div style="margin-top:20px;margin-left:20px" class="clearfix">
<div style="font-weight:600;float: left;">订单进度</div>
<div style="float: left;margin-left:30px;padding:10px;border:1px solid #ccc;width:550px">
#foreach($obj in $objs.contractDetailed)
<div style="margin-bottom:10px">$obj.addTime - $obj.detailedName</div>
#end
<!-- 方案上传，等待客户确认 -->
#if($!user.id == $!objs.user.id && $!objs.state == 2)
<div>
<span>$obj.addTime - $obj.detailedName</span>
<div class="allmen size7 btn">
<a href="$!webPath/buyer/confirm_detailed.htm?id=$!objs.id" class="blue yes">
确认方案
</a>
<a href="$!webPath/buyer/cancel_detailed.htm?id=$!objs.id" class="blue no">
取消方案
</a>
</div>
</div>
#end
</td>
</tr>
<tr>
<!-- 新建的订单，开始上传方案 -->
#if($!user.id == $!objs.decorate.user.id && $!objs.state == 1)
<td>
<div>
<span class="allmen size7">
<a href="$!webPath/buyer/add_detailed.htm?id=$!objs.id" class="blue">上传方案</a>
<a href="$!webPath/buyer/add_detailed.htm?id=$!objs.id" class="blue yes">上传方案</a>
</span>
</td>
</div>
#end
<!-- 方案上传，等待客户确认 -->
#if($!user.id == $!objs.user.id && $!objs.state == 2)
<td>
<span class="allmen size7">
<a href="$!webPath/buyer/confirm_detailed.htm?id=$!objs.id" class="blue">确认方案</a>
<a href="$!webPath/buyer/cancel_detailed.htm?id=$!objs.id" class="blue">取消方案</a>
</span>
</td>
#end
<!-- 确认之后客户支付 -->
#if($!user.id == $!objs.user.id && $!objs.state == 3)
<td>
<div class="btn">
<span class="allmen size7">
<a id="menberService" onclick="showPay($!objs.id)" class="blue">支付</a>
<a id="menberService" onclick="showPay($!objs.id)" class="blue yes">支付</a>
</span>
</td>
</div>
#end
</div>
</div>
<!--支付完成开始装修，有完成装修按钮 -->
#if($!user.id == $!objs.decorate.user.id && $!objs.state == 4)
<td>
<div>
<span class="allmen size7">
<a href="$!webPath/buyer/finish_trim.htm?id=$!objs.id&state=5" class="blue">装修完成</a>
</span>
</td>
</div>
#end
<!-- 完成装修等待客户验收 -->
#if($!user.id == $!objs.user.id && $!objs.state == 5)
<td>
<div>
<span class="allmen size7">
<a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=1" class="blue">客户验收</a>
</span>
</td>
</div>
#end
<!-- 分期付款开始第二期支付 -->
#if($!user.id == $!objs.user.id && $!objs.state == 6)
<td>
<div>
<span class="allmen size7">
<a id="menberService" onclick="showPay($!objs.id)" class="blue">支付</a>
</span>
</td>
</div>
#end
<!--第二期装修中 -->
#if($!user.id == $!objs.decorate.user.id && $!objs.state == 7)
<td>
<div>
<span class="allmen size7">
<a href="$!webPath/buyer/finish_trim.htm?id=$!objs.id&state=8" class="blue">装修完成</a>
</span>
</td>
</div>
#end
<!--客户验收第二期装修 -->
#if($!user.id == $!objs.user.id && $!objs.state == 8)
<td>
<div>
<span class="allmen size7">
<a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=2" class="blue">客户验收</a>
</span>
</td>
</div>
#end
<!-- 分期付款，第三起支付 -->
#if($!user.id == $!objs.user.id && $!objs.state == 9)
<td>
<div>
<span class="allmen size7">
<a id="menberService" onclick="showPay($!objs.id)" class="blue">支付</a>
</span>
</td>
</div>
#end
<!-- 第三期装修中 -->
#if($!user.id == $!objs.decorate.user.id && $!objs.state == 10)
<td>
<div>
<span class="allmen size7">
<a href="$!webPath/buyer/finish_trim.htm?id=$!objs.id&state=11" class="blue">装修完成</a>
</span>
</td>
</div>
#end
<!--客户验收第二期装修 -->
#if($!user.id == $!objs.user.id && $!objs.state == 11)
<td>
<div>
<span class="allmen size7">
<a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=3" class="blue">客户验收</a>
</span>
</td>
</div>
#end
#if($!user.id == $!objs.user.id && $!objs.state == 12)
<td>
<div>
<span class="allmen size7">
<a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=4" class="blue">竣工验收</a>
</span>
</td>
</div>
#end
</tr>
</table>
</div>
</div>
</div>
......@@ -283,4 +319,44 @@ $!httpInclude.include("/top.htm")
</div>
</div>
</body>
<style>
.clearfix:after{/*伪元素是行内元素 正常浏览器清除浮动方法*/
content: "";
display: block;
height: 0;
clear:both;
visibility: hidden;
}
.clearfix{
*zoom: 1;/*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
}
.box{
margin:20px 20px;
}
#opertable{
border-bottom: 1px solid #fff;
}
.ordercon{
border-top: 1px solid #fff;
}
#opertable td{
border-top: 1px solid #fff;
padding-top:15px
}
.btn{
margin:30px 0 10px 10px;
}
.yes{
border:1px solid #ccc;
padding:4px 5px 4px 7px;
border-radius:4px;
margin-right:20px
}
.no{
border:1px solid #ccc;
padding:4px 6px 4px 7px;
border-radius:4px
}
</style>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/contract_list.html
View file @ ef6f58d8
......@@ -33,14 +33,16 @@ $!httpInclude.include("/top.htm")
<tr> $!httpInclude.include("/buyer/account_nav.htm?op=buyer_cash")
<td id="centerbg" valign="top">
<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)
<span class="allmen size7">
<p class="allmen size7 new">
<a href="$!webPath/buyer/contract_add_detailed.htm" class="blue">新增</a>
</span>
</p>
#end
</div>
</div>
<div class="productmain">
<div class="ordercon">
......@@ -110,4 +112,10 @@ $!httpInclude.include("/top.htm")
$!httpInclude.include("/footer.htm")
</div>
</body>
<style>
.new{
display:inline-block;
margin-left:450px
}
</style>
</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