edit

app/goods/lib/Set.php

@@ -7,7 +7,7 @@ use Dever;
 class Set
 {
     # 获取商品及其属性列表
-    public function getGoodsList($id, $type, $table, $col = 'goods_id')
+    public function getGoodsList($id, $type, $table, $col = 'goods_id', $sku_state = true)
     {
         $total = Dever::input('total', 1);
         $where['status'] = 1;
@@ -83,7 +83,7 @@ class Set
                     $result[$i]['total'] = $result[$i]['total'] * $total;
                     $result[$i]['children'] = array();
                     $num = count($sku);
-                    if ($num == 1 && $sku[0]['key'] == -1) {
+                    if (($num == 1 && $sku[0]['key'] == -1) || !$sku_state) {
                         //$result[$i]['id'] .=  '-' . $sku[0]['id'];
                         $result[$i]['end'] = true;
                     } else {

service/agent/lib/Member.php

@@ -365,28 +365,28 @@ class Member
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_goods&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_goods&search_option_state=1&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '代理商权益',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=dh_order&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=dh_order&search_option_state=1&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '权益订单',
         );
 
         $button[2]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_agreement&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_agreement&search_option_state=1&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '代理商合同',
         );
 
         $button[2]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member&search_api_parent_mid='.$member['mobile'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member&search_option_state=1&search_api_parent_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '查看直推团队',
         );
 
@@ -563,7 +563,7 @@ class Member
     public function set_mobile($id){
         $info=Dever::db('agent/dh_order')->one(array('id'=>$id,'state'=>1));
         $data=array();
-        if($info['name']=='兑换商品'){
+        if($info && $info['name']=='兑换商品'){
             $address=Dever::db('agent/member_address')->one(array('id'=>$info['address_id'],'state'=>1));
             $data['联系人']=$address['contact'];
             $data['联系电话']=$address['mobile'];

service/agent/lib/Order.php

@@ -1036,35 +1036,10 @@ class Order
                 }
 
                 if ($param['cash'] > 0) {
-                    
                     $data_param = Dever::array_encode($param);
                     $param['cash'] = '<a style="color:blue" class="set_cash" data-param="'.$data_param.'">' . $param['cash'] . '</a>';
-
-                    /*                    
-                    if (isset($prize)) {
-                        $parent_name .= '&nbsp;&nbsp;赠送名额：'.$prize['name'];
-                    }
-                    if (isset($card)) {
-                        $parent_name .= '&nbsp;&nbsp;赠送权益：'.$card['name'];
-                    }
-                    if ($param['per'] > 0) {
-                        $parent_name .= '&nbsp;&nbsp;直推佣金比例：'.$param['per'].'%';
-                    }
-                    
-                    $parent_name .= '&nbsp;&nbsp;直推佣金：' . $param['cash'] . '元';
-                    if (isset($parent_goods)) {
-
-                    }
-                    */
                 }
                 $table['body'][] = array('直推佣金', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], $param['per'] . '%', $param['cash']);
-
-                if (isset($prize)) {
-                    $table['body'][] = array('赠送名额', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '1', $prize['name']);
-                }
-                if (isset($card)) {
-                    $parent_name .= '&nbsp;&nbsp;赠送权益：'.$card['name'];
-                }
             }
         } else {
             $order_cash['cash'] = '<a style="color:blue">' . $order_cash['cash'] . '</a>';
@@ -1073,18 +1048,14 @@ class Order
 
             if ($order_cash['prize_id'] && $order_cash['prize_id'] > 0) {
                 $prize = Dever::db('setting/prize')->find($order_cash['prize_id']);
-                if ($prize) {
-                    $table['body'][] = array('赠送名额', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '1', $prize['name']);
-                }
             }
+        }
 
-            /*
-            if ($order_cash['per'] > 0) {
-                $parent_name .= '&nbsp;&nbsp;直推佣金比例：'.$order_cash['per'].'%';
-            }
-            
-            $parent_name .= '&nbsp;&nbsp;直推佣金：' . $order_cash['cash'] . '元';
-            */
+        if (isset($prize) && $prize) {
+            $table['body'][] = array('赠送名额', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '1', $prize['name']);
+        }
+        if (isset($card)) {
+            $parent_name .= '&nbsp;&nbsp;赠送权益：'.$card['name'];
         }
 
         return $parent_name;