Skip to content

bds
bds
Commit c05952b2 by 冷斌
Options

update

parent a5eb8753
Showing with 326 additions and 225 deletions
Application/Admin/Controller/AuditController.class.php
......@@ -56,12 +56,19 @@ class AuditController extends AdminController
$data['status']=$status;
$msg=$approve->where('id='.$_GET['id'])->save($data);
if($msg){
$u_id=$approve->where('id='.$_GET['id'])->field('u_id')->find();
$u_id=$approve->where('id='.$_GET['id'])->field('u_id, business_license')->find();
$user=M('user');
if($data['status']==1){
$u_data['is_shop']=1;
if (!empty($u_id['business_license'])) {
$u_data['is_vip']=1;
}
}else{
$u_data['is_shop']=0;
if (!empty($u_id['business_license'])) {
$u_data['is_vip']=0;
} else {
$u_data['is_shop']=0;
}
}
$user->where('id='.$u_id['u_id'])->data($u_data)->save();
}
......@@ -73,15 +80,18 @@ class AuditController extends AdminController
if(!isset($_GET['id'])){header('location:'.U('Audit/index'));die;}
$approve=M('approve');
$rows=$approve->where('yi_approve.id='.$_GET['id'])
->field('yi_approve.id,head_img,u_name,tel,reg_time,is_shop,shop_name,s_name,s_tel,s_sex,s_eg,a1.name province_name,a2.name city_name,a3.name county_name,detail,shop_img,yi_approve.status,time')
->field('yi_approve.id,head_img,u_name,tel,reg_time,is_shop,shop_name,s_name,s_tel,s_sex,s_eg,a1.name province_name,a2.name city_name,a3.name county_name,detail,shop_img,yi_approve.status,time,business_license,contract')
->join('yi_area a1 on yi_approve.province=a1.id')
->join('yi_area a2 on yi_approve.city=a2.id')
->join('yi_area a3 on yi_approve.county=a3.id')
->join('yi_user on yi_approve.u_id=yi_user.id')
->find();
$rows['is_vip'] = !empty( $rows['business_license']) ? 1 : 0;
$rows['shop_img']=get_picture_list($rows['shop_img'],'abs');
$rows['business_license'] = get_picture_list($rows['business_license'],'abs');
$rows['contract'] = get_picture_list($rows['contract'],'abs');
$this->meta_title='资料详情';
$this->assign('rows',$rows);
$this->display();
}
}
\ No newline at end of file
}
Application/Admin/Controller/CarouselController.class.php
......@@ -63,6 +63,7 @@ class CarouselController extends AdminController
}else{
$this->error($rows['type'].'修改失败！请稍后在试！');
}
S('CarouselZt_list',null,-1);
}
}
//删除轮播
......@@ -82,4 +83,4 @@ class CarouselController extends AdminController
$ousel->where('id='.$_GET['id'])->data($data)->save();
header('location:'.U('carousel/index'));
}
}
\ No newline at end of file
}
Application/Admin/Controller/GroupOrderController.class.php
......@@ -412,7 +412,7 @@ class GroupOrderController extends AdminController
$user_info=$order->where($where)->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid'];
$title='发货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，易和仓淘已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，宅家有购已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息
$tel=$user_info['u_tel'];
//发送订单短信
......@@ -446,7 +446,7 @@ class GroupOrderController extends AdminController
$user_info=$order->where('id='.$_POST['order_id'])->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid'];
$title='收货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对易和仓淘的支持，谢谢！';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对宅家有购的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息
}
$this->success('状态修改成功！',U('GroupOrder/index2'),2);
......@@ -1359,4 +1359,4 @@ class GroupOrderController extends AdminController
header('Content-Disposition: attachment;filename="'.$name.'.xls"');
header('Cache-Control: max-age=0');
}
}
\ No newline at end of file
}
Application/Admin/Controller/GroupOrderController00.class.php
......@@ -411,7 +411,7 @@ class GroupOrderController extends AdminController
$user_info=$order->where($where)->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid'];
$title='发货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，易和仓淘已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，宅家有购已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息
$tel=$user_info['u_tel'];
//发送订单短信
......@@ -445,7 +445,7 @@ class GroupOrderController extends AdminController
$user_info=$order->where('id='.$_POST['order_id'])->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid'];
$title='收货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对易和仓淘的支持，谢谢！';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对宅家有购的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息
}
$this->success('状态修改成功！',U('GroupOrder/index2'),2);
......@@ -1401,4 +1401,4 @@ class GroupOrderController extends AdminController
header('Content-Disposition: attachment;filename="'.$name.'.xls"');
header('Cache-Control: max-age=0');
}
}
\ No newline at end of file
}
Application/Admin/Controller/InveController.class.php
......@@ -43,7 +43,7 @@ class InveController extends AdminController
->join('yi_goods_group gg on yi_goods.id=gg.goods_id')
->select();
$order_info[$key]['o_status']=$goods_info[0]['status'];
$order_info[$key]['goods']=$goods_info;
$order_info[$key]['goods']=[$goods_info[0]];
$order_info[$key]['s_price']=0;
foreach($goods_info as $v1){
$order_info[$key]['s_price']+=$v1['s_price'];
......@@ -221,7 +221,7 @@ class InveController extends AdminController
$user_info=$order->where($where)->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid'];
$title='发货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，易和仓淘已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，宅家有购已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息
$tel=$user_info['u_tel'];
addSms($tel,$content);
......@@ -245,7 +245,7 @@ class InveController extends AdminController
$user_info=$order->where('id='.$_POST['order_id'])->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid'];
$title='收货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对易和仓淘的支持，谢谢！';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对宅家有购的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息
}
$this->success('状态修改成功！',U('GroupOrder/index2'),2);
......
Application/Admin/View/Audit/getaudit.html
......@@ -16,6 +16,7 @@
<p style="font-size: 18px;font-weight: 600;">会员类型：
<eq name="rows.is_shop" value="0">普通会员</eq>
<eq name="rows.is_shop" value="1">认证会员</eq>
<eq name="rows.is_vip" value="1"><span style="color: red;"> - VIP </span></eq>
</p>
<hr/>
<p>店铺名称：{$rows.shop_name}</p>
......@@ -35,6 +36,16 @@
<img src="{$vo.path}" alt="" width="500" height="220" style="border: 2px grey solid;padding: 2px;margin: 5px;">
</volist>
</p>
<p>营业执照：<br/>
<volist name="rows.business_license" id="vo">
<img src="{$vo.path}" alt="" width="500" height="220" style="border: 2px grey solid;padding: 2px;margin: 5px;">
</volist>
</p>
<p>签订合同首页：<br/>
<volist name="rows.contract" id="vo">
<img src="{$vo.path}" alt="" width="500" height="220" style="border: 2px grey solid;padding: 2px;margin: 5px;">
</volist>
</p>
</div>
<a href="{:U('Audit/changeS?id='.$rows['id'].'&status=1')}" class="btn">通过</a>
<a href="{:U('Audit/changeS?id='.$rows['id'].'&status=2')}" class="btn">不通过</a>
......@@ -51,4 +62,4 @@
<script>
</script>
</block>
\ No newline at end of file
</block>
Application/Admin/View/AuthManager/editgroup.html
......@@ -61,6 +61,13 @@
<!--<empty name="auth_group.detail">-->
<!-- </empty>-->
<div class="form-item">
<label for="auth-description" class="item-label">是否指定vip发货</label>
<div class="controls">
<input type="radio" name="is_vip" <?php if($auth_group['is_vip']=='0'){ echo 'checked';} ?> value=0 /> 否
<input type="radio" name="is_vip" <?php if($auth_group['is_vip']=='1'){ echo 'checked';} ?> value=1 />是
</div>
</div>
<div class="form-item">
<label for="auth-description" class="item-label">描述</label>
<div class="controls">
<label class="textarea input-large"><textarea id="auth-description" type="text" name="description">{$auth_group.description}</textarea></label>
......
Application/Admin/View/OrderS/details.html
......@@ -72,7 +72,7 @@
规格：{$v.stan|default="无"}
</div>
<div>
配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq><br/>
配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq><br/>
支付方式：<eq name="rows.pay_type" value="1">支付宝支付</eq><eq name="rows.pay_type" value="2">货到付款</eq><eq name="rows.pay_type" value="3">微信支付</eq><br/>
所属分仓：{$v.title}
</div>
......@@ -145,7 +145,7 @@
支付方式：<eq name="rows.pay_type" value="1">支付宝</eq><eq name="rows.pay_type" value="2">货到付款</eq>
</span>
<span style="margin-left: 20px;">
配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq>
配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq>
</span><br/>
<span>订单状态：
（<eq name="rows.status1" value="1">待付款</eq>
......@@ -234,4 +234,4 @@
document.getElementById("time").innerHTML = showLocale();
}, 1000);
</script>
</block>
\ No newline at end of file
</block>
Application/Admin/View/Public/base.html
......@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
<title>{$meta_title}|易和仓淘管理平台</title>
<title>{$meta_title}|宅家有购管理平台</title>
<link href="__ROOT__/Public/favicon.ico" type="image/x-icon" rel="shortcut icon">
<link rel="stylesheet" type="text/css" href="__CSS__/base.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/common.css" media="all">
......@@ -22,7 +22,7 @@
<!-- 头部 -->
<div class="header">
<!-- Logo -->
<span class="logo">易和仓淘</span>
<span class="logo">宅家有购</span>
<!-- /Logo -->
<!-- 主导航 -->
......
Application/Admin/View/Public/error.html
......@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>易和仓淘跳转提示</title>
<title>宅家有购跳转提示</title>
<style type="text/css">
*{ padding: 0; margin: 0; }
body{ background: #290C0C; font-family: '微软雅黑'; color: #fff; font-size: 16px; }
......@@ -46,9 +46,9 @@ body{ background: #290C0C; font-family: '微软雅黑'; color: #fff; font-size:
<b id="wait"><?php echo($waitSecond); ?></b> 秒后页面将自动跳转
</p>
<div>
<a id="href" id="btn-now" href="<?php echo($jumpUrl); ?>">立即跳转</a>
<button id="btn-stop" type="button" onclick="stop()">停止跳转</button>
<a id="href" id="btn-now" href="<?php echo(U('Public/logout')); ?>">重新登录</a>
<a id="href" id="btn-now" href="<?php echo($jumpUrl); ?>">立即跳转</a>
<button id="btn-stop" type="button" onclick="stop()">停止跳转</button>
<a id="href" id="btn-now" href="<?php echo(U('Public/logout')); ?>">重新登录</a>
</div>
</div>
<script type="text/javascript">
......
Application/Admin/View/Public/login.html
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>欢迎您登录易和仓淘</title>
<title>欢迎您登录宅家有购</title>
<link href="__ROOT__/Public/favicon.ico" type="image/x-icon" rel="shortcut icon">
<link rel="stylesheet" type="text/css" href="__CSS__/login.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/{$Think.config.COLOR_STYLE}.css" media="all">
......@@ -14,7 +14,7 @@
<div class="login-body">
<div class="login-main pr">
<form action="{:U('login')}" method="post" class="login-form">
<h3 class="welcome"><i class="login-logo"><img src="__ROOT__/Public/favicon.ico" width="35" style="margin-top: 7px;" /></i>易和仓淘管理平台</h3>
<h3 class="welcome"><i class="login-logo"><img src="__ROOT__/Public/favicon.ico" width="35" style="margin-top: 7px;" /></i>宅家有购管理平台</h3>
<div id="itemBox" class="item-box">
<div class="item">
<i class="icon-login-user"></i>
......@@ -43,6 +43,9 @@
</button>
<div class="check-tips"></div>
</div>
<div class="bgBox">
<a class="beian" href="http://www.beian.miit.gov.cn">蜀ICP备20006621号</a>
</div>
</form>
</div>
</div>
......@@ -100,7 +103,7 @@
});
//placeholder兼容性
//如果支持
//如果支持
function isPlaceholer(){
var input = document.createElement('input');
return "placeholder" in input;
......@@ -113,17 +116,17 @@
$("#itemBox input").keydown(function(){
$(this).parents(".item").next(".placeholder_copy").css({
display:'none'
})
})
})
$("#itemBox input").blur(function(){
if($(this).val()==""){
$(this).parents(".item").next(".placeholder_copy").css({
display:'block'
})
})
}
})
}
});
</script>
......
Application/Admin/View/Public/success.html
......@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>易和仓淘跳转提示</title>
<title>宅家有购跳转提示</title>
<style type="text/css">
*{ padding: 0; margin: 0; }
body{ background: #30333F; font-family: '微软雅黑'; color: #fff; font-size: 16px; }
......@@ -46,8 +46,8 @@ body{ background: #30333F; font-family: '微软雅黑'; color: #fff; font-size:
<b id="wait"><?php echo($waitSecond); ?></b> 秒后页面将自动跳转
</p>
<div>
<a id="href" id="btn-now" href="<?php echo($jumpUrl); ?>">立即跳转</a>
<button id="btn-stop" type="button" onclick="stop()">停止跳转</button>
<a id="href" id="btn-now" href="<?php echo($jumpUrl); ?>">立即跳转</a>
<button id="btn-stop" type="button" onclick="stop()">停止跳转</button>
</div>
</div>
<script type="text/javascript">
......
Application/Admin/View/distribution/add.html
......@@ -60,4 +60,4 @@
<script>
highlight_subnav("{:U('distribution/add')}");
</script>
</block>
\ No newline at end of file
</block>
Application/Admin/View/groupOrder/day.html
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>订单打印|易和仓淘</title>
<title>订单打印|宅家有购</title>
<link href="__ROOT__/Public/favicon.ico" type="image/x-icon" rel="shortcut icon">
<script language="javascript" src="__STATIC__/jquery-1.4.4.min.js"></script>
<script language="javascript" src="__STATIC__/jquery.jqprint-0.3.js"></script>
......@@ -19,7 +19,7 @@
</head>
<body>
<div class="dingDan" id="dingDan" style="padding: 0;margin: 0;width: 1060px;margin: 0 auto;">
<p style="padding: 0;margin: 0;text-align: center;font-size: 30px;font-weight: 600;height: 45px;"><img src="__ROOT__/Public/logo2.png" alt="" width="40" style="margin-top: -8px;" align="absmiddle"> 易和仓淘配送单</p>
<p style="padding: 0;margin: 0;text-align: center;font-size: 30px;font-weight: 600;height: 45px;"><img src="__ROOT__/Public/logo2.png" alt="" width="40" style="margin-top: -8px;" align="absmiddle"> 宅家有购配送单</p>
<div style="padding: 0;margin: 0;border: 1px solid grey;border-bottom: 0;">
<div class="biaoTi" style="font-size: 22px;padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;">
<p style="padding: 0;margin: 0;width: 588px;height: 30px;line-height: 30px;border-right: 1px solid grey;float: left;border-bottom: 1px solid grey;">订单号：{$rows.order_num}</p>
......@@ -36,7 +36,7 @@
</div>
<div class="biaoTi" style="font-size: 18px;padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;">
<p style="padding: 0;margin: 0;width: 588px;height: 30px;line-height: 30px;border-right: 1px solid grey;float: left;border-bottom: 1px solid grey;">付款方式：<eq name="rows.pay_type" value="1">支付宝支付</eq><eq name="rows.pay_type" value="2">货到付款</eq><eq name="rows.pay_type" value="3">微信支付</eq></p>
<p style="padding: 0;margin: 0;width: 469px;height: 30px;line-height: 30px;float: left;border-bottom: 1px solid grey;">配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq></p>
<p style="padding: 0;margin: 0;width: 469px;height: 30px;line-height: 30px;float: left;border-bottom: 1px solid grey;">配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq></p>
</div>
<div class="biaoTi" style="font-size: 18px;padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;">
<p style="padding: 0;margin: 0;width: 588px;height: 30px;line-height: 30px;border-right: 1px solid grey;float: left;border-bottom: 1px solid grey;">商品总价：￥{$rows.s_price}</p>
......@@ -149,7 +149,7 @@
<p style="padding: 0;margin: 0;width: 25%;float: left;text-indent: 2em;height: 35px;">客户：</p>
</div>
<div style="font-size: 18px;padding: 0;margin: 0;width: 100%;">
<p style="padding: 0;margin: 0;width: 30%;float: left;text-indent: 2em;">易和仓淘：{$rows.group.title}</p>
<p style="padding: 0;margin: 0;width: 30%;float: left;text-indent: 2em;">宅家有购：{$rows.group.title}</p>
<p style="padding: 0;margin: 0;width: 25%;float: left;text-indent: 2em;">联系电话：{$rows.group.group_tel}</p>
<p style="padding: 0;margin: 0;width: 44%;float: left;text-indent: 2em;">地址：{$rows.group.p_name}{$rows.group.c_name}{$rows.group.c2_name}{$rows.group.detail}</p>
</div>
......@@ -187,4 +187,4 @@
}, 1000);
</script>
</body>
</html>
\ No newline at end of file
</html>
Application/Admin/View/groupOrder/day2.html
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>订单打印|易和仓淘</title>
<title>订单打印|宅家有购</title>
<link href="__ROOT__/Public/favicon.ico" type="image/x-icon" rel="shortcut icon">
<script language="javascript" src="__STATIC__/jquery-1.4.4.min.js"></script>
<script language="javascript" src="__STATIC__/jquery.jqprint-0.3.js"></script>
......@@ -19,7 +19,7 @@
</head>
<body>
<div class="dingDan" id="dingDan" style="padding: 0;margin: 0;width: 1020px;margin: 0 auto;">
<p style="padding: 0;margin: 0;text-align: center;font-size: 30px;font-weight: 600;height: 45px;"><img src="__ROOT__/Public/logo2.png" alt="" width="40" style="margin-top: -8px;" align="absmiddle"> 易和仓淘配送单</p>
<p style="padding: 0;margin: 0;text-align: center;font-size: 30px;font-weight: 600;height: 45px;"><img src="__ROOT__/Public/logo2.png" alt="" width="40" style="margin-top: -8px;" align="absmiddle"> 宅家有购配送单</p>
<div style="padding: 0;margin: 0;border: 1px solid grey;border-bottom: 0;">
<div class="biaoTi" style="padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;">
<p style="padding: 0;margin: 0;width: 588px;height: 30px;line-height: 30px;border-right: 1px solid grey;float: left;border-bottom: 1px solid grey;">订单号：{$rows.order_num}</p>
......@@ -35,7 +35,7 @@
</div>
<div class="biaoTi" style="padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;">
<p style="padding: 0;margin: 0;width: 588px;height: 30px;line-height: 30px;border-right: 1px solid grey;float: left;border-bottom: 1px solid grey;">付款方式：<eq name="rows.pay_type" value="1">支付宝支付</eq><eq name="rows.pay_type" value="2">货到付款</eq><eq name="rows.pay_type" value="3">微信支付</eq></p>
<p style="padding: 0;margin: 0;width: 429px;height: 30px;line-height: 30px;float: left;border-bottom: 1px solid grey;">配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq></p>
<p style="padding: 0;margin: 0;width: 429px;height: 30px;line-height: 30px;float: left;border-bottom: 1px solid grey;">配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq></p>
</div>
<div class="biaoTi" style="padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;">
<p style="padding: 0;margin: 0;width: 588px;height: 30px;line-height: 30px;border-right: 1px solid grey;float: left;border-bottom: 1px solid grey;">商品总价：￥{$rows.s_price}</p>
......@@ -100,7 +100,7 @@
<p style="padding: 0;margin: 0;width: 25%;float: left;text-indent: 2em;height: 35px;">客户：</p>
</div>
<div style="padding: 0;margin: 0;width: 100%;">
<p style="padding: 0;margin: 0;width: 30%;float: left;text-indent: 2em;">易和仓淘：{$rows.group.title}</p>
<p style="padding: 0;margin: 0;width: 30%;float: left;text-indent: 2em;">宅家有购：{$rows.group.title}</p>
<p style="padding: 0;margin: 0;width: 25%;float: left;text-indent: 2em;">联系电话：{$rows.group.group_tel}</p>
<p style="padding: 0;margin: 0;width: 44%;float: left;text-indent: 2em;">地址：{$rows.group.p_name}{$rows.group.c_name}{$rows.group.c2_name}{$rows.group.detail}</p>
</div>
......@@ -138,4 +138,4 @@
}, 1000);
</script>
</body>
</html>
\ No newline at end of file
</html>
Application/Admin/View/groupOrder/details.html
......@@ -75,7 +75,7 @@
规格：{$v.stan|default="无"}
</div>
<div>
配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq><br/>
配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq><br/>
支付方式：<eq name="rows.pay_type" value="1">支付宝支付</eq><eq name="rows.pay_type" value="2">货到付款</eq><eq name="rows.pay_type" value="3">微信支付</eq><br/>
</div>
</li>
......@@ -139,7 +139,7 @@
<!-- 订单打印 -->
<div id="tab3" class="tab-pane tab3">
<div class="dingDan" id="dingDan" style="margin: 0 auto;width: 1184px;">
<p style="text-align: center;font-size: 30px;font-weight: 600;height: 45px;"><img src="__ROOT__/Public/logo2.png" alt="" width="40" style="margin-top: -6px;" align="absmiddle"> 易和仓淘配送单</p>
<p style="text-align: center;font-size: 30px;font-weight: 600;height: 45px;"><img src="__ROOT__/Public/logo2.png" alt="" width="40" style="margin-top: -6px;" align="absmiddle"> 宅家有购配送单</p>
<div style="border: 1px solid grey;border-bottom: 0;">
<div class="biaoTi">
<p style="width: 60%;border-right: 1px solid grey;height: 30px;line-height: 30px;">订单号：{$rows.order_num}</p>
......@@ -155,7 +155,7 @@
</div>
<div class="biaoTi">
<p style="width: 60%;border-right: 1px solid grey;line-height: 28px;height: 28px;">付款方式：<eq name="rows.pay_type" value="1">支付宝支付</eq><eq name="rows.pay_type" value="2">货到付款</eq><eq name="rows.pay_type" value="3">微信支付</eq></p>
<p style="width: 39.9%;line-height: 28px;height: 28px;">配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq></p>
<p style="width: 39.9%;line-height: 28px;height: 28px;">配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq></p>
</div>
<div class="biaoTi">
<p style="width: 60%;border-right: 1px solid grey;line-height: 28px;height: 28px;">商品总价：￥{$rows.s_price}</p>
......@@ -221,7 +221,7 @@
<p style="width: 25%;float: left;text-indent: 2em;">客户：</p>
</div>
<div style="width: 100%;">
<p style="width: 30%;float: left;text-indent: 2em;">易和仓淘：{$rows.group.title}</p>
<p style="width: 30%;float: left;text-indent: 2em;">宅家有购：{$rows.group.title}</p>
<p style="width: 20%;float: left;text-indent: 2em;">联系电话：{$rows.group.group_tel}</p>
<p style="width: 50%;float: left;text-indent: 2em;">地址：{$rows.group.p_name}{$rows.group.c_name}{$rows.group.c2_name}{$rows.group.detail}</p>
</div>
......@@ -274,4 +274,4 @@
document.getElementById("time").innerHTML = showLocale();
}, 1000);
</script>
</block>
\ No newline at end of file
</block>
Application/Admin/View/inve/details.html
......@@ -68,7 +68,7 @@
规格：{$v.stan|default="无"}
</div>
<div>
配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq><br/>
配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq><br/>
支付方式：<eq name="rows.pay_type" value="1">支付宝支付</eq><eq name="rows.pay_type" value="2">货到付款</eq><br/>
</div>
</li>
......@@ -92,6 +92,7 @@
<th class="">配送状态</th>
<th class="">配送次数</th>
<th class="">剩余数量</th>
<th class="">剩余赠送数量</th>
<th class="">提交时间</th>
<th>操作</th>
</tr>
......@@ -112,6 +113,7 @@
</td>
<td>第{$vo.dist_ci}次</td>
<td>{$vo.s_sum}</td>
<td>{$vo.s_sum2}</td>
<td>{$vo.dist_time|date='Y-m-d H:i',###}</td>
<td>
<eq name="vo.dist_type" value="1"><a href="{:U('inve/change?id='.$vo['id'].'&dist_type=2')}">点击发货</a></eq>
......@@ -225,7 +227,7 @@
支付方式：<eq name="rows.pay_type" value="1">支付宝</eq><eq name="rows.pay_type" value="2">货到付款</eq>
</span>
<span style="margin-left: 20px;">
配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq>
配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq>
</span><br/>
<span>订单状态：
（<eq name="rows.status1" value="1">待付款</eq>
......@@ -271,9 +273,11 @@
<th style="border: 1px grey dashed;text-align: center;">电话</th>
<th style="border: 1px grey dashed;text-align: center;">地址</th>
<th style="border: 1px grey dashed;text-align: center;">配送数量</th>
<th style="border: 1px grey dashed;text-align: center;">配送赠送数量</th>
<th style="border: 1px grey dashed;text-align: center;">配送状态</th>
<th style="border: 1px grey dashed;text-align: center;">配送次数</th>
<th style="border: 1px grey dashed;text-align: center;">剩余数量</th>
<th style="border: 1px grey dashed;text-align: center;">剩余赠送数量</th>
<th style="border: 1px grey dashed;text-align: center;">提交时间</th>
</tr>
<notempty name="rows.dist">
......@@ -284,13 +288,16 @@
<td style="border: 1px grey dashed;text-align: center;">{$vo.u_tel}</td>
<td style="border: 1px grey dashed;text-align: center;">{$vo.u_add}</td>
<td style="border: 1px grey dashed;text-align: center;">{$vo.dist_sum} </td>
<td style="border: 1px grey dashed;text-align: center;">{$vo.dist_sum2} </td>
<td style="border: 1px grey dashed;text-align: center;">
<eq name="vo.dist_type" value="1">未配送</eq>
<eq name="vo.dist_type" value="2">配送中</eq>
<eq name="vo.dist_type" value="3">已完成</eq>
</td>
<td style="border: 1px grey dashed;text-align: center;">第{$voi}次</td>
<!-- <td style="border: 1px grey dashed;text-align: center;">第{$voi}次</td>-->
<td style="border: 1px grey dashed;text-align: center;">第{$vo.dist_ci}次</td>
<td style="border: 1px grey dashed;text-align: center;">{$vo.s_sum}</td>
<td style="border: 1px grey dashed;text-align: center;">{$vo.s_sum2}</td>
<td style="border: 1px grey dashed;text-align: center;">{$vo.dist_time|date='Y-m-d H:i',###}</td>
</tr>
<volist name="vo.goods" id="v">
......
Application/Admin/View/inve/index.html
......@@ -178,4 +178,4 @@
<script>
highlight_subnav("{:U('Users/index')}");
</script>
</block>
\ No newline at end of file
</block>
Application/Admin/View/invoOrder/details.html
......@@ -72,7 +72,7 @@
规格：{$v.stan|default="无"}
</div>
<div>
配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq><br/>
配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq><br/>
支付方式：<eq name="rows.pay_type" value="1">支付宝支付</eq><eq name="rows.pay_type" value="2">货到付款</eq><br/>
</div>
</li>
......@@ -186,7 +186,7 @@
支付方式：<eq name="rows.pay_type" value="1">支付宝</eq><eq name="rows.pay_type" value="2">货到付款</eq>
</span>
<span style="margin-left: 20px;">
配送方式：<eq name="rows.type" value="1">全配送</eq><eq name="rows.type" value="2">库存购</eq>
配送方式：<eq name="rows.type" value="1">立即购买</eq><eq name="rows.type" value="2">库存购</eq>
</span><br/>
<span>订单状态：
（<eq name="rows.status1" value="1">待付款</eq>
......@@ -271,4 +271,4 @@
document.getElementById("time").innerHTML = showLocale();
}, 1000);
</script>
</block>
\ No newline at end of file
</block>
Application/Common/Common/function.php
......@@ -185,8 +185,8 @@ function Logs($msg = '', $file = 'debug.txt') {
* @author 穆风杰 <374037066@qq.com>
*/
function getFreight($add){
//$lnt_lat=file_get_contents('http://apis.map.qq.com/ws/geocoder/v1/?address='.$add.'&key=26DBZ-JHYRX-WAJ4Q-ZHXIQ-SXZTF-XGF3V');
$lnt_lat=file_get_contents('http://api.map.baidu.com/geocoder/v2/?address='.$add.'&output=json&ak=V9zYV8ha7MUFqVXic6qxWM1vb3tySQa3');
$lnt_lat=file_get_contents('http://apis.map.qq.com/ws/geocoder/v1/?address='.$add.'&key=26DBZ-JHYRX-WAJ4Q-ZHXIQ-SXZTF-XGF3V');
// $lnt_lat=file_get_contents('http://api.map.baidu.com/geocoder/v2/?address='.$add.'&output=json&ak=V9zYV8ha7MUFqVXic6qxWM1vb3tySQa3');
$lnt_lat=json_decode($lnt_lat);
$new_lnt_lat=array(
'lat'=>$lnt_lat->result->location->lat,
......
Application/Common/Conf/config.php
......@@ -11,10 +11,13 @@
* 系统配文件
* 所有系统级别的配置
*/
return array(
/* 模块相关配置 */
'AUTOLOAD_NAMESPACE' => array('Addons' => ONETHINK_ADDON_PATH), //扩展模块列表
'DEFAULT_MODULE' => 'Home',
// 'DEFAULT_MODULE' => 'Home',
//
'DEFAULT_MODULE' => DEFAULT_MODULE,
'MODULE_DENY_LIST' => array('Common', 'User'),
//'MODULE_ALLOW_LIST' => array('Home','Admin'),
......
Application/Home/Controller/ApiUserController.class.php
......@@ -101,13 +101,15 @@ class ApiUserController extends Controller
}
$approve = M('approve');
$rows = $approve->where('u_id=' . $_GET['uid'])
->field('yi_approve.id,u_id,shop_name,s_name,s_tel,s_sex,s_eg,province,city,county,detail,shop_img,status,a1.name province_name,a2.name city_name,a3.name county_name')
->field('yi_approve.id,u_id,shop_name,s_name,s_tel,s_sex,s_eg,province,city,county,detail,shop_img,status,a1.name province_name,a2.name city_name,a3.name county_name, business_license, contract')
->join('yi_area a1 on yi_approve.province=a1.id')
->join('yi_area a2 on yi_approve.city=a2.id')
->join('yi_area a3 on yi_approve.county=a3.id')
->find();
if($rows){
$rows['shop_img'] = get_picture_list($rows['shop_img'],'abs');
$rows['business_license'] = get_picture_list($rows['business_license'],'abs');
$rows['contract'] = get_picture_list($rows['contract'],'abs');
echo json(200, '获取成功！', $rows);
}else {
echo json(400, '数据不存在', 'error');
......@@ -217,4 +219,11 @@ class ApiUserController extends Controller
echo json2(400,'默认地址为空',null);
}
}
}
\ No newline at end of file
public function getXieY()
{
$xie=M('xie');
$info=$xie->find();
echo $info['content'];
}
}
Application/Home/Controller/CenterController.class.php
......@@ -12,12 +12,12 @@ use Think\Controller;
class CenterController extends HomeController{
//个人中心
/*public function index()
{
{
}*/
//我的订单
public function order()
{
{
$uid = $this->login();
//获取订单条数
$ordercou = $this->orderNum($uid);
......@@ -102,7 +102,7 @@ class CenterController extends HomeController{
$order_goods->where('order_id='.$order_info['id'])->data('status=4')->save();
$uid=$order_info['uid'];
$title='收货提醒';
$content='尊敬的'.$order_info['u_name'].'（先生/女士）您好，您订单号为（'.$_GET['order_num'].'）的订单，已经完成交易，感谢您的对易和仓淘的支持，谢谢！';
$content='尊敬的'.$order_info['u_name'].'（先生/女士）您好，您订单号为（'.$_GET['order_num'].'）的订单，已经完成交易，感谢您的对宅家有购的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息
$this->success('收货成功',U('Center/order'));
}else{
......@@ -338,7 +338,7 @@ class CenterController extends HomeController{
}
//获取个状态订单数量
public function orderNum($uid)
{
{
$order=M('order');
//待付款
$where1['uid']=$uid;
......@@ -371,13 +371,13 @@ class CenterController extends HomeController{
}
//我的发票 已申请
public function invo()
{
{
$uid = $this->login();
$order_invo=M('order_invo');
//分页
$count = $order_invo->where('uid='.$uid)->count();
$page = new \Think\Page($count,6);
$page = new \Think\Page($count,6);
$order_list=$order_invo->where('uid='.$uid)
->field('id,order_num,invo_num,invo_id,invo_name,status,pay_price')
......@@ -411,7 +411,7 @@ class CenterController extends HomeController{
}
//未申请发票列表
public function invoNot()
{
{
$uid = $this->login();
$order=M('order');
//条件
......@@ -425,7 +425,7 @@ class CenterController extends HomeController{
$where['invoice_type'] = '1';
//分页
$count = $order->where($where)->count();
$page = new \Think\Page($count,6);
$page = new \Think\Page($count,6);
$info=$order->where($where)
->field('id,order_num,order_type,s_price,dis_price,invoice_type,type,status')
->limit($page->firstRow.','.$page->listRows)
......@@ -449,7 +449,7 @@ class CenterController extends HomeController{
$info[$key]['goods_list']=$list;
}
}
//print_r($info);
//print_r($info);
$this->assign('info',$info);
$this->display();
}
......@@ -644,7 +644,7 @@ class CenterController extends HomeController{
->select();
$count = count($count);
//分页
$page = new \Think\Page($count,10);
$page = new \Think\Page($count,10);
$list=$collect->where($where)
->field('yi_collect.id,yi_collect.goods_id gid,stan,z_img,title,price,suggest_price,goods_model,sales')
->limit($page->firstRow.','.$page->listRows)
......@@ -666,7 +666,7 @@ class CenterController extends HomeController{
$au_id=$auth->field('sum(repertory) repertory')->where('group_city='.$now_city)
->join('yi_goods_group gg on yi_auth_group.id=gg.group_id and gg.goods_id='.$v['gid'])->find();
$list[$key]['repertory']=$au_id['repertory'];
$stanS = explode('/',$v['stan']);
$stanS = explode('/',$v['stan']);
$list[$key]['stan'] = $stanS['0'];
}
$this->assign('info',$list);
......@@ -698,8 +698,8 @@ class CenterController extends HomeController{
}
//我的优惠劵
public function coupon()
{
{
$uid = $this->login();
$user_coupon=M('userCoupon');
if($_GET['type']==1 || empty($_GET['type'])){//获取未使用的优惠券
......@@ -716,7 +716,7 @@ class CenterController extends HomeController{
//分页
$count = $user_coupon->where($where)->join('yi_coupon on yi_user_coupon.cou_id=yi_coupon.id')->select();
$count = count($count);
$page = new \Think\Page($count,6);
$page = new \Think\Page($count,6);
$list=$user_coupon->where($where)
->limit($page->firstRow.','.$page->listRows)
->field('yi_coupon.id,logo,title,a_time,b_time,money,sort')
......@@ -868,19 +868,19 @@ class CenterController extends HomeController{
$this->assign('list1',$list1);
$this->assign('list2',$list2);
$this->assign('info',$user_info);
//echo json('200','success',$user_info);
//echo json('200','success',$user_info);
$this->display();
}
}
//物流信息
public function wlxx()
{
{
$where['order_num']=$_GET['order_num'];
$where['type']=isset($_GET['type'])?$_GET['type']:1;
$logistics=M('logistics');
$info=$logistics->where($where)->order('id desc')->select();
if(!$info){
if(!$info){
}else{
$logistics2=M('logistics2');
foreach($info as $key=>$v){
......@@ -904,7 +904,7 @@ class CenterController extends HomeController{
}
//我的退换货
public function thhh()
{
{
$uid=$this->login();
if(IS_POST){
if(!isset($_POST['order_num'])||empty($_POST['order_num'])){$this->error('订单号=null');}
......@@ -967,7 +967,7 @@ class CenterController extends HomeController{
$this->assign('info',$info);
$this->display();
}
}
//商品需求反馈
public function xqfk()
......@@ -996,7 +996,7 @@ class CenterController extends HomeController{
}
//意见反馈
public function yjfk()
{
{
$uid = $this->login();
if(IS_POST){
$data = I('post.');
......@@ -1023,7 +1023,7 @@ class CenterController extends HomeController{
}
//收货地址管理
public function shdz()
{
{
$uid = $this->login();
$site=M('site');
$list=$site->where('u_id='.$uid)
......@@ -1044,7 +1044,7 @@ class CenterController extends HomeController{
$this->display();
}
//设置默认
public function shdzSmr(){
public function shdzSmr(){
$uid = session('user_id');
$site=M('site');
if(!isset($_GET['id'])){$this->error('缺少参数');}//判断地址id
......@@ -1065,7 +1065,7 @@ class CenterController extends HomeController{
}
}
//
public function shdzDel(){
public function shdzDel(){
$uid = session('user_id');
$site=M('site');
if(!isset($_GET['id'])){$this->error('缺少参数');}//判断地址id
......@@ -1089,7 +1089,7 @@ class CenterController extends HomeController{
}
}
//修改编辑或新增地址
public function shdzEa(){
public function shdzEa(){
$uid = session('user_id');
$site=M('site');
$data = I('');
......@@ -1118,11 +1118,11 @@ class CenterController extends HomeController{
$this->error('修改失败');
}
}
}
//系统消息
public function xtxx()
{
{
$uid = $this->login();
$advices=M('advices');
$where['uid']=array('EQ',$uid);
......@@ -1133,7 +1133,7 @@ class CenterController extends HomeController{
}
//系统消息 详情
public function xtxxInfo()
{
{
$uid = $this->login();
$id = I('id');
$advices=M('advices');
......@@ -1169,13 +1169,13 @@ class CenterController extends HomeController{
$rows['sales']=null;
}
//print_r($list);
$this->assign('info',$rows);
$this->display();
}
//系统消息
public function xtxxD()
{
{
$uid = $this->login();
$id = I('id');
$advices=M('advices');
......@@ -1194,7 +1194,7 @@ class CenterController extends HomeController{
}*/
//认证信息
public function rzxx()
{
{
$uid = $this->login();
$approve = M('approve');
if(IS_POST){
......@@ -1238,7 +1238,7 @@ class CenterController extends HomeController{
$this->error('修改错误','','1');
}
}else{
$rows = $approve->where('u_id=' . $uid)
->field('yi_approve.id,u_id,shop_name,s_name,s_tel,s_sex,s_eg,province,city,county,detail,shop_img,status,a1.name province_name,a2.name city_name,a3.name county_name')
->join('yi_area a1 on yi_approve.province=a1.id')
......@@ -1261,8 +1261,8 @@ class CenterController extends HomeController{
}
}
/**
* 上传头像
* @author H
* 上传头像
* @author H
*/
public function uploadPictureshop(){
//TODO: 用户登录检测
......@@ -1290,4 +1290,4 @@ class CenterController extends HomeController{
/* 返回JSON数据 */
$this->ajaxReturn($return);
}
}
\ No newline at end of file
}
Application/Home/Controller/PublicController.class.php
......@@ -214,29 +214,20 @@ class PublicController extends Controller{
$verify = rand(123456, 999999);//获取随机验证码
//以下信息自己填以下
$mobile=$_GET['tel'];//手机号
$argv = array(
'name'=>'15982155557', //必填参数。用户账号
'pwd'=>'DC4F2D967EF1BC7095303187B521', //必填参数。（web平台：基本资料中的接口密码）
'content'=>'短信验证码为：'.$verify.'，请勿将验证码提供给他人。请在3分钟内进行验证。', //必填参数。发送内容（1-500 个汉字）UTF-8编码
'mobile'=>$mobile, //必填参数。手机号码。多个以英文逗号隔开
'stime'=>'', //可选参数。发送时间，填写时已填写的时间发送，不填时为当前时间发送
'sign'=>'易和仓淘', //必填参数。用户签名。
'type'=>'pt', //必填参数。固定值 pt
'extno'=>'' //可选参数，扩展码，用户定义扩展码，只能为数字
);
include __DIR__ . '/CCPRestSDK.php';
//主帐号
$accountSid= '8a216da8701eb7c101702e0f20b90475';
$accountToken= '5b64528817344a8fa8d7d0b6db7c1818';
$appId='8a216da8701eb7c101702e0f2115047b';
$serverIP='app.cloopen.com';
$serverPort='8883';
$softVersion='2013-12-26';
$rest = new \REST($serverIP,$serverPort,$softVersion);
$rest->setAccount($accountSid,$accountToken);
$rest->setAppId($appId);
$result = $rest->sendTemplateSMS($mobile,[$verify, 5],'577306');
foreach ($argv as $key=>$value) {
if ($flag!=0) {
$params .= "&";
$flag = 1;
}
$params.= $key."="; $params.= urlencode($value);// urlencode($value);
$flag = 1;
}
$url = "http://web.cr6868.com/asmx/smsservice.aspx?".$params; //提交的url地址
$msg=file_get_contents($url);
$con= substr( $msg, 0, 1 ); //获取信息发送后的状态
if($con == '0'){
if($result->statusCode == '000000'){
$sms=M('sms');
$data['code']=$verify;
$data['time']=time();
......@@ -248,14 +239,8 @@ class PublicController extends Controller{
$sms->data($data)->add();
}
echo json(200,'success','短信请求成功！');
}elseif($con=='2'){
echo json(402,'error','账户余额不足');
}elseif($con==1){
echo json(401,'error','平台账户密码有误');
}elseif($con=='3'){
echo json(403,'error','不是有效号码');
}else{
echo json(400,'error','获取失败！请稍后在试');
echo json(400,'error',$result->statusMsg);
}
}
//获取广告详情
......@@ -340,4 +325,4 @@ class PublicController extends Controller{
echo json2(200,'success',$list);
}
}
\ No newline at end of file
}
Application/Home/Controller/WxpayController.class.php
......@@ -16,7 +16,7 @@ class WxpayController extends Controller{
$wx = new WxpayModel();//实例化微信支付控制器
$body ='感谢使用易和仓淘';//支付说明
$body ='感谢使用宅家有购';//支付说明
$out_trade_no = $tsk['order_num'];//订单号
......@@ -67,8 +67,8 @@ class WxpayController extends Controller{
if($find){
$input = new \WxPayUnifiedOrder();
$input->SetBody("感谢使用易和仓淘");
$input->SetAttach("感谢使用易和仓淘");
$input->SetBody("感谢使用宅家有购");
$input->SetAttach("感谢使用宅家有购");
$input->SetOut_trade_no($tsk['order_num']);
$input->SetTotal_fee("1");
$input->SetTime_start(date("YmdHis"));
......@@ -170,4 +170,4 @@ class WxpayController extends Controller{
}
}
}
\ No newline at end of file
}
Application/Home/View/default/Center/xtxx.html
<extend name="Base/center"/>
<block name="body">
<div class="BZ_con">
<include file="Center/leftmenu"/>
<include file="Center/leftmenu"/>
<div class="WDxiaox fr">
<div class="WDxiaox_tit">服务消息</div>
<volist name='info' id='v'>
<div class="WDxiaox_con">
<div class="h5"><a href="{:U('Center/xtxxInfo',array('id'=>$v['id']))}">易和仓淘：{$v.title}</a><eq name="v.status" value="1"><font color="red">未读</font><else/><font color="green">已读</font></eq></div>
<div class="h5"><a href="{:U('Center/xtxxInfo',array('id'=>$v['id']))}">宅家有购：{$v.title}</a><eq name="v.status" value="1"><font color="red">未读</font><else/><font color="green">已读</font></eq></div>
<div class="pic">
<div class="ddh">{$v.time|date="Y-m-d h:i:s",###}</div>
<div class="ddh"><a href="{:U('Center/xtxxInfo',array('id'=>$v['id']))}">去看看</a><eq name="v.status" value="2">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: red;" href="{:U('Center/xtxxD',array('id'=>$v['id']))}">删除</a></eq></div>
......
Application/Home/View/default/Center/xtxxInfo.html
<extend name="Base/center"/>
<block name="body">
<div class="BZ_con">
<include file="Center/leftmenu"/>
<include file="Center/leftmenu"/>
<div class="WDxiaox fr">
<div class="WDxiaox_tit">服务消息</div>
<div class="WDxiaox_con">
<div class="h5">易和仓淘：{$info.title}<eq name="v.status" value="1"><font color="red">未读</font><else/><font color="green">已读--</font><a style="color: red;" href="{:U('Center/xtxxD',array('id'=>$info['id']))}">删除</a></eq></div>
<div class="h5">宅家有购：{$info.title}<eq name="v.status" value="1"><font color="red">未读</font><else/><font color="green">已读--</font><a style="color: red;" href="{:U('Center/xtxxD',array('id'=>$info['id']))}">删除</a></eq></div>
<div class="pic">
<div class="ddh">{$info.content}</div>
<div class="ddh"></div>
......
Application/Home/View/default/Center/yjfk.html
......@@ -2,10 +2,10 @@
<block name="body">
<!--用户中心-->
<div class="BZ_con">
<include file="Center/leftmenu"/>
<include file="Center/leftmenu"/>
<div class="GRXX_r fr">
<form action="{:U('Center/yjfk')}" method="post" id="yjfk">
<div class="yhfk-tit">易和仓淘用户反馈</div>
<div class="yhfk-tit">宅家有购用户反馈</div>
<div class="yhfk-p">亲爱的用户，请将你使用后的意见和建议告诉我们，以便我们更好的改进产品，为您提供更好的服务。谢谢您的支持</div>
<div class="fhfk-yj">
<div class="tit">1、您使用“当前页面”时，遇到任何问题、意见或建议，请告诉我们</div>
......
Application/Home/View/default/Index/index.html
<extend name="Base/common"/>
<block name="nav">
</block>
<block name="body">
<!-- index-banner -->
<div class="IND_banner">
<div class="pubox" style="position: relative;">
<div class="ind_ban swiper-container fl" style="margin-left: 211px;">
<div class="swiper-wrapper">
......@@ -45,7 +45,7 @@
</li>
</volist>
</ul>
<script language="javascript">
<script language="javascript">
var mySwiper = new Swiper('.ind_ban',{
pagination : '.swiper-pagination',
loop : true,
......@@ -62,7 +62,7 @@
<div class="ind_Ut_l fl"><img src="__IMG__/logo_02.png" height="50"></div>
<div class="ind_Ut_r fl">
<div class="t1">未登录！请登录</div>
<div class="t2">欢迎来到易和仓淘</div>
<div class="t2">欢迎来到宅家有购</div>
</div>
</div>
<div class="btn name">
......@@ -74,7 +74,7 @@
<div class="ind_Ut_l fl"><empty name="facePath"><img src="__IMG__/logo_02.png" height="50"><else/><img src="{$facePath}" height="50"></empty></div>
<div class="ind_Ut_r fl">
<div class="t1">嗨！您好<br/>{$Think.session.user_id|get_user}</div>
<div class="t2">欢迎来到易和仓淘</div>
<div class="t2">欢迎来到宅家有购</div>
</div>
</div>
<div class="btn name">
......@@ -85,7 +85,7 @@
<div class="ind_gg">
<div class="tit">公告</div>
<volist name='gonggao' id='v'>
<div class="p"><a href="{:U('Article/gongg',array('id'=>$v['id']))}">{$v.title}</a></div>
<div class="p"><a href="{:U('Article/gongg',array('id'=>$v['id']))}">{$v.title}</a></div>
</volist>
</div>
<ul class="ind_ps">
......@@ -114,7 +114,7 @@
<!--content-->
<div class="content">
<div class="indcon" style="overflow: visible;">
<div class="HM_Gg ">
<volist name='zhuanti' id='v'>
<a href="{:U('Product/lists2',array('special'=>$v['id']))}"><img src="{$v.img}" class="fl" width="390" height="195"></a>
......@@ -147,13 +147,13 @@
</div>
</li>
</volist>
</ul>
</ul>
</div>
<div class="HM_cx_r fr"><img src="__IMG__/ind_jt_05.png" width="35px" height="62px"></div>
<script type="text/javascript">
var size = $('.HM_cxA li').size();
if ( size < 5 ) {
}else{
$('.HM_cx_l').on('click',function(){
var _scroll = $(".HM_cx ul");
......@@ -170,7 +170,7 @@
}
</script>
</div>
<div class="HM_qtdh">
<span class="fl"><a href="#">热销<br>品牌</a></span>
<ul>
......@@ -258,4 +258,4 @@
});
});
</script>
</block>
\ No newline at end of file
</block>
Application/Home/View/default/Product/detail.html
......@@ -25,15 +25,15 @@
<a href="#">休闲食品 </a> >
<a href="#">饼干 </a>
</div> -->
<!--小导航-->
<!--小导航-->
<div class="more_dh">
<!-- <a href="#">所有商品</a>
<notempty name="xiao.zid">
><a href="#">{:get_sort_name($xiao['zid'])}</a>
</notempty>
</notempty>
<notempty name="xiao.pid">
><a href="#">{:get_sort_name($xiao['pid'])}</a>
</notempty>
</notempty>
<notempty name="xiao.id">
><a href="{:U('Product/lists',array('id'=>$xiao['id']))}">{:get_sort_name($xiao['id'])}</a>
</notempty> -->
......@@ -76,7 +76,7 @@
{$info.price}
<else />
{$info.suggest_price}
</eq>
</eq>
</span>{$info.unit}
</span>
<eq name="Think.session.user_is_shop" value="1">
......@@ -118,7 +118,7 @@
<input type="hidden" name="now" value="1" id="now">
<input type="hidden" name="gid" value="{$info.id}" id="gid">
</div>
<div class="ps">温馨提示：本产品由易和仓淘发货<a href="{:U('Article/peisong')}" target="_blank">《配送说明》</a></div>
<div class="ps">温馨提示：本产品由宅家有购发货<a href="{:U('Article/peisong')}" target="_blank">《配送说明》</a></div>
</div>
</div>
</form>
......@@ -159,7 +159,7 @@
var k_quo = "{$info.k_quota}";
var stock = Number($("#stock").text());
var sum = $('#number').val();
var y = sum%k_quo;
var y = sum%k_quo;
$("#purchase-dispatching").val(0);
if(k_quo > sum){
alert('库存购起购为'+k_quo);
......@@ -175,10 +175,10 @@
$('#min').attr('data-quota',k_quo);
$('#add').attr('data-quota',k_quo);
return false;
}
}
});
</script>
<!--列表内容-->
<div class="LB_con" style="margin-top: 40px;">
<div class="LB_con_l fl">
......@@ -199,7 +199,7 @@
<div class="con">
{$info.details}
</div>
</div>
<div class="SP_LBcon" style="display:none;">
<div class="SP_LB_yue">
......@@ -261,8 +261,8 @@
}
});
}else{
location.href = "{:U('User/login')}";
}
location.href = "{:U('User/login')}";
}
}
$(function(){
$("#nature li").on("click",function(){
......@@ -310,4 +310,4 @@
return false
});
</script>
</block>
\ No newline at end of file
</block>
Application/Home/View/default/Public/toolbar.html
......@@ -3,7 +3,7 @@
<div class="pubox">
<div class="phone fl">
<img src="__IMG__/dh_top3.png">
<a href="{:U('Article/xiazai')}" class="color-da">手机逛易和仓淘！</a>
<a href="{:U('Article/xiazai')}" class="color-da">手机逛宅家有购！</a>
</div>
<div class="home fl">
<img src="__IMG__/dh_top1.png">
......@@ -14,7 +14,7 @@
<a href="javascript:;">网站导航</a> -->
</div>
<div class="fr">
<?php if(isLogin()){ ?>
<?php if(isLogin()){ ?>
<div class="user fl">
<span class="span">{$Think.session.user_id|get_user}</span>
<div class="userinfo">
......@@ -40,8 +40,8 @@
</div>
<?php } else { ?>
<div class="fl user_mr">
<a href="{:U('User/login')}">登录</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="{:U('User/register')}">注册</a>
</div>
<a href="{:U('User/login')}">登录</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="{:U('User/register')}">注册</a>
</div>
<?php }?>
<div class="emaill max-left-10 fl">
<img src="__IMG__/dh_top5.png">
......@@ -68,4 +68,4 @@
</div>
</div>
</div>
</div>
\ No newline at end of file
</div>
Application/Home/View/default/User/register.html
......@@ -3,7 +3,7 @@
<!--内容-->
<div class="password_con">
<div class="PSW_tit">
<ul class="PSW_tit_r">
<ul class="PSW_tit_r">
<li class="select"><img src="__IMG__/wangjmiam1.png"><p>注册</p></li>
<li><img src="__IMG__/gwcjdt_05.png"><p>资质认证</p></li>
<li><img src="__IMG__/gwcjdt_05.png"><p>注册成功 </p></li>
......@@ -35,8 +35,8 @@
return false;
} else{
settime(this);
$.post("{:U('User/getSms')}",{tel:mobile},function(rst){
if(rst.status==0){
$.post("{:U('User/getSms')}",{tel:mobile},function(rst){
if(rst.status==0){
$('.getsms').css('background-color','#ccc');
}else{
alert(rst.msg);
......@@ -85,7 +85,7 @@
<div class="danx" style="height:16px; line-height: 16px;">
<input type="checkbox" value='1' name='tongyi' id='tongyi' class="fl">同意
<a href="{:U('Article/xieyi',array('type'=>'3'))}" target="_blank">《易和仓淘服务协议》</a>
<a href="{:U('Article/xieyi',array('type'=>'3'))}" target="_blank">《宅家有购服务协议》</a>
</div>
<a href="javascript:;" class="xiayibu">下一步</a>
</form>
......
Application/User/Conf/config.php
......@@ -15,7 +15,7 @@
define('UC_APP_ID', 1); //应用ID
define('UC_API_TYPE', 'Model'); //可选值 Model / Service
define('UC_AUTH_KEY', 'hS1nQ$:i,|y[}*-+XKDFsP~_Z3TR=;o7Ok{IJU6z'); //加密KEY
//define('UC_DB_DSN', 'mysqli://root:@localhost:3306/bds'); // 数据库连接，使用Model方式调用API必须配置此项
define('UC_DB_DSN', 'mysqli://root:e8T4u3to2GurjjEH@47.108.181.205:3306/bds'); // 数据库连接，使用Model方式调用API必须配置此项
define('UC_DB_DSN', 'mysqli://root:@localhost:3306/bds'); // 数据库连接，使用Model方式调用API必须配置此项
//define('UC_DB_DSN', 'mysqli://root:e8T4u3to2GurjjEH@47.108.181.205:3306/bds'); // 数据库连接，使用Model方式调用API必须配置此项
define('UC_TABLE_PREFIX', 'yi_'); // 数据表前缀，使用Model方式调用API必须配置此项
ThinkPHP/Conf/convention.php
......@@ -21,7 +21,7 @@ return array(
'APP_FILE_CASE' => false, // 是否检查文件的大小写 对Windows平台有效
'APP_SUB_DOMAIN_DEPLOY' => false, // 是否开启子域名部署
'APP_SUB_DOMAIN_RULES' => array(), // 子域名部署规则
'APP_DOMAIN_SUFFIX' => '', // 域名后缀 如果是com.cn net.cn 之类的后缀必须设置
'APP_DOMAIN_SUFFIX' => '', // 域名后缀 如果是com.cn net.cn 之类的后缀必须设置
'ACTION_SUFFIX' => '', // 操作方法后缀
'MULTI_MODULE' => true, // 是否允许多模块 如果为false 则必须设置 DEFAULT_MODULE
'MODULE_DENY_LIST' => array('Common','Runtime'),
......@@ -83,7 +83,7 @@ return array(
'ERROR_MESSAGE' => '页面错误！请稍后再试～',//错误显示信息,非调试模式有效
'ERROR_PAGE' => '', // 错误定向页面
'SHOW_ERROR_MSG' => false, // 显示错误信息
'TRACE_EXCEPTION' => false, // TRACE错误信息是否抛异常 针对trace方法
'TRACE_EXCEPTION' => false, // TRACE错误信息是否抛异常 针对trace方法
'TRACE_MAX_RECORD' => 100, // 每个级别的错误信息 最大记录数
/* 日志设置 */
......@@ -129,14 +129,15 @@ return array(
'TAGLIB_END' => '>', // 标签库标签结束标记
'TAGLIB_LOAD' => true, // 是否使用内置标签库之外的其它标签库，默认自动检测
'TAGLIB_BUILD_IN' => 'cx', // 内置标签库名称(标签使用不必指定标签库名称),以逗号分隔 注意解析顺序
'TAGLIB_PRE_LOAD' => '', // 需要额外加载的标签库(须指定标签库名称)，多个以逗号分隔
'TAGLIB_PRE_LOAD' => '', // 需要额外加载的标签库(须指定标签库名称)，多个以逗号分隔
/* URL设置 */
'URL_CASE_INSENSITIVE' => true, // 默认false 表示URL区分大小写 true则表示不区分大小写
'URL_MODEL' => 1, // URL访问模式,可选参数0、1、2、3,代表以下四种模式：
// 0 (普通模式); 1 (PATHINFO 模式); 2 (REWRITE 模式); 3 (兼容模式) 默认为PATHINFO 模式
'URL_PATHINFO_DEPR' => '/', // PATHINFO模式下，各参数之间的分割符号
'URL_PATHINFO_FETCH' => 'ORIG_PATH_INFO,REDIRECT_PATH_INFO,REDIRECT_URL', // 用于兼容判断PATH_INFO 参数的SERVER替代变量列表
// 'URL_PATHINFO_FETCH' => 'ORIG_PATH_INFO,REDIRECT_PATH_INFO,REDIRECT_URL', // 用于兼容判断PATH_INFO 参数的SERVER替代变量列表
'pathinfo_fetch' => ['ORIG_PATH_INFO', 'REDIRECT_PATH_INFO', 'REDIRECT_URL', 'REQUEST_URI'],
'URL_REQUEST_URI' => 'REQUEST_URI', // 获取当前页面地址的系统变量 默认为REQUEST_URI
'URL_HTML_SUFFIX' => 'html', // URL伪静态后缀设置
'URL_DENY_SUFFIX' => 'ico|png|gif|jpg', // URL禁止访问的后缀设置
......
ThinkPHP/Library/Vendor/Wxpay/WxPayPubHelper/WxPay.pub.config.php
......@@ -13,16 +13,16 @@ class WxPayConf_pub
const KEY = 'caiyin19890000000000000000000000';
//JSAPI接口中获取openid，审核后在公众平台开启开发模式后可查看
const APPSECRET = '';
//=======【JSAPI路径设置】===================================
//获取access_token过程中的跳转uri，通过跳转将code传入jsapi支付页面
const JS_API_CALL_URL = '';
//=======【证书路径设置】=====================================
//证书路径,注意应该填写绝对路径
const SSLCERT_PATH = 'D:/phpStudy/WWW/yhct/apiclient_cert.pem';
const SSLKEY_PATH = 'D:/phpStudy/WWW/yhct/apiclient_key.pem';
const SSLCERT_PATH = __DIR__ . '/cacert/apiclient_cert.pem';
const SSLKEY_PATH = __DIR__ . '/cacert/apiclient_key.pem';
//=======【异步通知url设置】===================================
//异步通知url，商户根据实际开发过程设定
const NOTIFY_URL = 'http://www.yhctvip.com/Home/Wxpay/notifyurl';
......@@ -31,5 +31,5 @@ class WxPayConf_pub
//本例程通过curl使用HTTP POST方法，此处可修改其超时时间，默认为30秒
const CURL_TIMEOUT = 30;
}
?>
\ No newline at end of file
?>
ThinkPHP/Library/Vendor/Wxpay/WxPayPubHelper/WxPayConfig.php
......@@ -10,14 +10,14 @@ class WxPayConfig
/**
* TODO: 修改这里配置为您自己申请的商户信息
* 微信公众号信息配置
*
*
* APPID：绑定支付的APPID（必须配置，开户邮件中可查看）
*
*
* MCHID：商户号（必须配置，开户邮件中可查看）
*
*
* KEY：商户支付密钥，参考开户邮件设置（必须配置，登录商户平台自行设置）
* 设置地址：https://pay.weixin.qq.com/index.php/account/api_cert
*
*
* APPSECRET：公众帐号secert（仅JSAPI支付的时候需要配置， 登录公众平台，进入开发者中心可设置），
* 获取地址：https://mp.weixin.qq.com/advanced/advanced?action=dev&t=advanced/dev&token=2005451881&lang=zh_CN
* @var string
......@@ -26,7 +26,7 @@ class WxPayConfig
const MCHID = '1536579071';
const KEY = 'caiyin19890000000000000000000000';
const APPSECRET = '';
//=======【证书路径设置】=====================================
/**
* TODO：设置商户证书路径
......@@ -34,8 +34,8 @@ class WxPayConfig
* API证书下载地址：https://pay.weixin.qq.com/index.php/account/api_cert，下载之前需要安装商户操作证书）
* @var path
*/
const SSLCERT_PATH = 'D:/phpStudy/WWW/yhct/apiclient_cert.pem';
const SSLKEY_PATH = 'D:/phpStudy/WWW/yhct/apiclient_key.pem';
const SSLCERT_PATH = __DIR__ . '/cacert/apiclient_cert.pem';
const SSLKEY_PATH = __DIR__ . '/cacert/apiclient_key.pem';
//=======【curl代理设置】===================================
/**
......@@ -46,7 +46,7 @@ class WxPayConfig
*/
const CURL_PROXY_HOST = "0.0.0.0";//"10.152.18.220";
const CURL_PROXY_PORT = 0;//8080;
//=======【上报信息配置】===================================
/**
* TODO：接口调用上报等级，默认紧错误上报（注意：上报超时间为【1s】，上报无论成败【永不抛出异常】，
......
a.jpg 0 → 100755
This diff is collapsed. Click to expand it.
admin.php 0 → 100755
<?php
// +----------------------------------------------------------------------
// | OneThink [ WE CAN DO IT JUST THINK IT ]
// +----------------------------------------------------------------------
// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
// +----------------------------------------------------------------------
// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
// +----------------------------------------------------------------------
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
die('require PHP > 5.3.0 !');
}
/**
* 系统调试设置
* 项目正式部署后请设置为false
*/
define('APP_DEBUG', true);
/**
* 应用目录设置
* 安全期间，建议安装调试完成后移动到非WEB目录
*/
define('APP_PATH', './Application/');
if (!is_file(APP_PATH . 'User/Conf/config.php')) {
header('Location: ./install.php');
exit;
}
/**
* 缓存目录设置
* 此目录必须可写，建议移动到非WEB目录
*/
define('RUNTIME_PATH', './Runtime/');
define('DEFAULT_MODULE', 'Admin');
/**
* 引入核心入口
* ThinkPHP亦可移动到WEB以外的目录
*/
require './ThinkPHP/ThinkPHP.php';
aliapay/notify_url.php
......@@ -56,12 +56,12 @@ $trade_no = $_POST['trade_no'];
$trade_status = $_POST['trade_status'];
error_log($s,3,'111.log');
$time = time();
$link = mysql_connect($config['DB_HOST'], $config['DB_USER'], $config['DB_PWD']);
$link = mysqli_connect($config['DB_HOST'], $config['DB_USER'], $config['DB_PWD']);
if (!$link) {
error_log('数据库连接失败', 3, 'db_content.log');
}
mysql_select_db($config['DB_NAME']);
mysql_query("SET BAMES UTF8");
mysqli_select_db($config['DB_NAME']);
mysqli_query("SET BAMES UTF8");
$table1 = $config['DB_PREFIX'] . 'order';//订单
$table2 = $config['DB_PREFIX'] . 'order_goods';//订单商品
$table3 = $config['DB_PREFIX'] . 'order_invo';//发票
......@@ -75,25 +75,25 @@ error_log($config,3,'cons.log');
$msg=strpos($out_trade_no,'i');
if($msg){//存在i 则判断为发票订单
$sql="UPDATE {$table3} SET status=2 where invo_num='{$out_trade_no}'";
mysql_query($sql);
mysqli_query($sql);
$sql11='select id from '.$table3.' where invo_num="'.$out_trade_no.'"';
$rows=mysql_query($sql11);
$id=mysql_fetch_array($rows,MYSQL_ASSOC );
$rows=mysqli_query($sql11);
$id=mysqli_fetch_array($rows,MYSQLI_ASSOC );
$sq2 = "UPDATE {$table4} SET status=2 where invo_id=".$id['id'];
mysql_query($sq2);
mysqli_query($sq2);
}else{//商品订单
$infoSql = 'select order_type from '.$table1.' where order_num="'.$out_trade_no.'"';
$infoRows=mysql_query($infoSql);
$info=mysql_fetch_array($infoRows,MYSQL_ASSOC );
$infoRows=mysqli_query($infoSql);
$info=mysqli_fetch_array($infoRows,MYSQLI_ASSOC );
if ($info['order_type'] == 1) {
//设置订单为已经支付
$sql = "UPDATE {$table1} SET order_type=2 where order_num='{$out_trade_no}'";
$sql11='select id from '.$table1.' where order_num="'.$out_trade_no.'"';
mysql_query($sql);
$rows=mysql_query($sql11);
$id=mysql_fetch_array($rows,MYSQL_ASSOC );
mysqli_query($sql);
$rows=mysqli_query($sql11);
$id=mysqli_fetch_array($rows,MYSQLI_ASSOC );
$sq2 = "UPDATE {$table2} SET status=2 where order_id=".$id['id'];
mysql_query($sq2);
mysqli_query($sq2);
//调试用，写文本函数记录程序运行情况是否正常
writeLog("$sql", "TRADE_SUCCESS.log");
......
apiclient_cert.pem 100644 → 100755
File mode changed from 100644 to 100755
apiclient_key.pem 100644 → 100755
File mode changed from 100644 to 100755
index.php
......@@ -31,6 +31,8 @@ if(!is_file(APP_PATH . 'User/Conf/config.php')){
*/
define ( 'RUNTIME_PATH', './Runtime/' );
define('DEFAULT_MODULE','Home');
/**
* 引入核心入口
* ThinkPHP亦可移动到WEB以外的目录
......
index2.html 0 → 100755
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>宅家有购</title>
<style>
body,ol,ul,h1,h2,h3,h4,h5,h6,p,th,td,dl,dd,form,fieldset,legend,input,textarea,select{margin:0;padding:0}
body{font:12px"宋体","Arial Narrow",HELVETICA;background:#fff;-webkit-text-size-adjust:100%;}
a{color:#2d374b;text-decoration:none}
a:hover{color:#cd0200;text-decoration:underline}
em{font-style:normal}
li{list-style:none}
img{border:0;vertical-align:middle}
table{border-collapse:collapse;border-spacing:0}
p{word-wrap:break-word}
img{
width: 100%;
}
.bgBox{
position: relative;width: 100%;
}
.beian{
position: absolute;left: 50%;
bottom: 20px;
-webkit-transform: translateX(-50%);
-moz-transform: translateX(-50%);
transform: translateX(-50%);
color: #656565;
}
</style>
</head>
<body>
<div class="bgBox">
<img src="/a.jpg">
<a class="beian" href="http://www.beian.miit.gov.cn">蜀ICP备20006621号</a>
</div>
</body>
</html>
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