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

order css

feat/task1-c-wallet
gongfuxiang 2018-10-01 00:47:53 +08:00
parent 242583d9c6
commit 19001681aa
11 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
service/Application/Admin/View/Default/Order/Index.html
View File

@ -202,16 +202,16 @@
</td>
<td class="view-operation">
<if condition="in_array($v['status'], [0,1])">
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-paint-brush submit-ajax" data-url="{{:U('Admin/Order/Cancel')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="reload" data-msg="{{:L('common_cancel_tips')}}"> {{:L('common_operation_cancel')}}</button>
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-paint-brush am-btn-block submit-ajax" data-url="{{:U('Admin/Order/Cancel')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="reload" data-msg="{{:L('common_cancel_tips')}}"> {{:L('common_operation_cancel')}}</button>
</if>
<if condition="$v['status'] eq 2">
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-send-o submit-ajax" data-url="{{:U('Admin/Order/Delivery')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="reload" data-msg="{{:L('common_delivery_tips')}}"> {{:L('common_delivery_submit')}}</button>
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-send-o am-btn-block submit-ajax" data-url="{{:U('Admin/Order/Delivery')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="reload" data-msg="{{:L('common_delivery_tips')}}"> {{:L('common_delivery_submit')}}</button>
</if>
<if condition="$v['status'] eq 3">
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-check-circle-o submit-ajax" data-url="{{:U('Admin/Order/Collect')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="reload" data-msg="{{:L('common_collect_tips')}}"> {{:L('common_collect_submit')}}</button>
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-check-circle-o am-btn-block submit-ajax" data-url="{{:U('Admin/Order/Collect')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="reload" data-msg="{{:L('common_collect_tips')}}"> {{:L('common_collect_submit')}}</button>
</if>
<if condition="in_array($v['status'], [0,1,5,6])">
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-ajax" data-url="{{:U('Admin/Order/Delete')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="delete" data-msg="{{:L('common_delete_tips')}}"> {{:L('common_operation_delete')}}</button>
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o am-btn-block submit-ajax" data-url="{{:U('Admin/Order/Delete')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="delete" data-msg="{{:L('common_delete_tips')}}"> {{:L('common_operation_delete')}}</button>
</if>
</td>
</tr>

4
service/Application/Home/View/Default/Order/Index.html
View File

@ -99,9 +99,7 @@
<tr>
<td>
<button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
<a href="{{:U('Home/Order/Index')}}">
<button type="button" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</button>
</a>
<a href="{{:U('Home/Order/Index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
</td>
</tr>
</tbody></table>

4
service/Application/Home/View/Default/User/EmailRegInfo.html
View File

@ -19,9 +19,7 @@
<form class="am-form form-validation" method="post" action="{{:U('Home/User/Reg')}}" request-type="ajax-url" request-value="{{$referer_url}}">
<fieldset>
<span class="">{{:L('user_reg_there_are_accounts_text')}}</span>
<a href="{{:U('Home/User/LoginInfo')}}">
<button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius">{{:L('user_reg_login_immediately_text')}}</button>
</a>
<a href="{{:U('Home/User/LoginInfo')}}" class="am-btn am-btn-secondary am-btn-xs am-radius">{{:L('user_reg_login_immediately_text')}}</a>
<hr />
<label>{{:L('common_email_name')}}
<if condition="in_array('sms', MyC('home_user_reg_state'))">

4
service/Application/Home/View/Default/User/ForgetPwdInfo.html
View File

@ -19,9 +19,7 @@
<form class="am-form form-validation" method="post" action="{{:U('Home/User/ForgetPwd')}}" request-type="ajax-url" request-value="{{:U('Home/User/LoginInfo')}}">
<fieldset>
<span class="">{{:L('user_reg_there_are_accounts_text')}}</span>
<a href="{{:U('Home/User/LoginInfo')}}">
<button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius">{{:L('user_reg_login_immediately_text')}}</button>
</a>
<a href="{{:U('Home/User/LoginInfo')}}" class="am-btn am-btn-secondary am-btn-xs am-radius">{{:L('user_reg_login_immediately_text')}}</a>
<hr />
<label>{{:L('user_login_accounts_text')}}</label>
<div class="am-form-group">

4
service/Application/Home/View/Default/User/LoginInfo.html
View File

@ -20,9 +20,7 @@
<fieldset>
<if condition="in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state'))">
<span class="">{{:L('user_login_on_accounts_text')}}</span>
<a href="{{:U('Home/User/RegInfo')}}">
<button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius">{{:L('user_login_immediately_reg_text')}}</button>
</a>
<a href="{{:U('Home/User/RegInfo')}}" class="am-btn am-btn-secondary am-btn-xs am-radius">{{:L('user_login_immediately_reg_text')}}</a>
<hr />
</if>
<label>{{:L('user_login_accounts_text')}}</label>

4
service/Application/Home/View/Default/User/ModalLoginInfo.html
View File

@ -8,9 +8,7 @@
<fieldset>
<if condition="in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state'))">
<span class="">{{:L('user_login_on_accounts_text')}}</span>
<a href="{{:U('Home/User/RegInfo')}}" target="_blank">
<button class="am-btn am-btn-secondary am-btn-xs am-radius">{{:L('user_login_immediately_reg_text')}}</button>
</a>
<a href="{{:U('Home/User/RegInfo')}}" target="_blank" class="am-btn am-btn-secondary am-btn-xs am-radius">{{:L('user_login_immediately_reg_text')}}</a>
<hr />
</if>
<label>{{:L('user_login_accounts_text')}}</label>

12
service/Application/Home/View/Default/User/RegInfo.html
View File

@ -17,18 +17,14 @@
<div class="am-u-md-6 am-u-sm-centered">
<div class="reg-switch-view">
<if condition="in_array('sms', MyC('home_user_reg_state'))">
<a href="{{:U('Home/User/SmsRegInfo')}}">
<button class="am-btn am-btn-primary"><i class="am-icon-comment-o am-icon-sm"></i> {{:L('common_close_sms_user_reg_text')}}</button>
</a>
<a href="{{:U('Home/User/SmsRegInfo')}}" class="am-btn am-btn-primary"><i class="am-icon-comment-o am-icon-sm"></i> {{:L('common_close_sms_user_reg_text')}}</a>
<else />
<button class="am-btn am-btn-danger am-disabled" href="javascript:;"><i class="am-icon-comment-o am-icon-sm"></i> {{:L('common_close_sms_user_reg_tips')}}</button>
<a class="am-btn am-btn-danger am-disabled" href="javascript:;"><i class="am-icon-comment-o am-icon-sm"></i> {{:L('common_close_sms_user_reg_tips')}}</a>
</if>
<if condition="in_array('email', MyC('home_user_reg_state'))">
<a href="{{:U('Home/User/EmailRegInfo')}}">
<button class="am-btn am-btn-secondary"><i class="am-icon-envelope-o am-icon-sm"></i> {{:L('common_close_email_user_reg_text')}}</button>
</a>
<a href="{{:U('Home/User/EmailRegInfo')}}" class="am-btn am-btn-secondary"><i class="am-icon-envelope-o am-icon-sm"></i> {{:L('common_close_email_user_reg_text')}}</a>
<else />
<button class="am-btn am-btn-danger am-disabled" href="javascript:;"><i class="am-icon-envelope-o am-icon-sm"></i> {{:L('common_close_email_user_reg_tips')}}</button>
<a class="am-btn am-btn-danger am-disabled" href="javascript:;"><i class="am-icon-envelope-o am-icon-sm"></i> {{:L('common_close_email_user_reg_tips')}}</a>
</if>
</div>
</div>

2
service/Public/Admin/Default/Css/Common.css
View File

@ -395,7 +395,7 @@ ul {margin-top:0;}
.admin-sidebar-list li a {padding:0.6rem 0 0.6rem 1.6rem;}
.common-left-menu a:hover,.common-left-menu-active {background:#ececec;color:#333 !important;}
#ifcontent {border:0px;width:100%;overflow-x:hidden;}
.am-table > tbody > tr > td {vertical-align:inherit;}
.am-table > tbody > tr > td {vertical-align:top;}
.am-form-file input[type="file"] { margin-top: 0; }
/**

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

@ -122,20 +122,18 @@ function GetFormVal(element)
// input 复选框checkboox
tmp_all = [];
temp_field = '';
i = 0;
$(element).find('input[type="checkbox"]').each(function(key, tmp)
{
if(tmp.name != undefined && tmp.name != '')
{
// name不一样的时候初始化索引值
if(temp_field != tmp.name)
{
i = 0;
}
if($(this).is(':checked'))
{
if(tmp_all[tmp.name] == undefined) tmp_all[tmp.name] = [];
if(tmp_all[tmp.name] == undefined)
{
tmp_all[tmp.name] = [];
i = 0;
}
tmp_all[tmp.name][i] = tmp.value;
i++;
}

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

@ -514,7 +514,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
* 框架覆盖
*/
.am-btn-default {
color: #959595;;
color: #959595 !important;
background-color: #e6e6e6;
border-color: #e6e6e6;
}
@ -522,7 +522,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
background-color: #D4D3D3;
}
.am-btn-default:hover, .am-btn-default:focus, .am-btn-default:active, .am-btn-default.am-active, .am-dropdown.am-active .am-btn-default.am-dropdown-toggle {
color: #666;
color: #666 !important;
border-color: #D4D3D3;
}
.am-btn-default.am-disabled, .am-btn-default[disabled], fieldset[disabled] .am-btn-default, .am-btn-default.am-disabled:hover, .am-btn-default[disabled]:hover, fieldset[disabled] .am-btn-default:hover, .am-btn-default.am-disabled:focus, .am-btn-default[disabled]:focus, fieldset[disabled] .am-btn-default:focus, .am-btn-default.am-disabled:active, .am-btn-default[disabled]:active, fieldset[disabled] .am-btn-default:active, .am-btn-default.am-disabled.am-active, .am-btn-default[disabled].am-active, fieldset[disabled] .am-btn-default.am-active {
@ -535,7 +535,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
}
.am-btn-secondary {
color: #f77076;
color: #f77076 !important;
background-color: #ffe2e5;
border-color: #ffe2e5;
}
@ -543,7 +543,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
background-color: #fd9ba5;
}
.am-btn-secondary:hover, .am-btn-secondary:focus, .am-btn-secondary:active, .am-btn-secondary.am-active, .am-dropdown.am-active .am-btn-secondary.am-dropdown-toggle {
color: #fff;
color: #fff !important;
border-color: #fd9ba5;
}
.am-btn-secondary.am-disabled, .am-btn-secondary[disabled], fieldset[disabled] .am-btn-secondary, .am-btn-secondary.am-disabled:hover, .am-btn-secondary[disabled]:hover, fieldset[disabled] .am-btn-secondary:hover, .am-btn-secondary.am-disabled:focus, .am-btn-secondary[disabled]:focus, fieldset[disabled] .am-btn-secondary:focus, .am-btn-secondary.am-disabled:active, .am-btn-secondary[disabled]:active, fieldset[disabled] .am-btn-secondary:active, .am-btn-secondary.am-disabled.am-active, .am-btn-secondary[disabled].am-active, fieldset[disabled] .am-btn-secondary.am-active {
@ -556,7 +556,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
}
.am-btn-primary {
color: #d13b49;
color: #d13b49 !important;
background-color: #ffcbd0;
border-color: #ffcbd0;
}
@ -564,7 +564,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
background-color: #f77682;
}
.am-btn-primary:hover, .am-btn-primary:focus, .am-btn-primary:active, .am-btn-primary.am-active, .am-dropdown.am-active .am-btn-primary.am-dropdown-toggle {
color: #fff;
color: #fff !important;
border-color: #f77682;
}
.am-btn-primary.am-disabled, .am-btn-primary[disabled], fieldset[disabled] .am-btn-primary, .am-btn-primary.am-disabled:hover, .am-btn-primary[disabled]:hover, fieldset[disabled] .am-btn-primary:hover, .am-btn-primary.am-disabled:focus, .am-btn-primary[disabled]:focus, fieldset[disabled] .am-btn-primary:focus, .am-btn-primary.am-disabled:active, .am-btn-primary[disabled]:active, fieldset[disabled] .am-btn-primary:active, .am-btn-primary.am-disabled.am-active, .am-btn-primary[disabled].am-active, fieldset[disabled] .am-btn-primary.am-active {
@ -577,7 +577,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
}
.am-btn-danger {
color: #DC9A9A;
color: #DC9A9A !important;
background-color: #F8F2F2;
border-color: #F8F2F2;
}
@ -585,7 +585,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
background-color: #F5D2D2;
}
.am-btn-danger:hover, .am-btn-danger:focus, .am-btn-danger:active, .am-btn-danger.am-active, .am-dropdown.am-active .am-btn-danger.am-dropdown-toggle {
color: #fff;
color: #fff !important;
border-color: #F5D2D2;
}
.am-btn-danger.am-disabled, .am-btn-danger[disabled], fieldset[disabled] .am-btn-danger, .am-btn-danger.am-disabled:hover, .am-btn-danger[disabled]:hover, fieldset[disabled] .am-btn-danger:hover, .am-btn-danger.am-disabled:focus, .am-btn-danger[disabled]:focus, fieldset[disabled] .am-btn-danger:focus, .am-btn-danger.am-disabled:active, .am-btn-danger[disabled]:active, fieldset[disabled] .am-btn-danger:active, .am-btn-danger.am-disabled.am-active, .am-btn-danger[disabled].am-active, fieldset[disabled] .am-btn-danger.am-active {
@ -598,7 +598,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
}
.am-btn-success {
color: #82BE82;
color: #82BE82 !important;
background-color: #E4F3E4;
border-color: #E4F3E4;
}
@ -606,7 +606,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
background-color: #A5DEA5;
}
.am-btn-success:hover, .am-btn-success:focus, .am-btn-success:active, .am-btn-success.am-active, .am-dropdown.am-active .am-btn-success.am-dropdown-toggle {
color: #fff;
color: #fff !important;
border-color: #A5DEA5;
}
.am-btn-success.am-disabled, .am-btn-success[disabled], fieldset[disabled] .am-btn-success, .am-btn-success.am-disabled:hover, .am-btn-success[disabled]:hover, fieldset[disabled] .am-btn-success:hover, .am-btn-success.am-disabled:focus, .am-btn-success[disabled]:focus, fieldset[disabled] .am-btn-success:focus, .am-btn-success.am-disabled:active, .am-btn-success[disabled]:active, fieldset[disabled] .am-btn-success:active, .am-btn-success.am-disabled.am-active, .am-btn-success[disabled].am-active, fieldset[disabled] .am-btn-success.am-active {
@ -619,7 +619,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
}
.am-btn-warning {
color: #FF9800;
color: #FF9800 !important;
background-color: #ffe5be;
border-color: #ffe5be;
}
@ -627,7 +627,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
background-color: #ffc165;
}
.am-btn-warning:hover, .am-btn-warning:focus, .am-btn-warning:active, .am-btn-warning.am-active, .am-dropdown.am-active .am-btn-warning.am-dropdown-toggle {
color: #fff;
color: #fff !important;
border-color: #ffc165;
}
.am-btn-warning.am-disabled, .am-btn-warning[disabled], fieldset[disabled] .am-btn-warning, .am-btn-warning.am-disabled:hover, .am-btn-warning[disabled]:hover, fieldset[disabled] .am-btn-warning:hover, .am-btn-warning.am-disabled:focus, .am-btn-warning[disabled]:focus, fieldset[disabled] .am-btn-warning:focus, .am-btn-warning.am-disabled:active, .am-btn-warning[disabled]:active, fieldset[disabled] .am-btn-warning:active, .am-btn-warning.am-disabled.am-active, .am-btn-warning[disabled].am-active, fieldset[disabled] .am-btn-warning.am-active {

2
service/Public/Home/Default/Css/User.css
View File

@ -3,7 +3,7 @@ form.form-validation, .reg-switch-view { margin: 30px 0 60px 0; }
.reg-switch-tips { font-weight: 100; font-size: 12px; color: #f87689; margin-left: 20px; }
#verify-win .am-modal-bd .base { overflow: hidden; }
#verify-win .am-modal-bd .base .verify-tips { font-size: 12px; }
.reg-switch-view button { width: 49%; line-height: 100px; font-size: 16px; }
.reg-switch-view .am-btn { width: 49%; line-height: 100px; font-size: 16px; }
/**
* PC