系统优化

feat/task1-c-wallet
devil_gong 2019-07-25 18:21:36 +08:00
parent bfc8f8acd2
commit 2faa4c7303
3 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@
</div>
<div class="am-u-sm-12 am-u-md-6 am-u-lg-4 container-right">
<div class="forgetpwd-top">
{{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state'))}}
{{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state')) or in_array('username', MyC('home_user_reg_state'))}}
<span class="">还没有帐号?</span>
<a href="{{:MyUrl('index/user/reginfo')}}" class="am-btn am-btn-secondary am-btn-xs am-radius">注册</a>
{{/if}}

View File

@ -5,7 +5,7 @@
<!-- form start -->
<form class="am-form form-validation" method="post" action="{{:MyUrl('index/user/login')}}" request-type="ajax-fun" request-value="ViewModalBack">
<div class="xo-padding-horizontal-md-sm login-modal-container-top">
{{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state'))}}
{{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state')) or in_array('username', MyC('home_user_reg_state'))}}
<span class="">还没有帐号?</span>
<a href="{{:MyUrl('index/user/reginfo')}}" target="_blank" class="am-btn am-btn-secondary am-btn-xs am-radius">立即注册</a>
{{/if}}

View File

@ -500,7 +500,7 @@ class GoodsService
if($temp['code'] == 0)
{
$temp_spec['is_only_level_one'] = 1;
$temp_spec['inventory'] = $temp['data']['inventory'];
$temp_spec['inventory'] = $temp['data']['spec_base']['inventory'];
}
}
}