Skip to content

施宇 / icsales

Go to a project
Commit 23a241d6 by 施宇
Options

Merge branch 'sy_ic_1016'

parents 709a96db 27280565
Inline Side-by-side
Showing with 93 additions and 70 deletions
Application/Common/View/public/indexfoot.html
...@@ -13,14 +13,12 @@ ...@@ -13,14 +13,12 @@
<span>工作日服务时间：<i>9:00-18:00</i></span> <span>工作日服务时间：<i>9:00-18:00</i></span>
&nbsp; &nbsp; &nbsp; &nbsp;
<span>联系电话：<i>0755-23940717</i></span> <span>联系电话：<i>0755-23940717</i></span>
&nbsp; &nbsp;
<span>电子邮箱：<i>service@icsales.com </i></span>
</p> </p>
<h5>copyright &#169; 2019 www.ICsales.com</h5> <h5>copyright &#169; 2019 www.ICsales.com</h5>
</div> </div>
<div class="fl qrcode">
<img src="__PUBLIC__/images/gzhqr.jpg" alt="">
<p>微信公众号</p>
</div>
</div> </div>
</div> </div>
......
Application/Home/View/GoodManage/index.html
...@@ -66,6 +66,10 @@ ...@@ -66,6 +66,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="gb">
<span class="icon iconfont iconjuxing19 va-m"></span>
<span>目前商品sku上限为2000条，超出部分将上传失败。</span>
</div>
<div class="btn_group clr"> <div class="btn_group clr">
<div class="dgsc fl btn btn_blue"> <div class="dgsc fl btn btn_blue">
<span class="icon iconfont iconjuxing16"></span> <span class="icon iconfont iconjuxing16"></span>
......
Application/Home/View/QuotePrice/inquiry.html
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<div class="right_content inquiry_content"> <div class="right_content inquiry_content">
<div class="edit_div"> <div class="edit_div">
<span class=" icon iconfont iconjuxing14"></span> <span class=" icon iconfont iconjuxing14"></span>
<p>发布询价</p>
</div> </div>
<div class="content"> <div class="content">
<div class="nav_title">询报价 > 我的询价</div> <div class="nav_title">询报价 > 我的询价</div>
......
Application/Home/View/RobOrder/index.html
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
<div class="wrapper_right"> <div class="wrapper_right">
<include file="Common@public/top" /> <include file="Common@public/top" />
<div class="right_content roborder_content"> <div class="right_content roborder_content">
<div class="edit_div"> <!-- <div class="edit_div">
<span class=" icon iconfont iconjuxing14"></span> <span class=" icon iconfont iconjuxing14"></span>
</div> </div> -->
<div class="content"> <div class="content">
<div class="nav_title"> <div class="nav_title">
首页 > 抢单专区 首页 > 抢单专区
......
Application/Index/View/Index/index.html
...@@ -162,6 +162,10 @@ ...@@ -162,6 +162,10 @@
<img src="__PUBLIC__/images/gzhqr.jpg" alt=""> <img src="__PUBLIC__/images/gzhqr.jpg" alt="">
<p>微信公众号</p> <p>微信公众号</p>
</div> </div>
<div class="qrcode">
<img src="__PUBLIC__/images/dyqr.jpg" alt="">
<p>微信订阅号</p>
</div>
</div> </div>
</div> </div>
</div> </div>
......
dist/css/common/base.css
...@@ -234,22 +234,26 @@ body { ...@@ -234,22 +234,26 @@ body {
font-size: 14px; font-size: 14px;
} }
.edit_div { .edit_div {
height: 80px; height: 75px;
width: 80px; width: 80px;
border-radius: 50% 50%; border-radius: 10px;
background: rgba(234, 173, 55, 0.9); background: rgba(234, 173, 55, 0.9);
box-shadow: 0px 2px 9px 0px rgba(242, 191, 97, 0.5); box-shadow: 0px 2px 9px 0px rgba(242, 191, 97, 0.5);
position: fixed; position: fixed;
top: 160px; top: 180px;
right: 20px; right: 40px;
cursor: pointer; cursor: pointer;
text-align: center; text-align: center;
line-height: 80px;
z-index: 3; z-index: 3;
color: #fff;
padding-top: 5px;
} }
.edit_div .icon { .edit_div .icon {
font-size: 40px; font-size: 40px;
color: #fff; }
.edit_div p {
font-size: 12px;
margin-top: 5px;
} }
.no_data { .no_data {
text-align: center; text-align: center;
...@@ -508,20 +512,20 @@ body { ...@@ -508,20 +512,20 @@ body {
bottom: 0; bottom: 0;
right: 0; right: 0;
left: 0; left: 0;
height: 210px; height: 141px;
border-top: 2px solid #F5F9FC; border-top: 2px solid #F5F9FC;
background-color: #fff; background-color: #fff;
} }
.index_wrapper .index_footer .footer_content img { .index_wrapper .index_footer .footer_content img {
margin-top: 50px; margin-top: 41px;
} }
.index_wrapper .index_footer .footer_content .text { .index_wrapper .index_footer .footer_content .text {
margin-top: 56px; margin-top: 47px;
} }
.index_wrapper .index_footer .footer_content .fw_desc { .index_wrapper .index_footer .footer_content .fw_desc {
font-size: 14px; font-size: 14px;
color: #ADB6BF; color: #ADB6BF;
margin-top: 74px; margin-top: 47px;
} }
.index_wrapper .index_footer .footer_content .fw_desc i { .index_wrapper .index_footer .footer_content .fw_desc i {
color: #686E73; color: #686E73;
...@@ -530,20 +534,6 @@ body { ...@@ -530,20 +534,6 @@ body {
text-align: right; text-align: right;
margin-top: 4px; margin-top: 4px;
} }
.index_wrapper .index_footer .footer_content .qrcode {
margin: 0 20px 0 30px;
}
.index_wrapper .index_footer .footer_content .qrcode img {
height: 80px;
width: 80px;
margin-top: 50px;
}
.index_wrapper .index_footer .footer_content .qrcode p {
font-size: 12px;
color: #ADB6BF;
text-align: center;
margin-top: 5px;
}
.pull_qrcode { .pull_qrcode {
display: none; display: none;
height: 130px; height: 130px;
......
dist/css/common/base.less
...@@ -277,22 +277,25 @@ body { ...@@ -277,22 +277,25 @@ body {
} }
.edit_div { .edit_div {
height: 80px; height: 75px;
width: 80px; width: 80px;
border-radius: 50% 50%; border-radius:10px;
background: rgba(234, 173, 55, 0.9); background: rgba(234, 173, 55, 0.9);
box-shadow: 0px 2px 9px 0px rgba(242, 191, 97, 0.5); box-shadow: 0px 2px 9px 0px rgba(242, 191, 97, 0.5);
position: fixed; position: fixed;
top: 160px; top: 180px;
right: 20px; right: 40px;
cursor: pointer; cursor: pointer;
text-align: center; text-align: center;
line-height: 80px;
z-index: 3; z-index: 3;
color: #fff;
padding-top:5px;
.icon { .icon {
font-size: 40px; font-size: 40px;
color: #fff; }
p{
font-size: 12px;
margin-top:5px;
} }
} }
...@@ -635,24 +638,24 @@ body { ...@@ -635,24 +638,24 @@ body {
bottom: 0; bottom: 0;
right: 0; right: 0;
left: 0; left: 0;
height: 210px; height:141px;
border-top: 2px solid #F5F9FC; border-top: 2px solid #F5F9FC;
background-color: #fff; background-color: #fff;
.footer_content { .footer_content {
img { img {
margin-top: 50px; margin-top: 41px;
} }
.text { .text {
margin-top: 56px margin-top: 47px
} }
.fw_desc { .fw_desc {
font-size: 14px; font-size: 14px;
color: #ADB6BF; color: #ADB6BF;
margin-top: 74px; margin-top: 47px;
i { i {
color: #686E73; color: #686E73;
...@@ -663,23 +666,6 @@ body { ...@@ -663,23 +666,6 @@ body {
margin-top: 4px; margin-top: 4px;
} }
} }
.qrcode {
margin: 0 20px 0 30px;
img {
height: 80px;
width: 80px;
margin-top: 50px;
}
p {
font-size: 12px;
color: #ADB6BF;
text-align: center;
margin-top: 5px;
}
}
} }
} }
} }
......
dist/css/goodmanage.css
...@@ -134,6 +134,18 @@ ...@@ -134,6 +134,18 @@
.good_manage_content .btn_group div.xz { .good_manage_content .btn_group div.xz {
margin-left: 20px; margin-left: 20px;
} }
.good_manage_content .gb {
height: 34px;
line-height: 34px;
background-color: #FFF6E6;
margin: 16px 0;
color: #EAA217;
font-size: 14px;
}
.good_manage_content .gb .icon {
font-size: 15px;
margin: 0 6px 0 12px;
}
.good_manage_content .good_data .data_list { .good_manage_content .good_data .data_list {
margin-top: 10px; margin-top: 10px;
} }
...@@ -276,4 +288,3 @@ ...@@ -276,4 +288,3 @@
.good_manage_content .good_data .data_list .data_item .xj_status.fb { .good_manage_content .good_data .data_list .data_item .xj_status.fb {
color: #0D84D1; color: #0D84D1;
} }
/*# sourceMappingURL=goodmanage.css.map */
\ No newline at end of file
dist/css/goodmanage.less
...@@ -176,6 +176,19 @@ ...@@ -176,6 +176,19 @@
} }
} }
} }
.gb {
height: 34px;
line-height: 34px;
background-color: #FFF6E6;
margin: 16px 0;
color: #EAA217;
font-size: 14px;
.icon {
font-size: 15px;
margin: 0 6px 0 12px;
}
}
.good_data { .good_data {
.data_list { .data_list {
......
dist/css/home.css
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
text-align: center; text-align: center;
width: 477px; width: 477px;
} }
.home_content .user_info .price_info div {
cursor: pointer;
}
.home_content .user_info .price_info .hf { .home_content .user_info .price_info .hf {
margin: 0 80px; margin: 0 80px;
} }
......
dist/css/home.less
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
margin-top: 45px; margin-top: 45px;
text-align: center; text-align: center;
width: 477px; width: 477px;
div{
cursor: pointer;
}
.hf { .hf {
margin: 0 80px; margin: 0 80px;
} }
......
dist/js/global/global.min.js
...@@ -85,19 +85,21 @@ ...@@ -85,19 +85,21 @@
this.getData(apis.userInfo, 'GET', { this.getData(apis.userInfo, 'GET', {
token: Util.getCookie('token') || '' token: Util.getCookie('token') || ''
}, function (res) { }, function (res) {
if (res.errcode === 0) { if (res.errcode === 0) {
var avatar = ""
//消息数量 //消息数量
$("#count_num").empty().html(res.data['msg_notification']); $("#count_num").empty().html(res.data['msg_notification']);
//设置头像 //设置头像
if (res.data.avatar) { if (!res.data.avatar) {
avatar = res.data.wechat_oauth ? res.data.wechat_oauth.oauth_head : ''
}else{
avatar = res.data.avatar
}
if(avatar){
$("#head_pic").find('img').attr('src', res.data['avatar']); $("#head_pic").find('img').attr('src', res.data['avatar']);
$(".info_logo").attr('src', res.data['avatar']); $(".info_logo").attr('src', res.data['avatar']);
} }
//首页信息 //首页信息
......
dist/js/home/index.js
...@@ -94,6 +94,16 @@ $(function () { ...@@ -94,6 +94,16 @@ $(function () {
}, },
bindFun: function () { bindFun: function () {
var self = this; var self = this;
$('.price_info').on('click','.xj',function(){
console.log(111)
window.location.href = "/inquiry";
});
$('.price_info').on('click','.hf',function(){
window.location.href = "/quote";
});
$('.price_info').on('click','.sp',function(){
window.location.href = "/goodmanage";
});
$('.index_tab div').on('click', function () { $('.index_tab div').on('click', function () {
var i = $(this).attr('data-i'); var i = $(this).attr('data-i');
$(".goods_data_list").empty() $(".goods_data_list").empty()
......
dist/js/roborder/index.js
...@@ -62,9 +62,9 @@ $(function () { ...@@ -62,9 +62,9 @@ $(function () {
window.location.href = "/quotedetail?id=" + userid window.location.href = "/quotedetail?id=" + userid
}); });
//编辑 //编辑
$('.edit_div').click(function () { // $('.edit_div').click(function () {
window.location.href = "/releaseinquiry" // window.location.href = "/releaseinquiry"
}); // });
} }
}; };
roborderObj.init(); roborderObj.init();
......
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