Skip to content

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

装修公司

parent 96865929
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1098 additions and 166 deletions
WebRoot/WEB-INF/templates/zh_cn/shop/forget.html
View file @ 8dd8395e
......@@ -20,7 +20,11 @@ jQuery(document).ready(function(){
},
rules: {
userName: {required:true},
email: {required:true,email:true},
//email: {required:true,email:true},
mobileCode:{required:true},
password:{required:true,
minlength:6,
maxlength:20},
code:{required:true,
remote:{
url: "$!webPath/verify_code.htm", //后台处理程序
......@@ -33,8 +37,14 @@ jQuery(document).ready(function(){
}
},
messages: {
userName: {required:"用户名不能为空"},
email: {required:"邮箱不能为空",email:"邮箱格式不对"},
userName: {required:"手机号"},
//email: {required:"邮箱不能为空",email:"邮箱格式不对"},
mobileCode:{
required:"手机验证码不能为空",
},
password:{ required:"密码不能为空",
minlength:"密码不能小于{0}个字符",
maxlength:"密码不能大于{0}个字符" },
code:{required:"验证码不能为空",remote:"验证码不正确"}
}
});
......@@ -59,16 +69,26 @@ $!httpInclude.include("/top.htm")
<form action="$!webPath/find_pws.htm" method="post" id="theForm">
<table width="360" border="0" cellspacing="0" cellpadding="0" class="login_user_table">
<tr>
<td width="60" class="login_nameu">用户名：</td>
<td width="60" class="login_nameu">手机号：</td>
<td><span class="login_user_input input_size">
<input name="userName" type="text" id="userName" />
</span></td>
</span>
</td>
</tr>
<tr>
<td class="login_nameu">手机验证码：</td>
<td><span class="login_user_input input_size2">
<input name="mobileCode" type="text" id="mobileCode" style="text-transform:;"/></span>
<span class="getcode validateCode-btn">获取验证码</span>
</td>
</tr>
<tr>
<td class="login_nameu">邮箱：</td>
<td class="login_nameu">新密码：</td>
<td><span class="login_user_input input_size">
<input name="email" type="text" id="email" />
</span></td>
<input name="password" type="text" id="password" />
</span>
</td>
</tr>
<tr>
<td class="login_nameu">验证码：</td>
......
WebRoot/WEB-INF/templates/zh_cn/shop/index.html
View file @ 8dd8395e
......@@ -706,7 +706,7 @@ $!httpInclude.include("/nav.htm")
<ul class="outside_box">
<li class="outside_li">
<div class="inside_box">
<p class="level">黄金会员</p>
<p class="level">黄金合伙人</p>
<p><span>（创业版）</span></p>
<p class="money">￥399</p>
......@@ -722,7 +722,7 @@ $!httpInclude.include("/nav.htm")
</li>
<li class="outside_li">
<div class="inside_box">
<p class="level">铂金会员</p>
<p class="level">铂金合伙人</p>
<p><span>（门店版）</span></p>
<p class="money">￥2999</p>
<p><span>销售利器，引流好帮手</span></p>
......@@ -737,7 +737,7 @@ $!httpInclude.include("/nav.htm")
</li>
<li class="outside_li">
<div class="inside_box">
<p class="level">企业会员</p>
<p class="level">企业合伙人</p>
<p><span>（厂家版）</span></p>
<p class="money">￥9999</p>
<p><span>共享资源，共享利润</span></p>
......@@ -805,7 +805,7 @@ $!httpInclude.include("/nav.htm")
<img src="$!webPath/resources/style/system/front/default/images/new/dialog_colsed.png"></img>
</div>
<div class="dialog_conten">
<p class="diaglog_title">黄金会员</p>
<p class="diaglog_title">黄金合伙人</p>
<p>渠道的神器</p>
<p class="diaglog_money">￥399</p>
<p class="p-desc">助力家具生意简单高效</p>
......@@ -835,7 +835,7 @@ $!httpInclude.include("/nav.htm")
<p>请扫二维码支付</p>
</div>
<div class="ercode-right">
<p class="ercode-numb">黄金会员</p>
<p class="ercode-numb">黄金合伙人</p>
<p class="ercode-money">￥399</p>
<p class="hadpay-btn"><span class="had_pay">已支付</span></p>
</div>
......@@ -852,7 +852,7 @@ $!httpInclude.include("/nav.htm")
<img src="$!webPath/resources/style/system/front/default/images/new/dialog_colsed.png"></img>
</div>
<div class="dialog_conten1">
<p class="diaglog_title">铂金会员</p>
<p class="diaglog_title">铂金合伙人</p>
<p>销售利器</p>
<p class="diaglog_money">￥2999</p>
<p class="p-desc1">助力家具生意简单高效</p>
......@@ -882,7 +882,7 @@ $!httpInclude.include("/nav.htm")
<p>请扫二维码支付</p>
</div>
<div class="ercode-right1">
<p class="ercode-numb">铂金会员</p>
<p class="ercode-numb">铂金合伙人</p>
<p class="ercode-money">￥2999</p>
<p class="hadpay-btn1"><span class="had_pay1">已支付</span></p>
</div>
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_decorate_detaile.html 0 → 100644
View file @ 8dd8395e
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>$!config.title</title>
<meta name="keywords" content="$!config.keywords" >
<meta name="description" content="$!config.description" >
<meta name="generator" content="shopping 2.0">
<meta name="author" content="www.shopping.com">
<meta name="copyright" content="shopping Inc. All Rights Reserved">
<meta content="IE=edge" http-equiv="X-UA-Compatible">
#if($!config.sina_domain_code)
$!{config.sina_domain_code}
#end
#if($!config.qq_domain_code)
$!{config.qq_domain_code}
#end
<link href="$!webPath/resources/style/system/front/default/css/public.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/public_auto.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/designer.css" type="text/css" rel="stylesheet" />
<script src="$!webPath/resources/js/jquery-1.11.0.min.js"></script>
<script src="$!webPath/resources/js/jquery.SuperSlide.2.1.1.js"></script>
<script src="$!webPath/resources/js/jquery.lazyload.min.js"></script>
<script>
jQuery(document).ready(function(){
jQuery(".sale_two_img img").lazyload({effect:"fadeIn",width:150,height:150});
//鼠标经过推荐商品tab
jQuery("#index_sale_tab ul li").mouseover(function(){
jQuery(this).siblings().removeClass("this");
jQuery(this).addClass("this");
var i = jQuery(this).index();
jQuery("#index_sale_tab").siblings().hide();
jQuery("#index_sale_tab").siblings().eq(i).show();
jQuery("#sale_change").attr("mark",jQuery(this).attr("id").replace("goodscase",""));
});
//团购图片轮播懒加载
jQuery(".goods_tab img").lazyload({effect:"fadeIn",width:210,height:210});
//楼层懒加载
jQuery(".floor_main img").lazyload({effect:"fadeIn",width:147,height:147});
//
jQuery(".index_sales_left>h3>ul>li").mouseover(function(){
jQuery(".index_sales_left>h3>ul>li").removeClass("this");
jQuery(this).addClass("this");
jQuery(".index_sales_box>[class^=index_sales_]").hide();
var div_index=jQuery(this).attr("div_index");
jQuery(".index_sales_"+div_index).show();
});
$('.adv_mid_slide').slide({mainCell:'.adv_mid_slider_ul',autoPlay:true});
//
var size="4";
if(size>0){
jQuery("html").scrollTop(0); //刷新页面返回顶部
//Call DataLazyLoad
jQuery("#floors .floor_main").lazyload({load : function(page, unLocked) {
var html = '';
var max = 4+1;
var count = page-1;
var id =jQuery(".floor_main[count="+count+"]").attr("id");
var load_url =jQuery(".floor_main[count="+count+"]").attr("load_url");
//Generate the data
jQuery.get("$!webPath/"+load_url,{"id":id,"count":count},function(data){
html += data;
jQuery(html).appendTo('#floors .floor_main[count='+count+']');
/* jQuery(".floorclass img").lazyload({effect:"fadeIn",width:147,height:147});
jQuery(".ranking img").lazyload({effect:"fadeIn",width:73,height:73}); */
//鼠标经过楼层tab时
jQuery(".floorul li").mouseover(function(){
var store_gc=jQuery(this).attr("store_gc");
jQuery(".floorul li[store_gc="+store_gc+"]").css("cursor","pointer").removeClass("this");
jQuery(this).addClass("this");
var id=jQuery(this).attr("id");
jQuery(".ftab[store_gc="+store_gc+"]").hide();
jQuery(".ftab[store_gc="+store_gc+"][id="+id+"]").show();
});
//Check whether to end
page = page >= max ? 0 : page + 1;
//To prevent repeated load, The first parameter to the next page, No page is 0
unLocked(page);
},"text");
}});
}else{
//jQuery("#toolbar").load("toolbar.htm");
}
});
</script>
</head>
<body>
<!--低版本提示-->
<!--[if IE 6]>
<div class="top_tipe">
<div class="top_tipe_center">
<em><img src="$!webPath/resources/style/system/front/default/images/ie6_warning.png" style="height:16px; width:16px;"/></em><b>温馨提示：您当前使用的浏览器版本过低，兼容性和安全性较差，建议您升级：</b><em><img src="$!webPath/resources/style/system/front/default/images/ie_b.png"/></em><b><a href="http://windows.microsoft.com/zh-cn/internet-explorer/download-ie?tp=1.0.0.0.0.KdMt0Yu">IE8浏览器</a>或</b><em><img src="$!webPath/resources/style/system/front/default/images/google_b.png" /></em><b><a href="http://www.google.cn/intl/zh-CN/chrome/">谷歌浏览器</a></b>
<span><a href="javascript:void(0);" onclick="javascript:jQuery('.top_tipe').hide();">x</a></span>
</div>
</div>
<![endif]-->
$!httpInclude.include("/top.htm")
$!httpInclude.include("/head.htm")
$!httpInclude.include("/nav1.htm")
<div class="main">
<div class="index">
<div class="position">当前位置：<a href="$!webPath/index.htm" >首页 ></a> <a href="$!webPath/zs_decorate_index.htm" class="pos">找装修公司</a> > <span>装修公司详情页</span></div>
<div class="choice_list">
<div class="detail_left">
#if($design.acc)
#set($img="$webPath/$design.acc.path/$design.acc.name")
#end
<img src="$img" />
</div>
<div class="detail_mid">
<h4>$!{design.decorationName}</h4>
<p>所在城市：$!{design.area.parent.parent.areaName} $!{design.area.parent.areaName} $!{design.area.areaName} </p>
<p>装修风格：
#foreach($expert in $design.decorateStyle)
$!{expert.styleName}
#end
</p>
<p>装修类型：
#foreach($expert in $design.decorateType)
$!{expert.typeName}
#end
</p>
<p>联系地址：$!{design.decorationArea}</p>
<!-- <p>咨询数：#if($!design.consult)
$!{design.consult}
#else
<span>0</span>
#end
</p> -->
</div>
<div class="detail_right">
<!-- <p class="price">$!{design.fees.feesName}</p> -->
<p><a href="$!webPath/zs_account_count.htm?managerId=$!{design.user.id}&type=2">预约咨询</a></p>
</div>
</div>
<!--商品列表开始-->
<div class="alldesigner_detail">
<div class="index">
#foreach($obj in $design.works)
#if($obj.main_img)
#set($img ="$webPath/$obj.main_img.path/$obj.main_img.name")
#end
<div class="designer_detail_box">
<img src="$img" />
<div class="detail">
<p>$obj.worksName</p>
</div>
</div>
#end
</div>
<div class="fenye">
<div class="fenyes">
<input name="pageSize" type="hidden" id="brand_ids" value="$!pageSize" />
<input name="currentPage" type="hidden" id="currentPage" value="$!currentPage" />
<input name="orderBy" type="hidden" id="orderBy" value="$!orderBy" />
<input name="orderType" type="hidden" id="orderType" value="$!orderType" />
$!gotoPageFormHTML
</div>
</div>
</div>
</div>
</div>
$!httpInclude.include("/footer.htm")
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/shop/zs_decorate_index.html 0 → 100644
View file @ 8dd8395e
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>$!config.title</title>
<meta name="keywords" content="$!config.keywords" >
<meta name="description" content="$!config.description" >
<meta name="generator" content="shopping 2.0">
<meta name="author" content="www.shopping.com">
<meta name="copyright" content="shopping Inc. All Rights Reserved">
<meta content="IE=edge" http-equiv="X-UA-Compatible">
#if($!config.sina_domain_code)
$!{config.sina_domain_code}
#end
#if($!config.qq_domain_code)
$!{config.qq_domain_code}
#end
<link href="$!webPath/resources/style/system/front/default/css/public.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/public_auto.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/designer.css" type="text/css" rel="stylesheet" />
<script src="$!webPath/resources/js/jquery-1.11.0.min.js"></script>
<script src="$!webPath/resources/js/jquery.SuperSlide.2.1.1.js"></script>
<script src="$!webPath/resources/js/jquery.lazyload.min.js"></script>
</head>
<body>
$!httpInclude.include("/top.htm")
$!httpInclude.include("/head.htm")
$!httpInclude.include("/nav1.htm")
<div class="main">
<div class="index">
<div class="choice_list">
<div class="choice_line">
<div class="fl_label city">
所在城市：
</div>
<div class="fr_list">
<ul class="areaul">
#foreach($area in $cts)
<li><a href="javascript:void(0);" id="searchBy_area_$!area.id" area_id="$!area.id">$!area.areaName</a></li>
#end
</ul>
</div>
</div>
<div class="choice_line">
<div class="fl_label">
装修类型：
</div>
<div class="fr_list">
<ul>
#foreach($exp in $decorateType)
<li><a href="javascript:void(0);" expert_id="$!exp.id">$!exp.typeName</a></li>
#end
</ul>
</div>
</div>
<div class="choice_line">
<div class="fl_label">
装修风格：
</div>
<div class="fr_list">
<ul>
#foreach($money in $decorateStyle)
<li><a href="javascript:void(0);" fees_id="$!money.id">$!money.styleName</a></li>
#end
</ul>
</div>
</div>
</div>
<!--商品列表开始-->
<div class="alldesigner">
<div class="index">
#foreach($obj in $objs)
#if($!obj.acc)
#set($img="$!imageWebServer/$!{obj.acc.path}/$!{obj.acc.name}")
#end
<div class="designer_box">
<a href="zs_decorate_detaile.htm?decorateId=$!{obj.id}&currentPage=0">
<img src="$!img" />
<div class="detail">
<h5>$obj.decorationName</h5>
<p>所在城市：$obj.Area.areaName</p>
<p>装修类型：
#foreach($objname in $obj.decorateStyle)
$objname.styleName
#end
</p>
<p>装修风格：
#foreach($objname in $obj.decorateType)
$objname.typeName
#end
</p>
</div>
</a>
</div>
#end
</div>
</div>
</div>
</div>
$!httpInclude.include("/footer.htm")
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/shop/zs_designer_detaile.html
View file @ 8dd8395e
......@@ -134,7 +134,7 @@ $!httpInclude.include("/nav1.htm")
</div>
<div class="detail_right">
<p class="price">$!{design.fees.feesName}</p>
<p><a>预约咨询</a></p>
<p><a href="$!webPath/zs_account_count.htm?managerId=$!{design.user.id}&type=1">预约咨询</a></p>
</div>
</div>
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_member_index.html
View file @ 8dd8395e
......@@ -689,7 +689,7 @@ $!httpInclude.include("/nav.htm")
<ul class="outside_box">
<li class="outside_li">
<div class="inside_box">
<p class="level">黄金会员</p>
<p class="level">黄金合伙人</p>
<p><span>个人等级会员</span></p>
<p class="money">￥399</p>
<p><span>7X2小时服务</span></p>
......@@ -704,7 +704,7 @@ $!httpInclude.include("/nav.htm")
</li>
<li class="outside_li">
<div class="inside_box">
<p class="level">白金会员</p>
<p class="level">白金合伙人</p>
<p><span>团队等级会员</span></p>
<p class="money">￥2999</p>
<p><span>7X2小时服务</span></p>
......@@ -719,7 +719,7 @@ $!httpInclude.include("/nav.htm")
</li>
<li class="outside_li">
<div class="inside_box">
<p class="level">企业会员</p>
<p class="level">企业合伙人</p>
<p><span>企业等级会员</span></p>
<p class="money">￥9999</p>
<p><span>7X2小时服务</span></p>
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/fs_layout_list.html
View file @ 8dd8395e
......@@ -32,8 +32,8 @@ function ajax_update(id,fieldName,obj){
<div class="cont">
<h1 class="seth1">店铺管理</h1>
<div class="settab"><span class="tab-one"></span> <span class="tabs">
<a href="$!webPath/admin/fs_bespoke_list.htm" class="this">风水预约</a> |
<a href="$!webPath/admin/fs_layout_list.htm">风水布局</a> </span> <span class="tab-two"></span>
<a href="$!webPath/admin/fs_bespoke_list.htm" >风水预约</a> |
<a href="$!webPath/admin/fs_layout_list.htm" class="this">风水布局</a> </span> <span class="tab-two"></span>
</div>
<!-- <form action="$!webPath/admin/store_gradelog_list.htm" method="post" name="queryForm" id="queryForm">
<div class="allmem_search">
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/swj_list.html
View file @ 8dd8395e
......@@ -53,13 +53,13 @@
<td>普通会员</td>
#end
#if($!obj.user.level==1)
<td>黄金会员</td>
<td>黄金合伙人</td>
#end
#if($!obj.user.level==2)
<td>铂金会员</td>
<td>铂金合伙人</td>
#end
#if($!obj.user.level==3)
<td>钻石会员</td>
<td>企业合伙人</td>
#end
<td align="center" class="aoprater">
#if($!obj.state==false)
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/user_list.html
View file @ 8dd8395e
......@@ -121,15 +121,15 @@ jQuery(document).ready(function(){
&nbsp;|&nbsp;
#end
#if($level1)
<a href="$!webPath/admin/user_updateLevl.htm?id=$obj.id&level=$obj.level&type=1" >黄金会员</a>
<a href="$!webPath/admin/user_updateLevl.htm?id=$obj.id&level=$obj.level&type=1" >黄金合伙人</a>
&nbsp;|&nbsp;
#end
#if($level2)
<a href="$!webPath/admin/user_updateLevl.htm?id=$obj.id&level=$obj.level&type=2" >铂金会员</a>
<a href="$!webPath/admin/user_updateLevl.htm?id=$obj.id&level=$obj.level&type=2" >铂金合伙人</a>
&nbsp;|&nbsp;
#end
#if($level3)
<a href="$!webPath/admin/user_updateLevl.htm?id=$obj.id&level=$obj.level&type=3" >企业会员</a>
<a href="$!webPath/admin/user_updateLevl.htm?id=$obj.id&level=$obj.level&type=3" >企业合伙人</a>
#end
</td>
</tr>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/account_message.html 0 → 100644
View file @ 8dd8395e
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>个人信息-$!{config.title}</title>
<meta name="keywords" content="$!config.keywords" />
<meta name="description" content="$!config.description" />
<meta name="generator" content="shopping 2.0" />
<meta name="author" content="www.shopping.com">
<meta name="copyright" content="shopping Inc. All Rights Reserved">
<link href="$!webPath/resources/style/system/front/default/css/public.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/user.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/common/css/jquery-ui-1.8.22.custom.css" type=text/css rel=stylesheet>
<script src="$!webPath/resources/js/jquery-1.11.0.min.js"></script>
<script src="$!webPath/resources/js/jquery-ui-1.8.21.js"></script>
<script src="$!webPath/resources/js/jquery.zh.cn.js"></script>
<script>
jQuery(document).ready(function(){
});
</script>
</head>
<body>
$!httpInclude.include("/top.htm")
<div class="main">
$!httpInclude.include("/buyer/head.htm")
<div class="user_center">
<table width="1000" border="0" cellspacing="0" cellpadding="0" class="user_table">
<tr>
$!httpInclude.include("/buyer/account_nav.htm?op=account_message")
<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="productmain">
<div class="ordernav">
<ul class="orderul">
<li class="this"><a href='$!webPath/buyer/account_message.htm' >预约消息</a></li>
<!-- <li><a href='$!webPath/buyer/account_message.htm'>布局消息</a></li> -->
</ul>
</div>
<div class="ordercon">
<table width="942" border="0" cellspacing="0" cellpadding="0" id="opertable" >
<tr id="opertitle">
<td width="115">预约账号</td>
<td width="162">预约时间</td>
<td width="88">手机号码</td>
<!-- <td width="211" align="left">操作</td> -->
</tr>
#foreach($obj in $objs)
<tr class="opertr" id="$!obj.id">
<td width="115">$!obj.startUser.userName</td>
<td width="162" >$!obj.addTime</td>
<td width="88">$!obj.startUser.mobile</td>
<!-- <td align="left"><span class="edit"><a href="javascript:void(0);" dialog_uri="$!webPath/buyer/address_edit.htm?id=$!obj.id&currentPage=$!currentPage" dialog_title="编辑地址" dialog_width="500" dialog_height="100" dialog_id="cart_address">编辑</a></span><span class="del"><a href="javascript:void(0);" onclick="if(confirm('删除后不可恢复，是否继续?'))window.location.href='$!webPath/buyer/address_del.htm?mulitId=$!obj.id&currentPage=$!currentPage'">删除</a></span></td> -->
</tr>
#end
</table>
</div>
<div class="alldel">
<div class="userfenye">$!gotoPageHTML</div>
</div>
</div></td>
</tr>
</table>
</div>
$!httpInclude.include("/footer.htm")
</div>
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/account_nav.html
View file @ 8dd8395e
......@@ -47,6 +47,7 @@ jQuery(document).ready(function(){
<!-- <li op="predeposit"><a href="$!webPath/buyer/predeposit.htm">充值管理</a></li> -->
<!-- <li op="buyer_cash"><a href="$!webPath/buyer/buyer_cash.htm">提现管理</a></li> -->
<li op="predeposit_log"><a href="$!webPath/buyer/predeposit_log.htm">收支明细</a></li>
<li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li>
#end
</ul>
</li>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/buyer_index.html
View file @ 8dd8395e
......@@ -318,7 +318,7 @@ $!httpInclude.include("/buyer/head.htm")
#end
#if($credit>5)#set($credit=5)#end
<span class="user_info_grade"> #if($!credit==0) <img src="$!webPath/resources/style/common/images/level_-1.gif"/> #else #foreach($count in [1..$!credit])<img style="margin-left:1px;" src="$!img" />#end #end </span>
<span class="user_info_grade">#if(${user.state})黄金会员#else 普通会员#end</span>
<span class="user_info_grade">#if(${user.state})黄金合伙人#else 普通会员#end</span>
<span class="user_account">
<!--user_act_up向下三角user_act_down向上三角-->
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/child_user.html
View file @ 8dd8395e
......@@ -353,9 +353,9 @@ $!httpInclude.include("/buyer/head.htm")
<select id="level">
<option value="">会员等级</option>
<option value="0">普通会员</option>
<option value="1">黄金会员</option>
<option value="2">铂金会员</option>
<option value="3">企业会员</option>
<option value="1">黄金合伙人</option>
<option value="2">铂金合伙人</option>
<option value="3">企业合伙人</option>
</select>
</td>
......@@ -374,13 +374,13 @@ $!httpInclude.include("/buyer/head.htm")
<td><span class="narmal-number">普通会员</span></td>
#end
#if($obj.level==1)
<td><span class="narmal-number">黄金会员</span></td>
<td><span class="narmal-number">黄金合伙人</span></td>
#end
#if($obj.level==2)
<td><span class="narmal-number">铂金会员</span></td>
<td><span class="narmal-number">铂金合伙人</span></td>
#end
#if($obj.level==3)
<td><span class="narmal-number">企业会员</span></td>
<td><span class="narmal-number">企业合伙人</span></td>
#end
</tr>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/decorate_work_list.html
View file @ 8dd8395e
......@@ -111,9 +111,9 @@ $!httpInclude.include("/seller/nav_head.htm")
<img src="$img" width="60" height="63" /></span><span class="nameproduct">
</span></td>
<td class="proclassify" >#if($!obj.worksName) $!{obj.worksName} #end</td>
<td class="promoney">#if($!obj.decorateType.typeName) $!{obj.decorateType.typeName} #end</td>
<td class="promoney">#if($!obj.decorateStyle.styleName) $!{obj.decorateStyle.styleName} #end</td>
<td class="operajt"><span class="edit"><a href="$!webPath/design/works_edit.htm?id=$!obj.id" target="_blank">编辑</a></span>
<td class="promoney">#if($!obj.type.typeName) $!{obj.type.typeName} #end</td>
<td class="promoney">#if($!obj.style.styleName) $!{obj.style.styleName} #end</td>
<td class="operajt"><span class="edit"><a href="$!webPath/design/decorate_works_edit.htm?id=$!obj.id" target="_blank">编辑</a></span>
<span class="del">
<!-- <a href="javascript:if(confirm('删除后不可恢复?'))window.location.href='$!webPath/seller/goods_del.htm?mulitId=$!obj.id'">删除</a></span></td> -->
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/decorate_works_edit.html
View file @ 8dd8395e
......@@ -99,7 +99,10 @@ window.webuploader = {
minlength:2,
maxlength:15
},
expertId:{
styleId:{
required:true
},
typeId:{
required:true
},
main_img:{
......@@ -115,7 +118,8 @@ window.webuploader = {
minlength:"作品名称最少为2个字符",
maxlength:"作品名称最多为15个字符",
},
expertId:{required:"请选择空间类型"},
typeId:{required:"请选择装修类型"},
styleId:{required:"请选择装修风格"},
main_img:{
required: "请选择封面图片"
},
......@@ -248,12 +252,12 @@ $!httpInclude.include("/seller/nav_head.htm")
<td align="right" valign="top">装修类型：</td>
<td class="px10">
<span class="expertList">
#foreach($exp in $expert)
#foreach($exp in $type)
#if($exp.checked)
<label><input name="expertId" type="checkbox"
checked id="expertId" value="$!{exp.id}" />$!{exp.expertName}</label>
<label><input name="typeId" type="radio"
checked id="typeId" value="$!{exp.id}" />$!{exp.typeName}</label>
#else
<label><input name="expertId" type="checkbox" id="expertId" value="$!{exp.id}" />$!{exp.expertName}</label>
<label><input name="typeId" type="radio" id="typeId" value="$!{exp.id}" />$!{exp.typeName}</label>
#end
#end
</span>
......@@ -263,12 +267,12 @@ $!httpInclude.include("/seller/nav_head.htm")
<td align="right" valign="top">装修风格：</td>
<td class="px10">
<span class="expertList">
#foreach($exp in $expert)
#foreach($exp in $style)
#if($exp.checked)
<label><input name="expertId" type="checkbox"
checked id="expertId" value="$!{exp.id}" />$!{exp.expertName}</label>
<label><input name="styleId" type="radio"
checked id="styleId" value="$!{exp.id}" />$!{exp.styleName}</label>
#else
<label><input name="expertId" type="checkbox" id="expertId" value="$!{exp.id}" />$!{exp.expertName}</label>
<label><input name="styleId" type="radio" id="styleId" value="$!{exp.id}" />$!{exp.styleName}</label>
#end
#end
</span>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/seller_index.html
View file @ 8dd8395e
......@@ -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>
......
src/com/shopping/foundation/dao/AccountMessageDAO.java 0 → 100644
View file @ 8dd8395e
package com.shopping.foundation.dao;
import org.springframework.stereotype.Repository;
import com.shopping.core.base.GenericDAO;
import com.shopping.foundation.domain.AccountMessage;
@Repository("accountmessageDAO")
public class AccountMessageDAO extends GenericDAO<AccountMessage> {
}
src/com/shopping/foundation/domain/AccountMessage.java 0 → 100644
View file @ 8dd8395e
package com.shopping.foundation.domain;
import javax.persistence.Entity;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import com.shopping.core.domain.IdEntity;
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
@Entity
@Table(name = "shopping_account_message")
public class AccountMessage extends IdEntity {
@OneToOne
private User startUser;
@OneToOne
private User managerUser;
private String mack;
private String state;
public User getStartUser() {
return startUser;
}
public void setStartUser(User startUser) {
this.startUser = startUser;
}
public User getManagerUser() {
return managerUser;
}
public void setManagerUser(User managerUser) {
this.managerUser = managerUser;
}
public String getMack() {
return mack;
}
public void setMack(String mack) {
this.mack = mack;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
}
src/com/shopping/foundation/domain/Decorate.java
View file @ 8dd8395e
package com.shopping.foundation.domain;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.FetchType;
......@@ -14,6 +16,7 @@ import javax.persistence.Table;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import com.alibaba.fastjson.annotation.JSONField;
import com.shopping.core.domain.IdEntity;
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
......@@ -43,17 +46,18 @@ public class Decorate extends IdEntity {
// 联系方式
private String decorationPhone;
@ManyToMany (fetch = FetchType.LAZY)
@ManyToMany(targetEntity = DecorateStyle.class, fetch = FetchType.EAGER)
@JoinTable(name = "shopping_decorate_style_relation", joinColumns = {
@javax.persistence.JoinColumn(name = "decorate_id") }, inverseJoinColumns = {
@javax.persistence.JoinColumn(name = "style_id") })
private List<DecorateStyle> decorateStyle = new ArrayList<DecorateStyle>();
// @JSONField(serialize = false)
private Set<DecorateStyle> decorateStyle = new HashSet<DecorateStyle>();
@ManyToMany (fetch = FetchType.LAZY)
@ManyToMany(fetch = FetchType.EAGER)
@JoinTable(name = "shopping_decorate_type_relation", joinColumns = {
@javax.persistence.JoinColumn(name = "decorate_id") }, inverseJoinColumns = {
@javax.persistence.JoinColumn(name = "type_id") })
private List<DecorateType> decorateType = new ArrayList<DecorateType>();
private Set<DecorateType> decorateType = new HashSet<DecorateType>();
// 装修公司作品
@OneToMany(mappedBy = "decorateWorks", targetEntity = DecorateWork.class, fetch = FetchType.LAZY)
......@@ -115,22 +119,37 @@ public class Decorate extends IdEntity {
this.decorationPhone = decorationPhone;
}
public List<DecorateStyle> getDecorateStyle() {
/*
* public List<DecorateStyle> getDecorateStyle() { return decorateStyle; }
*
* public void setDecorateStyle(List<DecorateStyle> decorateStyle) {
* this.decorateStyle = decorateStyle; }
*/
/*
* public List<DecorateType> getDecorateType() { return decorateType; }
*/
public Set<DecorateStyle> getDecorateStyle() {
return decorateStyle;
}
public void setDecorateStyle(List<DecorateStyle> decorateStyle) {
public void setDecorateStyle(Set<DecorateStyle> decorateStyle) {
this.decorateStyle = decorateStyle;
}
public List<DecorateType> getDecorateType() {
public Set<DecorateType> getDecorateType() {
return decorateType;
}
public void setDecorateType(List<DecorateType> decorateType) {
public void setDecorateType(Set<DecorateType> decorateType) {
this.decorateType = decorateType;
}
/*
* public void setDecorateType(List<DecorateType> decorateType) {
* this.decorateType = decorateType; }
*/
public List<DecorateWork> getWorks() {
return works;
}
......
src/com/shopping/foundation/domain/DecorateStyle.java
View file @ 8dd8395e
package com.shopping.foundation.domain;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
......@@ -22,8 +26,19 @@ public class DecorateStyle extends IdEntity {
// 排序序列
private int sequence;
@ManyToMany(mappedBy = "decorateStyle")
private List<Decorate> decorates = new ArrayList<Decorate>();
@ManyToMany(mappedBy = "decorateStyle",fetch = FetchType.LAZY)
private Set<Decorate> decorates = new HashSet<Decorate>();
@Transient
private boolean checked;
public boolean isChecked() {
return checked;
}
public void setChecked(boolean checked) {
this.checked = checked;
}
public String getStyleName() {
return styleName;
......@@ -41,12 +56,20 @@ public class DecorateStyle extends IdEntity {
this.sequence = sequence;
}
public List<Decorate> getDecorates() {
public Set<Decorate> getDecorates() {
return decorates;
}
public void setDecorates(List<Decorate> decorates) {
public void setDecorates(Set<Decorate> decorates) {
this.decorates = decorates;
}
/*public List<Decorate> getDecorates() {
return decorates;
}
public void setDecorates(List<Decorate> decorates) {
this.decorates = decorates;
}*/
}
src/com/shopping/foundation/domain/DecorateType.java
View file @ 8dd8395e
package com.shopping.foundation.domain;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
......@@ -23,8 +27,19 @@ public class DecorateType extends IdEntity {
// 排序序列
private int sequence;
@ManyToMany(mappedBy = "decorateType")
private List<Decorate> decorate = new ArrayList<Decorate>();
@ManyToMany(mappedBy = "decorateType",fetch = FetchType.LAZY)
private Set<Decorate> decorate = new HashSet<Decorate>();
@Transient
private boolean checked;
public boolean isChecked() {
return checked;
}
public void setChecked(boolean checked) {
this.checked = checked;
}
public String getTypeName() {
return typeName;
......@@ -42,12 +57,20 @@ public class DecorateType extends IdEntity {
this.sequence = sequence;
}
public List<Decorate> getDecorate() {
public Set<Decorate> getDecorate() {
return decorate;
}
public void setDecorate(List<Decorate> decorate) {
public void setDecorate(Set<Decorate> decorate) {
this.decorate = decorate;
}
/*public List<Decorate> getDecorate() {
return decorate;
}
public void setDecorate(List<Decorate> decorate) {
this.decorate = decorate;
}*/
}
src/com/shopping/foundation/domain/DecorateWork.java
View file @ 8dd8395e
......@@ -31,6 +31,7 @@ public class DecorateWork extends IdEntity {
@ManyToMany(fetch = FetchType.EAGER)
//shopping_decowork_photo_ralation
@JoinTable(name = "shopping_decowork_photo_relation", joinColumns = {
@javax.persistence.JoinColumn(name = "decorate_works_id") }, inverseJoinColumns = {
@javax.persistence.JoinColumn(name = "photo_id") })
......@@ -45,11 +46,11 @@ public class DecorateWork extends IdEntity {
//作品类型
@OneToOne
private DecorateType decorateType;
private DecorateType type;
//作品风格
@OneToOne
private DecorateStyle decorateStyle;
private DecorateStyle style;
......@@ -93,19 +94,20 @@ public class DecorateWork extends IdEntity {
this.introduction = introduction;
}
public DecorateType getDecorateType() {
return decorateType;
public DecorateType getType() {
return type;
}
public void setDecorateType(DecorateType decorateType) {
this.decorateType = decorateType;
public void setType(DecorateType type) {
this.type = type;
}
public DecorateStyle getDecorateStyle() {
return decorateStyle;
public DecorateStyle getStyle() {
return style;
}
public void setDecorateStyle(DecorateStyle decorateStyle) {
this.decorateStyle = decorateStyle;
public void setStyle(DecorateStyle style) {
this.style = style;
}
}
src/com/shopping/foundation/domain/query/AccountMessageQueryObject.java 0 → 100644
View file @ 8dd8395e
package com.shopping.foundation.domain.query;
import org.springframework.web.servlet.ModelAndView;
import com.shopping.core.query.QueryObject;
public class AccountMessageQueryObject extends QueryObject {
public AccountMessageQueryObject(String currentPage, ModelAndView mv, String orderBy, String orderType) {
super(currentPage, mv, orderBy, orderType);
}
public AccountMessageQueryObject() {
}
}
src/com/shopping/foundation/service/IAccountMessageService.java 0 → 100644
View file @ 8dd8395e
package com.shopping.foundation.service;
import java.util.List;
import java.util.Map;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.query.support.IQueryObject;
import com.shopping.foundation.domain.AccountMessage;
public interface IAccountMessageService {
public abstract boolean save(AccountMessage accountMessage);
public abstract AccountMessage getObjById(Long paramLong);
public abstract boolean delete(Long paramLong);
public abstract boolean update(AccountMessage accountMessage);
public abstract List<AccountMessage> query(String paramString, Map paramMap, int paramInt1, int paramInt2);
public abstract IPageList list(IQueryObject paramIQueryObject);
}
src/com/shopping/foundation/service/impl/AccountMessageServiceImpl.java 0 → 100644
View file @ 8dd8395e
package com.shopping.foundation.service.impl;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.shopping.core.dao.IGenericDAO;
import com.shopping.core.query.GenericPageList;
import com.shopping.core.query.PageObject;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.query.support.IQueryObject;
import com.shopping.foundation.domain.AccountMessage;
import com.shopping.foundation.service.IAccountMessageService;
@Service
@Transactional
public class AccountMessageServiceImpl implements IAccountMessageService {
@Resource(name = "accountmessageDAO")
private IGenericDAO<AccountMessage> accountmessageDAO;
@Override
public boolean save(AccountMessage accountMessage) {
try {
this.accountmessageDAO.save(accountMessage);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
@Override
public AccountMessage getObjById(Long id) {
AccountMessage accountMessage = (AccountMessage)this.accountmessageDAO.get(id);
if (accountMessage != null) {
return accountMessage;
}
return null;
}
@Override
public boolean delete(Long id) {
try {
this.accountmessageDAO.remove(id);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
@Override
public boolean update(AccountMessage accountMessage) {
try {
this.accountmessageDAO.update(accountMessage);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
@Override
public List<AccountMessage> query(String query, Map params, int begin, int max) {
return this.accountmessageDAO.query(query, params, begin, max);
}
@Override
public IPageList list(IQueryObject properties) {
if (properties == null) {
return null;
}
String query = properties.getQuery();
Map params = properties.getParameters();
GenericPageList pList = new GenericPageList(AccountMessage.class, query, params, this.accountmessageDAO);
if (properties != null) {
PageObject pageObj = properties.getPageObj();
if (pageObj != null)
pList.doList(pageObj.getCurrentPage() == null ? 0 : pageObj.getCurrentPage().intValue(), pageObj.getPageSize() == null ? 0 : pageObj.getPageSize().intValue());
} else {
pList.doList(0, -1);
}
return pList;
}
}
src/com/shopping/manage/admin/action/SwjManageAction.java
View file @ 8dd8395e
......@@ -181,11 +181,11 @@ public class SwjManageAction {
if(Integer.parseInt(type) == 0) {
swjType = "普通会员";
}else if(Integer.parseInt(type) == 1) {
swjType = "黄金会员";
swjType = "黄金合伙人";
}else if(Integer.parseInt(type) == 2) {
swjType = "铂金会员";
swjType = "铂金合伙人";
}else if(Integer.parseInt(type) == 3) {
swjType = "企业会员";
swjType = "企业合伙人";
}
if(list.size()>0) {
......
src/com/shopping/manage/buyer/action/AccountBuyerAction.java
View file @ 8dd8395e
......@@ -42,13 +42,16 @@ import com.shopping.core.tools.CommUtil;
import com.shopping.core.tools.Md5Encrypt;
import com.shopping.core.tools.WebForm;
import com.shopping.foundation.domain.Accessory;
import com.shopping.foundation.domain.AccountMessage;
import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.MobileVerifyCode;
import com.shopping.foundation.domain.SnsFriend;
import com.shopping.foundation.domain.User;
import com.shopping.foundation.domain.query.AccountMessageQueryObject;
import com.shopping.foundation.domain.query.SnsFriendQueryObject;
import com.shopping.foundation.domain.query.UserQueryObject;
import com.shopping.foundation.service.IAccessoryService;
import com.shopping.foundation.service.IAccountMessageService;
import com.shopping.foundation.service.IAreaService;
import com.shopping.foundation.service.IMobileVerifyCodeService;
import com.shopping.foundation.service.ISnsFriendService;
......@@ -86,6 +89,9 @@ public class AccountBuyerAction {
@Autowired
private IAreaService areaService;
@Autowired
private IAccountMessageService accountMessageService;
@Autowired
private MsgTools msgTools;
private static final String DEFAULT_AVATAR_FILE_EXT = ".jpg";
......@@ -114,6 +120,19 @@ public class AccountBuyerAction {
return mv;
}
@SecurityMapping(display = false, rsequence = 0, title = "个人消息中心", value = "/buyer/account_message.htm*", rtype = "buyer", rname = "用户中心", rcode = "user_center", rgroup = "用户中心")
@RequestMapping({ "/buyer/account_message.htm" })
public ModelAndView account_message(HttpServletRequest request, HttpServletResponse response,String currentPage) {
ModelAndView mv = new JModelAndView("user/default/usercenter/account_message.html", this.configService.getSysConfig(), this.userConfigService.getUserConfig(), 0, request, response);
User user = SecurityUserHolder.getCurrentUser();
//查询所有预约
AccountMessageQueryObject qo = new AccountMessageQueryObject(currentPage, mv, "addTime", "desc");
qo.addQuery("obj.managerUser.id", new SysMap("managerUserId", user.getId()),"=");
IPageList pList = this.accountMessageService.list(qo);
CommUtil.saveIPageList2ModelAndView("", "", "", pList, mv);
return mv;
}
@SecurityMapping(display = false, rsequence = 0, title = "个人信息获取下级地区ajax", value = "/buyer/account_getAreaChilds.htm*", rtype = "buyer", rname = "用户中心", rcode = "user_center", rgroup = "用户中心")
@RequestMapping({ "/buyer/account_getAreaChilds.htm" })
public ModelAndView account_getAreaChilds(HttpServletRequest request, HttpServletResponse response, String parent_id) {
......
src/com/shopping/view/web/action/AccountMessageAction.java 0 → 100644
View file @ 8dd8395e
package com.shopping.view.web.action;
import static org.hamcrest.CoreMatchers.nullValue;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
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 com.shopping.core.security.support.SecurityUserHolder;
import com.shopping.foundation.domain.AccountMessage;
import com.shopping.foundation.domain.User;
import com.shopping.foundation.service.IAccountMessageService;
import com.shopping.foundation.service.ISysConfigService;
import com.shopping.foundation.service.IUserConfigService;
import com.shopping.foundation.service.IUserService;
@Controller
public class AccountMessageAction {
@Autowired
private ISysConfigService configService;
@Autowired
private IUserConfigService userConfigService;
@Autowired
private IUserService userService;
@Autowired
private IAccountMessageService accountMessageService;
@RequestMapping({ "/zs_account_count.htm" })
public Object design_index(HttpServletRequest request, HttpServletResponse response,
String managerId,String type) {
User user = SecurityUserHolder.getCurrentUser();
if(user == null) {
return "redirect:/user/login.htm" ;
}else {
//获取处理者
User manegeUser = this.userService.getObjById(Long.parseLong(managerId));
//保存预约消息
AccountMessage accountMessage = new AccountMessage();
accountMessage.setAddTime(new Date());
accountMessage.setStartUser(user);
accountMessage.setManagerUser(manegeUser);
accountMessage.setState("0");
accountMessage.setState(type);
this.accountMessageService.save(accountMessage);
}
if("1".equals(type)) {
return "redirect:/zs_designer_index.htm";
}else {
return "redirect:/zs_decorate_index.htm";
}
}
}
src/com/shopping/view/web/action/DecorateViewAction.java 0 → 100644
View file @ 8dd8395e
package com.shopping.view.web.action;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
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.domain.virtual.SysMap;
import com.shopping.core.mv.JModelAndView;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.tools.CommUtil;
import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.Decorate;
import com.shopping.foundation.domain.DecorateStyle;
import com.shopping.foundation.domain.DecorateType;
import com.shopping.foundation.domain.DecorateWork;
import com.shopping.foundation.domain.Design;
import com.shopping.foundation.domain.DesignExpert;
import com.shopping.foundation.domain.DesignFees;
import com.shopping.foundation.domain.query.DecorateQueryObject;
import com.shopping.foundation.domain.query.DecorateWorkQueryObject;
import com.shopping.foundation.domain.query.DesignQueryObject;
import com.shopping.foundation.domain.query.WorksQueryObject;
import com.shopping.foundation.service.IAreaService;
import com.shopping.foundation.service.IDecorateService;
import com.shopping.foundation.service.IDecorateStyleService;
import com.shopping.foundation.service.IDecorateTypeService;
import com.shopping.foundation.service.IDecorateWork;
import com.shopping.foundation.service.ISysConfigService;
import com.shopping.foundation.service.IUserConfigService;
@Controller
public class DecorateViewAction {
@Autowired
private ISysConfigService configService;
@Autowired
private IUserConfigService userConfigService;
@Autowired
private IAreaService areaService;
@Autowired
private IDecorateService decorateService;
@Autowired
private IDecorateStyleService decorateStyleService;
@Autowired
private IDecorateTypeService decorateTypeService;
@Autowired
private IDecorateWork decorateWork;
@RequestMapping({ "/zs_decorate_index.htm" })
public ModelAndView design_index(HttpServletRequest request, HttpServletResponse response, Long typeID,
Long styleId,String currentPage,String orderBy, String orderType) {
ModelAndView mv = new JModelAndView("/zs_decorate_index.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
// 城市
List<Area> areas = this.areaService.query("select obj from Area obj where obj.level = 0", null, -1, -1);
mv.addObject("cts", areas);
// 装修类型
List<DecorateType> decorateType = this.decorateTypeService.query("select obj from DecorateType obj", null, -1,
-1);
mv.addObject("decorateType", decorateType);
// 装修风格
List<DecorateStyle> decorateStyle = this.decorateStyleService.query("select obj from DecorateStyle obj", null, -1,
-1);
mv.addObject("decorateStyle", decorateStyle);
DecorateQueryObject qo = new DecorateQueryObject(currentPage, mv, orderBy, orderType);
/*if (expertId != null ) {
qo.addQuery("obj.designExpert.id", new SysMap("expertId", expertId), "=");
}
if(feesId !=null) {
qo.addQuery("obj.fees.id", new SysMap("feesId", feesId), "=");
}*/
// 查询所有装修公司
IPageList pList = this.decorateService.list(qo);
CommUtil.saveIPageList2ModelAndView("", "", "", pList, mv);
return mv;
}
/**
* 装修公司详情
* @param request
* @param response
* @param decorateId
* @param currentPage
* @param orderBy
* @param orderType
* @return
*/
@RequestMapping({ "/zs_decorate_detaile.htm" })
public ModelAndView design_detail(HttpServletRequest request, HttpServletResponse response, String decorateId,
String currentPage,String orderBy, String orderType) {
ModelAndView mv = new JModelAndView("/zs_decorate_detaile.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
//获取装修公司信息
Decorate decorate = this.decorateService.getObjById(Long.parseLong(decorateId));
mv.addObject("design", decorate);
//获取装修公司作品信息
DecorateWorkQueryObject qo = new DecorateWorkQueryObject(currentPage, mv, orderBy, orderType);
qo.addQuery("obj.decorateWorks.id", new SysMap("id", Long.parseLong(decorateId)), "=");
IPageList pList = this.decorateWork.list(qo);
CommUtil.saveIPageList2ModelAndView("", "", "", pList, mv);
return mv;
}
}
src/com/shopping/view/web/action/LoginViewAction.java
View file @ 8dd8395e
......@@ -751,7 +751,7 @@ public class LoginViewAction {
swjUser.setPassword("zsh123456");
swjUser.setUser(user);
swjUser.setOwner(user);
swjUser.setType("黄金会员");
swjUser.setType("黄金合伙人");
this.swjUserService.save(swjUser);
Map<String, Object> smsMap = SendTemplateSMS.sendTemplateSMSPay(user.getMobile(), "黄金");
......@@ -822,7 +822,7 @@ public class LoginViewAction {
if(listSwj.size() > 0) {
SwjUser swjUser = listSwj.get(0);
swjUser.setState(false);
swjUser.setType("铂金会员");
swjUser.setType("铂金合伙人");
this.swjUserService.update(swjUser);
}else {
SwjUser swjUser = new SwjUser();
......@@ -832,7 +832,7 @@ public class LoginViewAction {
swjUser.setPassword("zsh123456");
swjUser.setUser(user);
swjUser.setOwner(user);
swjUser.setType("铂金会员");
swjUser.setType("铂金合伙人");
this.swjUserService.save(swjUser);
}
......
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