Skip to content

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

bug，文案，新需求

parent a5db0a5a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 581 additions and 252 deletions
WebRoot/WEB-INF/templates/zh_cn/shop/area_chlids.html 0 → 100644
View file @ 591fec57
#if(!$!childs)
<option >请选择...</option>
#end
#foreach($area in $childs)
<option value="$!area.id">$!area.areaName</option>
#end
\ No newline at end of file
WebRoot/WEB-INF/templates/zh_cn/shop/nav.html
View file @ 591fec57
...@@ -187,11 +187,11 @@ function getbrand(){ ...@@ -187,11 +187,11 @@ function getbrand(){
</dl> </dl>
#end #end
<dl style="position:relative;" class="left_menu_dl"> <!-- <dl style="position:relative;" class="left_menu_dl">
<dt id="dts_15" class="left_menu_dt"> <dt id="dts_15" class="left_menu_dt">
<img class="nav_adv_img "src="$!webPath/resources/style/system/front/default/images/nav_bottom.png"> <img class="nav_adv_img "src="$!webPath/resources/style/system/front/default/images/nav_bottom.png">
</dt> </dt>
</dl> </dl> -->
</div> </div>
</div> </div>
......
WebRoot/WEB-INF/templates/zh_cn/shop/register.html
View file @ 591fec57
...@@ -20,10 +20,9 @@ jQuery(document).ready(function(){ ...@@ -20,10 +20,9 @@ jQuery(document).ready(function(){
//获取下级地区信息 //获取下级地区信息
jQuery("select[id^=areas_]").change(function(){ jQuery("select[id^=areas_]").change(function(){
debugger
var areaMark = jQuery(this).attr("areaMark"); var areaMark = jQuery(this).attr("areaMark");
var parent_id = jQuery("#areas_"+areaMark).val(); var parent_id = jQuery("#areas_"+areaMark).val();
jQuery.post("$!webPath/buyer/account_getAreaChilds.htm",{ jQuery.post("$!webPath/area_chlids.htm",{
"parent_id":parent_id, "parent_id":parent_id,
"areaMark":areaMark "areaMark":areaMark
},function(data){ },function(data){
...@@ -81,6 +80,12 @@ jQuery(document).ready(function(){ ...@@ -81,6 +80,12 @@ jQuery(document).ready(function(){
required:true, required:true,
equalTo:"#password" equalTo:"#password"
}, },
trueName:{
required:true,
},
area_id:{
required:true,
},
/* email:{ /* email:{
required:true, required:true,
email:true, email:true,
...@@ -124,6 +129,12 @@ jQuery(document).ready(function(){ ...@@ -124,6 +129,12 @@ jQuery(document).ready(function(){
required:"推荐人不能为空", required:"推荐人不能为空",
}, },
trueName:{
required:"真实姓名不能为空",
},
area_id:{
required:"请选择区域",
},
password:{ password:{
required:"密码不能为空", required:"密码不能为空",
minlength:"密码不能小于{0}个字符", minlength:"密码不能小于{0}个字符",
...@@ -302,7 +313,7 @@ $!httpInclude.include("/nav1.htm") ...@@ -302,7 +313,7 @@ $!httpInclude.include("/nav1.htm")
<span class="getcode validateCode-btn">获取验证码</span> <span class="getcode validateCode-btn">获取验证码</span>
</td> </td>
<td class="login_nameu2">请输入手机验证码</td>
</tr> </tr>
<tr> <tr>
<td class="login_nameu">密码：</td> <td class="login_nameu">密码：</td>
...@@ -334,6 +345,14 @@ $!httpInclude.include("/nav1.htm") ...@@ -334,6 +345,14 @@ $!httpInclude.include("/nav1.htm")
<option value="$!objs.area.id">请选择...</option> <option value="$!objs.area.id">请选择...</option>
</select> </select>
</span></td> </span></td>
<td class="login_nameu2">请选择区域</td>
</tr>
<tr>
<td class="login_nameu">真实姓名：</td>
<td><span class="login_user_input input_size">
<input name="trueName" type="text" id="trueName" />
</span></td>
<td class="login_nameu2">请输入你的真实姓名</td>
</tr> </tr>
<tr id="refereetr"> <tr id="refereetr">
<td class="login_nameu">推荐人：</td> <td class="login_nameu">推荐人：</td>
......
WebRoot/WEB-INF/templates/zh_cn/shop/store_goods_list.html
View file @ 591fec57
...@@ -232,8 +232,12 @@ function goods_property_generic(type,id,value){ ...@@ -232,8 +232,12 @@ function goods_property_generic(type,id,value){
</head> </head>
<body> <body>
$!httpInclude.include("/top.htm") $!httpInclude.include("/top.htm")
$!httpInclude.include("/head.htm?type=$!type") $!httpInclude.include("/head.htm?type=$!type")
$!httpInclude.include("/nav_shopping.htm?navId=${gc.parent.parent.id}") #if(!${gc.parent.parent.id})
$!httpInclude.include("/nav_shopping.htm?navId=${gc.parent.id}")
#else
$!httpInclude.include("/nav_shopping.htm?navId=${gc.parent.parent.id}")
#end
<script src="$!webPath/advert_invoke.htm?id=1"></script> <script src="$!webPath/advert_invoke.htm?id=1"></script>
<div class="main"> <div class="main">
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_customization_index.html
View file @ 591fec57
...@@ -135,7 +135,7 @@ $!httpInclude.include("/nav1.htm") ...@@ -135,7 +135,7 @@ $!httpInclude.include("/nav1.htm")
<div class="service_box"> <div class="service_box">
<img src="$!webPath/resources/style/system/front/default/images/new/service_icon_05.jpg" /> <img src="$!webPath/resources/style/system/front/default/images/new/service_icon_05.jpg" />
<p class="font18">竣工验收</p> <p class="font18">竣工验收</p>
<p class="gray">士巴兔专业质检验收</p> <p class="gray">智尚荟专业质检验收</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -231,7 +231,7 @@ $!httpInclude.include("/nav1.htm") ...@@ -231,7 +231,7 @@ $!httpInclude.include("/nav1.htm")
<p class="font14">平台亿元补贴，每单补贴2%-5%</p> <p class="font14">平台亿元补贴，每单补贴2%-5%</p>
</li> </li>
<li><p class="font18">特权三</p> <li><p class="font18">特权三</p>
<p class="font14">平台资金托管，装修更有保障</p> <p class="font14">专人监管生产安装过程，验收再打款</p>
</li> </li>
<li><p class="font18">特权四</p> <li><p class="font18">特权四</p>
<p class="font14">环保材质，品质保证，计价透明</p> <p class="font14">环保材质，品质保证，计价透明</p>
...@@ -248,7 +248,7 @@ $!httpInclude.include("/nav1.htm") ...@@ -248,7 +248,7 @@ $!httpInclude.include("/nav1.htm")
<div class="one-title"> <div class="one-title">
特权一 低价承诺 免费设计 免费报价 特权一 低价承诺 免费设计 免费报价
</div> </div>
<p class="gray">士巴兔严选合作品牌和厂家，保证在同价情况再给业主折扣</p> <p class="gray">智尚荟严选合作品牌和厂家，保证在同价情况再给业主折扣</p>
<div class="conent"> <div class="conent">
<ul> <ul>
<li> <li>
...@@ -270,47 +270,158 @@ $!httpInclude.include("/nav1.htm") ...@@ -270,47 +270,158 @@ $!httpInclude.include("/nav1.htm")
</div> </div>
</div> </div>
<div class="showTwo"> <div class="showTwo">
222 <div class="one-title">
特权二 平台亿元补贴，每单补贴2%-5%
</div>
<p class="gray">智商荟现金补贴、品牌商补贴，享不断</p>
<div class="conent">
<ul>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq2.png"></img>
<p class="font18">平台补贴</p>
<p class="gray">网络平台为您准备的现金补贴</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq2.png"></img>
<p class="font18">流量补贴</p>
<p class="gray">品牌商引流费用补贴给业主</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq2.png"></img>
<p class="font18">补贴明细</p>
<p class="gray">为业主向品牌商申请折扣补贴</p>
</li>
</ul>
</div>
</div> </div>
<div class="showTwo"> <div class="showTwo">
333 <div class="one-title">
特权三 专人监管生产安装过程，验收再打款
</div>
<p class="gray">智尚荟携手中科院云计算中心，放心大平台，资金托管定制更有保障</p>
<div class="conent">
<ul>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq3.png"></img>
<p class="font18">权威论证 </p>
<p class="gray">平台携手中科院云计算中心</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq3.png"></img>
<p class="font18">资金托管</p>
<p class="gray">资金托管至平台更安全</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq3.png"></img>
<p class="font18">定制保障</p>
<p class="gray">装修更有话语权</p>
</li>
</ul>
</div>
</div> </div>
<div class="showTwo"> <div class="showTwo">
444 <div class="one-title">
特权四 环保材质，品质保证，计价透明
</div>
<p class="gray">智商荟绿色环保做观念，专业行情，更省时省事</p>
<div class="conent">
<ul>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq4.png"></img>
<p class="font18">审核报价</p>
<p class="gray">专业懂行情不花冤枉钱</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq4.png"></img>
<p class="font18">环保材质</p>
<p class="gray">绿色环保材料看得见</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq4.png"></img>
<p class="font18">品质保证</p>
<p class="gray">全程质检全程保障</p>
</li>
</ul>
</div>
</div> </div>
<div class="showTwo"> <div class="showTwo">
555 <div class="one-title">
特权五 专人监管装修过程，验收再打款
</div>
<p class="gray">智商荟科学流程，保证质量，把控竣工进度</p>
<div class="conent">
<ul>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq5.png"></img>
<p class="font18">平台流程</p>
<p class="gray">平台定制流程规范化</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq5.png"></img>
<p class="font18">监管施工</p>
<p class="gray">生产安装过程全面把关</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq5.png"></img>
<p class="font18">验收打款</p>
<p class="gray">专业检测验收再交付</p>
</li>
</ul>
</div>
</div> </div>
<div class="showTwo"> <div class="showTwo">
666 <div class="one-title">
特权六 平台有保障，售后不用愁
</div>
<p class="gray">智尚荟质量无忧，售后服务也无忧</p>
<div class="conent">
<ul>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq6.png"></img>
<p class="font18">平台售后</p>
<p class="gray">由平台协助业主处理</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq6.png"></img>
<p class="font18">保障售后</p>
<p class="gray">品牌商专业定制售后服务</p>
</li>
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/tq6.png"></img>
<p class="font18">售后无忧</p>
<p class="gray">选择那一刻起便定无后顾之忧</p>
</li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<a id="maodian1" href="#"></a>
<div class="getdesign"> <div class="getdesign">
<div class="main"> <div class="main">
<div class="box-left"> <div class="box-left">
<p class="desi-title">已有<span class="red">3150</span>名客户申请成功</p> <p class="desi-title">已有<span class="red">3150</span>名客户申请成功</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p> <p>乐城郑先生获取索菲亚|皇朝家私报价，获取2039元补贴</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p> <p>东城蓝先生获取索恒峰家居报价，获取补贴1971元</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p> <p>松山湖成先生获取欧派|顶峰家具报价，获取补贴1787元</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p> <p>南城林先生获取恒峰家居报价，获取补贴1883元</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p> <p>道滘高小姐获取索菲亚|皇朝家私报价，获取补贴1978元</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p> <p>松山湖赵小姐获取欧派|顶峰家具报价，获取补贴2069元</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p> <p>南城何先生获取欧派|顶峰家具报价，获取补贴1837元</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p> <p>松山湖肖小姐获取恒峰家居报价，获取补贴2347元</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p> <p>大朗黄先生获取索菲亚|皇朝家私报价，获取2173元补贴</p>
</div> </div>
<div class="box-right"> <div class="box-right">
<div class="form-box"> <div class="form-box">
<p class="form-title">马上获取免费设计</p> <p class="form-title">马上获取免费设计</p>
<p class="gray-title">—— 多家品牌精准方案报价 ——</p> <p class="gray-title">—— 多家品牌精准方案报价 ——</p>
<form action=""> <form action="$webPath/add_customization_bespoke.htm">
<div class="area"> <div class="area">
<input type="text" name="area_id" placeholder="请选择地区"></input> <input type="text" name="address" placeholder="请填写地址"></input>
</div> </div>
<input type="text" name="name" placeholder="您的称呼"></input> <input type="text" name="name" placeholder="您的称呼"></input>
<input type="text" name="phone" placeholder="您的电话"></input> <input type="text" name="phone" placeholder="您的电话"></input>
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/bespoke_list.html
View file @ 591fec57
...@@ -27,11 +27,11 @@ jQuery(document).ready(function(){ ...@@ -27,11 +27,11 @@ jQuery(document).ready(function(){
<form method="post" id="queryForm"> <form method="post" id="queryForm">
<div class="orders"> <div class="orders">
<ul> <ul>
<li><span>活动标题</span> <span class="allmen size6"> <li><span>预约姓名</span> <span class="allmen size6">
<input name="name" type="text" id="name" /> <input name="name" type="text" id="name" />
</span> <span> </span> <span>
<select name="state" id="state"> <select name="state" id="state">
<option value="">活动状态</option> <option value="">全部</option>
<option value="1">新提交</option> <option value="1">新提交</option>
<option value="2">已处理</option> <option value="2">已处理</option>
</select> </select>
...@@ -41,7 +41,7 @@ jQuery(document).ready(function(){ ...@@ -41,7 +41,7 @@ jQuery(document).ready(function(){
</ul> </ul>
</div> </div>
</form> </form>
<form method="post" id="ListForm" action="$!webPath/admin/activity_list.htm"> <form method="post" id="ListForm" action="$!webPath/admin/bespoke_list.htm">
<div class="allshop_table"> <div class="allshop_table">
<table width="98%" border="0" cellspacing="0" cellpadding="0"> <table width="98%" border="0" cellspacing="0" cellpadding="0">
<tr style="background: #if($!config.websiteCss=='blue') #2A7AD2 #end <tr style="background: #if($!config.websiteCss=='blue') #2A7AD2 #end
...@@ -105,7 +105,7 @@ jQuery(document).ready(function(){ ...@@ -105,7 +105,7 @@ jQuery(document).ready(function(){
<input name="state" type="hidden" id="state" value="$!state" /> <input name="state" type="hidden" id="state" value="$!state" />
<input name="name" type="hidden" id="name" value="" /> <input name="name" type="hidden" id="name" value="" />
<input name="currentPage" type="hidden" id="currentPage" value="$!currentPage" /> <input name="currentPage" type="hidden" id="currentPage" value="$!currentPage" />
$!gotoPageFormHTML</div> $!gotoPageHTML</div>
</td> </td>
</tr> </tr>
</table> </table>
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/fs_layout_edit.html
View file @ 591fec57
...@@ -76,7 +76,7 @@ jQuery(document).ready(function(){ ...@@ -76,7 +76,7 @@ jQuery(document).ready(function(){
function saveForm(){ function saveForm(){
//editor.sync(); //editor.sync();
// var s = $("#accessory").val(); var s = $("#imgTwo").val();
debugger; debugger;
jQuery("#theForm").submit(); jQuery("#theForm").submit();
} }
...@@ -87,7 +87,7 @@ $("#fileSubmit").click(function(){ ...@@ -87,7 +87,7 @@ $("#fileSubmit").click(function(){
}); });
function uploadFile(msg){ function uploadFile(msg){
if(msg!=error){ if(msg!=error){
$("#imgPhoto").attr("src",msg); $("#imgTwo").attr("src",msg);
}else { }else {
alert("上传图片失败！"); alert("上传图片失败！");
...@@ -137,6 +137,7 @@ function uploadFile(msg){ ...@@ -137,6 +137,7 @@ function uploadFile(msg){
#end #end
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<div class="submit"> <div class="submit">
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/fs_layout_list.html
View file @ 591fec57
...@@ -77,7 +77,7 @@ function ajax_update(id,fieldName,obj){ ...@@ -77,7 +77,7 @@ function ajax_update(id,fieldName,obj){
<tr> <tr>
<td><span class="tpborder"><img src="$!webPath/$!{obj.imgOne.path}/$!{obj.imgOne.name}" width="90" height="33" /></span></td> <td><span class="tpborder"><img src="$!webPath/$!{obj.imgOne.path}/$!{obj.imgOne.name}" width="90" height="33" /></span></td>
<td>$!CommUtil.formatLongDate($!obj.birthday)</td> <td>$!CommUtil.formatLongDate($!obj.birthday)</td>
<td><span class="tpborder"><img src="$!webPath/$!{obj.imgOne.path}/$!{obj.imgOne.name}" width="90" height="33" /></span></td> <td><span class="tpborder"><img src="$!webPath/$!{obj.imgTwo.path}/$!{obj.imgTwo.name}" width="90" height="33" /></span></td>
#if($!obj.payState==1) #if($!obj.payState==1)
#set($payState="已支付") #set($payState="已支付")
#end #end
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/user_list.html
View file @ 591fec57
...@@ -36,7 +36,23 @@ jQuery(document).ready(function(){ ...@@ -36,7 +36,23 @@ jQuery(document).ready(function(){
</select> </select>
</span> <span class="allmen size4"> </span> <span class="allmen size4">
<input name="value" type="text" id="value" /> <input name="value" type="text" id="value" />
</span><span class="btn_search"> </span>
<span>
开始时间:<input name="beginTime" id="beginTime" type="date" value=""/>
</span>
<span>
结束时间:<input name="endTime" id="denTime" type="date" value=""/>
</span>
<span>
<select name="type" id="type">
<option value="-1">全部会员</option>
<option value="0">普通会员</option>
<option value="1">黄金会员</option>
<option value="2">铂金会员</option>
<option value="3">企业会员</option>
</select>
</span>
<span class="btn_search">
<input name="" type="submit" value="搜索" style="cursor:pointer;" title="搜索会员"/> <input name="" type="submit" value="搜索" style="cursor:pointer;" title="搜索会员"/>
</span> </li> </span> </li>
</ul> </ul>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/seller_index.html
View file @ 591fec57
...@@ -74,7 +74,7 @@ $!httpInclude.include("/seller/nav_head.htm") ...@@ -74,7 +74,7 @@ $!httpInclude.include("/seller/nav_head.htm")
<li><span><a href="$!webPath/buyer/index.htm">买家中心</a></span></li> <li><span><a href="$!webPath/buyer/index.htm">买家中心</a></span></li>
<li><span><a href="$!webPath/buyer/account.htm">我的账户</a></span></li> <li><span><a href="$!webPath/buyer/account.htm">我的账户</a></span></li>
<li><span><a href="$!webPath/design/design_message.htm">设计师</a></span></li> <li><span><a href="$!webPath/design/design_message.htm">设计师</a></span></li>
<!-- <li><span><a href="$!webPath/design/decorate_message.htm">装修公司</a></span></li> --> <li><span><a href="$!webPath/design/decorate_message.htm">装修公司</a></span></li>
</ul> </ul>
#if($!user.store) #if($!user.store)
<span class="seller_nav_a"><a href="javascript:void(0);" dialog_uri="$!webPath/seller/store_quick_menu.htm" dialog_title="设置快捷操作" dialog_width="730" dialog_height="100" dialog_id="store_quick_menu">设置快捷操作</a></span> <span class="seller_nav_a"><a href="javascript:void(0);" dialog_uri="$!webPath/seller/store_quick_menu.htm" dialog_title="设置快捷操作" dialog_width="730" dialog_height="100" dialog_id="store_quick_menu">设置快捷操作</a></span>
......
WebRoot/resources/style/system/front/default/css/index.css
View file @ 591fec57
...@@ -371,6 +371,15 @@ p.desc_text { ...@@ -371,6 +371,15 @@ p.desc_text {
font-size: 16px; font-size: 16px;
border-radius: 6px; border-radius: 6px;
} }
.content_plan_box a {
border: 1px solid #ddd;
background: none;
color: #fff;
padding: 12px 68px;
font-size: 16px;
border-radius: 6px;
}
/*云渲染*/ /*云渲染*/
.index_yun{ .index_yun{
margin:60px 0 ; margin:60px 0 ;
...@@ -427,7 +436,8 @@ p.desc_text { ...@@ -427,7 +436,8 @@ p.desc_text {
} }
.contant_article_lis ul li img { .contant_article_lis ul li img {
width: 100%; width: 360px;
height: 220px;
} }
.contant_article_lis ul li div p{ .contant_article_lis ul li div p{
color:#999 color:#999
...@@ -465,6 +475,15 @@ p.desc_text { ...@@ -465,6 +475,15 @@ p.desc_text {
border-radius: 6px; border-radius: 6px;
} }
.content_fengshui_box a {
padding: 12px 80px;
background: #ff656b;
border: #ff656b;
color: #fff;
font-size: 16px;
border-radius: 6px;
}
.content_fengshui_box button:hover { .content_fengshui_box button:hover {
background: #f37229; background: #f37229;
} }
...@@ -509,7 +528,8 @@ p.desc_text { ...@@ -509,7 +528,8 @@ p.desc_text {
margin-left: 5%; margin-left: 5%;
} }
.contant_designer_lis ul li img { .contant_designer_lis ul li img {
width: 100%; width: 360px;
height: 345px;
} }
.contant_designer_lis .lihover { .contant_designer_lis .lihover {
position: absolute; position: absolute;
...@@ -1053,11 +1073,17 @@ showTwo .conent ul li { ...@@ -1053,11 +1073,17 @@ showTwo .conent ul li {
font-size:14px font-size:14px
} }
.showTwo .conent ul li { .showTwo .conent ul li {
width: 28%; width: 200px;
height:180px;
float: left; float: left;
padding: 27px 0; padding: 27px 0;
margin-left: 4%; margin-left: 4%;
border: 1px solid #ddd; border: 1px solid #ddd;
}
.showTwo .conent ul li img{
width: 200px;
height:140px;
} }
ul.service-silebar p.font14 { ul.service-silebar p.font14 {
color: #999; color: #999;
...@@ -1131,7 +1157,10 @@ input.getsubmit_btm{ ...@@ -1131,7 +1157,10 @@ input.getsubmit_btm{
font-size: 20px; font-size: 20px;
letter-spacing: 2px; letter-spacing: 2px;
border: 1px solid #ff656a; border: 1px solid #ff656a;
width: 335px; width: 225px;
height: 40px;
position: relative;
top:3px;
} }
input.getsubmit_btm:hover { input.getsubmit_btm:hover {
......
WebRoot/resources/style/system/front/default/css/user.css
View file @ 591fec57
...@@ -1907,7 +1907,7 @@ input.designinput { ...@@ -1907,7 +1907,7 @@ input.designinput {
input.designinput.objs { input.designinput.objs {
border: honeydew; border: honeydew;
pointer-events: none; /* pointer-events: none; */
} }
#workpic-list img { #workpic-list img {
width: 100px; width: 100px;
......
WebRoot/resources/style/system/front/default/images/new/qw20190412001.png 0 → 100644
View file @ 591fec57
This image diff could not be displayed because it is too large. You can view the blob instead.
src/com/shopping/manage/admin/action/FsbespokeManageAction.java
View file @ 591fec57
...@@ -134,7 +134,7 @@ public class FsbespokeManageAction { ...@@ -134,7 +134,7 @@ public class FsbespokeManageAction {
Map map = new HashMap(); Map map = new HashMap();
try { try {
String fileName = zshLayout.getImgTwo() == null ? "" : zshLayout.getImgTwo().getName(); String fileName = zshLayout.getImgTwo() == null ? "" : zshLayout.getImgTwo().getName();
map = CommUtil.saveFileToServer(request, "acc", saveFilePathName, fileName, null); map = CommUtil.saveFileToServer(request, "imgTwo", saveFilePathName, fileName, null);
if (fileName.equals("")) { if (fileName.equals("")) {
if (map.get("fileName") != "") { if (map.get("fileName") != "") {
Accessory ac_acc = new Accessory(); Accessory ac_acc = new Accessory();
......
src/com/shopping/manage/admin/action/UserManageAction.java
View file @ 591fec57
...@@ -34,10 +34,15 @@ import com.shopping.foundation.service.ISysConfigService; ...@@ -34,10 +34,15 @@ import com.shopping.foundation.service.ISysConfigService;
import com.shopping.foundation.service.IUserConfigService; import com.shopping.foundation.service.IUserConfigService;
import com.shopping.foundation.service.IUserService; import com.shopping.foundation.service.IUserService;
import com.shopping.manage.admin.tools.StoreTools; import com.shopping.manage.admin.tools.StoreTools;
import com.sun.org.apache.bcel.internal.generic.NEW;
import javafx.scene.chart.PieChart.Data;
import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.nullValue;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
...@@ -123,7 +128,7 @@ public class UserManageAction { ...@@ -123,7 +128,7 @@ public class UserManageAction {
@SecurityMapping(display = false, rsequence = 0, title = "会员列表", value = "/admin/user_list.htm*", rtype = "admin", rname = "会员管理", rcode = "user_manage", rgroup = "会员") @SecurityMapping(display = false, rsequence = 0, title = "会员列表", value = "/admin/user_list.htm*", rtype = "admin", rname = "会员管理", rcode = "user_manage", rgroup = "会员")
@RequestMapping({ "/admin/user_list.htm" }) @RequestMapping({ "/admin/user_list.htm" })
public ModelAndView user_list(HttpServletRequest request, HttpServletResponse response, String currentPage, public ModelAndView user_list(HttpServletRequest request, HttpServletResponse response, String currentPage,
String orderBy, String orderType, String condition, String value) { String orderBy, String orderType, String condition, String value,String beginTime, String endTime,String type) throws Exception {
ModelAndView mv = new JModelAndView("admin/blue/user_list.html", this.configService.getSysConfig(), ModelAndView mv = new JModelAndView("admin/blue/user_list.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 0, request, response); this.userConfigService.getUserConfig(), 0, request, response);
UserQueryObject uqo = new UserQueryObject(currentPage, mv, orderBy, orderType); UserQueryObject uqo = new UserQueryObject(currentPage, mv, orderBy, orderType);
...@@ -131,15 +136,30 @@ public class UserManageAction { ...@@ -131,15 +136,30 @@ public class UserManageAction {
wf.toQueryPo(request, uqo, User.class, mv); wf.toQueryPo(request, uqo, User.class, mv);
uqo.addQuery("obj.userRole", new SysMap("userRole", "ADMIN"), "!="); uqo.addQuery("obj.userRole", new SysMap("userRole", "ADMIN"), "!=");
if (condition != null) { if (condition != null) {
String val = "%"+value+"%";
if (condition.equals("userName")) { if (condition.equals("userName")) {
uqo.addQuery("obj.userName", new SysMap("userName", value), "="); uqo.addQuery("obj.userName", new SysMap("userName", val), "like");
} }
if (condition.equals("email")) { if (condition.equals("email")) {
uqo.addQuery("obj.email", new SysMap("email", value), "="); uqo.addQuery("obj.email", new SysMap("email", val), "like");
} }
if (condition.equals("trueName")) { if (condition.equals("trueName")) {
uqo.addQuery("obj.trueName", new SysMap("trueName", value), "="); uqo.addQuery("obj.trueName", new SysMap("trueName", val), "like");
}
}
if (type != null && !("-1").equals(type)) {
uqo.addQuery("obj.level", new SysMap("level", Integer.parseInt(type)), "=");
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (beginTime != null && !("").equals(beginTime)) {
beginTime += " 00:00:00";
Date time = sdf.parse(beginTime);
uqo.addQuery("obj.addTime", new SysMap("beginTime", time), ">");
} }
if (endTime != null && !("").equals(endTime)) {
endTime += " 00:00:00";
Date time = sdf.parse(endTime);
uqo.addQuery("obj.addTime", new SysMap("endTime", time), "<");
} }
uqo.addQuery("obj.parent.id is null", null); uqo.addQuery("obj.parent.id is null", null);
IPageList pList = this.userService.list(uqo); IPageList pList = this.userService.list(uqo);
......
src/com/shopping/view/web/action/BespokeViewAction.java
View file @ 591fec57
...@@ -12,7 +12,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -12,7 +12,9 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import com.shopping.core.mv.JModelAndView;
import com.shopping.core.tools.WebForm; import com.shopping.core.tools.WebForm;
import com.shopping.foundation.domain.Bespoke; import com.shopping.foundation.domain.Bespoke;
import com.shopping.foundation.service.IBespokeService; import com.shopping.foundation.service.IBespokeService;
...@@ -49,8 +51,8 @@ public class BespokeViewAction { ...@@ -49,8 +51,8 @@ public class BespokeViewAction {
params.put("name", bespoke.getName()); params.put("name", bespoke.getName());
params.put("type", 1); params.put("type", 1);
params.put("state", 1); params.put("state", 1);
List<Bespoke> list = this.bespokeService.query("select obj from Bespoke where obj.phone = :phone and " List<Bespoke> list = this.bespokeService.query("select obj from Bespoke obj where obj.phone = :phone and "
+ "obj.name = :name and obj.type = :type and obj.state = : state", params, -1, -1); + "obj.name = :name and obj.type = :type and obj.state = :state", params, -1, -1);
if (list.size() > 0) { if (list.size() > 0) {
returnJson.put("state", 0); returnJson.put("state", 0);
returnJson.put("message", "已提交，无需重复提交"); returnJson.put("message", "已提交，无需重复提交");
...@@ -64,10 +66,77 @@ public class BespokeViewAction { ...@@ -64,10 +66,77 @@ public class BespokeViewAction {
returnJson.put("message", "提交成功"); returnJson.put("message", "提交成功");
} }
response.setContentType("text/xml"); response.setContentType("text/plain");
response.getWriter().write(returnJson.toString()); response.getWriter().write(returnJson.toString());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
/**
* 全屋定制页面
*
* @param request
* @param response
* @param currentPage
* @param orderBy
* @param orderType
* @return
*/
@RequestMapping({ "/add_customization_bespoke.htm" })
public ModelAndView add_customization_bespoke(HttpServletRequest request, HttpServletResponse response, String area,
String name, String phone) {
ModelAndView mv = new JModelAndView("/zs_customization_index.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
WebForm wf = new WebForm();
Bespoke bespoke = wf.toPo(request, Bespoke.class);
Map<String, Object> params = new HashMap<String, Object>();
params.put("phone", bespoke.getPhone());
params.put("name", bespoke.getName());
params.put("type", 1);
params.put("state", 1);
boolean flagName = false;
boolean flagPhone = false;
if (("").endsWith(bespoke.getPhone()) || bespoke.getPhone() == null) {
flagPhone = true;
}
if (("").endsWith(bespoke.getName()) || bespoke.getName() == null) {
flagName = true;
}
if(flagPhone) {
return mv;
}else {
List<Bespoke> list = this.bespokeService.query("select obj from Bespoke obj where obj.phone = :phone and "
+ "obj.name = :name and obj.type = :type and obj.state = :state", params, -1, -1);
if (list.size() > 0) {
return mv;
} else {
bespoke.setState(1);
bespoke.setType(1);
bespoke.setAddTime(new Date());
this.bespokeService.save(bespoke);
}
}
return mv;
}
/**
* 全屋定制页面
*
* @param request
* @param response
* @param currentPage
* @param orderBy
* @param orderType
* @return
*/
@RequestMapping({ "/zs_customization_index.htm" })
public ModelAndView allHouse_index(HttpServletRequest request, HttpServletResponse response, String area,
String name, String phone) {
ModelAndView mv = new JModelAndView("/zs_customization_index.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
return mv;
}
} }
src/com/shopping/view/web/action/EntityStoreViewAction.java
View file @ 591fec57
...@@ -67,22 +67,6 @@ public class EntityStoreViewAction { ...@@ -67,22 +67,6 @@ public class EntityStoreViewAction {
return mv; return mv;
} }
/**
* 全屋定制页面
*
* @param request
* @param response
* @param currentPage
* @param orderBy
* @param orderType
* @return
*/
@RequestMapping({ "/zs_customization_index.htm" })
public ModelAndView allHouse_index(HttpServletRequest request, HttpServletResponse response, String currentPage, String orderBy, String orderType) {
ModelAndView mv = new JModelAndView("/zs_customization_index.html", this.configService.getSysConfig(), this.userConfigService.getUserConfig(), 1, request, response);
return mv;
}
/** /**
* 会员介绍 * 会员介绍
......
src/com/shopping/view/web/action/LoginViewAction.java
View file @ 591fec57
...@@ -31,11 +31,13 @@ import org.springframework.stereotype.Controller; ...@@ -31,11 +31,13 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.shopping.core.annotation.SecurityMapping;
import com.shopping.core.mv.JModelAndView; import com.shopping.core.mv.JModelAndView;
import com.shopping.core.security.support.SecurityUserHolder; import com.shopping.core.security.support.SecurityUserHolder;
import com.shopping.core.tools.CommUtil; import com.shopping.core.tools.CommUtil;
import com.shopping.core.tools.Md5Encrypt; import com.shopping.core.tools.Md5Encrypt;
import com.shopping.foundation.domain.Album; import com.shopping.foundation.domain.Album;
import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.Goods; import com.shopping.foundation.domain.Goods;
import com.shopping.foundation.domain.GoodsCart; import com.shopping.foundation.domain.GoodsCart;
import com.shopping.foundation.domain.GoodsSpecProperty; import com.shopping.foundation.domain.GoodsSpecProperty;
...@@ -284,8 +286,7 @@ public class LoginViewAction { ...@@ -284,8 +286,7 @@ public class LoginViewAction {
*/ */
@RequestMapping({ "/register_finish.htm" }) @RequestMapping({ "/register_finish.htm" })
public String register_finish(HttpServletRequest request, HttpServletResponse response, String userName, public String register_finish(HttpServletRequest request, HttpServletResponse response, String userName,
String password, String email, String code, String refereeId,String mobileCode) throws HttpException, IOException { String password, String email, String code, String refereeId,String mobileCode,String area_id,String trueName) throws HttpException, IOException {
// 获取refereeId推荐人id // 获取refereeId推荐人id
if (!(refereeId == null) && !(refereeId.equals(""))) { if (!(refereeId == null) && !(refereeId.equals(""))) {
//refereeId = (String) request.getAttribute("refereeId"); //refereeId = (String) request.getAttribute("refereeId");
...@@ -335,9 +336,15 @@ public class LoginViewAction { ...@@ -335,9 +336,15 @@ public class LoginViewAction {
user.setAddTime(new Date()); user.setAddTime(new Date());
user.setEmail(email); user.setEmail(email);
user.setPassword(Md5Encrypt.md5(password).toLowerCase()); user.setPassword(Md5Encrypt.md5(password).toLowerCase());
user.setTrueName(trueName);
params.clear(); params.clear();
params.put("type", "BUYER"); params.put("type", "BUYER");
if ((area_id != null) && (!area_id.equals(""))) {
Area area = this.areaService.getObjById(CommUtil.null2Long(area_id));
user.setArea(area);
}
// 判断是否有推荐人 // 判断是否有推荐人
if ((refereeId != null) && (!refereeId.equals(""))) { if ((refereeId != null) && (!refereeId.equals(""))) {
User referee = this.userService.getObjById(Long.parseLong(refereeId)); User referee = this.userService.getObjById(Long.parseLong(refereeId));
...@@ -1014,4 +1021,17 @@ public class LoginViewAction { ...@@ -1014,4 +1021,17 @@ public class LoginViewAction {
} }
/* } */ /* } */
} }
@RequestMapping({ "/area_chlids.htm" })
public ModelAndView account_getAreaChilds(HttpServletRequest request, HttpServletResponse response, String parent_id) {
ModelAndView mv = new JModelAndView("area_chlids.html", this.configService.getSysConfig(), this.userConfigService.getUserConfig(), 1,
request, response);
Map map = new HashMap();
map.put("parent_id", CommUtil.null2Long(parent_id));
List childs = this.areaService.query("select obj from Area obj where obj.parent.id=:parent_id", map, -1, -1);
if (childs.size() > 0) {
mv.addObject("childs", childs);
}
return mv;
}
} }
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