sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yh

feat/task1-c-wallet
gongfuxiang 2018-09-15 13:29:06 +08:00
parent 5c1b205e53
commit 707aff2e66
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/Public/Common/Js/Common.js
View File

@ -565,7 +565,7 @@ function img_file_upload_show(class_name, show_img, default_images)
* @param {[string]} title [标题]
* @param {[string]} tag [指定id标记]
*/
function ModalLoad(url, title, tag)
function ModalLoad(url, title, tag, class_tag)
{
tag = tag || 'common-popup-modal';
if($('#'+tag).length > 0)
@ -573,7 +573,7 @@ function ModalLoad(url, title, tag)
$('#'+tag).remove();
}
var html = '<div class="am-popup popup-iframe" id="'+tag+'">';
var html = '<div class="am-popup popup-iframe '+class_tag+'" id="'+tag+'">';
html += '<div class="am-popup-inner">';
html += '<div class="am-popup-hd">';
html += '<h4 class="am-popup-title">'+(title || '温馨提示')+'</h4>';

8
service/Public/Home/Default/Css/Category.css
View File

@ -1,8 +1,8 @@
.category-list ul { overflow: hidden; border-bottom: 1px solid #dedede; margin-bottom: 20px; }
.category-list ul { overflow: hidden; border-bottom: 1px dotted #dedede; margin-bottom: 20px; }
.category-list ul:last-child { border-bottom: 0; margin-bottom: 0; }
.category-list .title { font-weight: 500; }
.category-list ul li { margin-right: 10px; line-height: 38px; font-size: 14px; }
.category-list ul li a { color: #888; border-left: 1px solid #dedede; padding-left: 10px; }
.category-list .title { font-weight: 500; font-size: 14px; color: #666; }
.category-list ul li { margin-right: 10px; line-height: 38px; }
.category-list ul li a { color: #787878; border-left: 1px solid #dedede; padding-left: 10px; font-size: 12px; }
.category-list ul li a.first { border-left: 0; padding-left: 0; }
.am-accordion-gapped .am-accordion-title { font-size: 16px; font-weight: 500; }
@media only screen and (min-width:640px) {

16
service/Public/Home/Default/Css/Common.css
View File

@ -153,7 +153,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
.message-r .topMessage {float: left;}
.nav-search .logo{display:none;}
.nav-search .logoBig{ display:block;float:left;height:40px;width:135px; margin:0px auto; margin-left:5px;}
.nav-search .logoBig{ display:block;float:left;height:40px;width:135px; margin:0px auto; margin-left:5px; margin-right: 5px;}
.nav-search .logoBig img{width:100%;}
.search-bar {height: 40px; width: calc(100% - 146px);}
#ai-topsearch {height: 36px;}
@ -183,7 +183,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
.mui-mbar-tabs{ display:block;}
.nav-search{padding-left:0px; max-width:1000px; margin:0px auto;padding: 20px 0;}
.nav-search .logo{display:none;}
.nav-search .logoBig { display: -webkit-inline-box; float:left;height:60px; width:230px; margin-left:0px;}
.nav-search .logoBig { display: -webkit-inline-box; float:left;height:60px; width:230px; margin:0px;}
.search-bar{height:50px; margin:auto;display: -webkit-inline-box;width: calc(60%);padding-left: 8%;}
#ai-topsearch {height: 47px;}
.shopMain{margin:0px 0px 0px 5px;}
@ -459,8 +459,11 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
/**
* 底部
*/
.am-footer {
font-size: 14px;
.am-footer, .am-footer-miscs {
font-size: 12px !important;
}
.am-footer-default a {
color: #333;
}
@ -505,6 +508,11 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
* 图片验证码
*/
#verify-img-value { float: left; width: 50%; margin-right: 5px; }
/**
* 公共登录窗口
*/
.common-login-modal { max-width: 400px; max-height: 350px; left: calc(50% + 100px); top: calc(50% + 100px); }
}
/**

2
service/Public/Home/Default/Js/Common.js
View File

@ -94,7 +94,7 @@ $(function()
// 是否登录
if(__user_id__ == 0)
{
ModalLoad(__modal_login_url__, '登录');
ModalLoad(__modal_login_url__, '登录', 'common-popup-modal-login', 'common-login-modal');
return false;
}
});