等级

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

@@ -23,13 +23,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('中文导读')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-zh_introduction" class="form-control" rows="5" name="row[zh_introduction]" cols="50"></textarea>
+            <textarea id="c-zh_introduction" class="form-control" rows="3" name="row[zh_introduction]" cols="50"></textarea>
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('英文导读')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-en_introduction" class="form-control" rows="5" name="row[en_introduction]" cols="50"></textarea>
+            <textarea id="c-en_introduction" class="form-control" rows="3" name="row[en_introduction]" cols="50"></textarea>
         </div>
     </div>
     
@@ -49,20 +49,24 @@
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-12 col-sm-3">
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
         </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('公告时间')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-createtime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[createtime]" type="text" value="">
+        </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('公告时间')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('中文详情')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-createtime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[createtime]" type="text" value="">
+            <textarea id="c-zh_body" class="form-control editor" rows="5" name="row[zh_body]" cols="50"></textarea>
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Details')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('英文详情')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-body" class="form-control editor" rows="5" name="row[body]" cols="50"></textarea>
+            <textarea id="c-en_body" class="form-control editor" rows="5" name="row[en_body]" cols="50"></textarea>
         </div>
     </div>
     <div class="form-group layer-footer">

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

@@ -22,13 +22,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('中文导读')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-zh_introduction" class="form-control" rows="5" name="row[zh_introduction]" cols="50">{$row.zh_introduction|htmlentities}</textarea>
+            <textarea id="c-zh_introduction" class="form-control" rows="3" name="row[zh_introduction]" cols="50">{$row.zh_introduction|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('英文导读')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-en_introduction" class="form-control" rows="5" name="row[en_introduction]" cols="50">{$row.en_introduction|htmlentities}</textarea>
+            <textarea id="c-en_introduction" class="form-control" rows="3" name="row[en_introduction]" cols="50">{$row.en_introduction|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group">
@@ -47,20 +47,24 @@
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-12 col-sm-3">
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
         </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('公告时间')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-createtime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[createtime]" type="text" value="{:$row.createtime?datetime($row.createtime):''}">
+        </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('公告时间')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('中文详情')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-createtime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[createtime]" type="text" value="{:$row.createtime?datetime($row.createtime):''}">
+            <textarea id="c-zh_body" class="form-control editor" rows="5" name="row[zh_body]" cols="50">{$row.zh_body|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Details')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('英文详情')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-body" class="form-control editor" rows="5" name="row[body]" cols="50">{$row.body|htmlentities}</textarea>
+            <textarea id="c-en_body" class="form-control editor" rows="5" name="row[en_body]" cols="50">{$row.en_body|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group layer-footer">

application/api/controller/Announcement.php

@@ -17,13 +17,14 @@ class Announcement extends Api
         $this->lan = $this->request->getLan();
     }
 
+    //
     public function list(AnnouncementModel $announcementModel)
     {
         $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,'.$this->lan.'_introduction as introduction')
+            ->field('id,img_url,createtime,' . $this->lan.'_title as title, REPLACE('.$this->lan.'_introduction, CHAR(13) + CHAR(10), "<br>") as introduction,'.$this->lan.'_body as body')
             ->paginate($this->pageSize);
         $this->success('', $this->buildResp($paginator->total(), $paginator->currentPage(), $paginator->items()));
     }
@@ -33,7 +34,7 @@ class Announcement extends Api
         $info = (new AnnouncementModel)
             ->where('id', $id)
             ->where('status', 1)
-            ->field('id,img_url,body,introduction,createtime,' . $this->lan.'_title as title')
+            ->field('id,img_url,introduction,createtime,' . $this->lan.'_title as title,'.$this->lan.'_body as body')
             ->find();
         if(empty($info)){
             $this->error('公告信息不存');

application/api/controller/User.php

@@ -40,6 +40,9 @@ class User extends Api
     public function userInfo(UserArea $userArea,UserModel $userModel, LedgerWalletModel $ledgerWalletModel)
     {
         $user = $this->auth->getUser();
+        if (!empty($user['is_super']) && empty($user['address_level'])) {
+            $user['address_level'] = $userModel::updateUserAddresLevel($user['id'], $user['parent_id']);
+        }
         $resp = [
             'id'              => $user['id'],
             'nickname'        => $user['nickname'],
@@ -56,13 +59,11 @@ class User extends Api
             'parent_id'       => $user['parent_id'], // 上级ID
             'is_super'        => $user['address_level'], // 新人福利标识
             'direct_super'    => ['one'=>3, 'two'=>10,'direct_super'=>$user['direct_super']], // 推广新人福等级标识
-            'direct_gold'     => $userModel::getDirectGoldNum($user['id']), // 推广黄金地址标识数量
             'avatar'          => !empty($user['avatar'])? $user['avatar']:$this->request->domain().'/assets/img/logo.png', // 头像
             'parent_address'  => '', // 上级的地址
             'invite_link'     => config('rental.invite_domain') . '/?inviteCode=' . $user['address'],
             'take_address'    => $userArea::getUserDefaultAdders($user['id']),  // 用户地址
         ];
-
         $this->success('', $resp);
     }
 

application/common/model/UserModel.php

@@ -136,18 +136,37 @@ class UserModel extends Model
         return self::where('id', $uid)->setInc('address_level', self::NORMAL);
     }
 
-     /**
-     * 获取直推用户黄金标识人数
-     * @param int $uid
-     * @return void
-     */
-    public static function getDirectGoldNum(int $uid)
-    {
-        return self::where('parent_id', $uid)->where('direct_super', '>=' , 10)->count();
+    /**
+     * 添加用户上级标识
+     * 领取超级福利后就会变成青铜地址
+     * 直推3个领取了超级福利的变成白银地址
+     * 直推10个领取了超级福利的变成黄金地址
+     * 有3个是黄金地址的 就变成翡翠地址
+     * */
+    public static function updateUserAddresLevel(int $uid, int $parentId)
+    {   
+        $addressLevel = self::levelOne;
+        if (!empty($parentId)) {
+            $paths  = UserPathModel::where('user_id', $uid)->order('distance', 'asc')->column('parent_id');
+            $paths[]= $uid;
+            foreach ($paths as $item) 
+            {
+                //更新等级
+                $parentCount = self::where('parent_id', $item)->where('is_super', '=', self::levelOne)->count();
+                if($parentCount >= self::level[1]) $addressLevel = self::levelTwo;
+                if($parentCount >= self::level[2]) $addressLevel = self::levelThre;
+
+                //是否升级翡翠
+                if($addressLevel == self::levelThre) {
+                    $parentCounts = self::where('parent_id', $item)->where('address_level', '>=', self::levelThre)->count();
+                    if($parentCounts >= self::level[3]) $addressLevel = self::levelFour;
+                }
+                self::where('id', $item)->setField('address_level', $addressLevel);
+            }
+        }
+        return  $addressLevel;
     }
 
-
-
     //社区向上发放奖励津贴
     public static function setCommunityRewards($uid, $pv, $token)
     {