Skip to content

semour / semour_web

Go to a project
Commit 37a51cd7 by 肖康
Options

个人中心 相关接口对接

parent aa24f135
Expand all
Inline Side-by-side
Showing with 443 additions and 64 deletions
public/assets/css/common/base.less
...@@ -195,7 +195,7 @@ select { ...@@ -195,7 +195,7 @@ select {
background-repeat: no-repeat; background-repeat: no-repeat;
} }
} }
.break-word{word-break : break-all;}
.clr:after { .clr:after {
visibility: hidden; visibility: hidden;
display : block; display : block;
......
public/assets/css/common/base.min.css
@charset "utf-8";html,body,div,iframe,em,img,p,a,strong,b,i,form,label,span,h1,h2,h3,h4,h5,h6,dl,dt,dd,ol,ul,li,applet,object,blockquote,big,cite,code,del,dfn,abbr,acronym,address,pre,time,mark,audio,video,article,aside,canvas,details,embed,figure,figcaption,footer,header,nav,section,menu,button,input,textarea{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;font-weight:normal;list-style:none;outline:none;resize:none}table,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;font-size:100%;font:inherit}a{text-decoration:none}table{border-color:#ccc !important}body,html,button,input{font-family:Arial,helvetica,PingFangSC-Regular,PingFang SC,"微软雅黑"}.but{height:33px;background:#283FEB;border-radius:8px;line-height:33px;font-size:18px;font-weight:bold;text-align:center;color:#fff;cursor:pointer;box-sizing:border-box;padding:0 5px}input{height:32px;line-height:32px;box-sizing:border-box;background:rgba(4,17,53,0.65);border:1px solid #FFFFFF;border-radius:8px;color:#fff;padding-left:10px;padding-right:10px}input::-webkit-input-placeholder{color:#BCBDC4}.scrollbar{overflow-y:auto}.scrollbar::-webkit-scrollbar{width:2px;background-color:#EDEDED}.scrollbar::-webkit-scrollbar-thumb{border-radius:2px;background-color:#164D9A}textarea{line-height:32px;box-sizing:border-box;background:rgba(4,17,53,0.65);border:1px solid #FFFFFF;border-radius:8px;color:#fff;padding-left:10px;padding-right:10px}textarea::-webkit-input-placeholder{color:#BCBDC4}select{height:32px;line-height:32px;background:rgba(4,17,53,0.65);border:1px solid #FFFFFF;border-radius:8px;color:#fff;padding-left:10px;padding-right:10px;box-sizing:border-box;-webkit-appearance:none;-moz-appearance:none;outline:none;background-image:linear-gradient(45deg, transparent 50%, #fff 50%),linear-gradient(135deg, #fff 50%, transparent 50%);background-position:calc(100% - 15px) calc(1em - 1px),calc(100% - 10px) calc(1em - 1px),calc(100% - 2.5em) .5em;background-size:7px 5px,5px 5px,1px 1.5em;background-repeat:no-repeat}select:focus{background-image:linear-gradient(45deg, #fff 50%, transparent 50%),linear-gradient(135deg, transparent 50%, #fff 50%);background-position:calc(100% - 8px) calc(1em - 1px),calc(100% - 15px) calc(1em - 1px),calc(100% - 2.5em) .5em;background-size:7px 5px,5px 5px,1px 1.5em;background-repeat:no-repeat}.clr:after{visibility:hidden;display:block;font-size:0;content:" ";clear:both;height:0}.clr{display:block;min-height:1%}.clr{clear:both}.clr:after{content:" ";display:table;clear:both}.fl{float:left}.fr{float:right}.fw{font-weight:bold}.ta-c{text-align:center}.ta-r{text-align:right}.ta-l{text-align:left}.flex{display:flex}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center} @charset "utf-8";html,body,div,iframe,em,img,p,a,strong,b,i,form,label,span,h1,h2,h3,h4,h5,h6,dl,dt,dd,ol,ul,li,applet,object,blockquote,big,cite,code,del,dfn,abbr,acronym,address,pre,time,mark,audio,video,article,aside,canvas,details,embed,figure,figcaption,footer,header,nav,section,menu,button,input,textarea{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;font-weight:normal;list-style:none;outline:none;resize:none}table,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;font-size:100%;font:inherit}a{text-decoration:none}table{border-color:#ccc !important}body,html,button,input{font-family:Arial,helvetica,PingFangSC-Regular,PingFang SC,"微软雅黑"}.but{height:33px;background:#283FEB;border-radius:8px;line-height:33px;font-size:18px;font-weight:bold;text-align:center;color:#fff;cursor:pointer;box-sizing:border-box;padding:0 5px}input{height:32px;line-height:32px;box-sizing:border-box;background:rgba(4,17,53,0.65);border:1px solid #FFFFFF;border-radius:8px;color:#fff;padding-left:10px;padding-right:10px}input::-webkit-input-placeholder{color:#BCBDC4}.scrollbar{overflow-y:auto}.scrollbar::-webkit-scrollbar{width:2px;background-color:#EDEDED}.scrollbar::-webkit-scrollbar-thumb{border-radius:2px;background-color:#164D9A}textarea{line-height:32px;box-sizing:border-box;background:rgba(4,17,53,0.65);border:1px solid #FFFFFF;border-radius:8px;color:#fff;padding-left:10px;padding-right:10px}textarea::-webkit-input-placeholder{color:#BCBDC4}select{height:32px;line-height:32px;background:rgba(4,17,53,0.65);border:1px solid #FFFFFF;border-radius:8px;color:#fff;padding-left:10px;padding-right:10px;box-sizing:border-box;-webkit-appearance:none;-moz-appearance:none;outline:none;background-image:linear-gradient(45deg, transparent 50%, #fff 50%),linear-gradient(135deg, #fff 50%, transparent 50%);background-position:calc(100% - 15px) calc(1em - 1px),calc(100% - 10px) calc(1em - 1px),calc(100% - 2.5em) .5em;background-size:7px 5px,5px 5px,1px 1.5em;background-repeat:no-repeat}select:focus{background-image:linear-gradient(45deg, #fff 50%, transparent 50%),linear-gradient(135deg, transparent 50%, #fff 50%);background-position:calc(100% - 8px) calc(1em - 1px),calc(100% - 15px) calc(1em - 1px),calc(100% - 2.5em) .5em;background-size:7px 5px,5px 5px,1px 1.5em;background-repeat:no-repeat}.break-word{word-break:break-all}.clr:after{visibility:hidden;display:block;font-size:0;content:" ";clear:both;height:0}.clr{display:block;min-height:1%}.clr{clear:both}.clr:after{content:" ";display:table;clear:both}.fl{float:left}.fr{float:right}.fw{font-weight:bold}.ta-c{text-align:center}.ta-r{text-align:right}.ta-l{text-align:left}.flex{display:flex}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}
\ No newline at end of file \ No newline at end of file
public/assets/css/common/common.less
...@@ -313,7 +313,6 @@ ...@@ -313,7 +313,6 @@
} }
} }
/**商城公用样式**/ /**商城公用样式**/
.mallpage { .mallpage {
background: #fafafa; background: #fafafa;
......
public/assets/css/common/pop.less
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
} }
} }
.tip-con{color:#fff;margin-bottom: 10px;}
.input-con { .input-con {
padding: 0 20px; padding: 0 20px;
......
public/assets/css/user/account.less
...@@ -174,3 +174,5 @@ ...@@ -174,3 +174,5 @@
} }
} }
} }
.gobtn{background: #F68332!important;}
\ No newline at end of file
public/assets/css/user/account.min.css
.accountbox .user-right{width:1024px;min-height:350px;background:#FFFFFF;padding:18px 12px}.accountbox .user-right .nav{border-bottom:1px solid #DFEAFA}.accountbox .user-right .nav .item{height:38px;font-size:16px;color:#222;text-align:center;box-sizing:border-box;padding:0px 30px;line-height:38px;cursor:pointer}.accountbox .user-right .nav .item .tt{width:80px}.accountbox .user-right .nav .item.act{font-weight:bold;border-bottom:4px solid #164D9A}.accountbox .user-right .section .boxinfo{width:1000px;background:#F7FAFF;border-radius:8px;margin:0 auto;box-sizing:border-box;padding:25px 46px;margin-top:10px}.accountbox .user-right .section .grp{font-size:14px;color:#555;margin-bottom:35px}.accountbox .user-right .section .grp:last-child{margin-bottom:0px}.accountbox .user-right .section .grp .labels{width:200px;color:#333;font-weight:bold}.accountbox .user-right .section .grp .labels span{color:#F68332}.accountbox .user-right .section .grp .lval{width:200px;margin-right:70px}.accountbox .user-right .section .grp .edit{color:#164D9A;cursor:pointer}.accountbox .user-right .section .changebtn{width:150px;height:32px;background:#164D9A;border-radius:8px;font-size:14px;color:#fff;text-align:center;line-height:32px;cursor:pointer}.accountbox .user-right .addressbox{margin-top:16px}.accountbox .user-right .addressbox .list-table .w56{width:56px}.accountbox .user-right .addressbox .list-table .w150{width:150px}.accountbox .user-right .addressbox .list-table .thead{width:1000px;height:48px;background:#DFEAFA;border-radius:8px 8px 0px 0px;height:39px;line-height:39px;padding:0 22px;border-bottom:1px solid #DFEAFA;box-sizing:border-box}.accountbox .user-right .addressbox .list-table .thead .th{font-size:14px;color:#333;font-weight:bold;box-sizing:border-box;padding-right:5px}.accountbox .user-right .addressbox .list-table .tbody{width:1000px;background:#F7FAFF;box-sizing:border-box;border-radius:0px 0px 8px 8px;padding:0 22px}.accountbox .user-right .addressbox .list-table .tr{padding:22px 0px;border-bottom:1px solid #DFEAFA}.accountbox .user-right .addressbox .list-table .tr:last-child{border:0px}.accountbox .user-right .addressbox .list-table .tr .td{font-size:14px;color:#555;box-sizing:border-box;padding-right:5px;word-break:break-all}.accountbox .user-right .addressbox .list-table .tr .td .bot{width:74px;height:32px;font-size:14px;background:#164D9A;border-radius:4px;line-height:74px;color:#fff;text-align:center;line-height:32px;cursor:pointer}.accountbox .user-right .addressbox .list-table .tr .td .bot.delbtns{background:#FFD7BB;color:#A74703;margin-left:10px} .accountbox .user-right{width:1024px;min-height:350px;background:#FFFFFF;padding:18px 12px}.accountbox .user-right .nav{border-bottom:1px solid #DFEAFA}.accountbox .user-right .nav .item{height:38px;font-size:16px;color:#222;text-align:center;box-sizing:border-box;padding:0px 30px;line-height:38px;cursor:pointer}.accountbox .user-right .nav .item .tt{width:80px}.accountbox .user-right .nav .item.act{font-weight:bold;border-bottom:4px solid #164D9A}.accountbox .user-right .section .boxinfo{width:1000px;background:#F7FAFF;border-radius:8px;margin:0 auto;box-sizing:border-box;padding:25px 46px;margin-top:10px}.accountbox .user-right .section .grp{font-size:14px;color:#555;margin-bottom:35px}.accountbox .user-right .section .grp:last-child{margin-bottom:0px}.accountbox .user-right .section .grp .labels{width:200px;color:#333;font-weight:bold}.accountbox .user-right .section .grp .labels span{color:#F68332}.accountbox .user-right .section .grp .lval{width:200px;margin-right:70px}.accountbox .user-right .section .grp .edit{color:#164D9A;cursor:pointer}.accountbox .user-right .section .changebtn{width:150px;height:32px;background:#164D9A;border-radius:8px;font-size:14px;color:#fff;text-align:center;line-height:32px;cursor:pointer}.accountbox .user-right .addressbox{margin-top:16px}.accountbox .user-right .addressbox .list-table .w56{width:56px}.accountbox .user-right .addressbox .list-table .w150{width:150px}.accountbox .user-right .addressbox .list-table .thead{width:1000px;height:48px;background:#DFEAFA;border-radius:8px 8px 0px 0px;height:39px;line-height:39px;padding:0 22px;border-bottom:1px solid #DFEAFA;box-sizing:border-box}.accountbox .user-right .addressbox .list-table .thead .th{font-size:14px;color:#333;font-weight:bold;box-sizing:border-box;padding-right:5px}.accountbox .user-right .addressbox .list-table .tbody{width:1000px;background:#F7FAFF;box-sizing:border-box;border-radius:0px 0px 8px 8px;padding:0 22px}.accountbox .user-right .addressbox .list-table .tr{padding:22px 0px;border-bottom:1px solid #DFEAFA}.accountbox .user-right .addressbox .list-table .tr:last-child{border:0px}.accountbox .user-right .addressbox .list-table .tr .td{font-size:14px;color:#555;box-sizing:border-box;padding-right:5px;word-break:break-all}.accountbox .user-right .addressbox .list-table .tr .td .bot{width:74px;height:32px;font-size:14px;background:#164D9A;border-radius:4px;line-height:74px;color:#fff;text-align:center;line-height:32px;cursor:pointer}.accountbox .user-right .addressbox .list-table .tr .td .bot.delbtns{background:#FFD7BB;color:#A74703;margin-left:10px}.gobtn{background:#F68332 !important}
\ No newline at end of file \ No newline at end of file
public/assets/css/user/frq.less
...@@ -39,9 +39,10 @@ ...@@ -39,9 +39,10 @@
.user-right { .user-right {
width : 1024px; width : 1024px;
min-height: 350px; min-height : 350px;
background: #FFFFFF; background : #FFFFFF;
padding : 18px 12px; padding : 18px 12px;
padding-bottom: 50px;
.nav { .nav {
...@@ -93,9 +94,10 @@ ...@@ -93,9 +94,10 @@
border-radius: 8px 8px 0px 0px; border-radius: 8px 8px 0px 0px;
height : 39px; height : 39px;
line-height : 39px; line-height : 39px;
padding:0 50px; padding : 0 50px;
border-bottom: 1px solid #DFEAFA; border-bottom: 1px solid #DFEAFA;
box-sizing: border-box; box-sizing : border-box;
.th { .th {
font-size : 16px; font-size : 16px;
color : #333; color : #333;
...@@ -108,17 +110,21 @@ ...@@ -108,17 +110,21 @@
.tbody { .tbody {
width : 988px; width : 988px;
background : #F7FAFF; background : #F7FAFF;
box-sizing: border-box; box-sizing : border-box;
border-radius: 0px 0px 8px 8px; border-radius: 0px 0px 8px 8px;
padding:0 22px; padding : 0 22px;
} }
.tr { .tr {
cursor: pointer;
padding : 22px 28px; padding : 22px 28px;
border-bottom: 1px solid #DFEAFA; border-bottom: 1px solid #DFEAFA;
&:last-child{border:0px;}
&:last-child {
border: 0px;
}
.td { .td {
font-size : 14px; font-size : 14px;
color : #555; color : #555;
...@@ -129,5 +135,44 @@ ...@@ -129,5 +135,44 @@
} }
} }
} }
}
}
.frqDetailPop {
flex-wrap: wrap;
color : #fff;
padding:0 10px;
.gtitle div {
flex : 0 0 33.33%;
font-size : 14px;
font-weight: bold;
span{color:#F68332;}
&.bpxtsad{
box-sizing: border-box;
padding-left: 10px;
}
}
.detailfrqbox {
overflow-x: hidden;
max-height: 220px;
.gcon div{
margin-top: 5px;
height:22px;
line-height: 22px;
font-size: 14px;
flex : 0 0 33.33%;
box-sizing: border-box;
padding-left:10px;
}
}
.msgbox{
.messti{
margin-bottom: 10px;
}
margin-top: 20px;
font-size: 14px;
color:#fff;
} }
} }
\ No newline at end of file
public/assets/css/user/frq.min.css
.frqbox .search-shit{width:350px;height:32px;background:#FAFAFA;border:1px solid #DFEAFA;border-radius:8px;position:relative;top:-5px}.frqbox .search-shit span.icon{position:absolute;right:0px;top:-1px;width:50px;height:32px;background:#164D9A;text-align:center;line-height:32px;border-radius:0px 8px 8px 0px;cursor:pointer}.frqbox .search-shit span.icon i{font-size:18px;color:#fff}.frqbox .search-shit input{background:#fff;display:block;height:30px;line-height:30px;color:#333;padding-left:15px;width:302px}.frqbox .user-right{width:1024px;min-height:350px;background:#FFFFFF;padding:18px 12px}.frqbox .user-right .nav{border-bottom:1px solid #DFEAFA;margin-bottom:16px}.frqbox .user-right .nav .item{height:38px;font-size:16px;color:#222;text-align:center;box-sizing:border-box;padding:0px 30px;line-height:38px;cursor:pointer}.frqbox .user-right .nav .item .tt{width:80px}.frqbox .user-right .nav .item span{height:34px;line-height:38px}.frqbox .user-right .nav .item.act{font-weight:bold;border-bottom:4px solid #164D9A}.frqbox .user-right .list-table .w200{width:190px}.frqbox .user-right .list-table .w188{width:128px}.frqbox .user-right .list-table .thead{width:988px;height:48px;background:#DFEAFA;border-radius:8px 8px 0px 0px;height:39px;line-height:39px;padding:0 50px;border-bottom:1px solid #DFEAFA;box-sizing:border-box}.frqbox .user-right .list-table .thead .th{font-size:16px;color:#333;font-weight:bold;box-sizing:border-box;padding-right:5px}.frqbox .user-right .list-table .tbody{width:988px;background:#F7FAFF;box-sizing:border-box;border-radius:0px 0px 8px 8px;padding:0 22px}.frqbox .user-right .list-table .tr{padding:22px 28px;border-bottom:1px solid #DFEAFA}.frqbox .user-right .list-table .tr:last-child{border:0px}.frqbox .user-right .list-table .tr .td{font-size:14px;color:#555;box-sizing:border-box;padding-right:5px;word-break:break-all} .frqbox .search-shit{width:350px;height:32px;background:#FAFAFA;border:1px solid #DFEAFA;border-radius:8px;position:relative;top:-5px}.frqbox .search-shit span.icon{position:absolute;right:0px;top:-1px;width:50px;height:32px;background:#164D9A;text-align:center;line-height:32px;border-radius:0px 8px 8px 0px;cursor:pointer}.frqbox .search-shit span.icon i{font-size:18px;color:#fff}.frqbox .search-shit input{background:#fff;display:block;height:30px;line-height:30px;color:#333;padding-left:15px;width:302px}.frqbox .user-right{width:1024px;min-height:350px;background:#FFFFFF;padding:18px 12px;padding-bottom:50px}.frqbox .user-right .nav{border-bottom:1px solid #DFEAFA;margin-bottom:16px}.frqbox .user-right .nav .item{height:38px;font-size:16px;color:#222;text-align:center;box-sizing:border-box;padding:0px 30px;line-height:38px;cursor:pointer}.frqbox .user-right .nav .item .tt{width:80px}.frqbox .user-right .nav .item span{height:34px;line-height:38px}.frqbox .user-right .nav .item.act{font-weight:bold;border-bottom:4px solid #164D9A}.frqbox .user-right .list-table .w200{width:190px}.frqbox .user-right .list-table .w188{width:128px}.frqbox .user-right .list-table .thead{width:988px;height:48px;background:#DFEAFA;border-radius:8px 8px 0px 0px;height:39px;line-height:39px;padding:0 50px;border-bottom:1px solid #DFEAFA;box-sizing:border-box}.frqbox .user-right .list-table .thead .th{font-size:16px;color:#333;font-weight:bold;box-sizing:border-box;padding-right:5px}.frqbox .user-right .list-table .tbody{width:988px;background:#F7FAFF;box-sizing:border-box;border-radius:0px 0px 8px 8px;padding:0 22px}.frqbox .user-right .list-table .tr{cursor:pointer;padding:22px 28px;border-bottom:1px solid #DFEAFA}.frqbox .user-right .list-table .tr:last-child{border:0px}.frqbox .user-right .list-table .tr .td{font-size:14px;color:#555;box-sizing:border-box;padding-right:5px;word-break:break-all}.frqDetailPop{flex-wrap:wrap;color:#fff;padding:0 10px}.frqDetailPop .gtitle div{flex:0 0 33.33%;font-size:14px;font-weight:bold}.frqDetailPop .gtitle div span{color:#F68332}.frqDetailPop .gtitle div.bpxtsad{box-sizing:border-box;padding-left:10px}.frqDetailPop .detailfrqbox{overflow-x:hidden;max-height:220px}.frqDetailPop .detailfrqbox .gcon div{margin-top:5px;height:22px;line-height:22px;font-size:14px;flex:0 0 33.33%;box-sizing:border-box;padding-left:10px}.frqDetailPop .msgbox{margin-top:20px;font-size:14px;color:#fff}.frqDetailPop .msgbox .messti{margin-bottom:10px}
\ No newline at end of file \ No newline at end of file
public/assets/js/common/config.js
...@@ -2,6 +2,7 @@ seajs.config({ ...@@ -2,6 +2,7 @@ seajs.config({
base: PUBLICXK + '/assets/js/', base: PUBLICXK + '/assets/js/',
alias: { alias: {
'slide':"common/jquery.SuperSlide.2.1.3",//最强轮播 因为公共尾部有轮播 直接预加载 'slide':"common/jquery.SuperSlide.2.1.3",//最强轮播 因为公共尾部有轮播 直接预加载
'artTemplate':"common/artTemplate.js",
'tool':"common/tool",//工具 'tool':"common/tool",//工具
'liexin_ajax':"common/liexin_ajax.js" , 'liexin_ajax':"common/liexin_ajax.js" ,
'liexin_pop':"common/liexin_pop.js", 'liexin_pop':"common/liexin_pop.js",
......
public/assets/js/common/liexin_pop.js
...@@ -7,8 +7,8 @@ define('liexin_pop', [], function (require, exports, module) { ...@@ -7,8 +7,8 @@ define('liexin_pop', [], function (require, exports, module) {
el.href = PUBLICXK + '/assets/css/common/pop.min.css?v=' + Date.now(); el.href = PUBLICXK + '/assets/css/common/pop.min.css?v=' + Date.now();
$("body").before($(el)) $("body").before($(el))
//提示消息 tips opt={time:2000,title:"放开那个女孩"} //提示消息 tips opt={time:2000,title:"放开那个女孩"} callback 提示消失后 执行
module.exports.Tip = function (opt) { module.exports.Tip = function (opt,callback) {
var time_ = opt.time || 2200; var time_ = opt.time || 2200;
$(".pop-tip").remove(); $(".pop-tip").remove();
var temp = '<div class="pop-tip" ><div class="tip-con">' + opt.title + '</div></div>'; var temp = '<div class="pop-tip" ><div class="tip-con">' + opt.title + '</div></div>';
...@@ -20,6 +20,7 @@ define('liexin_pop', [], function (require, exports, module) { ...@@ -20,6 +20,7 @@ define('liexin_pop', [], function (require, exports, module) {
"margin-left": -0.5 * width_ "margin-left": -0.5 * width_
}) })
setTimeout(function () { setTimeout(function () {
if(callback){callback()}
$(".pop-tip").fadeOut(300); $(".pop-tip").fadeOut(300);
}, time_); }, time_);
$(window).resize(function () { $(window).resize(function () {
......
public/assets/js/common/mallUi.js
...@@ -139,11 +139,10 @@ define('mallUi', ['tool', 'liexin_pop'], function (require, exports, module) { ...@@ -139,11 +139,10 @@ define('mallUi', ['tool', 'liexin_pop'], function (require, exports, module) {
return return
} }
$.liexin_ajax('/api/inquiry/add', 'POST', { $.liexin_ajax('/api/inquiry/add', 'POST', {
items: arr_, items: JSON.stringify(arr_),
remark: $(".allInquiryPop .inquiryremark").val() remark: $(".allInquiryPop .inquiryremark").val()
}, function (res) { }, function (res) {
if (res.code === 0) { if (res.code === 0) {
liexin_pop.Tip({ title: res.msg })
setTimeout(function () { setTimeout(function () {
history.go(0) history.go(0)
}, 1000) }, 1000)
......
public/assets/js/common/tool.js
...@@ -56,5 +56,10 @@ define(function (require, exports, module) { ...@@ -56,5 +56,10 @@ define(function (require, exports, module) {
return false return false
} }
//无结果
module.exports.NoData = function (ele) {
$(ele).html('<div class="row verCenter rowCenter" style="height:150px;color:#555;">No Data</div>')
}
}); });
\ No newline at end of file
public/assets/js/user/account.js
define('frq', ['tool', 'liexin_pop'], function (require, exports, module) { define('account', ['tool', 'liexin_pop', 'form'], function (require, exports, module) {
var tool = require("tool"); var tool = require("tool");
var liexin_pop = require("liexin_pop"); var liexin_pop = require("liexin_pop");
var frq = { var form = require("form")
var account = {
init: function () { init: function () {
frq.handle(); account.handle();
frq.getData() account.getData()
}, },
getData:function(){ getData: function () {
$.liexin_ajax('/api/user/info', 'GET', {}, function (res) { $.liexin_ajax('/api/user/info', 'GET', {}, function (res) {
if (res.code == 0) { if (res.code == 0) {
$(".infobase .phone_val").text(res.data.phone)
$(".infobase .email_val").text(res.data.email)
$(".infobase .company_name_val").text(res.data.company_name)
$(".changeInfoPop .company_name_acpo").val(res.data.company_name)
$(".infobase .first_name_val").text(res.data.first_name)
$(".changeInfoPop .first_name_acpo").val(res.data.first_name)
$(".infobase .last_name_val").text(res.data.last_name)
$(".changeInfoPop .last_name_acpo").val(res.data.last_name)
$(".infobase .account_properties_val").text("For Business")
if (res.data.account_properties == 2) {
$(".infobase .account_properties_val").text("For Individual")
$(".changeInfoPop .checkbox_acpo .check-group").removeClass("act")
$(".changeInfoPop .checkbox_acpo .check-group22").addClass("act")
}
} else { } else {
liexin_pop.Tip({ title: res.msg }) liexin_pop.Tip({ title: res.msg })
} }
}) })
}, },
handle: function () { handle: function () {
//切换盒子
$("body").on("click", ".navitemx", function () {
$(".user-right .navitemx").removeClass("act");
$(this).addClass("act");
$(".lboxs").hide();
if($(this).attr("guid")==1){
$(".infobase").show()
}else{
$(".addressbox").show()
}
})
//切换属性
$("body").on("click", ".check-group", function () {
$(".changeInfoPop").find(".check-group").removeClass("act")
$(this).addClass("act");
})
//修改密码
$(".infobase .changepasswordbtn").click(function () {
liexin_pop.Open({
title: "Change Your Password",
width: 420,
ele: ".changePasswordPop",
success: function () {
}
})
})
$("body").on("click", ".changepasswordpopbtn", function () {
if (form.test(".changePasswordPop")) {
return
}
$.liexin_ajax('/api/auth/reset_password', 'POST', {
password_confirmation: $(".changePasswordPop .passwordnewagain").val(),
password: $(".changePasswordPop .passwordnew").val(),
old_password: $(".changePasswordPop .passwordori").val(),
}, function (res) {
if (res.code == 0) {
liexin_pop.Tip({ title: res.msg }, function () { history.go(0) })
} else {
liexin_pop.Tip({ title: res.msg })
}
})
})
//修改手机
$(".infobase .phone_edit").click(function () {
liexin_pop.Open({
title: "Change Your Phone",
width: 420,
ele: ".changePhonePop",
success: function () {
}
})
})
$("body").on("click", ".changephonepopbtn", function () {
if (form.test(".changePhonePop")) {
return
}
$.liexin_ajax('/api/user/change_phone', 'POST', {
password: $(".changePhonePop .passwordphone").val(),
phone: $(".changePhonePop .phoneval").val(),
}, function (res) {
if (res.code == 0) {
liexin_pop.Tip({ title: res.msg }, function () { history.go(0) })
} else {
liexin_pop.Tip({ title: res.msg })
}
})
})
//修改邮箱
$(".infobase .email_edit").click(function () {
liexin_pop.Open({
title: "Change Your Email",
width: 420,
ele: ".changeEmailPop",
success: function () {
} }
})
})
//修改邮箱获取验证码
$("body").on("click", ".getCodeEmailUpdate", function () {
account.getCode()
})
$("body").on("click", ".changeemailpopbtn", function () {
if (form.test(".changeEmailPop")) {
return
}
$.liexin_ajax('/api/auth/send_email_code', 'POST', {
password: $(".changeEmailPop .passwordemail").val(),
email: $(".changeEmailPop .emailval").val(),
email_code: $(".changeEmailPop .emailcodeval").val(),
}, function (res) {
if (res.code == 0) {
liexin_pop.Tip({ title: res.msg }, function () { history.go(0) })
} else {
liexin_pop.Tip({ title: res.msg })
}
})
})
//修改基本信息
$(".infobase .changeinfobtns").click(function () {
liexin_pop.Open({
title: "Change Your Basic information",
width: 420,
ele: ".changeInfoPop",
success: function () {
}
})
})
$("body").on("click", ".changeinfopopbtn", function () {
if (form.test(".changeInfoPop")) {
return
}
$.liexin_ajax('/api/user/update', 'POST', {
account_properties: $(".changeInfoPop .check-group.act").attr("guid"),
company_name:$(".changeInfoPop .company_name_acpo").val(),
first_name:$(".changeInfoPop .first_name_acpo").val(),
last_name:$(".changeInfoPop .last_name_acpo").val(),
}, function (res) {
if (res.code == 0) {
liexin_pop.Tip({ title: res.msg }, function () { history.go(0) })
} else {
liexin_pop.Tip({ title: res.msg })
}
})
})
},
getCode: function () {
//发送邮件
$.liexin_ajax('/api/auth/send_email_code', 'POST', {
email: $(".changeEmailPop .emailval").val(),
type: "change_email"
}, function (res) {
if (res.code === 0) {
liexin_pop.Tip({ title: "Send Success" })
} else {
liexin_pop.Tip({ title: res.msg })
}
})
}
} }
module.exports = frq.init(); module.exports = account.init();
}) })
seajs.use(['frq']) seajs.use(['account'])
\ No newline at end of file \ No newline at end of file
public/assets/js/user/frq.js
define('frq', ['tool', 'liexin_pop'], function (require, exports, module) { define('frq', ['tool', 'liexin_pop','artTemplate'], function (require, exports, module) {
var tool = require("tool"); var tool = require("tool");
var liexin_pop = require("liexin_pop"); var liexin_pop = require("liexin_pop");
var artTemplate=require("artTemplate");
var frq = { var frq = {
init: function () { init: function () {
frq.handle(); frq.handle();
...@@ -12,7 +13,16 @@ define('frq', ['tool', 'liexin_pop'], function (require, exports, module) { ...@@ -12,7 +13,16 @@ define('frq', ['tool', 'liexin_pop'], function (require, exports, module) {
keyword:$(".inquirysearchvalss").val() keyword:$(".inquirysearchvalss").val()
}, function (res) { }, function (res) {
if (res.code == 0) { if (res.code == 0) {
var dataArr=res.data||[];
if(dataArr.length==0){
tool.NoData(".tbody")
return
}
var json_={
data:dataArr
}
var html = template('DataTmp', json_);
$(".tbody").html(html);
} else { } else {
liexin_pop.Tip({ title: res.msg }) liexin_pop.Tip({ title: res.msg })
...@@ -20,8 +30,45 @@ define('frq', ['tool', 'liexin_pop'], function (require, exports, module) { ...@@ -20,8 +30,45 @@ define('frq', ['tool', 'liexin_pop'], function (require, exports, module) {
}) })
}, },
handle: function () { handle: function () {
$(".inuirynavs .item").click(function(){
if($(this).hasClass("act")){return}
$(".inuirynavs .item").removeClass("act")
$(this).addClass("act")
frq.getData()
})
$(".inquirysearchbtnss").click(function(){
frq.getData()
})
$("body").on("click",".trdetail",function(){
var guid_=$(this).attr("guid");
frq.getFrqDetail(guid_);
})
},
getFrqDetail:function(id_){
$.liexin_ajax('/api/inquiry/detail', 'GET', {
inquiry_id:id_
}, function (res) {
if (res.code == 0) {
var arr_=res.data.items||[];
var html_="";
for(var i=0;i<arr_.length;i++){
html_+='<div class="row gcon"><div>'+arr_[i].goods_name+'</div><div>'+arr_[i].brand_name+'</div><div>'+arr_[i].inquiry_number+'</div></div>'
}
liexin_pop.Open({
title:"Inquiry",
width:766,
ele:".frqDetailPop",
success:function(){
$(".frqDetailPop .detailfrqbox").html(html_);
$(".frqDetailPop .gba").text(res.data.remark)
}
})
} else {
liexin_pop.Tip({ title: res.msg })
}
})
} }
} }
module.exports = frq.init(); module.exports = frq.init();
......
public/assets/js/user/orderdetail.js
define('orderDetail', ['liexin_pop','tool'], function (require, exports, module) { define('orderDetail', ['liexin_pop','tool'], function (require, exports, module) {
var liexin_pop = require("liexin_pop"); var liexin_pop = require("liexin_pop");
var tool = require("tool"); var tool = require("tool");
var orderDetail = { var orderDetail = {
init: function () { init: function () {
orderDetail.handle(); orderDetail.handle();
......
resources/views/user/account.blade.php
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<i>></i> <i>></i>
<span>My Account</span> <span>My Account</span>
</div> </div>
</div> </div>
<div class="cons row bothSide"> <div class="cons row bothSide">
<div class="user-left-nav boxsiz"> <div class="user-left-nav boxsiz">
...@@ -26,62 +25,62 @@ ...@@ -26,62 +25,62 @@
</div> </div>
<div class="user-right boxsiz"> <div class="user-right boxsiz">
<div class="nav row"> <div class="nav row">
<div class="item act "> <div class="item act navitemx" guid="1">
<div class="row rowCenter"> <div class="row rowCenter">
Information Information
</div> </div>
</div> </div>
<div class="item "> <div class="item navitemx" guid="2">
<div class="row rowCenter"> <div class="row rowCenter">
Address Address
</div> </div>
</div> </div>
</div> </div>
<div class="section lboxs infobase" > <div class="section lboxs infobase">
<div class="row bothSide boxinfo"> <div class="row bothSide boxinfo">
<div class="l "> <div class="l ">
<div class="grp row"> <div class="grp row">
<div class="labels"><span>*</span>PHONE</div> <div class="labels"><span>*</span>PHONE</div>
<span class="lval">000-0000-0000</span> <span class="lval phone_val"></span>
<div class="edit">Edit</div> <div class="edit phone_edit">Edit</div>
</div> </div>
<div class="grp row"> <div class="grp row">
<div class="labels"><span>*</span>EMAIL</div> <div class="labels"><span>*</span>EMAIL</div>
<span class="lval">123456789@qq.com</span> <span class="lval email_val"></span>
<div class="edit">Edit</div> <div class="edit email_edit">Edit</div>
</div> </div>
</div> </div>
<div class="r"> <div class="r">
<div class="changebtn">Change Password</div> <div class="changebtn changepasswordbtn">Change Password</div>
</div> </div>
</div> </div>
<div class="row bothSide boxinfo"> <div class="row bothSide boxinfo">
<div class="l "> <div class="l ">
<div class="grp row"> <div class="grp row">
<div class="labels">Account Properties</div> <div class="labels">Account Properties</div>
<span class="lval">For Business</span> <span class="lval account_properties_val"></span>
</div> </div>
<div class="grp row"> <div class="grp row">
<div class="labels"><span>*</span>COMPANY NAME</div> <div class="labels"><span>*</span>COMPANY NAME</div>
<span class="lval">APPLE INC</span> <span class="lval company_name_val"></span>
</div> </div>
<div class="grp row"> <div class="grp row">
<div class="labels"><span>*</span>FIRST NAME</div> <div class="labels"><span>*</span>FIRST NAME</div>
<span class="lval">APPLE INC</span> <span class="lval first_name_val"></span>
</div> </div>
<div class="grp row"> <div class="grp row">
<div class="labels"><span>*</span>LAST NAME</div> <div class="labels"><span>*</span>LAST NAME</div>
<span class="lval">APPLE INC</span> <span class="lval last_name_val"></span>
</div> </div>
</div> </div>
<div class="r"> <div class="r">
<div class="changebtn">Change Information</div> <div class="changebtn changeinfobtns">Change Information</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -134,6 +133,110 @@ ...@@ -134,6 +133,110 @@
</div> </div>
@endsection @endsection
<!--修改密码-->
<div class="changePasswordPop" style="display:none;">
<div class="inputboxp boxsiz">
<div class="input-con">
<div class="input-group-auth stepbox step1">
<p class="labelp">The original password</p>
<input type="text" class="passwordori verify" verifyTip='{"type":"null","text":"Original Password"}'>
</div>
<div class="stepbox step2">
<div class="input-group-auth">
<p class="labelp ">NEW PASSWORD</p>
<input type="text" class="passwordnew verify" verifyTip='{"type":"null","text":"New Password"}'>
</div>
<div class="tip-con">
<p>· Contain at least 8 characters.</p>
<p>· Cannot contain common or guessable text</p>
</div>
<div class="input-group-auth">
<p class="labelp ">CONFIRM PASSWORD</p>
<input type="text" class="passwordnewagain verify" verifyTip='{"type":"null","text":"CONFIRM PASSWORD"}'>
</div>
</div>
<div class="tips"></div>
<div class="but gobtn gonext changepasswordpopbtn">Submit</div>
</div>
</div>
</div>
<!--修改手机-->
<div class="changePhonePop" style="display:none;">
<div class="inputboxp boxsiz">
<div class="input-con">
<div class="input-group-auth">
<p class="labelp">Password</p>
<input type="text" class="passwordphone verify" verifyTip='{"type":"null","text":"Original Password"}'>
</div>
<div class="input-group-auth">
<p class="labelp ">NEW Phone</p>
<input type="text" class="phoneval verify" verifyTip='{"type":"null","text":"New Password"}'>
</div>
<div class="tips"></div>
<div class="but gobtn gonext changephonepopbtn">Submit</div>
</div>
</div>
</div>
<!--修改邮箱-->
<div class="changeEmailPop" style="display:none">
<div class="inputboxp boxsiz">
<div class="input-con">
<div class="input-group-auth ">
<p class="labelp">Password</p>
<input type="text" class="passwordemail verify" verifyTip='{"type":"null","text":"Original Password"}'>
</div>
<div class="input-group-auth">
<p class="labelp ">NEW Email</p>
<input type="text" class="emailval verify" verifyTip='{"type":"null","text":"New Password"}'>
</div>
<div class="getCodeEmailUpdate but" style="width:250px;margin-bottom:15px;">Get verification code</div>
<div class="input-group-auth">
<p class="labelp ">Please enter the validation code that your email received.</p>
<input type="text" class="emailcodeval verify" verifyTip='{"type":"null","text":"Validation Code"}'>
</div>
<div class="tips"></div>
<div class="but gobtn gonext changeemailpopbtn">Submit</div>
</div>
</div>
</div>
<!--修改用户信息-->
<div class="changeInfoPop" style="display:none;">
<div class="inputboxp boxsiz">
<div class="checkbox row checkbox_acpo">
<div class="check-group row act check-group11" guid="1">
<p class="row verCenter rowCenter">
<font></font>
</p>
<span>For Business</span>
</div>
<div class="check-group row check-group22" guid="2">
<p class="row verCenter rowCenter">
<font></font>
</p>
<span>For Individual</span>
</div>
</div>
<div class="input-con ">
<div class="input-group-auth">
<p class="labelp"><span>*</span>COMPANY NAME</p>
<input type="text" class="verify company_name_acpo" verifyTip='{"type":"null","text":"COMPANY NAME"}'>
</div>
<div class="input-group-auth">
<p class="labelp"><span>*</span>FIRST NAME</p>
<input type="text" class="verify first_name_acpo" verifyTip='{"type":"null","text":"FIRST NAME"}'>
</div>
<div class="input-group-auth">
<p class="labelp"><span>*</span>LAST NAME</p>
<input type="text" class="verify last_name_acpo" verifyTip='{"type":"null","text":"LAST NAME"}'>
</div>
</div>
<div class="tips"></div>
<div class="but gobtn gonext changeinfopopbtn">Submit</div>
</div>
</div>
@section('js') @section('js')
<script src="{{$public}}/assets/js/user/account.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/user/account.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/user/inquiry.blade.php
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
<div class="search-shit boxsiz"> <div class="search-shit boxsiz">
<span class="icon"><i class="icon iconfont icon-shouyesousuo"></i></span> <span class="icon inquirysearchbtnss"><i class="icon iconfont icon-shouyesousuo"></i></span>
<input type="text" placeholder="Search Part No./Quotation No." class="inquirysearchvalss"> <input type="text" placeholder="Search Part No./Quotation No." class="inquirysearchvalss">
</div> </div>
</div> </div>
...@@ -58,32 +58,47 @@ ...@@ -58,32 +58,47 @@
<div class="th w200">Time</div> <div class="th w200">Time</div>
</div> </div>
<div class="tbody"> <div class="tbody">
<div class="tr row boxsiz">
<div class="td w200">ABC123456789</div>
<div class="td w200">ABC123456789</div>
<div class="td w200">ABC123456789</div>
<div class="td w188">Pending</div>
<div class="td w200">2022-10-10 12:00:00</div>
</div>
<div class="tr row boxsiz">
<div class="td w200">ABC123456789</div>
<div class="td w200">ABC123456789</div>
<div class="td w200">ABC123456789</div>
<div class="td w188">Pending</div>
<div class="td w200">2022-10-10 12:00:00</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
@include('common.mallFooter') @include('common.mallFooter')
</div> </div>
@endsection @endsection
<!--询价详情弹窗-->
<div class="frqDetailPop" style="display:none;">
<div class="row gtitle">
<div><span>*</span> Part No</div>
<div class="bpxtsad">Manufacturer</div>
<div><span>*</span>Quantity</div>
</div>
<div class="detailfrqbox scrollbar">
</div>
<div class="msgbox">
<div class="messti">Message</div>
<div class="break-word gba"></div>
</div>
</div>
@verbatim
<script id="DataTmp" type="text/html">
{{each data value index}}
<div class="tr row boxsiz trdetail" guid="{{value.inquiry_id}}">
<div class="td w200">{{value.inquiry_sn}}</div>
<div class="td w200">{{value.goods_name}}</div>
<div class="td w200">{{value.remark}}</div>
<div class="td w188">{{value.status_name}}</div>
<div class="td w200">{{value.create_time}}</div>
</div>
{{/each}}
</script>
@endverbatim
@section('js') @section('js')
<script src="{{$public}}/assets/js/user/frq.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/user/frq.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
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 sign in to comment