合并分支 'heshupeng' 到 'master'

消息模板链接添加house_id



查看合并请求 !339

@@ -127,9 +127,7 @@ class UserHouse extends Backend
                         "remark" => ['请仔细核对以上信息，如有不符，请与相关物业人员反馈，谢谢！','#FF0000'],
                         "remark" => ['请仔细核对以上信息，如有不符，请与相关物业人员反馈，谢谢！','#FF0000'],
                     );
                     );
                     $openid = Db::name('third')->where('user_id',$row->user_id)->value('openid');
                     $openid = Db::name('third')->where('user_id',$row->user_id)->value('openid');
-                    // 把用户的当前社区改为审核成功的小区
-                    Db::name('user')->where('id',$row->user_id)->setField('house_id',$row->house_id);
-                    $url = config('option.vue_url') . '/affiche';
+                    $url = config('option.vue_url') . '/affiche?house_id='.$row->house_id;
                     $this->wxsendmessage($openid,$send_data,config('option.template')['license'],$url);
                     $this->wxsendmessage($openid,$send_data,config('option.template')['license'],$url);
                 }
                 }
                 $result = $row->save();
                 $result = $row->save();

@@ -438,9 +438,7 @@ class HouseAdmin extends Api
                 );
                 );
                 foreach ($user_id_arr as $user_id) {
                 foreach ($user_id_arr as $user_id) {
                     $openid = Db::name('third')->where('user_id',$user_id)->value('openid');
                     $openid = Db::name('third')->where('user_id',$user_id)->value('openid');
-                    // 把用户的当前社区改为发送公告的小区
-                    Db::name('user')->where('id',$user_id)->setField('house_id',$post['house_id']);
-                    $url = config('option.vue_url') . '/affiche';
+                    $url = config('option.vue_url') . '/affiche?house_id='.$post['house_id'];
                     (new \app\index\controller\Ajax)->wxsendmessage($openid,$send_data,config('option.template')['house_notice'],$url);
                     (new \app\index\controller\Ajax)->wxsendmessage($openid,$send_data,config('option.template')['house_notice'],$url);
                 }
                 }
             }
             }

@@ -431,7 +431,7 @@ class HouseBoard extends Api
                 "remark" => ['点击查看详情','#FF0000'],
                 "remark" => ['点击查看详情','#FF0000'],
             );
             );
             $openid = Db::name('third')->where('user_id',$param['house_user_id'])->value('openid');
             $openid = Db::name('third')->where('user_id',$param['house_user_id'])->value('openid');
-            $url = config('option.vue_url') . '/liuyanxiaoxi?is_template=1&id='.$message_id;
+            $url = config('option.vue_url') . '/liuyanxiaoxi?is_template=1&id='.$message_id.'&house_id='.$param['house_id'];
             (new \app\index\controller\Ajax)->wxsendmessage($openid,$send_data,config('option.template')['msg'],$url);
             (new \app\index\controller\Ajax)->wxsendmessage($openid,$send_data,config('option.template')['msg'],$url);
             Db::commit();
             Db::commit();
         } catch (PDOException $e) {
         } catch (PDOException $e) {

@@ -722,7 +722,7 @@ class User extends Api
             if($msg['type'] == 2) {
             if($msg['type'] == 2) {
                 $url = config('option.vue_url') . '/messageto?is_template=1&id='.$msg['id'];
                 $url = config('option.vue_url') . '/messageto?is_template=1&id='.$msg['id'];
             } elseif($msg['type'] == 3) {
             } elseif($msg['type'] == 3) {
-                $url = config('option.vue_url') . '/liuyanxiaoxi?is_template=1&id='.$msg['id'];
+                $url = config('option.vue_url') . '/liuyanxiaoxi?is_template=1&id='.$msg['id'].'&house_id='.$msg['object_id'];
             }
             }
             (new \app\index\controller\Ajax)->wxsendmessage($openid,$send_data,config('option.template')['msg'],$url);
             (new \app\index\controller\Ajax)->wxsendmessage($openid,$send_data,config('option.template')['msg'],$url);
             Db::commit();
             Db::commit();

@@ -101,9 +101,10 @@ class Wechat extends Frontend
                 $content .= "\n"."{$v['name']}:{$v['phone']}";
                 $content .= "\n"."{$v['name']}:{$v['phone']}";
             }
             }
         }
         }
+        $vue_url = config('option.vue_url');
         $content .= "\n\n"."业主账号：%u"
         $content .= "\n\n"."业主账号：%u"
-            ."\n\n"."<a href='http://shequ.h.brofirst.cn/affiche'>查看物业公告</a>"
-            ."\n\n"."<a href='http://shequ.h.brofirst.cn/message?house_id={$house_id}'>给物业留言</a>";
+            ."\n\n"."<a href='{$vue_url}/affiche?house_id={$house_id}'>查看物业公告</a>"
+            ."\n\n"."<a href='{$vue_url}/message?house_id={$house_id}'>给物业留言</a>";
         //*------------------------已有账号，直接加入小区-----------------------*/
         //*------------------------已有账号，直接加入小区-----------------------*/
         if($user){
         if($user){
             $info = UserHouse::get(['user_id'=>$user['id'],'house_id'=>$house_id]);
             $info = UserHouse::get(['user_id'=>$user['id'],'house_id'=>$house_id]);