合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !304

@@ -84,6 +84,34 @@ class Store extends Api
     }
     }
 
 
     /**
     /**
+     * 商务/大客户电话
+     * @ApiWeigh    (90)
+     *
+     * @ApiTitle    (商务/大客户电话)
+     * @ApiSummary  (商务/大客户电话)
+     * @ApiMethod   (POST)
+     * @ApiRoute    (/api/store/shangwu_phone)
+     * @ApiReturnParams   (name="code", type="integer", required=true, sample="0")
+     * @ApiReturnParams   (name="msg", type="string", required=true, sample="返回成功")
+     * @ApiReturn   ({
+    'code':'1',
+    'msg':'返回成功',
+    "data": {
+        "shangwu_phone": 电话,
+    }
+    })
+     */
+    public function shangwu_phone()
+    {
+        if($this->request->isPost()){
+            $return = [
+                'shangwu_phone' => config('site.shangwu_phone')
+            ];
+            $this->success('成功',$return);
+        }
+    }
+
+    /**
      * 提现规则
      * 提现规则
      * @ApiWeigh    (89)
      * @ApiWeigh    (89)
      *
      *
@@ -271,6 +299,7 @@ class Store extends Api
         try{
         try{
             $param['user_id'] = $this->auth->id;
             $param['user_id'] = $this->auth->id;
             $param['original_ids'] = $param['house_ids'];
             $param['original_ids'] = $param['house_ids'];
+            $house_ids = $param['house_ids'];
             $param['house_ids'] = ','.$param['house_ids'].',';
             $param['house_ids'] = ','.$param['house_ids'].',';
             if(!empty($param['id'])) {
             if(!empty($param['id'])) {
                 $result = $this->store_model->edit($param);
                 $result = $this->store_model->edit($param);