Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

app/shop/lib/Sell.php

@@ -1751,7 +1751,7 @@ class Sell
         $button = array();
         if (Dever::load('manage/auth')->checkFunc('menu_61.menu_218', 'editaddress', '修改地址')) {
             if ($info['address_id']>0){
-                $button[0]['btn'][] = array
+                $button[] = array
                 (
                     'type' => 'edit',
                     'link' => Dever::url('project/database/update?project=passport&table=address&where_id='.$info['address_id'].'&status=1&col=contact,mobile,area,address,house_number', 'manage'),
@@ -1764,10 +1764,9 @@ class Sell
         $head = array
         (
             'name' => '基本信息',
-            'btn' => array(),
+            'btn' => $button,
         );
-        $foot = $button;
-        $html = Dever::show($head, $result,$foot);
+        $html = Dever::show($head, $result);
 
         return $html;
     }