茶说

application/admin/view/general/announcement/add.html

@@ -4,7 +4,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-type_id" data-rule="required" data-source='[{"id":"1","title":"公告"},{"id":"2","title":"轮播图"}]' data-field="title" class="form-control selectpage" name="row[type_id]" type="text" value="">
+            <input id="c-type_id" data-rule="required" data-source='[{"id":"1","title":"公告"},{"id":"2","title":"轮播图"},{"id":"3","title":"茶说"}]' data-field="title" class="form-control selectpage" name="row[type_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">

application/admin/view/general/announcement/edit.html

@@ -4,7 +4,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-type_id" data-rule="required" data-source='[{"id":"1","title":"公告"},{"id":"2","title":"轮播图"}]' data-field="title" class="form-control selectpage" name="row[type_id]" type="text" value="{$row.type_id|htmlentities}">
+            <input id="c-type_id" data-rule="required" data-source='[{"id":"1","title":"公告"},{"id":"2","title":"轮播图"},{"id":"3","title":"茶说"}]' data-field="title" class="form-control selectpage" name="row[type_id]" type="text" value="{$row.type_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/api/controller/Announcement.php

@@ -17,10 +17,10 @@ class Announcement extends Api
         $this->lan = $this->request->getLan();
     }
 
-    public function list()
+    public function list(AnnouncementModel $announcementModel)
     {
-        $paginator = (new AnnouncementModel)
-            ->where('type_id', 1)
+        $typeId = $this->request->param('type_id', 1, 'intval');
+        $paginator = $announcementModel->where('type_id', $typeId)
             ->where('status', 1)
             ->order('id DESC,weigh desc')
             ->field('id,img_url,createtime,' . $this->lan.'_title as title')

application/api/controller/User.php

@@ -40,6 +40,11 @@ class User extends Api
     public function userInfo(UserArea $userArea,UserModel $userModel, LedgerWalletModel $ledgerWalletModel)
     {
         $user = $this->auth->getUser();
+
+        $req = $userModel::updateUserLevel(1288, 1275);
+
+        dump($req );die;
+
         $resp = [
             'id'              => $user['id'],
             'nickname'        => $user['nickname'],

application/common/model/UserModel.php

@@ -30,7 +30,7 @@ class UserModel extends Model
     const NORMAL         = 1;
     const STOP           = 2;
 
-    const level          = [1=>3, 2=> 10, 3=>3];  //直推人数
+    const level          = [1=>3, 2=> 10, 3=>2];  //直推人数
     const levelOne       = 1; 
     const levelTwo       = 2;
     const levelThre      = 3;
@@ -122,17 +122,15 @@ class UserModel extends Model
                         $parentCount = self::where('parent_id', $item)->where('address_level', '>=', self::levelOne)->count();
                         if($parentCount >= self::level[1]) $parent->address_level = self::levelTwo;
                         if($parentCount >= self::level[2]) $parent->address_level = self::levelThre;
-                    }
-                    if($parent->address_level == self::levelThre){
-                        $parentCount = self::where('parent_id', $item)->where('address_level', '>=', self::levelThre)->count();
-                        if($parentCount >= self::level[3]) $parent->address_level = self::levelFour;
+                        if($parent->address_level == self::levelThre){
+                            $parentCount = self::where('parent_id', $item)->where('address_level', '>=', self::levelThre)->count();
+                            if($parentCount >= self::level[3]) $parent->address_level = self::levelFour;
+                        }
                     }
                 }
                 //更新直推领取人数
-                if($parentId == $item){
-                    $parent->direct_super +=  self::NORMAL;
-                    $parent->save();
-                }
+                if($parentId == $item) $parent->direct_super +=  self::NORMAL;
+                $parent->save();
             }
         }
         return self::where('id', $uid)->setInc('address_level', self::NORMAL);

public/assets/js/backend/general/announcement.js

@@ -26,7 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [   
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'type_id', title: __('Type_id'), operate: 'LIKE',  searchList: {"1":__('公告'),"2":__('轮播图')}, formatter: Table.api.formatter.flag},
+                        {field: 'type_id', title: __('Type_id'), operate: 'LIKE',  searchList: {"1":__('公告'),"2":__('轮播图'),"3":__('茶说')}, formatter: Table.api.formatter.flag},
                         {field: 'zh_title', title: __('Zh_title'), operate: 'LIKE'},
                         {field: 'en_title', title: __('En_title'), operate: false},
                         {field: 'img_url', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},