作者 何书鹏
1 个管道 的构建 通过 耗费 1 秒

合并分支 'heshupeng' 到 'master'

Heshupeng



查看合并请求 !384
... ... @@ -21,7 +21,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-mobile" class="form-control" name="row[mobile]" type="text">
<input id="c-mobile" class="form-control" data-rule="required;mobile" name="row[mobile]" type="text">
</div>
</div>
<!--<div class="form-group">-->
... ...
... ... @@ -15,7 +15,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-mobile" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">
<input id="c-mobile" class="form-control" data-rule="required;mobile" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">
</div>
</div>
<div class="form-group layer-footer">
... ...
... ... @@ -709,6 +709,7 @@ class Store extends Api
// 商家每天可发布红包信息次数
$times = Db::name('store_inform')
->whereTime('createtime', 'today')
->where('type',1)
->where('store_id',$store['id'])
->count();
if($times >= config('site.send_red_times')){
... ... @@ -783,7 +784,7 @@ class Store extends Api
"remark" => ['请尽快处理!','#FF0000'],
);
$url = $this->request->root(true).'/admininfo.php/index/login';
(new \app\index\controller\Ajax)->wxsendmessage('otlkQ0l4L3wsmz8dhDIbHJQVJnI8',$send_data,config('option.template')['examine'],$url);
(new \app\index\controller\Ajax)->wxsendmessage(config('option.examine_openid'),$send_data,config('option.template')['examine'],$url);
if(!$result || !$res_user || !$res_log) {
Db::rollback();
} else {
... ...
... ... @@ -19,6 +19,7 @@ return [
// 'feedback' => ' tTdwXY1ZtF2IMUXPf4_5XyeZLFO90Ojseg_9LoE8sr8', // 意见反馈通知
'store_pass' => 'wKN6cG79pO92wrLifc_dMgmP_UIrsGeG-bDdWE8bYjo', // 商家审核结果通知
],
'examine_openid' => 'otlkQ0l4L3wsmz8dhDIbHJQVJnI8', //审核管理员
'sms' => [
'url' => 'http://api.mix2.zthysms.com/v2/sendSms',
'sms_user' => 'shequ',
... ...
... ... @@ -133,7 +133,7 @@ class Ajax extends Frontend
"remark" => ['请尽快处理!','#FF0000'],
);
$url = $this->request->root(true).'/admininfo.php/index/login';
$this->wxsendmessage('otlkQ0l4L3wsmz8dhDIbHJQVJnI8',$send_data,config('option.template')['examine'],$url);
$this->wxsendmessage(config('option.examine_openid'),$send_data,config('option.template')['examine'],$url);
Db::commit();
} else {
// 用户支付失败
... ...