Skip to content

X
xxmp
Commit fb6b6846 authored by chenzq's avatar chenzq
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	addons/longbing_company/inc/wxapp/addmember.inc.php
parents d79b9573 bc199c9f
Hide whitespace changes
Inline Side-by-side
Showing with 513 additions and 123 deletions
addons/longbing_company/inc/web/manage/make.inc.php 0 → 100644
View file @ fb6b6846
<?php
//dezend by http://www.yunlu99.com/
global $_GPC;
global $_W;
define('ROOT_PATH', IA_ROOT . '/addons/longbing_company/');
is_file(ROOT_PATH . '/inc/we7.php') || exit('Access Denied Longbing');
require_once ROOT_PATH . '/inc/we7.php';
$uniacid = $_W['uniacid'];
$module_name = $_W['current_module']['name'];
/*if ($_GPC['action'] == 'disable') {
$item = pdo_get('longbing_company_user_member', array('id' => $_GPC['id']));
if (!$item || empty($item)) {
message('未找到该数据', '', 'error');
}
if ($item['status'] == 1) {
message('该数据已审核', '', 'error');
}
$status=1;
$where=array('update_time'=>time());
if(isset($_GPC['type'])&&$_GPC['type']){
$status=0;
$where['reason']=$_GPC['reason'];
}else{
$where['status_time']=time();
}
$where['status']=$status;
$result = pdo_update('longbing_company_user_member',$where, array('id' => $_GPC['id']));
if ($result) {
if($status==1){
pdo_update('longbing_company_user', array('level_id' => $item['level']), array('id' => $item['user_id']));
}
message('审核成功', $this->createWebUrl('manage/member'), 'success');
}
message('审核失败', '', 'error');
}*/
$limit = array(1, 10);
$where = array('uniacid'=>$uniacid);
$curr = 1;
if (isset($_GPC['page'])) {
$limit[0] = $_GPC['page'];
$curr = $_GPC['page'];
}
$perPage = 10;
$page=($curr-1)*$limit[1];
$sql="SELECT m.id,m.name,m.number,m.phone,from_unixtime(m.start_time,'%Y-%m-%d %H:%i:%s') as start_time,from_unixtime(m.cre_time,'%Y-%m-%d %H:%i:%s') as cre_time,
from_unixtime(m.end_time,'%Y-%m-%d %H:%i:%s') as end_time,r.name as province,r1.name as city,g.`name` as goodName,g.cover,g.price FROM ims_longbing_company_user_make m
LEFT JOIN ims_sys_region r ON m.addr_province=r.id
LEFT JOIN ims_sys_region r1 ON m.addr_city=r1.id
LEFT JOIN ims_longbing_company_goods g ON m.good_id=g.id
WHERE m.isdel=0 and m.uniacid=$uniacid ";
$lists=pdo_fetchall($sql);
$count=count($lists);
$sql.=" ORDER BY m.cre_time LIMIT $page,$perPage";
$list=pdo_fetchall($sql);
load()->func('tpl');
include $this->template('manage/make');
?>
addons/longbing_company/inc/web/manage/member.inc.php
View file @ fb6b6846
......@@ -2,42 +2,52 @@
//dezend by http://www.yunlu99.com/
global $_GPC;
global $_W;
define('ROOT_PATH', IA_ROOT . '/addons/' . $_W['current_module']['name'] . '/');
define('ROOT_PATH', IA_ROOT . '/addons/longbing_company/');
is_file(ROOT_PATH . '/inc/we7.php') || exit('Access Denied Longbing');
require_once ROOT_PATH . '/inc/we7.php';
$uniacid = $_W['uniacid'];
$module_name = $_W['current_module']['name'];
$companyEdit = $this->createWebUrl('manage/member');
$redis_sup_v3 = false;
$redis_server_v3 = false;
include_once $_SERVER['DOCUMENT_ROOT'] . '/addons/longbing_company/images/phpqrcode/func_longbing.php';
if ($_GPC['action'] == 'disable') {
$item = pdo_get('longbing_company_user_member', array('id' => $_GPC['id']));
if (function_exists('longbing_check_redis')) {
$config = $_W['config']['setting']['redis'];
$password = '';
if ($config && isset($config['requirepass']) && $config['requirepass']) {
$password = $config['requirepass'];
if (!$item || empty($item)) {
message('未找到该数据', '', 'error');
}
if ($config && isset($config['server']) && $config['server'] && isset($config['port']) && $config['port']) {
list($redis_sup_v3, $redis_server_v3) = longbing_check_redis($config['server'], $config['port'], $password);
if ($item['status'] == 1) {
message('该数据已审核', '', 'error');
}
$status=1;
$where=array('update_time'=>time());
if(isset($_GPC['type'])&&$_GPC['type']){
$status=2;
$where['reason']=$_GPC['reason'];
}else{
$where['status_time']=time();
}
$where['status']=$status;
$result = pdo_update('longbing_company_user_member',$where, array('id' => $_GPC['id']));
if ($result) {
if($status==1){
pdo_update('longbing_company_user', array('level_id' => $item['level']), array('id' => $item['user_id']));
}
message('审核成功', $this->createWebUrl('manage/member'), 'success');
}
}
$limit = array(1, 15);
message('审核失败', '', 'error');
}
$limit = array(1, 10);
$where = array('uniacid'=>$uniacid);
$curr = 1;
if (isset($_GPC['page'])) {
$limit[0] = $_GPC['page'];
$curr = $_GPC['page'];
}
$company = pdo_getslice('longbing_card_usermember',array('level >'=>'0'),$limit,$count);
//$company = pdo_getslice('longbing_company_member_level', $where, $limit, $count);
$perPage = 15;
$sql="select name,level from ".tablename('longbing_company_member_level')."where isdel=0 order by level ";
$level=pdo_fetchall($sql);
$list = pdo_getslice('longbing_company_user_member', $where, $limit, $count, array(), '', array('update_time desc'));
$perPage = 10;
load()->func('tpl');
include $this->template('manage/member');
?>
addons/longbing_company/inc/web/manage/memberend.inc.php deleted 100644 → 0
View file @ d79b9573
<?php
define('ROOT_PATH', IA_ROOT . '/addons/longbing_company/');
is_file(ROOT_PATH . '/inc/we7.php') || exit('Access Denied Longbing');
require_once ROOT_PATH . '/inc/we7.php';
global $_GPC;
global $_W;
$id = $_GPC['id'];
if ( !$id) {
result(-1, '', array());
}
$dd = array(
'is_level' => 1
);
$result = pdo_update('longbing_card_usermember', $dd, array('id' => $id));
if($result){
result(0, '', array());
}
result(-1, '', array());
?>
\ No newline at end of file
addons/longbing_company/inc/wxapp/addmember.inc.php deleted 100644 → 0
View file @ d79b9573
<?php
define('ROOT_PATH', IA_ROOT . '/addons/longbing_company/');
is_file(ROOT_PATH . '/inc/we7.php') || exit('Access Denied Longbing');
require_once ROOT_PATH . '/inc/we7.php';
global $_GPC;
global $_W;
$user_id = $_GPC['user_id'];
$name = $_GPC['name'];
$phone = $_GPC['phone'];
$channel = $_GPC['channel'];
$level =$_GPC['level'];
$level_name=$_GPC['level_name'];
//3是线下成为会员 2是房车app
$d = pdo_get('longbing_company_user',array('id'=>$user_id));
if($channel==3){
$b= array(
'id'=>$user_id,
'name'=>$name,
'nickname'=>$d['nickName'],
'phone'=> $phone,
'level'=>$level,
'level_name'=>$level_name,
'is_level'=>0,
'channel'=>'线下'
);
// pdo_insert('longbing_card_usermember',$b);
}elseif($channel==2){
$b= array(
'id'=>$user_id,
'name'=>$name,
'nickname'=>$d['nickName'],
'phone'=> $phone,
'level'=>$level,
'level_name'=>$level_name,
'is_level'=>0,
'channel'=>'房车app'
);
}
pdo_insert('longbing_card_usermember',$b);
return $this->result(0, '请求成功', array());
?>
addons/longbing_company/inc/wxapp/make.inc.php 0 → 100644
View file @ fb6b6846
<?php
define('ROOT_PATH', IA_ROOT . '/addons/longbing_company/');
is_file(ROOT_PATH . '/inc/we7.php') || exit('Access Denied Longbing');
require_once ROOT_PATH . '/inc/we7.php';
global $_GPC;
global $_W;
function isphone($phone){
if(preg_match("/^[1](([3][0-9])|([4][5,7,9])|([5][0-9])|([6][6])|([7][1,2,3,5,6,7,8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/",$phone)){
return true;
}
return false;
}
$uniacid = $_W['uniacid'];
$user_id = $_GPC['user_id'];
if ($_GPC['action'] == 'apply') {
$phone=$_GPC['phone'];
$name=$_GPC['name'];
$addr_province=$_GPC['addr_province'];
$addr_city=$_GPC['addr_city'];
$start_time=$_GPC['start_time'];
$end_time=$_GPC['end_time'];
$good_id=$_GPC['good_id'];
$number=1;
if(isset($_GPC['number'])){
$number=$_GPC['number'];
}
if(!$name||!$phone||!$addr_province||!$addr_city||!$start_time||!$end_time){
return $this->result(-1, '提交信息不全!', array());
}
$end_time = strtotime($end_time);
$start_time = strtotime($start_time);
if(!isphone($phone)){
return $this->result(-1, '手机号码格式不对!', array());
}
$data=array('uniacid'=>$uniacid,'user_id'=>$user_id,'good_id'=>$good_id,'number'=>$number,'phone'=>$phone,'name'=>$name,'addr_province'=>$addr_province,'addr_city'=>$addr_city,'start_time'=>$start_time,'end_time'=>$end_time,'cre_time'=>time());
pdo_insert('longbing_company_user_make',$data);
return $this->result(0, '', array());
}
$curr = 1;
$size=10;
$page=0;
if (isset($_GPC['page'])) {
$curr = $_GPC['page'];
$page=($curr-1)*10;
}
$sql="SELECT m.user_id as to_uid,m.id,m.name,m.number,m.phone,FROM_UNIXTIME(m.start_time,'%Y-%m-%d') as start_time,FROM_UNIXTIME(m.cre_time,'%Y-%m-%d %H:%i:%s') as cre_time,
FROM_UNIXTIME(m.end_time,'%Y-%m-%d') as end_time,r.name as province,r1.name as city,g.`name` as goodName,g.cover,g.unit,g.price,g.id as good_id FROM ims_longbing_company_user_make m
LEFT JOIN ims_sys_region r ON m.addr_province=r.id
LEFT JOIN ims_sys_region r1 ON m.addr_city=r1.id
LEFT JOIN ims_longbing_company_goods g ON m.good_id=g.id
WHERE m.isdel=0 and m.user_id=$user_id and m.uniacid=$uniacid ";
$lists=pdo_fetchall($sql);
$count=count($lists);
$sql.=" ORDER BY m.cre_time LIMIT $page,$size";
$list=pdo_fetchall($sql);
$data = array('page' => $curr, 'total_page' => ceil($count / 10), 'list' => $list,'url'=>$_W['siteroot'] . $_W['config']['upload']['attachdir'] . '/');
return $this->result(0, '', $data);
?>
addons/longbing_company/inc/wxapp/member.inc.php 0 → 100644
View file @ fb6b6846
<?php
define('ROOT_PATH', IA_ROOT . '/addons/longbing_company/');
is_file(ROOT_PATH . '/inc/we7.php') || exit('Access Denied Longbing');
require_once ROOT_PATH . '/inc/we7.php';
global $_GPC;
global $_W;
$uniacid = $_W['uniacid'];
$user_id = $_GPC['user_id'];
$member=pdo_get('longbing_company_user_member',array('user_id'=>$user_id,'uniacid'=>$uniacid));
function isphone($phone){
if(preg_match("/^[1](([3][0-9])|([4][5,7,9])|([5][0-9])|([6][6])|([7][1,2,3,5,6,7,8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/",$phone)){
return true;
}
return false;
}
if ($_GPC['action'] == 'apply') {
$phone=$_GPC['phone'];
$name=$_GPC['name'];
$level=$_GPC['level'];
if(!$name||!$phone||$level==0){
return $this->result(-1, '提交信息不全!', array());
}
if(!isphone($phone)){
return $this->result(-1, '手机号码格式不对!', array());
}
$user=pdo_get('longbing_company_user',array('id'=>$user_id,'uniacid'=>$uniacid));
if(!$user||$user['level_id']>0){
return $this->result(-1, '已经是会员无法再申请!', array());
}
if($member){
if($member['status']!=2){
return $this->result(-1, '无法重复申请!', array());
}
$updatedata=array('name'=>$name,'phone'=>$phone,'level'=>$level,'update_time'=>time());
pdo_update('longbing_company_user_member',$updatedata,array('user_id'=>$user_id));
}else{
$insertdata=array('user_id'=>$user_id,'name'=>$name,'phone'=>$phone,'level'=>$level,'cre_time'=>time(),'update_time'=>time(),'uniacid'=>$uniacid);
pdo_insert('longbing_company_user_member',$insertdata);
}
return $this->result(0, '', array());
}
$sql="select name,level from ".tablename('longbing_company_member_level')."where isdel=0 order by level ";
$level=pdo_fetchall($sql);
return $this->result(0, '请求成功', array('member'=>$member,'level'=>$level));
?>
addons/longbing_company/module.php
View file @ fb6b6846
......@@ -86,6 +86,7 @@ class longbing_companyModule extends WeModule
$profitList = $this->createWebUrl('manage/profit');
$waterList = $this->createWebUrl('manage/water');
$cashList = $this->createWebUrl('manage/cash');
$makeList = $this->createWebUrl('manage/make');
$plugFormList = $this->createWebUrl('manage/plugform');
$plugList = $this->createWebUrl('manage/pluglist');
$industry = $this->createWebUrl('manage/industry');// 行业管理
......
addons/longbing_company/template/manage/index.html
View file @ fb6b6846
......@@ -209,6 +209,9 @@
<dd data-name="cashList">
<a lay-href="{$cashList}" style="color: #898989">提现记录</a>
</dd>
<dd data-name="cashList">
<a lay-href="{$makeList}" style="color: #898989">预约管理</a>
</dd>
</dl>
</li>
<li data-name="goods" class="layui-nav-item">
......
addons/longbing_company/template/manage/make.html 0 → 100644
View file @ fb6b6846
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../addons/{$module_name}/images/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../addons/{$module_name}/images/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" href="../../../addons/{$module_name}/images/css/main.css" media="all">
</head>
<body>
<div class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
<div class="layui-card-header">预约订单</div>
<div class="layui-card-body">
<table class="layui-table">
<thead>
<tr>
<th>预约ID</th>
<th>预约下单时间</th>
<th>姓名</th>
<th>联系电话</th>
<th>取车时间</th>
<th>还车时间</th>
<th>预约取车城市</th>
<th>车辆型号</th>
</tr>
</thead>
<tbody>
{loop $list $item}
<tr>
<td>{$item['id']}</td>
<td>{$item['cre_time']}</td>
<td>{$item['name']}</td>
<td>{$item['phone']}</td>
<td>{$item['start_time']}</td>
<td>{$item['end_time']}</td>
<td>{$item['province']} {$item['city']}</td>
<td>{$item['goodName']}</td>
</tr>
{/loop}
</tbody>
</table>
<div id="dataTable"></div>
</div>
</div>
</div>
</div>
</div>
<script src="../../../addons/{$module_name}/images/layuiadmin/layui/layui.js"></script>
<script src="../../../addons/{$module_name}/images/js/jquery.min.js"></script>
<script>
var keyword = $('#inputSearch').val();
layui.use(['layer', 'laypage'], function () {
var layer = layui.layer
, laypage = layui.laypage;
//执行一个laypage实例
laypage.render({
elem: 'dataTable' //注意，这里的 test1 是 ID，不用加 # 号
, count: {$count} //数据总数，从服务端得到
, curr: {$curr}
, limit: {$perPage} //每页显示的条数
,layout: ['count', 'prev', 'page', 'next', 'refresh', 'skip']
, jump: function (obj, first) {
//obj包含了当前分页的所有参数，比如：
console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
//首次不执行
if (!first) {
//do something
layer.load();
window.location.href = "{php echo $this->createWebUrl('manage/company')}" + "&page=" + obj.curr + "&keyword=" + keyword;
// window.location.href = "{php echo $this->createWebUrl('cards')}" + "&page=" + obj.curr;
}
}
});
});
// 删除
$('.btn-delete-item').click(function () {
var id = $(this).attr('itemId');
if (!id) {
layer.msg('获取参数失败!');
return false;
}
layer.open({
content: '是否删除?',
yes: function (index, layero) {
layer.close(index); //如果设定了yes回调，需进行手工关闭
layer.load();
var url = "{php echo $this->createWebUrl('manage/company')}";
var data = {
action: 'delete',
id: id
};
postData(url, data);
}
});
});
// 编辑
$('.btn-edit-item').click(function () {
var id = $(this).attr('itemId');
if (!id) {
layer.msg('获取参数失败!');
return false;
}
layer.load();
var url = "{php echo $this->createWebUrl('manage/memberLevelEdit')}" + "&id=" +id;
window.location.href = url;
});
// 提交
var uploading;
function btnUpload (obj)
{
if(uploading){
alert("文件正在上传中，请稍候");
return false;
}
layer.load();
file = obj.files[0]
var form = new FormData(); // FormData 对象
form.append("file", file);
form.append("action", "import");
var url = "{php echo $this->createWebUrl('manage/excel')}";
$.ajax({
url: url,
type: 'POST',
cache: false,
data: form,
processData: false,
contentType: false,
dataType:"json",
beforeSend: function(){
uploading = true;
},
success : function(data) {
alert(data.message);
//layer.msg(data.message);
uploading = false;
layer.closeAll();
}
});
return false;
};
//审核
function ajaxFun(e,fun){
var json_mun=false;
$.ajax({
type : "post",
url : e.url,
data : e.json,
async:false,
dataType : "json",
success : function(resp){
json_mun=resp;
if(fun){
fun(json_mun);
return false;
}
},error:function(){
if(fun){
fun(json_mun)
return false;
}
}
});
}
$('.btn-send-item').click(function () {
var id = $(this).attr('itemId');
if (!id) {
layer.msg('获取信息失败!');
return false;
}
$("input[name='itemId']").val(id);
layer.confirm('是否审核通过？', {
btn: ['通过','不通过'] //按钮
}, function(){
ajaxFun({
url:"{php echo $this->createWebUrl('manage/member')}",
json:{id:id,action:"disable"}
},function(e){
//console.log(e);
if(e){
//console.log(e);
if(e.type=="success"){
layer.msg("审核成功！",function(){
location.reload();
});
}else{
layer.msg("审核失败！");
}
//e是后台返回的数据；这里是成功的意思
}else{
layer.msg("网络失败，请稍后再试!");
}
})
}, function(){
layer.prompt({title: '不通过原因', formType: 2}, function(text, index){
layer.close(index);
if(!text){
layer.msg("请输入不通过原因！");
return;
}
//取消调这里
ajaxFun({
url:"{php echo $this->createWebUrl('manage/member')}",
json:{id:id,action:"disable",type:1,reason:text}
},function(e){
//console.log(e);
if(e){
//console.log(e);
if(e.type=="success"){
layer.msg("审核成功！",function(){
location.reload();
});
}else{
layer.msg("审核失败！");
}
//e是后台返回的数据；这里是成功的意思
}else{
layer.msg("网络失败，请稍后再试!");
}
})
});
});
});
</script>
<script src="../../../addons/{$module_name}/images/js/main.js"></script>
</body>
</html>
addons/longbing_company/template/manage/member.html
View file @ fb6b6846
......@@ -26,25 +26,37 @@
<thead>
<tr>
<th>会员ID</th>
<th>来源渠道</th>
<th>会员姓名</th>
<th>微信名称</th>
<th>手机</th>
<th>联系电话</th>
<th>会员等级</th>
<th>审批</th>
<th>状态</th>
<th>申请时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
{loop $company $item}
{loop $list $item}
<tr>
<td>{$item['id']}</td>
<td>{$item['channel']}</td>
<td>{$item['name']}</td>
<td>{$item['nickName']}</td>
<td>{$item['phone']}</td>
<td>{$item['level_name']}</td>
{loop $level $v}
{if $v['level'] == $item['level']}
<td>{$v['name']}</td>
{/if}
{/loop}
<td>
{if $item['status'] ==0}
未审核
{elseif $item['status'] == 1}
审核通过
{else}
审核不通过
{/if}
</td>
<td>{php echo date('Y-m-d H:i:s', $item['update_time'])}</td>
<td>
{if $item['is_level']==0}
{if $item['status']!=1}
<button type="button" class="layui-btn layui-btn-xs btn-send-item"
itemId="{$item['id']}">
审核
......@@ -194,16 +206,16 @@
}
$("input[name='itemId']").val(id);
layer.confirm('是否审核通过？', {
btn: ['通过','取消'] //按钮
btn: ['通过','不通过'] //按钮
}, function(){
ajaxFun({
url:"{php echo $this->createWebUrl('manage/memberend')}",
json:{id:id}
url:"{php echo $this->createWebUrl('manage/member')}",
json:{id:id,action:"disable"}
},function(e){
//console.log(e);
if(e){
//console.log(e);
if(e.errno==0){
if(e.type=="success"){
layer.msg("审核成功！",function(){
location.reload();
});
......@@ -216,7 +228,33 @@
}
})
}, function(){
//取消调这里
layer.prompt({title: '不通过原因', formType: 2}, function(text, index){
layer.close(index);
if(!text){
layer.msg("请输入不通过原因！");
return;
}
//取消调这里
ajaxFun({
url:"{php echo $this->createWebUrl('manage/member')}",
json:{id:id,action:"disable",type:1,reason:text}
},function(e){
//console.log(e);
if(e){
//console.log(e);
if(e.type=="success"){
layer.msg("审核成功！",function(){
location.reload();
});
}else{
layer.msg("审核失败！");
}
//e是后台返回的数据；这里是成功的意思
}else{
layer.msg("网络失败，请稍后再试!");
}
})
});
});
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment