郭盛 / community · 提交

转到一个项目

作者 何书鹏
提交 1da1a83fdf3f86598b4553ecb9a20810ca2ac53f 2 个父辈 5af7dc47 38c59b48
1 个管道 的构建 通过 耗费 0 秒

合并分支 'heshupeng' 到 'master' 

Heshupeng



查看合并请求 !344
内嵌 并排对比
正在显示 2 个修改的文件 包含 9 行增加 和 7 行删除
... ... @@ -154,7 +154,6 @@ class User extends Api
// 'end_time' => ['>',time()]
];
$store_house = Db::name('store_house')->where($where_house)->count();
halt(Db::name('store_house')->getLastSql());
if(!$store_house) {
$store_house = 2;
}
... ... @@ -173,7 +172,8 @@ class User extends Api
->where('is_read_user',2)
->count(),
// 是否入驻店铺
'is_store' => $store_house
'is_store' => $store_house,
'store' => \app\api\model\Store::where('user_id',$this->auth->id)->order('id','DESC')->find()
];
$user = $user->visible([
'id',
... ...
... ... @@ -35,11 +35,13 @@ return array (
'mail_smtp_pass' => 'password',
'mail_verify_type' => '2',
'mail_from' => '10000@qq.com',
'contact' => '<div class="mod-hd" style="margin:0px 0px 20px;padding:0px;color:#333333;font-family:tahoma, arial, &quot;Microsoft YaHei&quot;, &quot;Hiragino Sans GB&quot;, u5b8bu4f53, sans-serif;font-size:14px;white-space:normal;background-color:#FFFFFF;"><h3 class="title" style="margin:0px;padding:0px;font-size:16px;"><strong class="icon-font" style="margin:0px 6px 0px 0px;padding:0px;color:#F10215;"><span style="color:#333333;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">网站首页 | 品牌推荐 | 招商加盟 | 行业资讯 |&nbsp;</span><span style="color:#CC0000;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">联系我们</span><span style="color:#333333;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">&nbsp;| 温馨提示:投资有风险,加盟需谨慎 Copyright &copy; 2019-2025 火锅烧烤一站式平台 版权所有 火锅烧烤...</span></strong></h3></div><div class="mod-bd" style="margin:0px;padding:0px;color:#333333;font-family:tahoma, arial, &quot;Microsoft YaHei&quot;, &quot;Hiragino Sans GB&quot;, u5b8bu4f53, sans-serif;font-size:14px;white-space:normal;background-color:#FFFFFF;"><p class="g-para" style="margin-top:0px;margin-bottom:0px;padding:0px;word-break:break-all;color:#666666;line-height:1.7;width:1136px;"><span class="txt-red" style="margin:0px;padding:0px;color:#E2231A;"></span><a href="https://www.jd.com/contact/cooperate.aspx" class="txt-blue" target="_blank" style="margin:0px;padding:0px;color:#0084FF;"></a></p></div>',
'settled' => '<span style="white-space:normal;"><div class="mod-hd" style="white-space:normal;margin:0px 0px 20px;padding:0px;color:#333333;font-family:tahoma, arial, &quot;Microsoft YaHei&quot;, &quot;Hiragino Sans GB&quot;, u5b8bu4f53, sans-serif;font-size:14px;background-color:#FFFFFF;"><h3 class="title" style="margin:0px;padding:0px;font-size:16px;"><strong class="icon-font" style="margin:0px 6px 0px 0px;padding:0px;color:#F10215;"><span style="color:#333333;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">网站首页 | 品牌推荐 | 招商加盟 | 行业资讯 |&nbsp;</span><span style="color:#CC0000;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">联系我们</span><span style="color:#333333;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">&nbsp;| 温馨提示:投资有风险,加盟需谨慎 Copyright &copy; 2019-2025 火锅烧烤一站式平台 版权所有 火锅烧烤...</span></strong></h3></div><div class="mod-bd" style="white-space:normal;margin:0px;padding:0px;color:#333333;font-family:tahoma, arial, &quot;Microsoft YaHei&quot;, &quot;Hiragino Sans GB&quot;, u5b8bu4f53, sans-serif;font-size:14px;background-color:#FFFFFF;"><p class="g-para" style="margin-top:0px;margin-bottom:0px;padding:0px;word-break:break-all;color:#666666;line-height:1.7;width:1136px;"><span class="txt-red" style="margin:0px;padding:0px;color:#E2231A;"></span><a href="https://www.jd.com/contact/cooperate.aspx" class="txt-blue" target="_blank" style="margin:0px;padding:0px;color:#0084FF;"></a></p></div></span>',
'phone' => '010-12345678',
'shangwu_phone' => '13012345678',
'send_score' => '800',
'withdraw_percent' => '100',
'withdraw_rule' => '<br />',
'phone' => '010-12345678',
'house_board_count' => '2',
'withdraw_rule' => '<p>1、单笔提现最小金额为20元； <br />2、用户每月享受10次免费提现服务（若有变动根据页面显示为主）； <br />3、超次数提现手续费为每笔2.0元，在提现金额中扣除； <br />4、用户可通过参与平台活动获取更多免费提现券；</p>',
'settled' => '<span style="white-space:normal;"><div class="mod-hd" style="white-space:normal;margin:0px 0px 20px;padding:0px;color:#333333;font-family:tahoma, arial, &quot;Microsoft YaHei&quot;, &quot;Hiragino Sans GB&quot;, u5b8bu4f53, sans-serif;font-size:14px;background-color:#FFFFFF;"><h3 class="title" style="margin:0px;padding:0px;font-size:16px;"><strong class="icon-font" style="margin:0px 6px 0px 0px;padding:0px;color:#F10215;"><span style="color:#333333;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">网站首页 | 品牌推荐 | 招商加盟 | 行业资讯 |&nbsp;</span><span style="color:#CC0000;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">联系我们</span><span style="color:#333333;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">&nbsp;| 温馨提示:投资有风险,加盟需谨慎 Copyright &copy; 2019-2025 火锅烧烤一站式平台 版权所有 火锅烧烤...</span></strong></h3></div><div class="mod-bd" style="white-space:normal;margin:0px;padding:0px;color:#333333;font-family:tahoma, arial, &quot;Microsoft YaHei&quot;, &quot;Hiragino Sans GB&quot;, u5b8bu4f53, sans-serif;font-size:14px;background-color:#FFFFFF;"><p class="g-para" style="margin-top:0px;margin-bottom:0px;padding:0px;word-break:break-all;color:#666666;line-height:1.7;width:1136px;"><span class="txt-red" style="margin:0px;padding:0px;color:#E2231A;"></span><a href="https://www.jd.com/contact/cooperate.aspx" class="txt-blue" target="_blank" style="margin:0px;padding:0px;color:#0084FF;"></a></p></div></span>',
'house_board_count' => '10',
'house_valid' => '90',
'contact' => '<div class="mod-hd" style="margin:0px 0px 20px;padding:0px;color:#333333;font-family:tahoma, arial, &quot;Microsoft YaHei&quot;, &quot;Hiragino Sans GB&quot;, u5b8bu4f53, sans-serif;font-size:14px;white-space:normal;background-color:#FFFFFF;"><h3 class="title" style="margin:0px;padding:0px;font-size:16px;"><strong class="icon-font" style="margin:0px 6px 0px 0px;padding:0px;color:#F10215;"><span style="color:#333333;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">网站首页 | 品牌推荐 | 招商加盟 | 行业资讯 |&nbsp;</span><span style="color:#CC0000;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">联系我们</span><span style="color:#333333;font-family:Arial, sans-serif;white-space:normal;background-color:#FFFFFF;">&nbsp;| 温馨提示:投资有风险,加盟需谨慎 Copyright &copy; 2019-2025 火锅烧烤一站式平台 版权所有 火锅烧烤...</span></strong></h3></div><div class="mod-bd" style="margin:0px;padding:0px;color:#333333;font-family:tahoma, arial, &quot;Microsoft YaHei&quot;, &quot;Hiragino Sans GB&quot;, u5b8bu4f53, sans-serif;font-size:14px;white-space:normal;background-color:#FFFFFF;"><p class="g-para" style="margin-top:0px;margin-bottom:0px;padding:0px;word-break:break-all;color:#666666;line-height:1.7;width:1136px;"><span class="txt-red" style="margin:0px;padding:0px;color:#E2231A;"></span><a href="https://www.jd.com/contact/cooperate.aspx" class="txt-blue" target="_blank" style="margin:0px;padding:0px;color:#0084FF;"></a></p></div>',
);
\ No newline at end of file
... ...