Merge branch 'master' of http://114.215.101.231:8099/anyv/xkeasy

@@ -47,6 +47,8 @@ class OrderController extends WeChatBaseController
                     if(empty($vo['indent_address'])){
                         unset($data[$key]);
                     }
+                }else{
+                    unset($data[$key]);
                 }
             }
         }

@@ -65,25 +65,47 @@
     <!-- 地址  -->
     <div class="order_address">
         <!-- 有地址 -->
-        <a href="">
-            <div class="order_addressYes">
-                <div class="or_addressYesImg1">
-                    <img src="__TMPL__/public/assets/images/38.png" alt=""/>
-                </div>
-                <div class="or_addressYesTxt1">
-                    <div class="or_addressYesTxt2">
-                        <div class="or_addressName">{$data.address.name}</div>
-                        <p class="or_addressPhone">{$data.phone}</p>
+        <if condition="$data.is_courier eq 1">
+            <a href="{:url('orderpage/go_add_address',array('indet_id'=>$data['id']))}">
+                <div class="order_addressYes">
+                    <div class="or_addressYesImg1">
+                        <img src="__TMPL__/public/assets/images/38.png" alt=""/>
+                    </div>
+                    <div class="or_addressYesTxt1">
+                        <div class="or_addressYesTxt2">
+                            <div class="or_addressName">{$data.name}</div>
+                            <p class="or_addressPhone">{$data.phone}</p>
+                        </div>
+                        <p class="or_address_detailed">
+                            {$data.school}{$data.grade}{$data.class}
+                        </p>
+                    </div>
+                    <div class="or_addressYesImg2">
+                        <img src="__TMPL__/public/assets/images/29.png" alt=""/>
                     </div>
-                    <p class="or_address_detailed">
-                        {$data.address.region}{$data.address.detailed}
-                    </p>
                 </div>
-                <div class="or_addressYesImg2">
-                    <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+            </a>
+            <else />
+            <a href="">
+                <div class="order_addressYes">
+                    <div class="or_addressYesImg1">
+                        <img src="__TMPL__/public/assets/images/38.png" alt=""/>
+                    </div>
+                    <div class="or_addressYesTxt1">
+                        <div class="or_addressYesTxt2">
+                            <div class="or_addressName">{$data.address.name}</div>
+                            <p class="or_addressPhone">{$data.address.phone}</p>
+                        </div>
+                        <p class="or_address_detailed">
+                            {$data.address.region}{$data.address.detailed}
+                        </p>
+                    </div>
+                    <div class="or_addressYesImg2">
+                        <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+                    </div>
                 </div>
-            </div>
-        </a>
+            </a>
+        </if>
     </div>
     <!-- 订单信息 -->
     <div class="order_news">

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