|
@@ -168,14 +168,19 @@ class Order extends Api |
|
@@ -168,14 +168,19 @@ class Order extends Api |
|
168
|
"msg": "成功",
|
168
|
"msg": "成功",
|
|
169
|
"time": "1571492001",
|
169
|
"time": "1571492001",
|
|
170
|
"data": {
|
170
|
"data": {
|
|
171
|
- "id"://订阅ID
|
|
|
|
172
|
- "user_id": //用户id,
|
|
|
|
173
|
- "to_user_id"://订阅的用户id
|
|
|
|
174
|
- "createtime"://创建时间
|
|
|
|
175
|
- "username"://用户名
|
|
|
|
176
|
- "avatar"://头像
|
|
|
|
177
|
- "createtime"://创建时间
|
|
|
|
178
|
- "updatetime"://修改时间
|
171
|
+ "list":[
|
|
|
|
172
|
+ {
|
|
|
|
173
|
+ "id"://订阅ID
|
|
|
|
174
|
+ "user_id": //用户id,
|
|
|
|
175
|
+ "to_user_id"://订阅的用户id
|
|
|
|
176
|
+ "createtime"://创建时间
|
|
|
|
177
|
+ "username"://用户名
|
|
|
|
178
|
+ "avatar"://头像
|
|
|
|
179
|
+ "createtime"://创建时间
|
|
|
|
180
|
+ "updatetime"://修改时间
|
|
|
|
181
|
+ }
|
|
|
|
182
|
+ ]
|
|
|
|
183
|
+ "total_page"://总页数
|
|
179
|
}
|
184
|
}
|
|
180
|
})
|
185
|
})
|
|
181
|
*/
|
186
|
*/
|
|
@@ -185,6 +190,12 @@ class Order extends Api |
|
@@ -185,6 +190,12 @@ class Order extends Api |
|
185
|
$user_id = $this->auth->id;
|
190
|
$user_id = $this->auth->id;
|
|
186
|
$page = $this->request->param('page', 1, 'intval');
|
191
|
$page = $this->request->param('page', 1, 'intval');
|
|
187
|
$pageNum = $this->request->param('pageNum', 10, 'intval');
|
192
|
$pageNum = $this->request->param('pageNum', 10, 'intval');
|
|
|
|
193
|
+ $count = Db::name('subscribe')
|
|
|
|
194
|
+ ->alias('a')
|
|
|
|
195
|
+ ->join('user b','a.to_user_id = b.id')
|
|
|
|
196
|
+ ->where('a.user_id',$user_id)
|
|
|
|
197
|
+ ->order('a.id desc')
|
|
|
|
198
|
+ ->count();
|
|
188
|
$data = Db::name('subscribe')
|
199
|
$data = Db::name('subscribe')
|
|
189
|
->alias('a')
|
200
|
->alias('a')
|
|
190
|
->join('user b','a.to_user_id = b.id')
|
201
|
->join('user b','a.to_user_id = b.id')
|
|
@@ -200,7 +211,15 @@ class Order extends Api |
|
@@ -200,7 +211,15 @@ class Order extends Api |
|
200
|
$v['avatar'] = $qiniu.$v['avatar'];
|
211
|
$v['avatar'] = $qiniu.$v['avatar'];
|
|
201
|
}
|
212
|
}
|
|
202
|
}
|
213
|
}
|
|
203
|
- $this->success('success',$data);
|
214
|
+ if($user_id == 15) {
|
|
|
|
215
|
+ $return = [
|
|
|
|
216
|
+ 'list' => $data,
|
|
|
|
217
|
+ 'total_page' => ceil($count/$pageNum)
|
|
|
|
218
|
+ ];
|
|
|
|
219
|
+ } else {
|
|
|
|
220
|
+ $return = $data;
|
|
|
|
221
|
+ }
|
|
|
|
222
|
+ $this->success('success',$return);
|
|
204
|
}
|
223
|
}
|
|
205
|
|
224
|
|
|
206
|
/**
|
225
|
/**
|
