Wesmiler 校企小程序 更新 6.30

app/api/model/School.php

@@ -184,7 +184,6 @@ class School extends SchoolModel
             $filter['id'] = (int)$where;
         }
         $data = static::get($filter, $with);
-        $data->hidden(['book_fields']);
         if($data['logo']){
             $data['logo'] = getPreview($data['logo']);
         }

app/api/model/UserInfo.php

@@ -69,8 +69,8 @@ class UserInfo extends UserInfoModel
             Cache::set($cacheKey, ['user_id'=> $userId,'ids'=> $info['day_locked_uids'],'date'=> date('Y-m-d H:i:s')], rand(300, 3600));
             return false;
         }
-        $trade = SettingModel::getItem('trade');
-        $locked = isset($trade['locked'])? $trade['locked'] : [];
+        $platform = SettingModel::getItem('platform');
+        $locked = isset($platform['locked'])? $platform['locked'] : [];
         $lockNum = isset($locked['lock_num'])? $locked['lock_num'] : 0;
         $lockNum = $lockNum? $lockNum : 3;
         $uids = self::alias('a')

app/api/model/book/Order.php

@@ -243,8 +243,8 @@ class Order extends OrderModel
             return false;
         }
 
-        $trade = \app\store\model\Setting::getItem('trade');
-        $price = isset($trade['books']['book_cost'])? floatval($trade['books']['book_cost']) : 0;
+        $platform = \app\store\model\Setting::getItem('platform');
+        $price = isset($platform['books']['book_cost'])? floatval($platform['books']['book_cost']) : 0;
         if($price<=0){
             $this->error = '请先后台设置报名费用';
             return false;
@@ -429,8 +429,8 @@ class Order extends OrderModel
         }
 
         // 已经报名次数
-        $trade = \app\store\model\Setting::getItem('trade');
-        $bookLimit = isset($trade['books']['book_limit'])? intval($trade['books']['book_limit']) : 0;
+        $platform = \app\store\model\Setting::getItem('platform');
+        $bookLimit = isset($platform['books']['book_limit'])? intval($platform['books']['book_limit']) : 0;
         $bookLimit = $bookLimit? $bookLimit : 3;
         if(SpecialityBook::getUserBooks($orderId) >= $bookLimit){
             $this->error = "您已经报名了{$bookLimit}次，不能再报名";

app/common/model/UnlockOrder.php

@@ -105,8 +105,8 @@ class UnlockOrder extends BaseModel
             return false;
         }
 
-        $trade = \app\store\model\Setting::getItem('trade');
-        $price = isset($trade['locked']['locked_cost']) ? floatval($trade['locked']['locked_cost']) : 0;
+        $platform = \app\store\model\Setting::getItem('platform');
+        $price = isset($platform['locked']['locked_cost']) ? floatval($platform['locked']['locked_cost']) : 0;
         if ($price <= 0) {
             $this->error = '请先后台设置解锁费用';
             return false;

app/common/model/UserDynamic.php

@@ -102,6 +102,7 @@ class UserDynamic extends BaseModel
         // 执行查询
         $list = $query->alias($this->name)
             ->leftJoin('user_info ui', 'ui.user_id=' . $this->name . '.user_id')
+            ->leftJoin('user u', 'u.user_id=' . $this->name . '.user_id')
             ->where(function ($query) use ($userId, $param) {
                 if ($userId > 0) {
                     // 获取粉丝用户ID，并验证
@@ -118,7 +119,7 @@ class UserDynamic extends BaseModel
                     });
                 }
             })
-            ->field($this->name . '.*, ui.school_id')
+            ->field($this->name . '.*,u.nick_name,u.avatar_id, ui.school_id')
             ->order($sort)
             ->paginate($listRows);