edit

app/mshop/lib/Core.php

@@ -39,7 +39,7 @@ class Core
             Dever::db('shop/member')->update(array('where_id' => $shop['id'], 'set_uid' => $this->passport_uid));
         }
 
-        $this->shop = Dever::db('shop/info')->getOne($this->shop_id);
+        $this->shop = Dever::db('shop/info')->find($this->shop_id);
 
         if (!$this->shop) {
             Dever::alert('门店不存在');

app/shop/database/buy_order.php

@@ -887,6 +887,24 @@ $config = array
             'order' => array('cdate' => 'desc'),
             'col' => '*|id',
         ),
+
+        # 按月结算区域利润
+        'getArea' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'start' => array('yes-cdate', '>='),
+                'end' => array('yes-cdate', '>='),
+                'area' => array('yes', 'like'),
+                'type' => 1,
+                'status' => array('yes', 'in'),
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('cdate' => 'desc'),
+            'col' => '*',
+        ),
     ),
 );
 

service/agent/assets/pc/html/setMemberGoods.html

@@ -93,13 +93,14 @@
         $("#settlement").click(function(){
             var url = '<{$submit}>';
             var mid = '<{$mid}>';
+            var search_api_mid = '<{$search_api_mid}>';
 
             layui.layer.confirm('确定进行此项设置吗？', function() {
                 var desc = $('#desc').val();
                 var goods_string = JSON.stringify(goods);
 
                 var data = {};
-                data = {mid:mid, desc:desc, goods:goods_string};
+                data = {mid:mid,search_api_mid:search_api_mid, desc:desc, goods:goods_string};
                 $.post(url, data, function(t) {
                     t = JSON.parse(t);
                     if (t.status == 1) {

service/agent/database/member.php

@@ -71,6 +71,8 @@ $search_api_parent_mid = Dever::input('search_api_parent_mid');
 if ($search_api_parent_mid && $getInfo != 1) {
     Dever::setInput('search_api_parent_mid', 0);
     $parent = Dever::db('agent/member')->find(array('mobile' => $search_api_parent_mid));
+    Dever::setInput('search_api_parent_mid', $search_api_parent_mid);
+    Dever::setInput('search_option_parent_mid', $parent['id']);
     if ($parent) {
         $info = '上级' . Dever::load('agent/lib/member')->getInfoString($parent) . ', 以下为直推列表：';
     }
@@ -214,6 +216,7 @@ return array
                 'api' => 'agent/member-find',
                 'col' => 'mobile',
                 'result' => 'id',
+                'col' => 'parent_mid',
             ),
             'list_name' => '邀请人',
             'list'      => ($parent_mid || $pmid) ? false : 'Dever::load("agent/lib/member.getOne", {parent_mid})',

service/agent/lib/Manage.php

@@ -438,9 +438,9 @@ class Manage
             $card = Dever::db('card/info')->find($type_id);
             return array('name' => $card['name'], 'price' => $card['price']);
         } elseif ($type == 3) {
-            $prize = Dever::db('setting/role_goods')->config['set']['prize'];
+            $prize = Dever::db('setting/prize')->find($type_id);
 
-            return array('name' => $prize[$type_id], 'price' => 0);
+            return array('name' => $prize['name'], 'price' => $prize['price']);
         }
     }
 }

service/agent/lib/Member_set.php

@@ -24,6 +24,7 @@ class Member_set
     {
         $data = array();
         $data['mid'] = Dever::input('mid');
+        $data['search_api_mid'] = Dever::input('search_api_mid');
         $data['host'] = Dever::url('lib/member_set.home?mid=' . $data['mid'], 'agent');
         $data['url'] = Dever::url('lib/member_set.goods?mid=' . $data['mid'], 'agent');
         $data['submit'] = Dever::url('lib/member_set.action_cmmmit?json=1', 'agent');
@@ -34,6 +35,7 @@ class Member_set
     # 设置生产能力
     public function action_cmmmit_api()
     {
+        $search_api_mid = Dever::input('search_api_mid');
         $goods = Dever::input('goods');
         if (!$goods) {
             Dever::alert('请传入商品');
@@ -96,7 +98,12 @@ class Member_set
             # 记录日志
         }
 
-        return Dever::url('project/database/list&table=member_goods&project=agent&search_option_mid='.$mid, 'manage');
+        if ($search_api_mid) {
+            return Dever::url('project/database/list&table=member_goods&project=agent&search_api_mid='.$search_api_mid, 'manage');
+        } else {
+            return Dever::url('project/database/list&table=member_goods&project=agent&search_option_mid='.$mid, 'manage');
+        }
+        
     }
 
     # 记录日志