From 2faa4c73032383661babc05ae902109d760ce67e Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 25 Jul 2019 18:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/default/user/login_info.html       | 2 +-
 application/index/view/default/user/modal_login_info.html | 2 +-
 application/service/GoodsService.php                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/index/view/default/user/login_info.html b/application/index/view/default/user/login_info.html
index 33be46aba..6c09e1707 100755
--- a/application/index/view/default/user/login_info.html
+++ b/application/index/view/default/user/login_info.html
@@ -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}}
diff --git a/application/index/view/default/user/modal_login_info.html b/application/index/view/default/user/modal_login_info.html
index e5f3ba366..613b59aef 100755
--- a/application/index/view/default/user/modal_login_info.html
+++ b/application/index/view/default/user/modal_login_info.html
@@ -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}}
diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php
index 8c26f2136..b3f8945e3 100755
--- a/application/service/GoodsService.php
+++ b/application/service/GoodsService.php
@@ -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'];
                     }
                 }
             }