Merge branch 'stabble' of iqiyoo:zhuishuyun_wap

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -523,6 +523,7 @@ class WelcomeController extends BaseController
      */
     private function getSiteTitle(Request $request)
     {
+        if($this->distribution_channel_id == 6398) return '花溪亭苑';
         $title = "追书云";
         $get_force_subscribe_name = false;
         $subscribe = $request->cookie('force_subscribe_name');

app/Modules/User/Services/UserService.php

@@ -465,7 +465,7 @@ WHERE u.openid in (SELECT openid from users WHERE  id = %s)";
                     'bid'=>$g->bid,
                     'icon'=>$g->icon,
                     'name_desc'=>$g->name_desc,
-                    'cost'=>$g->cost,
+                    'cost'=>0,
                     'cost_reward'=>$g->cost_reward,
                     'cost_recharge'=>$g->cost_recharge,
                     'created_at'=>$g->created_at,