Merge branch 'master' of http://git.excellentkk.cn/mkm/nk-lihaink-cn
This commit is contained in:
彭桃
commit
6d60092cd5
@ -146,6 +146,8 @@ class Admin extends BaseController
|
|||||||
View::assign('department', $department);
|
View::assign('department', $department);
|
||||||
View::assign('position', $position);
|
View::assign('position', $position);
|
||||||
View::assign('id', $id);
|
View::assign('id', $id);
|
||||||
|
$team = Db::table('fa_supply_team')->select();
|
||||||
|
View::assign('team', $team);
|
||||||
return view();
|
return view();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -133,7 +133,7 @@ class SupplyAccount extends BaseController
|
|||||||
{
|
{
|
||||||
$param = get_params();
|
$param = get_params();
|
||||||
$id = isset($param['id']) ? $param['id'] : 0;
|
$id = isset($param['id']) ? $param['id'] : 0;
|
||||||
$type = isset($param['type']) ? $param['type'] : 0;
|
$type = 1;
|
||||||
|
|
||||||
$this->model->delSupplyAccountById($id,$type);
|
$this->model->delSupplyAccountById($id,$type);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,13 +40,14 @@ class SupplyBrokerage extends BaseController
|
|||||||
foreach ($list as $k =>$v){
|
foreach ($list as $k =>$v){
|
||||||
$list[$k]['fa_supply_chain_id'] = Db::table('fa_supply_team')->where('id',$v['fa_supply_chain_id'])->value('name');
|
$list[$k]['fa_supply_chain_id'] = Db::table('fa_supply_team')->where('id',$v['fa_supply_chain_id'])->value('name');
|
||||||
$list[$k]['mer_id'] = Db::connect('shop')->table('eb_merchant')->where('mer_id',$v['mer_id'])->value('mer_name');
|
$list[$k]['mer_id'] = Db::connect('shop')->table('eb_merchant')->where('mer_id',$v['mer_id'])->value('mer_name');
|
||||||
// $list[$k]['user_id'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name');
|
$list[$k]['user_id'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name');
|
||||||
if($v['status'] == 1){
|
if($v['status'] == 1){
|
||||||
$list[$k]['status'] = '成功';
|
$list[$k]['status'] = '成功';
|
||||||
}else{
|
}else{
|
||||||
$list[$k]['status'] = '待分佣';
|
$list[$k]['status'] = '待分佣';
|
||||||
}
|
}
|
||||||
$list[$k]['supply_level_id'] = Db::table('fa_supply_level')->where('id',$v['supply_level_id'])->value('name');
|
$list[$k]['supply_level_id'] = Db::table('fa_supply_level')->where('id',$v['supply_level_id'])->value('name');
|
||||||
|
$list[$k]['supply_userId'] = Db::table('cms_admin')->where('id',$v['supply_userId'])->value('nickname');
|
||||||
|
|
||||||
}
|
}
|
||||||
return table_assign(0, '', $list);
|
return table_assign(0, '', $list);
|
||||||
@ -136,7 +137,7 @@ class SupplyBrokerage extends BaseController
|
|||||||
{
|
{
|
||||||
$param = get_params();
|
$param = get_params();
|
||||||
$id = isset($param['id']) ? $param['id'] : 0;
|
$id = isset($param['id']) ? $param['id'] : 0;
|
||||||
$type = isset($param['type']) ? $param['type'] : 0;
|
$type = 1;
|
||||||
|
|
||||||
$this->model->delSupplyBrokerageById($id,$type);
|
$this->model->delSupplyBrokerageById($id,$type);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -124,7 +124,7 @@ class SupplyLevel extends BaseController
|
|||||||
{
|
{
|
||||||
$param = get_params();
|
$param = get_params();
|
||||||
$id = isset($param['id']) ? $param['id'] : 0;
|
$id = isset($param['id']) ? $param['id'] : 0;
|
||||||
$type = isset($param['type']) ? $param['type'] : 0;
|
$type = 1;
|
||||||
|
|
||||||
$this->model->delSupplyLevelById($id,$type);
|
$this->model->delSupplyLevelById($id,$type);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -150,7 +150,7 @@ class SupplyTeam extends BaseController
|
|||||||
{
|
{
|
||||||
$param = get_params();
|
$param = get_params();
|
||||||
$id = isset($param['id']) ? $param['id'] : 0;
|
$id = isset($param['id']) ? $param['id'] : 0;
|
||||||
$type = isset($param['type']) ? $param['type'] : 0;
|
$type = 1;
|
||||||
|
|
||||||
$this->model->delSupplyTeamById($id,$type);
|
$this->model->delSupplyTeamById($id,$type);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -53,7 +53,7 @@ Route::group(function(){
|
|||||||
Route::get('lst', '/lst')->name('systemMerchantIntentionLst')->option([
|
Route::get('lst', '/lst')->name('systemMerchantIntentionLst')->option([
|
||||||
'_alias' => '列表',
|
'_alias' => '列表',
|
||||||
]);
|
]);
|
||||||
Route::get('status', '/switchStatus')->name('systemMerchantIntentionStatus')->option([
|
Route::post('status', '/switchStatus')->name('systemMerchantIntentionStatus')->option([
|
||||||
'_alias' => '审核',
|
'_alias' => '审核',
|
||||||
]);
|
]);
|
||||||
Route::delete('delete', '/delete')->name('systemMerchantIntentionDelete')->option([
|
Route::delete('delete', '/delete')->name('systemMerchantIntentionDelete')->option([
|
||||||
|
|||||||
@ -14,7 +14,7 @@ class AdminCheck extends Validate
|
|||||||
protected $regex = [ 'checkUser' => '/^[A-Za-z]{1}[A-Za-z0-9_-]{4,19}$/'];
|
protected $regex = [ 'checkUser' => '/^[A-Za-z]{1}[A-Za-z0-9_-]{4,19}$/'];
|
||||||
|
|
||||||
protected $rule = [
|
protected $rule = [
|
||||||
'username' => 'require|regex:checkUser|unique:admin',
|
'username' => 'require|unique:admin',
|
||||||
'pwd' => 'require|min:6|confirm',
|
'pwd' => 'require|min:6|confirm',
|
||||||
'edit_pwd' => 'min:6|confirm',
|
'edit_pwd' => 'min:6|confirm',
|
||||||
'mobile' => 'require|mobile',
|
'mobile' => 'require|mobile',
|
||||||
@ -27,7 +27,7 @@ class AdminCheck extends Validate
|
|||||||
|
|
||||||
protected $message = [
|
protected $message = [
|
||||||
'username.require' => '登录账号不能为空',
|
'username.require' => '登录账号不能为空',
|
||||||
'username.regex' => '登录账号必须是以字母开头，只能包含字母数字下划线和减号，5到20位',
|
// 'username.regex' => '登录账号必须是以字母开头，只能包含字母数字下划线和减号，5到20位',
|
||||||
'username.unique' => '同样的登录账号已经存在',
|
'username.unique' => '同样的登录账号已经存在',
|
||||||
'pwd.require' => '密码不能为空',
|
'pwd.require' => '密码不能为空',
|
||||||
'pwd.min' => '密码至少要6个字符',
|
'pwd.min' => '密码至少要6个字符',
|
||||||
@ -48,7 +48,7 @@ class AdminCheck extends Validate
|
|||||||
|
|
||||||
protected $scene = [
|
protected $scene = [
|
||||||
'add' => ['mobile', 'nickname', 'group_id', 'pwd', 'username', 'status'],
|
'add' => ['mobile', 'nickname', 'group_id', 'pwd', 'username', 'status'],
|
||||||
'edit' => ['mobile', 'nickname', 'group_id', 'edit_pwd','id', 'username', 'status'],
|
'edit' => ['mobile', 'nickname', 'group_id', 'edit_pwd','id', 'status'],
|
||||||
'editPersonal' => ['mobile', 'nickname'],
|
'editPersonal' => ['mobile', 'nickname'],
|
||||||
'editpwd' => ['old_pwd', 'pwd'],
|
'editpwd' => ['old_pwd', 'pwd'],
|
||||||
];
|
];
|
||||||
|
|||||||
@ -81,6 +81,18 @@
|
|||||||
{/volist}
|
{/volist}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">供应链团队<font>*</font>
|
||||||
|
</td>
|
||||||
|
<td colspan="5">
|
||||||
|
<select name="fa_supply_team_id" lay-verify="required" lay-reqText="请完善所属后台供应链团队ID">
|
||||||
|
<option value="">请选择</option>
|
||||||
|
{volist name='team' id='vo'}
|
||||||
|
<option value="{$vo.id}" >{$vo.name}</option>
|
||||||
|
{/volist}
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="layui-td-gray">备注</td>
|
<td class="layui-td-gray">备注</td>
|
||||||
<td colspan="5">
|
<td colspan="5">
|
||||||
@ -169,6 +181,18 @@
|
|||||||
{/volist}
|
{/volist}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">供应链团队<font>*</font>
|
||||||
|
</td>
|
||||||
|
<td colspan="5">
|
||||||
|
<select name="fa_supply_team_id" lay-verify="required" lay-reqText="请完善所属后台供应链团队ID">
|
||||||
|
<option value="">请选择</option>
|
||||||
|
{volist name='team' id='vo'}
|
||||||
|
<option value="{$vo.id}" {eq name="$admin.fa_supply_team_id" value="$vo.id"} selected{/eq}>{$vo.name}</option>
|
||||||
|
{/volist}
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="layui-td-gray">备注</td>
|
<td class="layui-td-gray">备注</td>
|
||||||
<td colspan="5">
|
<td colspan="5">
|
||||||
@ -183,60 +207,60 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="layui-col-md6">
|
<!-- <div class="layui-col-md6">-->
|
||||||
<select name="city" lay-verify="required" lay-search="">
|
<!-- <select name="city" lay-verify="required" lay-search="">-->
|
||||||
<option value="">带搜索的选择框</option>
|
<!-- <option value="">带搜索的选择框</option>-->
|
||||||
<option value="1">layer</option>
|
<!-- <option value="1">layer</option>-->
|
||||||
<option value="2">form</option>
|
<!-- <option value="2">form</option>-->
|
||||||
<option value="3">layim</option>
|
<!-- <option value="3">layim</option>-->
|
||||||
<option value="4">element</option>
|
<!-- <option value="4">element</option>-->
|
||||||
<option value="5">laytpl</option>
|
<!-- <option value="5">laytpl</option>-->
|
||||||
<option value="6">upload</option>
|
<!-- <option value="6">upload</option>-->
|
||||||
<option value="7">laydate</option>
|
<!-- <option value="7">laydate</option>-->
|
||||||
<option value="8">laypage</option>
|
<!-- <option value="8">laypage</option>-->
|
||||||
<option value="9">flow</option>
|
<!-- <option value="9">flow</option>-->
|
||||||
<option value="10">util</option>
|
<!-- <option value="10">util</option>-->
|
||||||
<option value="11">code</option>
|
<!-- <option value="11">code</option>-->
|
||||||
<option value="12">tree</option>
|
<!-- <option value="12">tree</option>-->
|
||||||
<option value="13">layedit</option>
|
<!-- <option value="13">layedit</option>-->
|
||||||
<option value="14">nav</option>
|
<!-- <option value="14">nav</option>-->
|
||||||
<option value="15">tab</option>
|
<!-- <option value="15">tab</option>-->
|
||||||
<option value="16">table</option>
|
<!-- <option value="16">table</option>-->
|
||||||
<option value="17">select</option>
|
<!-- <option value="17">select</option>-->
|
||||||
<option value="18">checkbox</option>
|
<!-- <option value="18">checkbox</option>-->
|
||||||
<option value="19">switch</option>
|
<!-- <option value="19">switch</option>-->
|
||||||
<option value="20">radio</option>
|
<!-- <option value="20">radio</option>-->
|
||||||
</select>
|
<!-- </select>-->
|
||||||
<div class="layui-form-select layui-form-selected">
|
<!-- <div class="layui-form-select layui-form-selected">-->
|
||||||
<div class="layui-select-title">
|
<!-- <div class="layui-select-title">-->
|
||||||
<input type="text" placeholder="带搜索的选择框" value="" class="layui-input">
|
<!-- <input type="text" placeholder="带搜索的选择框" value="" class="layui-input">-->
|
||||||
<i class="layui-edge"></i>
|
<!-- <i class="layui-edge"></i>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
<dl class="layui-anim layui-anim-upbit" style="">
|
<!-- <dl class="layui-anim layui-anim-upbit" style="">-->
|
||||||
<dd lay-value="" class="layui-select-tips layui-this">带搜索的选择框</dd>
|
<!-- <dd lay-value="" class="layui-select-tips layui-this">带搜索的选择框</dd>-->
|
||||||
<dd lay-value="1" class="">layer</dd>
|
<!-- <dd lay-value="1" class="">layer</dd>-->
|
||||||
<dd lay-value="2" class="">form</dd>
|
<!-- <dd lay-value="2" class="">form</dd>-->
|
||||||
<dd lay-value="3" class="">layim</dd>
|
<!-- <dd lay-value="3" class="">layim</dd>-->
|
||||||
<dd lay-value="4" class="">element</dd>
|
<!-- <dd lay-value="4" class="">element</dd>-->
|
||||||
<dd lay-value="5" class="">laytpl</dd>
|
<!-- <dd lay-value="5" class="">laytpl</dd>-->
|
||||||
<dd lay-value="6" class="">upload</dd>
|
<!-- <dd lay-value="6" class="">upload</dd>-->
|
||||||
<dd lay-value="7" class="">laydate</dd>
|
<!-- <dd lay-value="7" class="">laydate</dd>-->
|
||||||
<dd lay-value="8" class="">laypage</dd>
|
<!-- <dd lay-value="8" class="">laypage</dd>-->
|
||||||
<dd lay-value="9" class="">flow</dd>
|
<!-- <dd lay-value="9" class="">flow</dd>-->
|
||||||
<dd lay-value="10" class="">util</dd>
|
<!-- <dd lay-value="10" class="">util</dd>-->
|
||||||
<dd lay-value="11" class="">code</dd>
|
<!-- <dd lay-value="11" class="">code</dd>-->
|
||||||
<dd lay-value="12" class="">tree</dd>
|
<!-- <dd lay-value="12" class="">tree</dd>-->
|
||||||
<dd lay-value="13" class="">layedit</dd>
|
<!-- <dd lay-value="13" class="">layedit</dd>-->
|
||||||
<dd lay-value="14" class="">nav</dd>
|
<!-- <dd lay-value="14" class="">nav</dd>-->
|
||||||
<dd lay-value="15" class="">tab</dd>
|
<!-- <dd lay-value="15" class="">tab</dd>-->
|
||||||
<dd lay-value="16" class="">table</dd>
|
<!-- <dd lay-value="16" class="">table</dd>-->
|
||||||
<dd lay-value="17" class="">select</dd>
|
<!-- <dd lay-value="17" class="">select</dd>-->
|
||||||
<dd lay-value="18" class="">checkbox</dd>
|
<!-- <dd lay-value="18" class="">checkbox</dd>-->
|
||||||
<dd lay-value="19" class="">switch</dd>
|
<!-- <dd lay-value="19" class="">switch</dd>-->
|
||||||
<dd lay-value="20" class="">radio</dd>
|
<!-- <dd lay-value="20" class="">radio</dd>-->
|
||||||
</dl>
|
<!-- </dl>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
{/block}
|
{/block}
|
||||||
|
|||||||
@ -1,7 +1,12 @@
|
|||||||
{extend name="common/base"/}
|
{extend name="common/base"/}
|
||||||
<!-- 主体 -->
|
<!-- 主体 -->
|
||||||
{block name="body"}
|
{block name="body"}
|
||||||
|
<style>
|
||||||
|
.layui-btn-group{
|
||||||
|
display:flex;
|
||||||
|
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<div class="p-3">
|
<div class="p-3">
|
||||||
|
|
||||||
@ -18,14 +23,15 @@
|
|||||||
<label class="layui-form-label">选择时间</label>
|
<label class="layui-form-label">选择时间</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<div class="layui-btn-group">
|
<div class="layui-btn-group">
|
||||||
<input id="chonse_date" type="hidden" name="chonse_date" value="" disabled placeholder="选择时间">
|
<input id="chonse_start_date" type="hidden" name="start_date" value="" readonly placeholder="选择时间">
|
||||||
<button name="both" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal">全部</button>
|
<input id="chonse_end_date" type="hidden" name="end_date" value="" readonly placeholder="选择时间">
|
||||||
|
<button name="both" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal">全部</button>
|
||||||
<button name="today" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">今天</button>
|
<button name="today" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">今天</button>
|
||||||
<button name="yeserday" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">昨天</button>
|
<button name="yeserday" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">昨天</button>
|
||||||
<button lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近7天</button>
|
<button name="week" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近7天</button>
|
||||||
<button lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近30天</button>
|
<button name="30day" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近30天</button>
|
||||||
<button lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本月</button>
|
<button name="month" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本月</button>
|
||||||
<button lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本年</button>
|
<button name="year" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本年</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -34,13 +40,11 @@
|
|||||||
<!-- <label class="layui-form-label">日期范围</label> -->
|
<!-- <label class="layui-form-label">日期范围</label> -->
|
||||||
<div class="layui-inline" id="range_date">
|
<div class="layui-inline" id="range_date">
|
||||||
<div class="layui-input-inline">
|
<div class="layui-input-inline">
|
||||||
<input type="text" autocomplete="off" name="start_date" id="test-startDate-1" class="layui-input"
|
<input type="text" autocomplete="off" name="start_date" id="start-date" class="layui-input" placeholder="开始日期">
|
||||||
placeholder="开始日期">
|
|
||||||
</div>
|
</div>
|
||||||
<div class="layui-form-mid">-</div>
|
<div class="layui-form-mid">-</div>
|
||||||
<div class="layui-input-inline">
|
<div class="layui-input-inline">
|
||||||
<input type="text" autocomplete="off" name="end_date" id="test-endDate-1" class="layui-input"
|
<input type="text" autocomplete="off" name="end_date" id="end-date" class="layui-input" placeholder="结束日期">
|
||||||
placeholder="结束日期">
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -48,22 +52,22 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<div class="layui-input-inline" style="width:35%;">
|
<div class="layui-input-inline" style="width:45%;">
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label">商户审核</label>
|
<label class="layui-form-label">商户审核</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<div class="layui-btn-group">
|
<div class="layui-btn-group">
|
||||||
<input type="hidden" id="status" name="status" value="0" disabled placeholder="核审状态值">
|
<input type="hidden" id="status" name="status" value="" readonly placeholder="核审状态值">
|
||||||
<button name="both" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal">全部</button>
|
<button name="both" lay-submit="" lay-filter="statusform" type="button" class="layui-btn layui-btn-normal">全部</button>
|
||||||
<button name="wait_status" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">待审核</button>
|
<button name="wait" lay-submit="" lay-filter="statusform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">待审核</button>
|
||||||
<button name="success_status" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核通过</button>
|
<button name="success" lay-submit="" lay-filter="statusform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核通过</button>
|
||||||
<button name="failed_status" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核未通过</button>
|
<button name="failed" lay-submit="" lay-filter="statusform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核未通过</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="layui-input-inline" style="width:35%;float:none;">
|
<div class="layui-input-inline" style="width:45%;float:none;">
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label">商户分类</label>
|
<label class="layui-form-label">商户分类</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
@ -83,8 +87,7 @@
|
|||||||
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
|
|
||||||
|
<div class="layui-input-inline" style="width:45%;">
|
||||||
<div class="layui-input-inline" style="width:35%;">
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label">店铺类型</label>
|
<label class="layui-form-label">店铺类型</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
@ -98,10 +101,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="layui-input-inline" style="width:35%;">
|
<div class="layui-input-inline" style="width:45%;">
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label">关键字</label>
|
<label class="layui-form-label">关键字</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block" style="display:flex">
|
||||||
<input style="width:70%;float:left" type="text" name="keywords" placeholder="请输入关键字"
|
<input style="width:70%;float:left" type="text" name="keywords" placeholder="请输入关键字"
|
||||||
class="layui-input" autocomplete="off" />
|
class="layui-input" autocomplete="off" />
|
||||||
<button class="layui-btn layui-btn-normal" lay-submit=""
|
<button class="layui-btn layui-btn-normal" lay-submit=""
|
||||||
@ -211,11 +214,11 @@
|
|||||||
width: 150,
|
width: 150,
|
||||||
templet: function(d){
|
templet: function(d){
|
||||||
if (d.status==0){
|
if (d.status==0){
|
||||||
return '待审核'
|
return '<span style="color:yellow">待审核</span>'
|
||||||
}else if(d.status==1){
|
}else if(d.status==1){
|
||||||
return '已审核'
|
return '<span style="color:green">已审核</span>'
|
||||||
}else if(d.status==2){
|
}else if(d.status==2){
|
||||||
return '审核未通过'
|
return '<span style="color:red">审核未通过</span>'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
@ -282,8 +285,10 @@
|
|||||||
elem: '#range_date'
|
elem: '#range_date'
|
||||||
//设置开始日期、日期日期的 input 选择器
|
//设置开始日期、日期日期的 input 选择器
|
||||||
//数组格式为 2.6.6 开始新增，之前版本直接配置 true 或任意分割字符即可
|
//数组格式为 2.6.6 开始新增，之前版本直接配置 true 或任意分割字符即可
|
||||||
, range: ['#test-startDate-1', '#test-endDate-1']
|
, range: ['#start-date', '#end-date']
|
||||||
,done: function(value, date, endDate){
|
,done: function(value, date, endDate){
|
||||||
|
switchDateForm(true);
|
||||||
|
|
||||||
active['reload'] ? active['reload'].call(this) : '';
|
active['reload'] ? active['reload'].call(this) : '';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -292,8 +297,8 @@
|
|||||||
//
|
//
|
||||||
var $ = layui.$, active = {
|
var $ = layui.$, active = {
|
||||||
reload: function(){
|
reload: function(){
|
||||||
let dataRload = getformdata();;
|
let dataRload = getformdata();
|
||||||
console.log(dataRload)
|
//console.log(dataRload)
|
||||||
//执行重载
|
//执行重载
|
||||||
table.reload('intention_list', {
|
table.reload('intention_list', {
|
||||||
page: {
|
page: {
|
||||||
@ -320,20 +325,80 @@
|
|||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//选择时间
|
||||||
form.on('submit(chonse_date)', function(data){
|
form.on('submit(chonse_date)', function(data){
|
||||||
console.log(data.elem.name);
|
|
||||||
$('#chonse_date').val(data.elem.name);
|
let start_date = '';
|
||||||
layui.pageTable.reload({
|
let end_date = getDaysAgo();
|
||||||
where: {
|
|
||||||
...data.field
|
let name = data.elem.name;
|
||||||
},
|
if (name =='today') {
|
||||||
page: {
|
start_date=end_date;
|
||||||
curr: 1
|
}else if(name == 'yeserday'){
|
||||||
}
|
start_date = end_date = getDaysAgo(1);
|
||||||
});
|
}else if(name == 'week'){
|
||||||
|
start_date = getDaysAgo(7);
|
||||||
|
}else if(name == '30day'){
|
||||||
|
start_date = getDaysAgo(30);
|
||||||
|
}else if(name == 'month'){
|
||||||
|
let days = (new Date).getDate()-1
|
||||||
|
start_date = getDaysAgo(days);
|
||||||
|
}else if(name == 'year'){
|
||||||
|
var year = (new Date()).getFullYear();//获取当前年份
|
||||||
|
start_date = year+'-01-01'
|
||||||
|
}
|
||||||
|
|
||||||
|
switchDateForm(false);
|
||||||
|
$('#chonse_start_date').val(start_date);
|
||||||
|
$('#chonse_end_date').val(end_date);
|
||||||
|
|
||||||
|
active['reload'] ? active['reload'].call(this) : '';
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// 两个时间表单是互斥的，只能提交一个
|
||||||
|
function switchDateForm(chonse=false)
|
||||||
|
{
|
||||||
|
let range = chonse?false:true;
|
||||||
|
$('#start-date').attr("disabled",range);
|
||||||
|
$('#end-date').attr("disabled",range);
|
||||||
|
|
||||||
|
$('#chonse_start_date').attr("disabled",chonse);
|
||||||
|
$('#chonse_end_date').attr("disabled",chonse);
|
||||||
|
|
||||||
|
if (chonse) {
|
||||||
|
$('#chonse_start_date').val("");
|
||||||
|
$('#chonse_end_date').val("");
|
||||||
|
}else{
|
||||||
|
$('#start-date').val("");
|
||||||
|
$('#end-date').val("");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 商户审核
|
||||||
|
form.on('submit(statusform)', function(data) {
|
||||||
|
let name = data.elem.name
|
||||||
|
let status = 0;
|
||||||
|
|
||||||
|
if (name=='wait') {
|
||||||
|
status = 0;
|
||||||
|
}else if(name=='success'){
|
||||||
|
status = 1;
|
||||||
|
}else if(name=='failed'){
|
||||||
|
status = 2;
|
||||||
|
}
|
||||||
|
if (name=='both'){
|
||||||
|
$('#status').attr('disabled', true);
|
||||||
|
}else{
|
||||||
|
$('#status').attr('disabled', false);
|
||||||
|
}
|
||||||
|
|
||||||
|
$('#status').val(status);
|
||||||
|
active['reload'] ? active['reload'].call(this) : '';
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
//监听select提交
|
//监听select提交
|
||||||
form.on('select(seleform)', function(data) {
|
form.on('select(seleform)', function(data) {
|
||||||
active['reload'] ? active['reload'].call(this) : '';
|
active['reload'] ? active['reload'].call(this) : '';
|
||||||
@ -341,19 +406,33 @@
|
|||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 获取表单所有参数
|
|
||||||
function getformdata() {
|
|
||||||
var form = $('#filterform').serializeArray();
|
|
||||||
var data = new Array();
|
|
||||||
for(let i=0;i<form.length; i++){
|
|
||||||
data[form[i].name] = form[i].value;
|
|
||||||
}
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
//获取n天以前日期
|
||||||
|
function getDaysAgo(n=0) {
|
||||||
|
let myDate = new Date();
|
||||||
|
let lw = new Date(myDate - 1000 * 60 * 60 * 24 * n); //最后一个数字30可改，n天前的意思
|
||||||
|
let lastY = lw.getFullYear();
|
||||||
|
let lastM = lw.getMonth() + 1;
|
||||||
|
let lastD = lw.getDate();
|
||||||
|
lastM = lastM < 10 ? "0" + lastM : lastM;
|
||||||
|
lastD = lastD < 10 ? "0" + lastD : lastD;
|
||||||
|
let startData = lastY+"-"+lastM+"-" +lastD; //n天之前日期
|
||||||
|
|
||||||
|
return startData;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取表单所有参数
|
||||||
|
function getformdata() {
|
||||||
|
var form = $('#filterform').serializeArray();
|
||||||
|
var data = new Array();
|
||||||
|
for(let i=0;i<form.length; i++){
|
||||||
|
data[form[i].name] = form[i].value;
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
{/block}
|
{/block}
|
||||||
|
|||||||
@ -53,11 +53,11 @@
|
|||||||
layer.msg(e.msg);
|
layer.msg(e.msg);
|
||||||
if (e.code == 0) {
|
if (e.code == 0) {
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
// parent.location.reload();
|
parent.location.reload();
|
||||||
}, 1000);
|
}, 1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tool.get('/admin/merchant/intention/status', data.field, callback);
|
tool.post('/admin/merchant/intention/status', data.field, callback);
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user