Merge branch 'master' of http://132.232.91.252:9999/ice/quxiu

api/Appapi/Api/User.php

@@ -366,11 +366,11 @@ class Api_User extends PhalApi_Api {
 //            $list1[]=array('id'=>'1','name'=>'我的收益','thumb'=>"http://mengyazhibo.com/public/appapi/images/personal/votes.png",'href'=>'' );
 //        }
         $list1[]=array('id'=>'1','name'=>'我的收益','thumb'=>"http://qn.quxiutv.com/income.png",'href'=>'' );
-        $list1[]=array('id'=>'4','name'=>'道具商城','thumb'=>"http://qn.quxiutv.com/shop.png" ,'href'=>get_upload_path("/index.php?g=Appapi&m=Mall&a=index"));
+        $list1[]=array('id'=>'4','name'=>'道具商城','thumb'=>"http://qn.quxiutv.com/room.png" ,'href'=>get_upload_path("/index.php?g=Appapi&m=Mall&a=index"));
         $list1[]=array('id'=>'22','name'=>'邀请好友','thumb'=>"http://qn.quxiutv.com/invite.png" ,'href'=>get_upload_path("/index.php?g=Appapi&m=Invite&a=index&agentid=" . $this->uid));
 
         $list2[]=array('id'=>'3','name'=>'我的等级','thumb'=>"http://qn.quxiutv.com/level.png" ,'href'=>get_upload_path("/index.php?g=Appapi&m=Level&a=index"));
-        $list2[]=array('id'=>'20','name'=>'直播间管理','thumb'=>"http://qn.quxiutv.com/room.png" ,'href'=>'');
+        $list2[]=array('id'=>'20','name'=>'直播间管理','thumb'=>"http://qn.quxiutv.com/shop.png" ,'href'=>'');
 
 
 //        $list1[]=array('id'=>'2','name'=> '钱包','thumb'=>"http:///qn.quxiutv.com/coin.png" ,'href'=>'');

api/Appapi/Model/User.php

@@ -908,7 +908,10 @@ class Model_User extends PhalApi_Model_NotORM
             return 0;
         }
         $bonus_day = $signinfo['bonus_day'];
-        DI()->notorm->users->where('id=?', $uid)->update(["coin" => new NotORM_Literal("coin + {$coin}"),]);
+        DI()->notorm->users
+            ->where('id = ?', $uid)
+            ->update( array('coin' => new NotORM_Literal("coin + {$coin}") ));
+
         /* 记录 */
         $insert = [
             "type"      => 'income',