Skip to content

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

bug，文案，新需求

parent a5db0a5a
Hide 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/index.html
View file @ 591fec57
......@@ -457,7 +457,106 @@ $!httpInclude.include("/nav.htm")
</ul>
</div>
</div>
<!-- 热销定制 -->
<!-- 云渲染 -->
<div class="index_yun">
<div class="main">
<div class="box-title">
<h5>云渲染</h5>
<p class="desc_text">专业量尺 | 快速设计 | 创新营销 | 规范管理 | 对接生产</p>
</div>
<div class="yun_box">
<div class="yun_fl">
<p class="spc_title">户型匹配秒速生成</p>
<p>500W+海量户型图，户型图识别秒速生成3D户型。 </p>
<p class="spc_title">智能辅助高效设计</p>
<p>傻瓜式操作，参数化设计100W+素材库，智能布置一键辅助，省时高效。</p>
</div>
<div class="yun_mid">
<img src="$!webPath/resources/style/system/front/default/images/new/yun_icon.jpg"></img>
</div>
<div class="yun_fl">
<p class="spc_title">专业高效渲染</p>
<p>2分钟渲染，照片级效果智能布置灯光，美观自然五种清晰度，满足不同需求。</p>
<p class="spc_title">自动报价，又快又准</p>
<p>一键自动报价，单元报价、展开面积报价多种报价方式，精准报价，避免错漏单。 </p>
</div>
</div>
</div>
</div>
<!-- 全屋定制计划 -->
<div class="index_box_plan">
<div class="main">
<div class="index">
<div class="content_plan_box">
<h4>全屋定制计划</h4>
<p>全屋配齐、生活美学、一站式服务、智能家居，以客户为中心,结合生活美学，充分尊重使用者的生活习惯,让使用者更简单便利、舒心的入住。</p>
<a class="index_play_btn" href="zs_customization_index.htm#maodian1">马上定制</a>
</div>
</div>
</div>
</div>
<!-- 家居风水 -->
<div class="index_box_fengshui">
<div class="main">
<div class="index">
<div class="content_fengshui_box">
<h4>全屋定制计划</h4>
<p class="desc_text">以卓越的家居梦想为导航，驱动定制家居创新，引领全屋定制潮流，提供一站式的全屋家居定制服务，为您定制舒适的家</p>
<p><a href="" class="red">《服务介绍》</a></p>
<div class=contant_article_lis>
<ul>
<li>
<div>
<img src="$!webPath/resources/style/system/front/default/images/new/qw20190412001.png"></img>
<!-- <h5>家居风水布局文章</h5> -->
<p>在现有的毛坯建筑 </p>
<p> 通过合理的空间改造 </p>
<p> 打破固化思维 </p>
<p> 结合当代最符合人体工学的室内家装方法 </p>
<p>对室内进行定制化装修改造 </p>
<p>为您打造舒心的居家环境</p>
</div>
</li>
<li>
<div>
<img src="$!webPath/resources/style/system/front/default/images/new/qw20190412002.png"></img>
<!-- <h5>家居风水布局文章</h5> -->
<p>了解你的习惯、你的性格和你的喜好</p>
<p> 精准测量您的房间户型图</p>
<p> 由一线设计师团队在一点一线间</p>
<p> 构筑一个前所未有的居家空间</p>
<p> 在专业、严苛的施工</p>
<p> 把控整体服务安装流程</p>
</div>
</li>
<li>
<div>
<img src="$!webPath/resources/style/system/front/default/images/new/qw20190412003.png"></img>
<!-- <h5>家居风水布局文章</h5> -->
<p>使用国际顶级装修搭配思维 </p>
<p> 为居家环境进行最优化调整与搭配 </p>
<p> 使居家环境更符合人体行为轨迹</p>
<p>真正做到“举手可触，落地可控”的良好居家使用感
</p>
</div>
</li>
</ul>
</div>
<a class="index_play_btn" href="zs_customization_index.htm#maodian1">马上预约</a>
</div>
</div>
</div>
</div>
<!-- 热销定制 -->
<div class="index_custom_box">
<div class="index_box_title">
<div class="title_left_fl">
......@@ -524,85 +623,7 @@ $!httpInclude.include("/nav.htm")
</div>
</div>
<!-- 全屋定制计划 -->
<div class="index_box_plan">
<div class="main">
<div class="index">
<div class="content_plan_box">
<h4>全屋定制计划</h4>
<p>全屋六大空间自由搭配：客厅、餐厅、卧室、阳台、玄关、功能房量身定制，打造梦想家！</p>
<button class="index_play_btn">马上定制</button>
</div>
</div>
</div>
</div>
<!-- 云渲染 -->
<div class="index_yun">
<div class="main">
<div class="box-title">
<h5>云渲染</h5>
<p class="desc_text">专业量尺 | 快速设计 | 创新营销 | 规范管理 | 对接生产</p>
</div>
<div class="yun_box">
<div class="yun_fl">
<p class="spc_title">户型匹配秒速生成</p>
<p>500W+海量户型图，户型图识别秒速生成3D户型。 </p>
<p class="spc_title">智能辅助高效设计</p>
<p>傻瓜式操作，参数化设计100W+素材库，智能布置一键辅助，省时高效。</p>
</div>
<div class="yun_mid">
<img src="$!webPath/resources/style/system/front/default/images/new/yun_icon.jpg"></img>
</div>
<div class="yun_fl">
<p class="spc_title">专业高效渲染</p>
<p>2分钟渲染，照片级效果智能布置灯光，美观自然五种清晰度，满足不同需求。</p>
<p class="spc_title">自动报价，又快又准</p>
<p>一键自动报价，单元报价、展开面积报价多种报价方式，精准报价，避免错漏单。 </p>
</div>
</div>
</div>
</div>
<!-- 家居风水 -->
<div class="index_box_fengshui">
<div class="main">
<div class="index">
<div class="content_fengshui_box">
<h4>全屋定制计划</h4>
<p class="desc_text">定制介绍文字，定制介绍文字，定制介绍文字，定制介绍文字，定制介绍文字</p>
<p><a href="" class="red">《服务介绍》</a></p>
<div class=contant_article_lis>
<ul>
<li>
<div>
<img src="$!webPath/resources/style/system/front/default/images/new/shui_img_1.jpg"></img>
<h5>家居风水布局文章1</h5>
<p>文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，</p>
</div>
</li>
<li>
<div>
<img src="$!webPath/resources/style/system/front/default/images/new/shui_img_2.jpg"></img>
<h5>家居风水布局文章2</h5>
<p>文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，</p>
</div>
</li>
<li>
<div>
<img src="$!webPath/resources/style/system/front/default/images/new/shui_img_3.jpg"></img>
<h5>家居风水布局文章3</h5>
<p>文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，文章介绍，</p>
</div>
</li>
</ul>
</div>
<button class="index_play_btn">马上预约</button>
</div>
</div>
</div>
</div>
<!-- 金牌设计师 -->
<div class="index_box_designer">
<div class="main">
......@@ -613,11 +634,16 @@ $!httpInclude.include("/nav.htm")
<div class=contant_designer_lis>
<ul class="designer_box">
<li>
<img src="$!webPath/resources/style/system/front/default/images/new/designer.jpg"></img>
#foreach($obj in $design)
#if($!obj.acc)
#set($img="$!imageWebServer/$!{obj.acc.path}/$!{obj.acc.name}")
#end
<li>
<!-- <img src="$!webPath/resources/style/system/front/default/images/new/designer.jpg"></img> -->
<img src="$!img" />
<div class="lihover">
<div class="hoverbox">
<p>王大量</p>
<p>$obj.User.userName</p>
<p>东莞十大设计师</p>
<div class="box_list">
<ul>
......@@ -638,7 +664,23 @@ $!httpInclude.include("/nav.htm")
</div>
</div>
</li>
<li>
<!-- <div class="designer_box">
<a href="zs_designer_detaile.htm?designId=$!{obj.id}&currentPage=0">
<img src="$!img" />
<div class="detail">
<h5>$obj.User.userName</h5>
<p>所在城市：$obj.Area.areaName</p>
<p>擅长空间：
#foreach($objname in $obj.DesignExpert)
$objname.expertName
#end
</p>
</div>
</a>
</div> -->
#end
<!-- <li>
<img src="$!webPath/resources/style/system/front/default/images/new/designer.jpg"></img>
<div class="lihover">
<div class="hoverbox">
......@@ -662,8 +704,8 @@ $!httpInclude.include("/nav.htm")
</div>
</div>
</div>
</li>
<li>
</li> -->
<!-- <li>
<img src="$!webPath/resources/style/system/front/default/images/new/designer.jpg"></img>
<div class="lihover">
<div class="hoverbox">
......@@ -687,7 +729,7 @@ $!httpInclude.include("/nav.htm")
</div>
</div>
</div>
</li>
</li> -->
</ul>
</div>
</div>
......@@ -709,9 +751,9 @@ $!httpInclude.include("/nav.htm")
<p class="level">黄金合伙人</p>
<p><span>（创业版）</span></p>
<p class="money">￥399</p>
<p><span>自用省钱，推荐赚钱</span></p>
<ul>
<li>自用省钱，推荐赚钱</li>
<!-- <li>自用省钱，推荐赚钱</li> -->
<li>√分享资源享受红利</li>
<li>√傻瓜式操作轻松上手，人人都能成为设计师</li>
<li>√装修神器，设计效果图VR即刻呈现</li>
......@@ -759,9 +801,11 @@ $!httpInclude.include("/nav.htm")
<div class="contact_style">
<p class="content-til"><span>客服回拨</span>在线留下您的联系方式，3个工作日内回拨联系您</p>
<div class="input_box">
<input class="youname" placeholder="您的姓名" />
<input class="yourmobile" placeholder="联系电话" />
<button>提交给客服</button>
<form action="$webPath/add_customization_bespoke.htm">
<input class="youname" type="text" name="name" placeholder="您的姓名" />
<input class="yourmobile" ype="text" name="phone" placeholder="联系电话" />
<input name="login" type="submit" class="getsubmit_btm" id="tjkf" value="提交给客服"/>
</form>
</div>
<p>您的联系方式不会泄露，请放心使用</p>
</div>
......@@ -808,17 +852,21 @@ $!httpInclude.include("/nav.htm")
<p class="diaglog_title">黄金合伙人</p>
<p>渠道的神器</p>
<p class="diaglog_money">￥399</p>
<p class="p-desc">助力家具生意简单高效</p>
<p>专注提高签单效率，提高整体营业额</p>
<!-- <p class="p-desc">助力家具生意简单高效</p> -->
<p>自用省钱，推荐赚钱</p>
<div class="content_ul">
<ul>
<li>提升导购工作效率</li>
<!-- <li>提升导购工作效率</li>
<li>让导购拥有设计技能</li>
<li>用户参与设计，增加留店率</li>
<li>提升厂家拓展市场速度</li>
<li>产品统一管理，信息及时更新</li>
<li>对旗下经销商即时统一管理</li>
<li>无需增加投入，增加店面额外收入</li>
<li>无需增加投入，增加店面额外收入</li> -->
<li>√分享资源享受红利</li>
<li>√傻瓜式操作轻松上手，人人都能成为设计师</li>
<li>√装修神器，设计效果图VR即刻呈现</li>
<li>√家装风格自己选，成本自由控制</li>
</ul>
</div>
<p><a href="#" id="ercode-choose">选择</a></p>
......@@ -855,17 +903,21 @@ $!httpInclude.include("/nav.htm")
<p class="diaglog_title">铂金合伙人</p>
<p>销售利器</p>
<p class="diaglog_money">￥2999</p>
<p class="p-desc1">助力家具生意简单高效</p>
<p>专注提高签单效率，提高整体营业额</p>
<!-- <p class="p-desc1">助力家具生意简单高效</p> -->
<p><!-- 专注提高签单效率，提高整体营业额 --></p>
<div class="content_ul">
<ul>
<li>提升导购工作效率</li>
<!-- <li>提升导购工作效率</li>
<li>让导购拥有设计技能</li>
<li>用户参与设计，增加留店率</li>
<li>提升厂家拓展市场速度</li>
<li>产品统一管理，信息及时更新</li>
<li>对旗下经销商即时统一管理</li>
<li>无需增加投入，增加店面额外收入</li>
<li>无需增加投入，增加店面额外收入</li> -->
<li>√分享客源、产品享受高额分成</li>
<li>√渠道精准引流，提升客单价</li>
<li>√体验式营销，提高粘性</li>
<li>√精准报价，避免错漏单</li>
</ul>
</div>
<p><a href="#" id="ercode-choose1">选择</a></p>
......
WebRoot/WEB-INF/templates/zh_cn/shop/nav.html
View file @ 591fec57
......@@ -187,11 +187,11 @@ function getbrand(){
</dl>
#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">
<img class="nav_adv_img "src="$!webPath/resources/style/system/front/default/images/nav_bottom.png">
</dt>
</dl>
</dl> -->
</div>
</div>
......
WebRoot/WEB-INF/templates/zh_cn/shop/register.html
View file @ 591fec57
......@@ -20,10 +20,9 @@ jQuery(document).ready(function(){
//获取下级地区信息
jQuery("select[id^=areas_]").change(function(){
debugger
var areaMark = jQuery(this).attr("areaMark");
var parent_id = jQuery("#areas_"+areaMark).val();
jQuery.post("$!webPath/buyer/account_getAreaChilds.htm",{
jQuery.post("$!webPath/area_chlids.htm",{
"parent_id":parent_id,
"areaMark":areaMark
},function(data){
......@@ -67,7 +66,7 @@ jQuery(document).ready(function(){
}
},
mobileCode:{
required: true,
required: true,
},
refereeId:{
required:true,
......@@ -81,6 +80,12 @@ jQuery(document).ready(function(){
required:true,
equalTo:"#password"
},
trueName:{
required:true,
},
area_id:{
required:true,
},
/* email:{
required:true,
email:true,
......@@ -124,6 +129,12 @@ jQuery(document).ready(function(){
required:"推荐人不能为空",
},
trueName:{
required:"真实姓名不能为空",
},
area_id:{
required:"请选择区域",
},
password:{
required:"密码不能为空",
minlength:"密码不能小于{0}个字符",
......@@ -302,7 +313,7 @@ $!httpInclude.include("/nav1.htm")
<span class="getcode validateCode-btn">获取验证码</span>
</td>
<td class="login_nameu2">请输入手机验证码</td>
</tr>
<tr>
<td class="login_nameu">密码：</td>
......@@ -334,7 +345,15 @@ $!httpInclude.include("/nav1.htm")
<option value="$!objs.area.id">请选择...</option>
</select>
</span></td>
</tr>
<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 id="refereetr">
<td class="login_nameu">推荐人：</td>
<td><span class="login_user_input input_size" id="refereespan">
......
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){
</head>
<body>
$!httpInclude.include("/top.htm")
$!httpInclude.include("/head.htm?type=$!type")
$!httpInclude.include("/nav_shopping.htm?navId=${gc.parent.parent.id}")
$!httpInclude.include("/head.htm?type=$!type")
#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>
<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")
<div class="service_box">
<img src="$!webPath/resources/style/system/front/default/images/new/service_icon_05.jpg" />
<p class="font18">竣工验收</p>
<p class="gray">士巴兔专业质检验收</p>
<p class="gray">智尚荟专业质检验收</p>
</div>
</div>
</div>
......@@ -231,7 +231,7 @@ $!httpInclude.include("/nav1.htm")
<p class="font14">平台亿元补贴，每单补贴2%-5%</p>
</li>
<li><p class="font18">特权三</p>
<p class="font14">平台资金托管，装修更有保障</p>
<p class="font14">专人监管生产安装过程，验收再打款</p>
</li>
<li><p class="font18">特权四</p>
<p class="font14">环保材质，品质保证，计价透明</p>
......@@ -248,7 +248,7 @@ $!httpInclude.include("/nav1.htm")
<div class="one-title">
特权一 低价承诺 免费设计 免费报价
</div>
<p class="gray">士巴兔严选合作品牌和厂家，保证在同价情况再给业主折扣</p>
<p class="gray">智尚荟严选合作品牌和厂家，保证在同价情况再给业主折扣</p>
<div class="conent">
<ul>
<li>
......@@ -270,47 +270,158 @@ $!httpInclude.include("/nav1.htm")
</div>
</div>
<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 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 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 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 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>
<a id="maodian1" href="#"></a>
<div class="getdesign">
<div class="main">
<div class="box-left">
<p class="desi-title">已有<span class="red">3150</span>名客户申请成功</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p>
<p>乐城郑先生获取索菲亚|皇朝家私报价，获取2039元补贴</p>
<p>东城蓝先生获取索恒峰家居报价，获取补贴1971元</p>
<p>松山湖成先生获取欧派|顶峰家具报价，获取补贴1787元</p>
<p>南城林先生获取恒峰家居报价，获取补贴1883元</p>
<p>道滘高小姐获取索菲亚|皇朝家私报价，获取补贴1978元</p>
<p>松山湖赵小姐获取欧派|顶峰家具报价，获取补贴2069元</p>
<p>南城何先生获取欧派|顶峰家具报价，获取补贴1837元</p>
<p>松山湖肖小姐获取恒峰家居报价，获取补贴2347元</p>
<p>乐城郑先生获取索菲亚|皇朝家俬报价，获取2000元补贴</p>
<p>大朗黄先生获取索菲亚|皇朝家私报价，获取2173元补贴</p>
</div>
<div class="box-right">
<div class="form-box">
<p class="form-title">马上获取免费设计</p>
<p class="gray-title">—— 多家品牌精准方案报价 ——</p>
<form action="">
<form action="$webPath/add_customization_bespoke.htm">
<div class="area">
<input type="text" name="area_id" placeholder="请选择地区"></input>
<input type="text" name="address" placeholder="请填写地址"></input>
</div>
<input type="text" name="name" 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(){
<form method="post" id="queryForm">
<div class="orders">
<ul>
<li><span>活动标题</span> <span class="allmen size6">
<li><span>预约姓名</span> <span class="allmen size6">
<input name="name" type="text" id="name" />
</span> <span>
<select name="state" id="state">
<option value="">活动状态</option>
<option value="">全部</option>
<option value="1">新提交</option>
<option value="2">已处理</option>
</select>
......@@ -41,7 +41,7 @@ jQuery(document).ready(function(){
</ul>
</div>
</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">
<table width="98%" border="0" cellspacing="0" cellpadding="0">
<tr style="background: #if($!config.websiteCss=='blue') #2A7AD2 #end
......@@ -105,7 +105,7 @@ jQuery(document).ready(function(){
<input name="state" type="hidden" id="state" value="$!state" />
<input name="name" type="hidden" id="name" value="" />
<input name="currentPage" type="hidden" id="currentPage" value="$!currentPage" />
$!gotoPageFormHTML</div>
$!gotoPageHTML</div>
</td>
</tr>
</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(){
function saveForm(){
//editor.sync();
// var s = $("#accessory").val();
var s = $("#imgTwo").val();
debugger;
jQuery("#theForm").submit();
}
......@@ -87,7 +87,7 @@ $("#fileSubmit").click(function(){
});
function uploadFile(msg){
if(msg!=error){
$("#imgPhoto").attr("src",msg);
$("#imgTwo").attr("src",msg);
}else {
alert("上传图片失败！");
......@@ -137,6 +137,7 @@ function uploadFile(msg){
#end
</li>
</ul>
</div>
</div>
<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){
<tr>
<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><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)
#set($payState="已支付")
#end
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/user_list.html
View file @ 591fec57
......@@ -35,9 +35,25 @@ jQuery(document).ready(function(){
<option value="trueName">真实姓名</option>
</select>
</span> <span class="allmen size4">
<input name="value" type="text" id="value" />
</span><span class="btn_search">
<input name="" type="submit" value="搜索" style="cursor:pointer;" title="搜索会员"/>
<input name="value" type="text" id="value" />
</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="搜索会员"/>
</span> </li>
</ul>
</div>
......
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")
<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/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>
#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>
......
WebRoot/resources/style/system/front/default/css/index.css
View file @ 591fec57
......@@ -371,6 +371,15 @@ p.desc_text {
font-size: 16px;
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{
margin:60px 0 ;
......@@ -427,7 +436,8 @@ p.desc_text {
}
.contant_article_lis ul li img {
width: 100%;
width: 360px;
height: 220px;
}
.contant_article_lis ul li div p{
color:#999
......@@ -465,6 +475,15 @@ p.desc_text {
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 {
background: #f37229;
}
......@@ -509,7 +528,8 @@ p.desc_text {
margin-left: 5%;
}
.contant_designer_lis ul li img {
width: 100%;
width: 360px;
height: 345px;
}
.contant_designer_lis .lihover {
position: absolute;
......@@ -1053,11 +1073,17 @@ showTwo .conent ul li {
font-size:14px
}
.showTwo .conent ul li {
width: 28%;
width: 200px;
height:180px;
float: left;
padding: 27px 0;
margin-left: 4%;
border: 1px solid #ddd;
}
.showTwo .conent ul li img{
width: 200px;
height:140px;
}
ul.service-silebar p.font14 {
color: #999;
......@@ -1131,7 +1157,10 @@ input.getsubmit_btm{
font-size: 20px;
letter-spacing: 2px;
border: 1px solid #ff656a;
width: 335px;
width: 225px;
height: 40px;
position: relative;
top:3px;
}
input.getsubmit_btm:hover {
......
WebRoot/resources/style/system/front/default/css/user.css
View file @ 591fec57
......@@ -1907,7 +1907,7 @@ input.designinput {
input.designinput.objs {
border: honeydew;
pointer-events: none;
/* pointer-events: none; */
}
#workpic-list img {
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 {
Map map = new HashMap();
try {
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 (map.get("fileName") != "") {
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;
import com.shopping.foundation.service.IUserConfigService;
import com.shopping.foundation.service.IUserService;
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 java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
......@@ -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 = "会员")
@RequestMapping({ "/admin/user_list.htm" })
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(),
this.userConfigService.getUserConfig(), 0, request, response);
UserQueryObject uqo = new UserQueryObject(currentPage, mv, orderBy, orderType);
......@@ -131,16 +136,31 @@ public class UserManageAction {
wf.toQueryPo(request, uqo, User.class, mv);
uqo.addQuery("obj.userRole", new SysMap("userRole", "ADMIN"), "!=");
if (condition != null) {
String val = "%"+value+"%";
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")) {
uqo.addQuery("obj.email", new SysMap("email", value), "=");
uqo.addQuery("obj.email", new SysMap("email", val), "like");
}
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);
IPageList pList = this.userService.list(uqo);
String url = this.configService.getSysConfig().getAddress();
......
src/com/shopping/view/web/action/BespokeViewAction.java
View file @ 591fec57
......@@ -12,7 +12,9 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
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.foundation.domain.Bespoke;
import com.shopping.foundation.service.IBespokeService;
......@@ -49,8 +51,8 @@ public class BespokeViewAction {
params.put("name", bespoke.getName());
params.put("type", 1);
params.put("state", 1);
List<Bespoke> list = this.bespokeService.query("select obj from Bespoke where obj.phone = :phone and "
+ "obj.name = :name and obj.type = :type and obj.state = : state", params, -1, -1);
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) {
returnJson.put("state", 0);
returnJson.put("message", "已提交，无需重复提交");
......@@ -64,10 +66,77 @@ public class BespokeViewAction {
returnJson.put("message", "提交成功");
}
response.setContentType("text/xml");
response.setContentType("text/plain");
response.getWriter().write(returnJson.toString());
} catch (IOException e) {
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 {
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/IndexViewAction.java
View file @ 591fec57
......@@ -46,6 +46,7 @@ import com.shopping.foundation.service.IArticleClassService;
import com.shopping.foundation.service.IArticleService;
import com.shopping.foundation.service.IBargainGoodsService;
import com.shopping.foundation.service.IDeliveryGoodsService;
import com.shopping.foundation.service.IDesignService;
import com.shopping.foundation.service.IGoodsBrandService;
import com.shopping.foundation.service.IGoodsCartService;
import com.shopping.foundation.service.IGoodsClassService;
......@@ -156,10 +157,13 @@ public class IndexViewAction {
@Autowired
private AreaViewTools areaViewTools;
@Autowired
private PhoneCodeViewTools phoneCodeViewTools;
@Autowired
private IDesignService designService;
/**
* 页面最上面部分
*
......@@ -219,8 +223,8 @@ public class IndexViewAction {
params, -1, -1);
for (StoreCart sc : store_cookie_cart) {
for (GoodsCart gc : ((StoreCart) sc).getGcs()) {
//gc.getGsps().clear();
//this.goodsCartService.delete(gc.getId());
// gc.getGsps().clear();
// this.goodsCartService.delete(gc.getId());
}
this.storeCartService.delete(((StoreCart) sc).getId());
}
......@@ -413,25 +417,26 @@ public class IndexViewAction {
@RequestMapping({ "/getBrand.htm" })
public void getBrand(HttpServletRequest request, HttpServletResponse response) {
//查询出所有的类别
List<GoodsClass> allNav = this.goodsClassService.query("select obj from GoodsClass obj",null, -1, -1);
// 查询出所有的类别
List<GoodsClass> allNav = this.goodsClassService.query("select obj from GoodsClass obj", null, -1, -1);
JSONArray returnArray = new JSONArray();
for (GoodsClass goodsClass : allNav) {
GoodsType types = goodsClass.getGoodsType();
//获取种类下面的所有品牌
List <GoodsBrand> list = types.getGbs();
// 获取种类下面的所有品牌
List<GoodsBrand> list = types.getGbs();
JSONObject jObj = new JSONObject();
JSONArray jArray = new JSONArray();
for (GoodsBrand goodsBrand : list) {
if(goodsBrand.isRecommend() && goodsBrand.getAudit() == 1) {
if (goodsBrand.isRecommend() && goodsBrand.getAudit() == 1) {
JSONObject jsObj = new JSONObject();
jsObj.put("id", goodsBrand.getId());
jsObj.put("name", goodsBrand.getName());
jsObj.put("imgPath", goodsBrand.getBrandLogo().getPath()+"/"+goodsBrand.getBrandLogo().getName());
jsObj.put("imgPath",
goodsBrand.getBrandLogo().getPath() + "/" + goodsBrand.getBrandLogo().getName());
jArray.add(jsObj);
}
}
......@@ -446,46 +451,35 @@ public class IndexViewAction {
} catch (IOException e) {
e.printStackTrace();
}
//查询出所有的品牌
/*GoodsClass goodsClass = this.goodsClassService.getObjById(Long.parseLong(id));
if(goodsClass != null) {
//获取品牌种类
GoodsType types = goodsClass.getGoodsType();
//获取种类下面的所有品牌
List <GoodsBrand> list = types.getGbs();
List <GoodsBrand> returnList = new ArrayList<GoodsBrand>();
for (GoodsBrand goodsBrand : list) {
if(goodsBrand.isRecommend() && goodsBrand.getAudit() == 1) {
returnList.add(goodsBrand);
}
}
JSONArray jsArray = new JSONArray();
for (GoodsBrand goodsBrand : returnList) {
JSONObject jsObj = new JSONObject();
jsObj.put("id", goodsBrand.getId());
jsObj.put("name", goodsBrand.getName());
jsObj.put("imgPath", goodsBrand.getBrandLogo().getPath()+"/"+goodsBrand.getBrandLogo().getName());
jsArray.add(jsObj);
}
try {
PrintWriter writer = response.getWriter();
writer.print(jsArray.toString());
} catch (IOException e) {
e.printStackTrace();
}
}*/
// 查询出所有的品牌
/*
* GoodsClass goodsClass =
* this.goodsClassService.getObjById(Long.parseLong(id)); if(goodsClass != null)
* { //获取品牌种类 GoodsType types = goodsClass.getGoodsType(); //获取种类下面的所有品牌 List
* <GoodsBrand> list = types.getGbs();
*
* List <GoodsBrand> returnList = new ArrayList<GoodsBrand>();
*
* for (GoodsBrand goodsBrand : list) { if(goodsBrand.isRecommend() &&
* goodsBrand.getAudit() == 1) { returnList.add(goodsBrand); } } JSONArray
* jsArray = new JSONArray(); for (GoodsBrand goodsBrand : returnList) {
* JSONObject jsObj = new JSONObject(); jsObj.put("id", goodsBrand.getId());
* jsObj.put("name", goodsBrand.getName()); jsObj.put("imgPath",
* goodsBrand.getBrandLogo().getPath()+"/"+goodsBrand.getBrandLogo().getName());
* jsArray.add(jsObj); }
*
* try { PrintWriter writer = response.getWriter();
* writer.print(jsArray.toString());
*
* } catch (IOException e) { e.printStackTrace(); }
*
* }
*/
}
@RequestMapping({ "/index.htm" })
public ModelAndView index(HttpServletRequest request, HttpServletResponse response) {
ModelAndView mv = new JModelAndView("index.html", this.configService.getSysConfig(),
......@@ -630,11 +624,15 @@ public class IndexViewAction {
0, 5);
mv.addObject("hots", hot_goods_list);
User user = SecurityUserHolder.getCurrentUser();
// 推荐设计师
List design = this.designService.query("select obj from Design obj order by obj.addTime desc", null, 0, 3);
mv.addObject("design", design);
if(user == null) {
User user = SecurityUserHolder.getCurrentUser();
if (user == null) {
mv.addObject("falg", false);
}else {
} else {
mv.addObject("falg", true);
}
......@@ -649,14 +647,15 @@ public class IndexViewAction {
* @return
*/
@RequestMapping({ "/zs_shopping_index.htm" })
public ModelAndView shoppingIndex(HttpServletRequest request, HttpServletResponse response,String currentPage, String orderBy,String orderType) {
public ModelAndView shoppingIndex(HttpServletRequest request, HttpServletResponse response, String currentPage,
String orderBy, String orderType) {
ModelAndView mv = new JModelAndView("zs_shopping_index.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
// 设置为PC访问
request.getSession().setAttribute("shopping_view_type", "pc");
String navId = (String) request.getAttribute("navId");
// 横向导航栏
List<GoodsClass> nav = this.goodsClassService.query("select obj from GoodsClass obj where obj.level = 0 ", null,
-1, -1);
......@@ -665,8 +664,8 @@ public class IndexViewAction {
// 左侧导航栏
List<GoodsClass> leftNav = new ArrayList<GoodsClass>();
if (navId == null) {
leftNav = this.goodsClassService.query("select obj from GoodsClass obj where obj.parent.id is NULL",
null, -1, -1);
leftNav = this.goodsClassService.query("select obj from GoodsClass obj where obj.parent.id is NULL", null,
-1, -1);
} else {
Map<String, Object> params = new HashMap<String, Object>();
params.put("navId", Long.parseLong(navId));
......@@ -675,10 +674,9 @@ public class IndexViewAction {
}
mv.addObject("leftNav", leftNav);
// 加载数据
List<Map<String, Object>> listDate = new ArrayList<Map<String, Object>>();
// 没有点击横向导航菜单默认每个菜单加载7条数据
if (navId == null) {
List<Long> navIdList = new ArrayList<Long>();
......@@ -690,11 +688,12 @@ public class IndexViewAction {
listDate.add(map);
}
mv.addObject("objs", listDate);
}else {
//根据导航菜单加载数据
} else {
// 根据导航菜单加载数据
GoodsClass goodsClass = this.goodsClassService.getObjById(Long.parseLong(navId));
//List<Goods> listGoods = this.goodsViewTools.query_with_gc(goodsClass.getId().toString(), 6);
// List<Goods> listGoods =
// this.goodsViewTools.query_with_gc(goodsClass.getId().toString(), 6);
Set<Long> gcIds = this.goodsViewTools.genericIds(goodsClass);
GoodsQueryObject qo = new GoodsQueryObject(currentPage, mv, orderBy, orderType);
qo.addQuery("obj.gc.id", new SysMap("gcIds", gcIds), "in");
......@@ -704,15 +703,14 @@ public class IndexViewAction {
return mv;
}
@RequestMapping({ "/nav_shopping.htm" })
public ModelAndView nav_shopping(HttpServletRequest request, HttpServletResponse response) {
ModelAndView mv = new JModelAndView("nav_shopping.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
//,String navId
// ,String navId
String navId = (String) request.getAttribute("navId");
// 横向导航栏
List<GoodsClass> nav = this.goodsClassService.query("select obj from GoodsClass obj where obj.level = 0 ", null,
-1, -1);
......@@ -721,8 +719,8 @@ public class IndexViewAction {
// 左侧导航栏
List<GoodsClass> leftNav = new ArrayList<GoodsClass>();
if (navId == null) {
leftNav = this.goodsClassService.query("select obj from GoodsClass obj where obj.parent.id is NULL",
null, -1, -1);
leftNav = this.goodsClassService.query("select obj from GoodsClass obj where obj.parent.id is NULL", null,
-1, -1);
} else {
Map<String, Object> params = new HashMap<String, Object>();
params.put("navId", Long.parseLong(navId));
......@@ -732,7 +730,7 @@ public class IndexViewAction {
mv.addObject("leftNav", leftNav);
return mv;
}
@RequestMapping({ "/close.htm" })
public ModelAndView wapclose(HttpServletRequest request, HttpServletResponse response) {
ModelAndView mv = new JModelAndView("close.html", this.configService.getSysConfig(),
......@@ -869,38 +867,38 @@ public class IndexViewAction {
@RequestMapping({ "/find_password.htm" })
public ModelAndView find_password(HttpServletRequest request, HttpServletResponse response, String userName,
String password, String code,String mobileCode) {
String password, String code, String mobileCode) {
ModelAndView mv = new JModelAndView("success.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
HttpSession session = request.getSession(false);
String verify_code = (String) session.getAttribute("verify_code");
if (code.toUpperCase().equals(verify_code)) {
User user = this.userService.getObjByProperty("userName", userName);
Map<String, Object>map = this.phoneCodeViewTools.yzPhoneCode(userName, mobileCode);
if(map == null) {
Map<String, Object> map = this.phoneCodeViewTools.yzPhoneCode(userName, mobileCode);
if (map == null) {
mv = new JModelAndView("error.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
mv.addObject("op_title", "短信验证失败");
mv.addObject("url", CommUtil.getURL(request) + "/forget.htm");
}else {
if(("2").equals(map.get("code"))) {
} else {
if (("2").equals(map.get("code"))) {
mv = new JModelAndView("error.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
mv.addObject("op_title", "短信验证码错误");
mv.addObject("url", CommUtil.getURL(request) + "/forget.htm");
}else if(("1").equals(map.get("code"))) {
} else if (("1").equals(map.get("code"))) {
mv = new JModelAndView("error.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
mv.addObject("op_title", "手机号错误");
mv.addObject("url", CommUtil.getURL(request) + "/forget.htm");
}else {
} else {
user.setPassword(Md5Encrypt.md5(password));
this.userService.update(user);
mv.addObject("op_title", "修改成功，请重新登录");
mv.addObject("url", CommUtil.getURL(request) + "/user/login.htm");
}
}
} else {
mv = new JModelAndView("error.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
......@@ -909,7 +907,7 @@ public class IndexViewAction {
}
return mv;
}
@RequestMapping({ "/switch_recommend_goods.htm" })
public ModelAndView switch_recommend_goods(HttpServletRequest request, HttpServletResponse response,
int recommend_goods_random) {
......@@ -1399,5 +1397,5 @@ public class IndexViewAction {
return sb.toString();
}
}
src/com/shopping/view/web/action/LoginViewAction.java
View file @ 591fec57
......@@ -31,11 +31,13 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import com.shopping.core.annotation.SecurityMapping;
import com.shopping.core.mv.JModelAndView;
import com.shopping.core.security.support.SecurityUserHolder;
import com.shopping.core.tools.CommUtil;
import com.shopping.core.tools.Md5Encrypt;
import com.shopping.foundation.domain.Album;
import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.Goods;
import com.shopping.foundation.domain.GoodsCart;
import com.shopping.foundation.domain.GoodsSpecProperty;
......@@ -284,8 +286,7 @@ public class LoginViewAction {
*/
@RequestMapping({ "/register_finish.htm" })
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
if (!(refereeId == null) && !(refereeId.equals(""))) {
//refereeId = (String) request.getAttribute("refereeId");
......@@ -335,8 +336,14 @@ public class LoginViewAction {
user.setAddTime(new Date());
user.setEmail(email);
user.setPassword(Md5Encrypt.md5(password).toLowerCase());
user.setTrueName(trueName);
params.clear();
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(""))) {
......@@ -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