5

@@ -111,7 +111,7 @@
                                 <p class="or_addressPhone">{$data.phone}</p>
                                 <p class="or_addressPhone">{$data.phone}</p>
                             </div>
                             </div>
                             <p class="or_address_detailed">
                             <p class="or_address_detailed">
-                                {$data.school}{$data.grade}{$data.class}
+                                {$data.region}{$data.school}{$data.grade}{$data.class}
                             </p>
                             </p>
                         </div>
                         </div>
                         <div class="or_addressYesImg2">
                         <div class="or_addressYesImg2">
@@ -131,7 +131,7 @@
                                 <p class="or_addressPhone">{$data.phone}</p>
                                 <p class="or_addressPhone">{$data.phone}</p>
                             </div>
                             </div>
                             <p class="or_address_detailed">
                             <p class="or_address_detailed">
-                                {$data.school}{$data.grade}{$data.class}
+                                {$data.region}{$data.school}{$data.grade}{$data.class}
                             </p>
                             </p>
                         </div>
                         </div>
                         <div class="or_addressYesImg2">
                         <div class="or_addressYesImg2">

@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
      */
      */
     public function checkWeChatUserLogin()
     public function checkWeChatUserLogin()
     {
     {
-        /*$user = Db::name('user')->where('id',13)->find();
+        /*$user = Db::name('user')->where('id',27)->find();
         cmf_update_current_user($user);*/
         cmf_update_current_user($user);*/
         $userId = cmf_get_current_user_id();
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
         if (empty($userId)) {