李忠强 / mane · 提交

转到一个项目

作者 李忠强
提交 4290730c0dee6e40ac5601b013c1247704ac5dca 1 个父辈 a02f0327
1 个管道 的构建 通过 耗费 0 秒

更新

内嵌 并排对比
正在显示 2 个修改的文件 包含 16 行增加 和 8 行删除
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 3
4 namespace app\api\controller; 4 namespace app\api\controller;
5 5
  6 +use app\api\model\IdeaType;
6 use app\api\model\UserIdeaRecord; 7 use app\api\model\UserIdeaRecord;
7 use app\common\controller\Api; 8 use app\common\controller\Api;
8 use fast\Http; 9 use fast\Http;
@@ -163,7 +164,7 @@ class Mycenter extends Api @@ -163,7 +164,7 @@ class Mycenter extends Api
163 * @ApiSummary (我的界面上半部分角色解析和数据统计) 164 * @ApiSummary (我的界面上半部分角色解析和数据统计)
164 * @ApiMethod (POST) 165 * @ApiMethod (POST)
165 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") 166 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
166 - * @ApiParams (name=userid, type=int, required=false, description="请求的Token") 167 + * @ApiParams (name=userid, type=int, required=false, description="用户id")
167 * @ApiReturn ({ 168 * @ApiReturn ({
168 'code':'1', 169 'code':'1',
169 'msg':'联系客服' 170 'msg':'联系客服'
@@ -173,18 +174,20 @@ class Mycenter extends Api @@ -173,18 +174,20 @@ class Mycenter extends Api
173 'describe' => 角色描述, 174 'describe' => 角色描述,
174 'avatar' => 角色图标, 175 'avatar' => 角色图标,
175 'idea_type' => 体验最多分类, 176 'idea_type' => 体验最多分类,
  177 + 'image' => 背景图,
176 } 178 }
177 }) 179 })
178 */ 180 */
179 public function myPageUp() 181 public function myPageUp()
180 { 182 {
  183 + $userid = $this->request->post('userid',$this->auth->id);
181 $data = []; 184 $data = [];
182 $usercount = Db::name('user')->count(); 185 $usercount = Db::name('user')->count();
183 $userlist = Db::name('user')->where('idea_number','<',$this->auth->idea_number)->count(); 186 $userlist = Db::name('user')->where('idea_number','<',$this->auth->idea_number)->count();
184 $percentage = round($userlist/$usercount*100,1); 187 $percentage = round($userlist/$usercount*100,1);
185 $data['percentage'] = $percentage; 188 $data['percentage'] = $percentage;
186 $ideaUserScore = Db::name('user_idea_score') 189 $ideaUserScore = Db::name('user_idea_score')
187 - ->where('user_id',$this->auth->id) 190 + ->where('user_id',$userid)
188 ->group('weigh') 191 ->group('weigh')
189 ->orderRaw('count(user_role_id) desc') 192 ->orderRaw('count(user_role_id) desc')
190 ->field('weigh,count(user_role_id)') 193 ->field('weigh,count(user_role_id)')
@@ -201,7 +204,7 @@ class Mycenter extends Api @@ -201,7 +204,7 @@ class Mycenter extends Api
201 $data['avatar'] = ''; 204 $data['avatar'] = '';
202 } 205 }
203 $ideaUserRecord = Db::name('user_idea_record') 206 $ideaUserRecord = Db::name('user_idea_record')
204 - ->where('user_id',$this->auth->id) 207 + ->where('user_id',$userid)
205 ->where('type',1) 208 ->where('type',1)
206 ->group('idea_type_id') 209 ->group('idea_type_id')
207 ->orderRaw('count(idea_type_id) desc') 210 ->orderRaw('count(idea_type_id) desc')
@@ -209,8 +212,9 @@ class Mycenter extends Api @@ -209,8 +212,9 @@ class Mycenter extends Api
209 ->select(); 212 ->select();
210 $ideaUserRecord = $ideaUserRecord->toArray(); 213 $ideaUserRecord = $ideaUserRecord->toArray();
211 if ($ideaUserRecord){ 214 if ($ideaUserRecord){
212 - $ideaType = Db::name('idea_type')->where('id',$ideaUserRecord[0]['idea_type_id'])->value('name');  
213 - $data['idea_type'] = $ideaType; 215 + $ideaType = IdeaType::where('id',$ideaUserRecord[0]['idea_type_id'])->find();
  216 + $data['idea_type'] = $ideaType['name'];
  217 + $data['image'] = $ideaType['image_text'];
214 }else{ 218 }else{
215 $data['idea_type'] = '无'; 219 $data['idea_type'] = '无';
216 } 220 }
@@ -224,6 +228,7 @@ class Mycenter extends Api @@ -224,6 +228,7 @@ class Mycenter extends Api
224 * @ApiSummary (我的界面中间部分已体验列表) 228 * @ApiSummary (我的界面中间部分已体验列表)
225 * @ApiMethod (POST) 229 * @ApiMethod (POST)
226 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") 230 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  231 + * @ApiParams (name=userid, type=int, required=false, description="用户id")
227 * @ApiReturn ({ 232 * @ApiReturn ({
228 'code':'1', 233 'code':'1',
229 'msg':'联系客服' 234 'msg':'联系客服'
@@ -262,10 +267,11 @@ class Mycenter extends Api @@ -262,10 +267,11 @@ class Mycenter extends Api
262 */ 267 */
263 public function myPageMid() 268 public function myPageMid()
264 { 269 {
  270 + $userid = $this->request->post('userid',$this->auth->id);
265 $ideaUserRecord = new UserIdeaRecord(); 271 $ideaUserRecord = new UserIdeaRecord();
266 $list = $ideaUserRecord 272 $list = $ideaUserRecord
267 ->with(['idea']) 273 ->with(['idea'])
268 - ->where('user_id',$this->auth->id) 274 + ->where('user_id',$userid)
269 ->where('type',1) 275 ->where('type',1)
270 ->order('id','desc') 276 ->order('id','desc')
271 ->select() 277 ->select()
@@ -297,6 +303,7 @@ class Mycenter extends Api @@ -297,6 +303,7 @@ class Mycenter extends Api
297 * @ApiSummary (我的界面底部部分已收藏列表) 303 * @ApiSummary (我的界面底部部分已收藏列表)
298 * @ApiMethod (POST) 304 * @ApiMethod (POST)
299 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") 305 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  306 + * @ApiParams (name=userid, type=int, required=false, description="用户id")
300 * @ApiReturn ({ 307 * @ApiReturn ({
301 'code':'1', 308 'code':'1',
302 'msg':'我的界面 下' 309 'msg':'我的界面 下'
@@ -335,10 +342,11 @@ class Mycenter extends Api @@ -335,10 +342,11 @@ class Mycenter extends Api
335 */ 342 */
336 public function myPageDown() 343 public function myPageDown()
337 { 344 {
  345 + $userid = $this->request->post('userid',$this->auth->id);
338 $ideaUserRecord = new UserIdeaRecord(); 346 $ideaUserRecord = new UserIdeaRecord();
339 $list = $ideaUserRecord 347 $list = $ideaUserRecord
340 ->with(['idea']) 348 ->with(['idea'])
341 - ->where('user_id',$this->auth->id) 349 + ->where('user_id',$userid)
342 ->where('type',2) 350 ->where('type',2)
343 ->order('id','desc') 351 ->order('id','desc')
344 ->select() 352 ->select()
@@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
37 {field: 'collection', title: __('Collection')}, 37 {field: 'collection', title: __('Collection')},
38 {field: 'idea_area_id', title: __('Idea_area_id'),visible:false,operate: false}, 38 {field: 'idea_area_id', title: __('Idea_area_id'),visible:false,operate: false},
39 {field: 'idea_weather_id', title: __('Idea_weather_id'),visible:false,operate: false}, 39 {field: 'idea_weather_id', title: __('Idea_weather_id'),visible:false,operate: false},
40 - {field: 'avatar_images', title: __('Avatar_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images}, 40 + // {field: 'avatar_images', title: __('Avatar_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
41 {field: 'ideatype.name', title: __('Ideatype.name'), operate: 'LIKE'}, 41 {field: 'ideatype.name', title: __('Ideatype.name'), operate: 'LIKE'},
42 {field: 'ideaweather.name', title: __('Ideaweather.name'), operate: 'LIKE'}, 42 {field: 'ideaweather.name', title: __('Ideaweather.name'), operate: 'LIKE'},
43 {field: 'ideaarea.name', title: __('Ideaarea.name'), operate: 'LIKE'}, 43 {field: 'ideaarea.name', title: __('Ideaarea.name'), operate: 'LIKE'},