afa 2 сар өмнө
parent
commit
f0184cba42

+ 2 - 1
application/api/controller/Codeno.php

@@ -28,7 +28,8 @@ class Codeno extends Api
       public function list(CodeNoModel $codeUserModel)
       {     
            $level = $this->request->post('level/d', 0);
-           $list = $codeUserModel->where('user_id', $this->auth->id)->where('level', $level)->select();
+           $list['used'] = $codeUserModel->where('user_id', $this->auth->id)->where('level', $level)->where('status', CodeNoModel::STATUS_USED)->column('id,code_no');
+           $list['normal'] = $codeUserModel->where('user_id', $this->auth->id)->where('level', $level)->where('status', CodeNoModel::STATUS_NORMAL)->column('id,code_no');
            $this->success('ok', $list);
       }
 

+ 0 - 1
public/assets/js/backend/user/user.js

@@ -45,7 +45,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         },
                         {field: 'ledger_wallet.token', title: '茶宝', operate: false},
                         {field: 'ledger_wallet.teac', title: 'Teac', operate: false},
-                        {field: 'team_num', title: __('Team_num'), operate: false},
                         {field: 'hold_num', title: __('持有产品数量'), operate: false},
                         {field: 'direct_num', title: __('Direct_num'), operate: false},
                         {field: 'effective_time', title: __('Effective_time'), operate: false, addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},