Skip to content

施宇 / icsales

Go to a project
Commit 693d61dd by 施宇
Options

Merge branch 'master' of http://119.23.72.7/shiyu/icsales

parents b443d8ba 7d5404fc
Expand all
Inline Side-by-side
Showing with 50 additions and 24 deletions
Application/Home/View/Account/index.html
...@@ -29,21 +29,6 @@ ...@@ -29,21 +29,6 @@
</div> </div>
</div> </div>
<div class="xh input_div"> <div class="xh input_div">
<span class="input_title lineBlock">国家地区:</span>
<div class="input_parent">
<div class="layui-input-block" style="width: 170px;margin-left: 0;">
<select name="city" lay-verify="required">
<option value=""></option>
<option value="0">北京</option>
<option value="1">上海</option>
<option value="2">广州</option>
<option value="3">深圳</option>
<option value="4">杭州</option>
</select>
</div>
</div>
</div>
<div class="xh input_div">
<span class="input_title lineBlock">所在地区:</span> <span class="input_title lineBlock">所在地区:</span>
<div class="input_parent"> <div class="input_parent">
<div class="layui-input-inline auto-area" style="width: 170px;margin-left: 0;margin-right: 20px;"> <div class="layui-input-inline auto-area" style="width: 170px;margin-left: 0;margin-right: 20px;">
...@@ -96,7 +81,7 @@ ...@@ -96,7 +81,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="tod-bar"> <!-- <div class="tod-bar">
<h3 class="bold">账户绑定</h3> <h3 class="bold">账户绑定</h3>
<ul class="list-box clr"> <ul class="list-box clr">
<li class="clr"> <li class="clr">
...@@ -115,7 +100,7 @@ ...@@ -115,7 +100,7 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="tod-bar"> <div class="tod-bar">
<h3 class="bold">消息通知</h3> <h3 class="bold">消息通知</h3>
<ul class="list-box clr"> <ul class="list-box clr">
......
Application/Home/View/public/navleft.html
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<span class="li_title">商品管理</span> <span class="li_title">商品管理</span>
</a> </a>
</li> </li>
<li class="content_ul_li <if condition="(ACTION_NAME eq 'integral')">active</if>"> <!-- <li class="content_ul_li <if condition="(ACTION_NAME eq 'integral')">active</if>">
<a href="homeicsales/integral" class="out"> <a href="homeicsales/integral" class="out">
<span class="li_icon icon iconfont iconjuxing9"></span> <span class="li_icon icon iconfont iconjuxing9"></span>
<span class="li_title">积分管理</span> <span class="li_title">积分管理</span>
</a> </a>
</li> </li>-->
<li class="content_ul_li <if condition="(ACTION_NAME eq 'certification')">active</if>"> <li class="content_ul_li <if condition="(ACTION_NAME eq 'certification')">active</if>">
<a href="homeicsales/cert" class="out"> <a href="homeicsales/cert" class="out">
<span class="li_icon icon iconfont iconjuxing10"></span> <span class="li_icon icon iconfont iconjuxing10"></span>
......
dist/css/inquirydetail.css
...@@ -486,3 +486,4 @@ ...@@ -486,3 +486,4 @@
.from_mask .form .form_content .btn_div span.cz_mask { .from_mask .form .form_content .btn_div span.cz_mask {
margin-left: 40px; margin-left: 40px;
} }
/*# sourceMappingURL=inquirydetail.css.map */
\ No newline at end of file
dist/js/global/api.js
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
* 注册获取短信验证码接口 * 注册获取短信验证码接口
*/ */
getRegistCode: auth_url + '/v1/getRegistCode', getRegistCode: auth_url + '/v1/getRegistCode',
/**
* 退出
*/
authLogout: auth_url + '/auth/logout',
/*** /***
* 获取用户基本信息 * 获取用户基本信息
*/ */
......
dist/js/global/global.min.js
...@@ -55,10 +55,14 @@ ...@@ -55,10 +55,14 @@
//导航栏 //导航栏
var isShow = $('.xbj_li').find('dl').css('display'); var isShow = $('.xbj_li').find('dl').css('display');
if (isShow == 'none') { if (isShow == 'none') {
$('.xbj_li').find('.li_right').removeClass('iconjuxing15').addClass('iconjuxing12')
$('.xbj_li').find('.li_right').removeClass('iconjuxing15').addClass('iconjuxing12');
} else { } else {
$('.xbj_li').find('.li_right').removeClass('iconjuxing12').addClass('iconjuxing15')
$('.xbj_li').find('.li_right').removeClass('iconjuxing12').addClass('iconjuxing15');
} }
return this; return this;
...@@ -67,17 +71,48 @@ ...@@ -67,17 +71,48 @@
//导航栏 //导航栏
$('.xbj_li').on('click', function () { $('.xbj_li').on('click', function () {
var isShow = $(this).find('dl').css('display'); var isShow = $(this).find('dl').css('display');
if (isShow == 'none') { if (isShow == 'none') {
$(this).find('dl').slideDown(); $(this).find('dl').slideDown();
$('.xbj_li').find('.li_right').removeClass('iconjuxing12').addClass('iconjuxing15')
$('.xbj_li').find('.li_right').removeClass('iconjuxing12').addClass('iconjuxing15');
} else { } else {
$(this).find('dl').slideUp(); $(this).find('dl').slideUp();
$('.xbj_li').find('.li_right').removeClass('iconjuxing15').addClass('iconjuxing12')
$('.xbj_li').find('.li_right').removeClass('iconjuxing15').addClass('iconjuxing12');
} }
$ });
//退出
$(".nav_end").on('click', function () {
layer.confirm('您确定退出系统嘛', {icon: 3, title: '提示',move:false}, function (index) {
opt.getData(apis.authLogout, 'POST', null, function (res) {
if (res.err_code == 0) {
Util.delCookie('token', cookieHostname);
window.location.reload();
} else {
layer.msg(res.err_msg);
}
}, undefined, true);
layer.close(index);
}) })
});
return this; return this;
}, },
}, $(function () { }, $(function () {
......
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