合并分支 'Branch_liuzhen' 到 'master'

申请店铺，个人中心调试



查看合并请求 !146

@@ -262,7 +262,7 @@ class Store extends Api
         $result_invite = true;
         try{
             $param['user_id'] = $this->auth->id;
-            $param['house_ids'] = ','.$pay_data['house_ids'].',';
+            $param['house_ids'] = ','.$param['house_ids'].',';
             if(!empty($param['id'])) {
                 $result = $this->store_model->edit($param);
             } else {

@@ -106,6 +106,7 @@ class User extends Api
             "id_num": "100001", //ID
             "identity": 0, //身份0普通用户1主管理员2子管理员3商家
             "url": "/u/2",
+            "is_store": 1, //商家入驻状态1待支付2待审核3审核通过4审核驳回
             "house": { //小区信息
                 "id": 17, //小区ID
                 "name": "碧海花园小区" //小区名称
@@ -135,7 +136,9 @@ class User extends Api
 	    	// 未读消息数量
 	    	'message_num' => \app\api\model\Message::where('user_id',$user['id'])
                 ->where('is_read_user',2)
-                ->count()
+                ->count(),
+            // 是否入驻店铺
+            'is_store' => \app\api\model\Store::where('id',$this->auth->id)->value('status')
     	];
     	$user = $user->visible([
     		'id',