|
@@ -95,11 +95,11 @@ class Userdecorate extends Api
|
|
|
|
|
|
$list = Db::name('user_decorate')
|
|
|
->alias('a')
|
|
|
- ->field('a.id,a.is_using,a.end_time,b.name,b.base_image,b.play_image')
|
|
|
+ ->field('a.id,a.is_using,a.end_time,b.name,b.base_image,b.play_image,b.android_image')
|
|
|
->join('decorate b', 'a.decorate_id = b.id')
|
|
|
->where($map)->order('a.id desc')->autopage()->select();
|
|
|
|
|
|
- $list = list_domain_image($list,['base_image','play_image']);
|
|
|
+ $list = list_domain_image($list,['base_image','play_image','android_image']);
|
|
|
|
|
|
$this->success('success',$list);
|
|
|
}
|
|
@@ -122,23 +122,24 @@ class Userdecorate extends Api
|
|
|
];
|
|
|
|
|
|
$info = Db::name('user_decorate')->alias('a')
|
|
|
- ->field('a.id,a.is_using,a.end_time,b.name,b.base_image,b.play_image')
|
|
|
+ ->field('a.id,a.is_using,a.end_time,b.name,b.base_image,b.play_image,b.android_image')
|
|
|
->join('decorate b', 'a.decorate_id = b.id')
|
|
|
->where($map)->order('a.id desc')->find();
|
|
|
+ $info = info_domain_image($info,['base_image','play_image','android_image']);
|
|
|
|
|
|
$this->success('success',$info);
|
|
|
}
|
|
|
//设置装扮
|
|
|
public function set_user_decorate()
|
|
|
{
|
|
|
- $did = input_post('did',''); //装扮ID
|
|
|
+ $did = input_post('did',''); //用户装扮ID
|
|
|
if (!$did) {
|
|
|
$this->error();
|
|
|
}
|
|
|
|
|
|
$map = [
|
|
|
'user_id' => $this->auth->id,
|
|
|
- 'decorate_id' => $did,
|
|
|
+ 'id' => $did,
|
|
|
];
|
|
|
$info = Db::name('user_decorate')->where($map)->find();
|
|
|
if (empty($info)) {
|
|
@@ -166,8 +167,8 @@ class Userdecorate extends Api
|
|
|
|
|
|
//设置使用中状态
|
|
|
$map = [
|
|
|
- 'user_id' => $this->auth->id,
|
|
|
- 'decorate_id' => $did,
|
|
|
+// 'user_id' => $this->auth->id,
|
|
|
+ 'id' => $did,
|
|
|
];
|
|
|
$data = [];
|
|
|
$data['is_using'] = 1;
|