wesmiler

app/Http/Controllers/Api/v1/IndexController.php

@@ -32,8 +32,6 @@ class IndexController extends webApp
                 $config = [
                     'app_name' => ConfigService::make()->getConfigByCode('app_name'),
                     'app_logo' => get_image_url(ConfigService::make()->getConfigByCode('app_logo')),
-                    'index_logo' => get_image_url(ConfigService::make()->getConfigByCode('index_logo')),
-                    'app_name_logo' => get_image_url(ConfigService::make()->getConfigByCode('app_name_logo')),
                     'app_version' => ConfigService::make()->getConfigByCode('app_version'),
                     'bonus_desc' => format_content(ConfigService::make()->getConfigByCode('bonus_desc', '')),
                     'auth_desc' => format_content(ConfigService::make()->getConfigByCode('auth_desc', '')),
@@ -41,7 +39,6 @@ class IndexController extends webApp
                     'withdraw_desc' => format_content(ConfigService::make()->getConfigByCode('withdraw_desc', '')),
                     'goods_disclaimer' => format_content(ConfigService::make()->getConfigByCode('goods_disclaimer', '')),
                     'wxpay_open' => ConfigService::make()->getConfigByCode('wxpay_open', 0),
-                    'bank_limit_num' => ConfigService::make()->getConfigByCode('bank_limit_num', 5),
                     'withdraw_open' => ConfigService::make()->getConfigByCode('withdraw_open', 0),
                     'withdraw_min' => ConfigService::make()->getConfigByCode('withdraw_min', 0),
                     'withdraw_fee' => ConfigService::make()->getConfigByCode('withdraw_fee', 0),
@@ -79,27 +76,6 @@ class IndexController extends webApp
     }
 
     /**
-     * 行业数据
-     * @return array
-     */
-    public function industry()
-    {
-        try {
-            $data = [
-                // 轮播
-                'banners' => AdService::make()->getListByPosition(2), // 轮播
-                'supervisors' => SupervisorsService::make()->getRecommendList(), // 推荐导师
-                'articles' => ArticleService::make()->getListByType(2), // 行业政策资讯
-            ];
-
-            return showJson(1010, true, $data);
-        } catch (\Exception $exception) {
-            $error = ['data' => $exception->getTrace(), 'err' => $exception->getMessage()];
-            return showJson(1046, false, $error);
-        }
-    }
-
-    /**
      * 验证更新
      * @return array
      */

app/Http/Controllers/Api/v1/MeetingController.php

@@ -1,108 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\v1;
-
-use App\Http\Controllers\Api\webApp;
-use App\Services\Api\MeetingService;
-use App\Services\MpService;
-
-/**
- * 会议管理
- * @package App\Http\Controllers\Api
- */
-class MeetingController extends webApp
-{
-
-    /**
-     * 列表
-     * @return array
-     */
-    public function index()
-    {
-        $params =request()->post();
-        $pageSize = request()->post('pageSize', 15);
-        $params['user_id'] = $this->userId;
-        $datas = MeetingService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
-    }
-
-
-
-    /**
-     * 详情
-     */
-    public function info()
-    {
-        $params = request()->all();
-        $id = isset($params['id'])? intval($params['id']) : 0;
-        $type = isset($params['type']) && $params['type']? intval($params['type']) : 1;
-        if(empty($id)){
-            return message(1036, false);
-        }
-
-        if($info = MeetingService::make()->getInfo($id,$this->userId,$type)){
-            return message(1010, true, $info);
-        }else{
-            return message(1009, false);
-        }
-    }
-
-
-    /**
-     * 会议链接
-     */
-    public function getLink()
-    {
-        $params = request()->all();
-        $id = isset($params['id'])? intval($params['id']) : 0;
-        if(empty($id)){
-            return message(1036, false);
-        }
-
-        if($link = MpService::make()->getMiniShareLink('pagesSub/pages/meeting/books?id='.$id,'邀请您参加会议')){
-            return message(1010, true, $link);
-        }else{
-            return message(MpService::make()->getError(), false);
-        }
-    }
-
-
-
-    /**
-     * 签到
-     */
-    public function books()
-    {
-        $params = request()->post();
-        try {
-            if ($result = MeetingService::make()->books($this->userId, $params)) {
-                return showJson(MeetingService::make()->getError(), true, $result);
-            } else {
-                return showJson(MeetingService::make()->getError(), false);
-            }
-        }  catch (\Exception $exception) {
-            $error = ['data' => $exception->getTrace(), 'err' => $exception->getMessage()];
-            return showJson(1046, false, $error);
-        }
-    }
-
-    /**
-     * 签到记录
-     */
-    public function records()
-    {
-        $params = request()->post();
-        $pageSize = request()->post('pageSize',20);
-        try {
-            if ($datas = MeetingService::make()->records($params,$pageSize)) {
-                return showJson(1010, true, $datas);
-            } else {
-                return showJson(1009, false);
-            }
-        }  catch (\Exception $exception) {
-            $error = ['data' => $exception->getTrace(), 'err' => $exception->getMessage()];
-            return showJson(1046, false, $error);
-        }
-    }
-
-}

app/Http/Controllers/Api/v1/MemberController.php

@@ -38,36 +38,6 @@ class MemberController extends webApp
     }
 
     /**
-     * 团队成员佣金订单
-     * @return array
-     */
-    public function bill()
-    {
-        try {
-            $params = request()->all();
-            $userId = isset($params['id']) && $params['id']>0?$params['id']:0;
-            if(!MemberService::make()->checkTeamPermission($this->userId, $userId)){
-                return showJson(MemberService::make()->getError(), false);
-            }
-
-            $date = isset($params['date']) ? $params['date'] : [];
-            $start = isset($date[0]) && $date[0]? $date[0] : date('Y-m-d 00:00:00', time() - 30 *3 *86400);
-            if($start < date('Y-m-d', time() - 365 * 86400)){
-                return showJson('只能查询最近1年的记录', false);
-            }
-
-            if ($datas = OrderService::make()->getCommissionBill($userId?$userId:$this->userId,$params)) {
-                return showJson(1010, true, $datas);
-            } else {
-                return showJson( 1009, false);
-            }
-        } catch (\Exception $exception){
-            $error = ['data'=>$exception->getTrace(),'err'=>$exception->getMessage()];
-            return showJson(1046, false, $error);
-        }
-    }
-
-    /**
      * 信息
      * @return array
      */

app/Services/Api/MemberService.php

@@ -394,7 +394,7 @@ class MemberService extends BaseService
             return $info;
         }
 
-        $defaultField = ['id', 'user_type', 'realname', 'mobile','is_auth','member_level','idcard', 'nickname','parent_id','point_id', 'balance','ls_score','bd_score','bonus_total','withdraw_total', 'code', 'openid','create_time', 'status', 'avatar'];
+        $defaultField = ['id', 'user_type', 'realname', 'mobile','is_auth','member_level','idcard', 'nickname','parent_id','point_id', 'balance','ls_score','bd_score','property','property_total','withdraw_property','bonus_total','withdraw_total', 'code', 'openid','create_time', 'status', 'avatar'];
         $field = $field ? $field : $defaultField;
         if (is_array($where)) {
             $info = $this->model->with(['parent','point'])->where(['mark' => 1])->where($where)->select($field)->first();