Skip to content

bds
bds
Commit c05952b2 by 冷斌
Options

update

parent a5eb8753
Showing with 279 additions and 122 deletions
Application/Admin/Controller/AuditController.class.php
...@@ -56,13 +56,20 @@ class AuditController extends AdminController ...@@ -56,13 +56,20 @@ class AuditController extends AdminController
$data['status']=$status; $data['status']=$status;
$msg=$approve->where('id='.$_GET['id'])->save($data); $msg=$approve->where('id='.$_GET['id'])->save($data);
if($msg){ 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'); $user=M('user');
if($data['status']==1){ if($data['status']==1){
$u_data['is_shop']=1; $u_data['is_shop']=1;
if (!empty($u_id['business_license'])) {
$u_data['is_vip']=1;
}
}else{ }else{
if (!empty($u_id['business_license'])) {
$u_data['is_vip']=0;
} else {
$u_data['is_shop']=0; $u_data['is_shop']=0;
} }
}
$user->where('id='.$u_id['u_id'])->data($u_data)->save(); $user->where('id='.$u_id['u_id'])->data($u_data)->save();
} }
} }
...@@ -73,13 +80,16 @@ class AuditController extends AdminController ...@@ -73,13 +80,16 @@ class AuditController extends AdminController
if(!isset($_GET['id'])){header('location:'.U('Audit/index'));die;} if(!isset($_GET['id'])){header('location:'.U('Audit/index'));die;}
$approve=M('approve'); $approve=M('approve');
$rows=$approve->where('yi_approve.id='.$_GET['id']) $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 a1 on yi_approve.province=a1.id')
->join('yi_area a2 on yi_approve.city=a2.id') ->join('yi_area a2 on yi_approve.city=a2.id')
->join('yi_area a3 on yi_approve.county=a3.id') ->join('yi_area a3 on yi_approve.county=a3.id')
->join('yi_user on yi_approve.u_id=yi_user.id') ->join('yi_user on yi_approve.u_id=yi_user.id')
->find(); ->find();
$rows['is_vip'] = !empty( $rows['business_license']) ? 1 : 0;
$rows['shop_img']=get_picture_list($rows['shop_img'],'abs'); $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->meta_title='资料详情';
$this->assign('rows',$rows); $this->assign('rows',$rows);
$this->display(); $this->display();
......
Application/Admin/Controller/CarouselController.class.php
...@@ -63,6 +63,7 @@ class CarouselController extends AdminController ...@@ -63,6 +63,7 @@ class CarouselController extends AdminController
}else{ }else{
$this->error($rows['type'].'修改失败！请稍后在试！'); $this->error($rows['type'].'修改失败！请稍后在试！');
} }
S('CarouselZt_list',null,-1);
} }
} }
//删除轮播 //删除轮播
......
Application/Admin/Controller/GroupOrderController.class.php
...@@ -412,7 +412,7 @@ class GroupOrderController extends AdminController ...@@ -412,7 +412,7 @@ class GroupOrderController extends AdminController
$user_info=$order->where($where)->field('uid,u_name,u_tel')->find(); $user_info=$order->where($where)->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid']; $uid=$user_info['uid'];
$title='发货提醒'; $title='发货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，易和仓淘已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！'; $content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，宅家有购已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息 addAdv($uid,$title,$content);//发送平台消息
$tel=$user_info['u_tel']; $tel=$user_info['u_tel'];
//发送订单短信 //发送订单短信
...@@ -446,7 +446,7 @@ class GroupOrderController extends AdminController ...@@ -446,7 +446,7 @@ class GroupOrderController extends AdminController
$user_info=$order->where('id='.$_POST['order_id'])->field('uid,u_name,u_tel')->find(); $user_info=$order->where('id='.$_POST['order_id'])->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid']; $uid=$user_info['uid'];
$title='收货提醒'; $title='收货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对易和仓淘的支持，谢谢！'; $content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对宅家有购的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息 addAdv($uid,$title,$content);//发送平台消息
} }
$this->success('状态修改成功！',U('GroupOrder/index2'),2); $this->success('状态修改成功！',U('GroupOrder/index2'),2);
......
Application/Admin/Controller/GroupOrderController00.class.php
...@@ -411,7 +411,7 @@ class GroupOrderController extends AdminController ...@@ -411,7 +411,7 @@ class GroupOrderController extends AdminController
$user_info=$order->where($where)->field('uid,u_name,u_tel')->find(); $user_info=$order->where($where)->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid']; $uid=$user_info['uid'];
$title='发货提醒'; $title='发货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，易和仓淘已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！'; $content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，宅家有购已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息 addAdv($uid,$title,$content);//发送平台消息
$tel=$user_info['u_tel']; $tel=$user_info['u_tel'];
//发送订单短信 //发送订单短信
...@@ -445,7 +445,7 @@ class GroupOrderController extends AdminController ...@@ -445,7 +445,7 @@ class GroupOrderController extends AdminController
$user_info=$order->where('id='.$_POST['order_id'])->field('uid,u_name,u_tel')->find(); $user_info=$order->where('id='.$_POST['order_id'])->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid']; $uid=$user_info['uid'];
$title='收货提醒'; $title='收货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对易和仓淘的支持，谢谢！'; $content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对宅家有购的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息 addAdv($uid,$title,$content);//发送平台消息
} }
$this->success('状态修改成功！',U('GroupOrder/index2'),2); $this->success('状态修改成功！',U('GroupOrder/index2'),2);
......
Application/Admin/Controller/InveController.class.php
...@@ -43,7 +43,7 @@ class InveController extends AdminController ...@@ -43,7 +43,7 @@ class InveController extends AdminController
->join('yi_goods_group gg on yi_goods.id=gg.goods_id') ->join('yi_goods_group gg on yi_goods.id=gg.goods_id')
->select(); ->select();
$order_info[$key]['o_status']=$goods_info[0]['status']; $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; $order_info[$key]['s_price']=0;
foreach($goods_info as $v1){ foreach($goods_info as $v1){
$order_info[$key]['s_price']+=$v1['s_price']; $order_info[$key]['s_price']+=$v1['s_price'];
...@@ -221,7 +221,7 @@ class InveController extends AdminController ...@@ -221,7 +221,7 @@ class InveController extends AdminController
$user_info=$order->where($where)->field('uid,u_name,u_tel')->find(); $user_info=$order->where($where)->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid']; $uid=$user_info['uid'];
$title='发货提醒'; $title='发货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，易和仓淘已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！'; $content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，宅家有购已经收到订单号为（'.$_POST['order_num'].'）订单信息，平台将尽快安排发货，并按照订单信息进行服务，感谢您的对易和仓淘的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息 addAdv($uid,$title,$content);//发送平台消息
$tel=$user_info['u_tel']; $tel=$user_info['u_tel'];
addSms($tel,$content); addSms($tel,$content);
...@@ -245,7 +245,7 @@ class InveController extends AdminController ...@@ -245,7 +245,7 @@ class InveController extends AdminController
$user_info=$order->where('id='.$_POST['order_id'])->field('uid,u_name,u_tel')->find(); $user_info=$order->where('id='.$_POST['order_id'])->field('uid,u_name,u_tel')->find();
$uid=$user_info['uid']; $uid=$user_info['uid'];
$title='收货提醒'; $title='收货提醒';
$content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对易和仓淘的支持，谢谢！'; $content='尊敬的'.$user_info['u_name'].'（先生/女士）您好，您订单号为（'.$_POST['order_num'].'）的订单，已经完成交易，感谢您的对宅家有购的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息 addAdv($uid,$title,$content);//发送平台消息
} }
$this->success('状态修改成功！',U('GroupOrder/index2'),2); $this->success('状态修改成功！',U('GroupOrder/index2'),2);
......
Application/Admin/View/Audit/getaudit.html
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<p style="font-size: 18px;font-weight: 600;">会员类型： <p style="font-size: 18px;font-weight: 600;">会员类型：
<eq name="rows.is_shop" value="0">普通会员</eq> <eq name="rows.is_shop" value="0">普通会员</eq>
<eq name="rows.is_shop" value="1">认证会员</eq> <eq name="rows.is_shop" value="1">认证会员</eq>
<eq name="rows.is_vip" value="1"><span style="color: red;"> - VIP </span></eq>
</p> </p>
<hr/> <hr/>
<p>店铺名称：{$rows.shop_name}</p> <p>店铺名称：{$rows.shop_name}</p>
...@@ -35,6 +36,16 @@ ...@@ -35,6 +36,16 @@
<img src="{$vo.path}" alt="" width="500" height="220" style="border: 2px grey solid;padding: 2px;margin: 5px;"> <img src="{$vo.path}" alt="" width="500" height="220" style="border: 2px grey solid;padding: 2px;margin: 5px;">
</volist> </volist>
</p> </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> </div>
<a href="{:U('Audit/changeS?id='.$rows['id'].'&status=1')}" class="btn">通过</a> <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> <a href="{:U('Audit/changeS?id='.$rows['id'].'&status=2')}" class="btn">不通过</a>
......
Application/Admin/View/AuthManager/editgroup.html
...@@ -61,6 +61,13 @@ ...@@ -61,6 +61,13 @@
<!--<empty name="auth_group.detail">--> <!--<empty name="auth_group.detail">-->
<!-- </empty>--> <!-- </empty>-->
<div class="form-item"> <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> <label for="auth-description" class="item-label">描述</label>
<div class="controls"> <div class="controls">
<label class="textarea input-large"><textarea id="auth-description" type="text" name="description">{$auth_group.description}</textarea></label> <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 @@ ...@@ -72,7 +72,7 @@
规格：{$v.stan|default="无"} 规格：{$v.stan|default="无"}
</div> </div>
<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/> 支付方式：<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} 所属分仓：{$v.title}
</div> </div>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
支付方式：<eq name="rows.pay_type" value="1">支付宝</eq><eq name="rows.pay_type" value="2">货到付款</eq> 支付方式：<eq name="rows.pay_type" value="1">支付宝</eq><eq name="rows.pay_type" value="2">货到付款</eq>
</span> </span>
<span style="margin-left: 20px;"> <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><br/>
<span>订单状态： <span>订单状态：
（<eq name="rows.status1" value="1">待付款</eq> （<eq name="rows.status1" value="1">待付款</eq>
......
Application/Admin/View/Public/base.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <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 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__/base.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/common.css" media="all"> <link rel="stylesheet" type="text/css" href="__CSS__/common.css" media="all">
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<!-- 头部 --> <!-- 头部 -->
<div class="header"> <div class="header">
<!-- Logo --> <!-- Logo -->
<span class="logo">易和仓淘</span> <span class="logo">宅家有购</span>
<!-- /Logo --> <!-- /Logo -->
<!-- 主导航 --> <!-- 主导航 -->
......
Application/Admin/View/Public/error.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>易和仓淘跳转提示</title> <title>宅家有购跳转提示</title>
<style type="text/css"> <style type="text/css">
*{ padding: 0; margin: 0; } *{ padding: 0; margin: 0; }
body{ background: #290C0C; font-family: '微软雅黑'; color: #fff; font-size: 16px; } body{ background: #290C0C; font-family: '微软雅黑'; color: #fff; font-size: 16px; }
......
Application/Admin/View/Public/login.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>欢迎您登录易和仓淘</title> <title>欢迎您登录宅家有购</title>
<link href="__ROOT__/Public/favicon.ico" type="image/x-icon" rel="shortcut icon"> <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__/login.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/{$Think.config.COLOR_STYLE}.css" media="all"> <link rel="stylesheet" type="text/css" href="__CSS__/{$Think.config.COLOR_STYLE}.css" media="all">
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="login-body"> <div class="login-body">
<div class="login-main pr"> <div class="login-main pr">
<form action="{:U('login')}" method="post" class="login-form"> <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 id="itemBox" class="item-box">
<div class="item"> <div class="item">
<i class="icon-login-user"></i> <i class="icon-login-user"></i>
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
</button> </button>
<div class="check-tips"></div> <div class="check-tips"></div>
</div> </div>
<div class="bgBox">
<a class="beian" href="http://www.beian.miit.gov.cn">蜀ICP备20006621号</a>
</div>
</form> </form>
</div> </div>
</div> </div>
......
Application/Admin/View/Public/success.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>易和仓淘跳转提示</title> <title>宅家有购跳转提示</title>
<style type="text/css"> <style type="text/css">
*{ padding: 0; margin: 0; } *{ padding: 0; margin: 0; }
body{ background: #30333F; font-family: '微软雅黑'; color: #fff; font-size: 16px; } body{ background: #30333F; font-family: '微软雅黑'; color: #fff; font-size: 16px; }
......
Application/Admin/View/groupOrder/day.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>订单打印|易和仓淘</title> <title>订单打印|宅家有购</title>
<link href="__ROOT__/Public/favicon.ico" type="image/x-icon" rel="shortcut icon"> <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-1.4.4.min.js"></script>
<script language="javascript" src="__STATIC__/jquery.jqprint-0.3.js"></script> <script language="javascript" src="__STATIC__/jquery.jqprint-0.3.js"></script>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</head> </head>
<body> <body>
<div class="dingDan" id="dingDan" style="padding: 0;margin: 0;width: 1060px;margin: 0 auto;"> <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 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%;"> <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> <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 @@ ...@@ -36,7 +36,7 @@
</div> </div>
<div class="biaoTi" style="font-size: 18px;padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;"> <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: 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>
<div class="biaoTi" style="font-size: 18px;padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;"> <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> <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 @@ ...@@ -149,7 +149,7 @@
<p style="padding: 0;margin: 0;width: 25%;float: left;text-indent: 2em;height: 35px;">客户：</p> <p style="padding: 0;margin: 0;width: 25%;float: left;text-indent: 2em;height: 35px;">客户：</p>
</div> </div>
<div style="font-size: 18px;padding: 0;margin: 0;width: 100%;"> <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: 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> <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> </div>
......
Application/Admin/View/groupOrder/day2.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>订单打印|易和仓淘</title> <title>订单打印|宅家有购</title>
<link href="__ROOT__/Public/favicon.ico" type="image/x-icon" rel="shortcut icon"> <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-1.4.4.min.js"></script>
<script language="javascript" src="__STATIC__/jquery.jqprint-0.3.js"></script> <script language="javascript" src="__STATIC__/jquery.jqprint-0.3.js"></script>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</head> </head>
<body> <body>
<div class="dingDan" id="dingDan" style="padding: 0;margin: 0;width: 1020px;margin: 0 auto;"> <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 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%;"> <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> <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 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div class="biaoTi" style="padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;"> <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: 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>
<div class="biaoTi" style="padding: 0;margin: 0;height: auto;overflow: hidden;width: 100%;"> <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> <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 @@ ...@@ -100,7 +100,7 @@
<p style="padding: 0;margin: 0;width: 25%;float: left;text-indent: 2em;height: 35px;">客户：</p> <p style="padding: 0;margin: 0;width: 25%;float: left;text-indent: 2em;height: 35px;">客户：</p>
</div> </div>
<div style="padding: 0;margin: 0;width: 100%;"> <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: 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> <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> </div>
......
Application/Admin/View/groupOrder/details.html
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
规格：{$v.stan|default="无"} 规格：{$v.stan|default="无"}
</div> </div>
<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/> 支付方式：<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> </div>
</li> </li>
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<!-- 订单打印 --> <!-- 订单打印 -->
<div id="tab3" class="tab-pane tab3"> <div id="tab3" class="tab-pane tab3">
<div class="dingDan" id="dingDan" style="margin: 0 auto;width: 1184px;"> <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 style="border: 1px solid grey;border-bottom: 0;">
<div class="biaoTi"> <div class="biaoTi">
<p style="width: 60%;border-right: 1px solid grey;height: 30px;line-height: 30px;">订单号：{$rows.order_num}</p> <p style="width: 60%;border-right: 1px solid grey;height: 30px;line-height: 30px;">订单号：{$rows.order_num}</p>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
</div> </div>
<div class="biaoTi"> <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: 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>
<div class="biaoTi"> <div class="biaoTi">
<p style="width: 60%;border-right: 1px solid grey;line-height: 28px;height: 28px;">商品总价：￥{$rows.s_price}</p> <p style="width: 60%;border-right: 1px solid grey;line-height: 28px;height: 28px;">商品总价：￥{$rows.s_price}</p>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<p style="width: 25%;float: left;text-indent: 2em;">客户：</p> <p style="width: 25%;float: left;text-indent: 2em;">客户：</p>
</div> </div>
<div style="width: 100%;"> <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: 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> <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> </div>
......
Application/Admin/View/inve/details.html
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
规格：{$v.stan|default="无"} 规格：{$v.stan|default="无"}
</div> </div>
<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/> 支付方式：<eq name="rows.pay_type" value="1">支付宝支付</eq><eq name="rows.pay_type" value="2">货到付款</eq><br/>
</div> </div>
</li> </li>
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
<th class="">配送状态</th> <th class="">配送状态</th>
<th class="">配送次数</th> <th class="">配送次数</th>
<th class="">剩余数量</th> <th class="">剩余数量</th>
<th class="">剩余赠送数量</th>
<th class="">提交时间</th> <th class="">提交时间</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
...@@ -112,6 +113,7 @@ ...@@ -112,6 +113,7 @@
</td> </td>
<td>第{$vo.dist_ci}次</td> <td>第{$vo.dist_ci}次</td>
<td>{$vo.s_sum}</td> <td>{$vo.s_sum}</td>
<td>{$vo.s_sum2}</td>
<td>{$vo.dist_time|date='Y-m-d H:i',###}</td> <td>{$vo.dist_time|date='Y-m-d H:i',###}</td>
<td> <td>
<eq name="vo.dist_type" value="1"><a href="{:U('inve/change?id='.$vo['id'].'&dist_type=2')}">点击发货</a></eq> <eq name="vo.dist_type" value="1"><a href="{:U('inve/change?id='.$vo['id'].'&dist_type=2')}">点击发货</a></eq>
...@@ -225,7 +227,7 @@ ...@@ -225,7 +227,7 @@
支付方式：<eq name="rows.pay_type" value="1">支付宝</eq><eq name="rows.pay_type" value="2">货到付款</eq> 支付方式：<eq name="rows.pay_type" value="1">支付宝</eq><eq name="rows.pay_type" value="2">货到付款</eq>
</span> </span>
<span style="margin-left: 20px;"> <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><br/>
<span>订单状态： <span>订单状态：
（<eq name="rows.status1" value="1">待付款</eq> （<eq name="rows.status1" value="1">待付款</eq>
...@@ -271,9 +273,11 @@ ...@@ -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>
<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> </tr>
<notempty name="rows.dist"> <notempty name="rows.dist">
...@@ -284,13 +288,16 @@ ...@@ -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_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.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_sum} </td>
<td style="border: 1px grey dashed;text-align: center;">{$vo.dist_sum2} </td>
<td style="border: 1px grey dashed;text-align: center;"> <td style="border: 1px grey dashed;text-align: center;">
<eq name="vo.dist_type" value="1">未配送</eq> <eq name="vo.dist_type" value="1">未配送</eq>
<eq name="vo.dist_type" value="2">配送中</eq> <eq name="vo.dist_type" value="2">配送中</eq>
<eq name="vo.dist_type" value="3">已完成</eq> <eq name="vo.dist_type" value="3">已完成</eq>
</td> </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_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> <td style="border: 1px grey dashed;text-align: center;">{$vo.dist_time|date='Y-m-d H:i',###}</td>
</tr> </tr>
<volist name="vo.goods" id="v"> <volist name="vo.goods" id="v">
......
Application/Admin/View/invoOrder/details.html
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
规格：{$v.stan|default="无"} 规格：{$v.stan|default="无"}
</div> </div>
<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/> 支付方式：<eq name="rows.pay_type" value="1">支付宝支付</eq><eq name="rows.pay_type" value="2">货到付款</eq><br/>
</div> </div>
</li> </li>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
支付方式：<eq name="rows.pay_type" value="1">支付宝</eq><eq name="rows.pay_type" value="2">货到付款</eq> 支付方式：<eq name="rows.pay_type" value="1">支付宝</eq><eq name="rows.pay_type" value="2">货到付款</eq>
</span> </span>
<span style="margin-left: 20px;"> <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><br/>
<span>订单状态： <span>订单状态：
（<eq name="rows.status1" value="1">待付款</eq> （<eq name="rows.status1" value="1">待付款</eq>
......
Application/Common/Common/function.php
...@@ -185,8 +185,8 @@ function Logs($msg = '', $file = 'debug.txt') { ...@@ -185,8 +185,8 @@ function Logs($msg = '', $file = 'debug.txt') {
* @author 穆风杰 <374037066@qq.com> * @author 穆风杰 <374037066@qq.com>
*/ */
function getFreight($add){ 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://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://api.map.baidu.com/geocoder/v2/?address='.$add.'&output=json&ak=V9zYV8ha7MUFqVXic6qxWM1vb3tySQa3');
$lnt_lat=json_decode($lnt_lat); $lnt_lat=json_decode($lnt_lat);
$new_lnt_lat=array( $new_lnt_lat=array(
'lat'=>$lnt_lat->result->location->lat, 'lat'=>$lnt_lat->result->location->lat,
......
Application/Common/Conf/config.php
...@@ -11,10 +11,13 @@ ...@@ -11,10 +11,13 @@
* 系统配文件 * 系统配文件
* 所有系统级别的配置 * 所有系统级别的配置
*/ */
return array( return array(
/* 模块相关配置 */ /* 模块相关配置 */
'AUTOLOAD_NAMESPACE' => array('Addons' => ONETHINK_ADDON_PATH), //扩展模块列表 'AUTOLOAD_NAMESPACE' => array('Addons' => ONETHINK_ADDON_PATH), //扩展模块列表
'DEFAULT_MODULE' => 'Home', // 'DEFAULT_MODULE' => 'Home',
//
'DEFAULT_MODULE' => DEFAULT_MODULE,
'MODULE_DENY_LIST' => array('Common', 'User'), 'MODULE_DENY_LIST' => array('Common', 'User'),
//'MODULE_ALLOW_LIST' => array('Home','Admin'), //'MODULE_ALLOW_LIST' => array('Home','Admin'),
......
Application/Home/Controller/ApiOrderController.class.php
...@@ -31,6 +31,17 @@ class ApiOrderController extends Controller ...@@ -31,6 +31,17 @@ class ApiOrderController extends Controller
if(!IS_GET){echo json2(402,'请求方式有误！','error');die;} if(!IS_GET){echo json2(402,'请求方式有误！','error');die;}
if(!isset($_GET['uid'])||empty($_GET['uid'])){echo json2(401,'用户id=null','error');die;} if(!isset($_GET['uid'])||empty($_GET['uid'])){echo json2(401,'用户id=null','error');die;}
$order=M('order'); $order=M('order');
// todo 库存购 到期后无法再次提货， 自动完成
$config = M("Config")->where(['name' => 'STORE_BUY_LIMIT'])->field('value')->order('sort')->find();
$limitTime = !empty($config['value']) ? $config['value'] : '2592000'; // 30天
$limitOrders = $order->where('status=1 and order_type!=6 and type=2 and time <' . (time()-$limitTime))->field('id')->select();
if ($limitOrders) {
foreach ($limitOrders as $limitOrder) {
M('order')->where('id=' . $limitOrder['id'])->data('order_type=6')->save();//交易完成
M('orderGoods')->where('order_id=' . $limitOrder['id'])->data('status=4')->save();
}
}
$where['uid']=$_GET['uid']; $where['uid']=$_GET['uid'];
$where['status']=array('NEQ',2); $where['status']=array('NEQ',2);
if(isset($_GET['type'])&&!empty($_GET['type'])){ if(isset($_GET['type'])&&!empty($_GET['type'])){
...@@ -112,8 +123,9 @@ class ApiOrderController extends Controller ...@@ -112,8 +123,9 @@ class ApiOrderController extends Controller
//->join('yi_dist_order do on yi_order.id=do.order_id') //->join('yi_dist_order do on yi_order.id=do.order_id')
->find(); ->find();
$dist_order=M('distOrder'); $dist_order=M('distOrder');
$dist_info=$dist_order->where('order_id='.$info['id'])->field('s_sum')->order('id desc')->find(); $dist_info=$dist_order->where('order_id='.$info['id'])->field('s_sum, s_sum2')->order('id desc')->find();
$info['s_sum']=$dist_info['s_sum']; $info['s_sum']=!empty($dist_info) ? $dist_info['s_sum'] : $info['g_sum'];
$info['s_sum2']=!empty($dist_info) ? $dist_info['s_sum2'] : $info['cou_sum'];
if($info){ if($info){
echo json2(200,'success',$info); echo json2(200,'success',$info);
}else{ }else{
...@@ -131,22 +143,42 @@ class ApiOrderController extends Controller ...@@ -131,22 +143,42 @@ class ApiOrderController extends Controller
$order_info=$this->getGroupDist($_POST['order_num'],$site_info['county']); $order_info=$this->getGroupDist($_POST['order_num'],$site_info['county']);
if($order_info==201){echo json2(406,'订单号有误！仓库获取失败！','error');die;} if($order_info==201){echo json2(406,'订单号有误！仓库获取失败！','error');die;}
if(!$order_info){echo json2(408,'此地址超出配送范围！','error');die;} if(!$order_info){echo json2(408,'此地址超出配送范围！','error');die;}
if ($_POST['dist_sum'] > $order_info['g_sum']) {
echo json2(410,'配送数量大于剩余数量！','error');die;
}
$dist_info=$this->getOneDistOrder($order_info['id']); $dist_info=$this->getOneDistOrder($order_info['id']);
$dist_order=M('distOrder'); if($dist_info){
if($dist_info['dist_type']!=3){echo json2(409,'还有配送任务未完成！请勿重复提交！','error');die;}
if ($_POST['dist_sum'] > $dist_info['s_sum']) {
echo json2(410,'配送数量大于剩余数量！','error');die;
}
$s_sum = $dist_info['s_sum'];
$s_sum2 = $dist_info['s_sum2'];
$dist_ci = $dist_info['dist_ci'] + 1;
}else{
$s_sum = $order_info['g_sum'];
$s_sum2 = $order_info['cou_sum'];
$dist_ci = 1;
}
$data['s_sum']=$s_sum - $_POST['dist_sum'];
// 按百分比 配送 赠送
if ($data['s_sum'] <= 0 || $s_sum2 <= 0) {
$dist_sum2 = $s_sum2;
} else {
$dist_sum2 = round($_POST['dist_sum']/$order_info['g_sum']*$order_info['cou_sum']);
}
$data['dist_ci'] = $dist_ci;
$data['s_sum2']=$s_sum2 - $dist_sum2;
$data['order_id']=$order_info['id']; $data['order_id']=$order_info['id'];
$data['dist_sum']=$_POST['dist_sum']; $data['dist_sum']=$_POST['dist_sum'];
$data['dist_sum2']=$dist_sum2;
$data['u_name']=$site_info['s_name']; $data['u_name']=$site_info['s_name'];
$data['u_tel']=$site_info['phone']; $data['u_tel']=$site_info['phone'];
$data['u_add']=$site_info['detail']; $data['u_add']=$site_info['detail'];
$data['dist_time']=time(); $data['dist_time']=time();
if($dist_info){ $dist_order=M('distOrder');
if($dist_info['dist_type']!=3){echo json2(409,'还有配送任务未完成！请勿重复提交！','error');die;}
$data['s_sum']=$dist_info['s_sum']-$_POST['dist_sum'];
}else{
$data['s_sum']=$order_info['z_sum'];
}
$msg=$dist_order->data($data)->add(); $msg=$dist_order->data($data)->add();
$dist_order->where('id='.$msg)->setInc('dist_ci'); // $dist_order->where('id='.$msg)->setInc('dist_ci');
if($msg){ if($msg){
echo json2(200,'提交成功！','success'); echo json2(200,'提交成功！','success');
}else{ }else{
...@@ -170,23 +202,27 @@ class ApiOrderController extends Controller ...@@ -170,23 +202,27 @@ class ApiOrderController extends Controller
$order_info['is_return']=true; $order_info['is_return']=true;
} }
if(!$order_info){echo json2(400,'抱歉订单获取失败！请稍后在试！','error');die;} if(!$order_info){echo json2(400,'抱歉订单获取失败！请稍后在试！','error');die;}
$order_info['s_sum']=0;
if($order_info['type']==2){//库存购商品 查询剩余数量
$dist_order=M('dist_order');
$dist_info=$dist_order->where('order_id='.$order_info['id'])->order('id desc')->find();
if(!$dist_info){echo json2(400,'抱歉剩余数量获取失败！请客观稍后在试！','error');die;}
$order_info['s_sum']=$dist_info['s_sum'];
$order_info['u_name']=$dist_info['u_name'];
$order_info['u_tel']=$dist_info['u_tel'];
$order_info['u_add']=$dist_info['u_add'];
$order_info['deliver_time']=$dist_info['dist_time'];
}
$order_goods=M('order_goods'); $order_goods=M('order_goods');
$goods_info=$order_goods->where('order_id='.$order_info['id']) $goods_info=$order_goods->where('order_id='.$order_info['id'])
->field('yi_order_goods.*,title,z_img,goods_model') ->field('yi_order_goods.*,title,z_img,goods_model')
->join('yi_goods on yi_order_goods.goods_id=yi_goods.id') ->join('yi_goods on yi_order_goods.goods_id=yi_goods.id')
->select(); ->select();
$order_info['s_sum']=0;
if($order_info['type']==2){//库存购商品 查询剩余数量
$dist_order=M('dist_order');
$dist_info=$dist_order->where('order_id='.$order_info['id'])->order('id desc')->find();
// if(!$dist_info){echo json2(400,'抱歉剩余数量获取失败！请客观稍后在试！','error');die;}
$order_info['s_sum']=!empty($dist_info['s_sum']) ? $dist_info['s_sum'] :$goods_info[0]['g_sum'];
$order_info['s_sum2']=!empty($dist_info['s_sum2']) ? $dist_info['s_sum2'] :$goods_info[0]['cou_sum'];
$order_info['u_name']=!empty($dist_info['u_name']) ? $dist_info['u_name'] : $order_info['u_name'];
$order_info['u_tel']=!empty($dist_info['u_tel']) ? $dist_info['u_tel'] : $order_info['u_tel'];
$order_info['u_add']=!empty($dist_info['u_add']) ? $dist_info['u_add'] : $order_info['u_add'];
$order_info['deliver_time']=!empty($dist_info['deliver_time']) ? $dist_info['deliver_time'] : $order_info['deliver_time'];
}
foreach($goods_info as $v){//计算出总价 foreach($goods_info as $v){//计算出总价
$order_info['z_sum']+=$v['z_sum']; $order_info['z_sum']+=$v['z_sum'];
} }
...@@ -249,7 +285,7 @@ class ApiOrderController extends Controller ...@@ -249,7 +285,7 @@ class ApiOrderController extends Controller
private function getGroupDist($order_num,$county){ private function getGroupDist($order_num,$county){
$order=M('order'); $order=M('order');
$order_info=$order->where('order_num="'.$order_num.'"') $order_info=$order->where('order_num="'.$order_num.'"')
->field('yi_order.id,goods_id,group_id,z_sum') ->field('yi_order.id,goods_id,group_id,z_sum,g_sum,cou_sum')
->join('yi_order_goods og on yi_order.id=og.order_id') ->join('yi_order_goods og on yi_order.id=og.order_id')
->find(); ->find();
if(!$order_info){return 201;} if(!$order_info){return 201;}
...@@ -379,7 +415,7 @@ class ApiOrderController extends Controller ...@@ -379,7 +415,7 @@ class ApiOrderController extends Controller
$order_goods->where('order_id='.$order_info['id'])->data('status=4')->save(); $order_goods->where('order_id='.$order_info['id'])->data('status=4')->save();
$uid=$order_info['uid']; $uid=$order_info['uid'];
$title='收货提醒'; $title='收货提醒';
$content='尊敬的'.$order_info['u_name'].'（先生/女士）您好，您订单号为（'.$_GET['order_num'].'）的订单，已经完成交易，感谢您的对易和仓淘的支持，谢谢！'; $content='尊敬的'.$order_info['u_name'].'（先生/女士）您好，您订单号为（'.$_GET['order_num'].'）的订单，已经完成交易，感谢您的对宅家有购的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息 addAdv($uid,$title,$content);//发送平台消息
echo json2(200,'success','收货成功'); echo json2(200,'success','收货成功');
}else{ }else{
......
Application/Home/Controller/ApiUserController.class.php
...@@ -101,13 +101,15 @@ class ApiUserController extends Controller ...@@ -101,13 +101,15 @@ class ApiUserController extends Controller
} }
$approve = M('approve'); $approve = M('approve');
$rows = $approve->where('u_id=' . $_GET['uid']) $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 a1 on yi_approve.province=a1.id')
->join('yi_area a2 on yi_approve.city=a2.id') ->join('yi_area a2 on yi_approve.city=a2.id')
->join('yi_area a3 on yi_approve.county=a3.id') ->join('yi_area a3 on yi_approve.county=a3.id')
->find(); ->find();
if($rows){ if($rows){
$rows['shop_img'] = get_picture_list($rows['shop_img'],'abs'); $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); echo json(200, '获取成功！', $rows);
}else { }else {
echo json(400, '数据不存在', 'error'); echo json(400, '数据不存在', 'error');
...@@ -217,4 +219,11 @@ class ApiUserController extends Controller ...@@ -217,4 +219,11 @@ class ApiUserController extends Controller
echo json2(400,'默认地址为空',null); echo json2(400,'默认地址为空',null);
} }
} }
public function getXieY()
{
$xie=M('xie');
$info=$xie->find();
echo $info['content'];
}
} }
Application/Home/Controller/CenterController.class.php
...@@ -102,7 +102,7 @@ class CenterController extends HomeController{ ...@@ -102,7 +102,7 @@ class CenterController extends HomeController{
$order_goods->where('order_id='.$order_info['id'])->data('status=4')->save(); $order_goods->where('order_id='.$order_info['id'])->data('status=4')->save();
$uid=$order_info['uid']; $uid=$order_info['uid'];
$title='收货提醒'; $title='收货提醒';
$content='尊敬的'.$order_info['u_name'].'（先生/女士）您好，您订单号为（'.$_GET['order_num'].'）的订单，已经完成交易，感谢您的对易和仓淘的支持，谢谢！'; $content='尊敬的'.$order_info['u_name'].'（先生/女士）您好，您订单号为（'.$_GET['order_num'].'）的订单，已经完成交易，感谢您的对宅家有购的支持，谢谢！';
addAdv($uid,$title,$content);//发送平台消息 addAdv($uid,$title,$content);//发送平台消息
$this->success('收货成功',U('Center/order')); $this->success('收货成功',U('Center/order'));
}else{ }else{
......
Application/Home/Controller/PublicController.class.php
...@@ -214,29 +214,20 @@ class PublicController extends Controller{ ...@@ -214,29 +214,20 @@ class PublicController extends Controller{
$verify = rand(123456, 999999);//获取随机验证码 $verify = rand(123456, 999999);//获取随机验证码
//以下信息自己填以下 //以下信息自己填以下
$mobile=$_GET['tel'];//手机号 $mobile=$_GET['tel'];//手机号
$argv = array( include __DIR__ . '/CCPRestSDK.php';
'name'=>'15982155557', //必填参数。用户账号 //主帐号
'pwd'=>'DC4F2D967EF1BC7095303187B521', //必填参数。（web平台：基本资料中的接口密码） $accountSid= '8a216da8701eb7c101702e0f20b90475';
'content'=>'短信验证码为：'.$verify.'，请勿将验证码提供给他人。请在3分钟内进行验证。', //必填参数。发送内容（1-500 个汉字）UTF-8编码 $accountToken= '5b64528817344a8fa8d7d0b6db7c1818';
'mobile'=>$mobile, //必填参数。手机号码。多个以英文逗号隔开 $appId='8a216da8701eb7c101702e0f2115047b';
'stime'=>'', //可选参数。发送时间，填写时已填写的时间发送，不填时为当前时间发送 $serverIP='app.cloopen.com';
'sign'=>'易和仓淘', //必填参数。用户签名。 $serverPort='8883';
'type'=>'pt', //必填参数。固定值 pt $softVersion='2013-12-26';
'extno'=>'' //可选参数，扩展码，用户定义扩展码，只能为数字 $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($result->statusCode == '000000'){
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'){
$sms=M('sms'); $sms=M('sms');
$data['code']=$verify; $data['code']=$verify;
$data['time']=time(); $data['time']=time();
...@@ -248,14 +239,8 @@ class PublicController extends Controller{ ...@@ -248,14 +239,8 @@ class PublicController extends Controller{
$sms->data($data)->add(); $sms->data($data)->add();
} }
echo json(200,'success','短信请求成功！'); 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{ }else{
echo json(400,'error','获取失败！请稍后在试'); echo json(400,'error',$result->statusMsg);
} }
} }
//获取广告详情 //获取广告详情
......
Application/Home/Controller/WxpayController.class.php
...@@ -16,7 +16,7 @@ class WxpayController extends Controller{ ...@@ -16,7 +16,7 @@ class WxpayController extends Controller{
$wx = new WxpayModel();//实例化微信支付控制器 $wx = new WxpayModel();//实例化微信支付控制器
$body ='感谢使用易和仓淘';//支付说明 $body ='感谢使用宅家有购';//支付说明
$out_trade_no = $tsk['order_num'];//订单号 $out_trade_no = $tsk['order_num'];//订单号
...@@ -67,8 +67,8 @@ class WxpayController extends Controller{ ...@@ -67,8 +67,8 @@ class WxpayController extends Controller{
if($find){ if($find){
$input = new \WxPayUnifiedOrder(); $input = new \WxPayUnifiedOrder();
$input->SetBody("感谢使用易和仓淘"); $input->SetBody("感谢使用宅家有购");
$input->SetAttach("感谢使用易和仓淘"); $input->SetAttach("感谢使用宅家有购");
$input->SetOut_trade_no($tsk['order_num']); $input->SetOut_trade_no($tsk['order_num']);
$input->SetTotal_fee("1"); $input->SetTotal_fee("1");
$input->SetTime_start(date("YmdHis")); $input->SetTime_start(date("YmdHis"));
......
Application/Home/View/default/Center/xtxx.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="WDxiaox_tit">服务消息</div> <div class="WDxiaox_tit">服务消息</div>
<volist name='info' id='v'> <volist name='info' id='v'>
<div class="WDxiaox_con"> <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="pic">
<div class="ddh">{$v.time|date="Y-m-d h:i:s",###}</div> <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> <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
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="WDxiaox fr"> <div class="WDxiaox fr">
<div class="WDxiaox_tit">服务消息</div> <div class="WDxiaox_tit">服务消息</div>
<div class="WDxiaox_con"> <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="pic">
<div class="ddh">{$info.content}</div> <div class="ddh">{$info.content}</div>
<div class="ddh"></div> <div class="ddh"></div>
......
Application/Home/View/default/Center/yjfk.html
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<include file="Center/leftmenu"/> <include file="Center/leftmenu"/>
<div class="GRXX_r fr"> <div class="GRXX_r fr">
<form action="{:U('Center/yjfk')}" method="post" id="yjfk"> <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="yhfk-p">亲爱的用户，请将你使用后的意见和建议告诉我们，以便我们更好的改进产品，为您提供更好的服务。谢谢您的支持</div>
<div class="fhfk-yj"> <div class="fhfk-yj">
<div class="tit">1、您使用“当前页面”时，遇到任何问题、意见或建议，请告诉我们</div> <div class="tit">1、您使用“当前页面”时，遇到任何问题、意见或建议，请告诉我们</div>
......
Application/Home/View/default/Index/index.html
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="ind_Ut_l fl"><img src="__IMG__/logo_02.png" height="50"></div> <div class="ind_Ut_l fl"><img src="__IMG__/logo_02.png" height="50"></div>
<div class="ind_Ut_r fl"> <div class="ind_Ut_r fl">
<div class="t1">未登录！请登录</div> <div class="t1">未登录！请登录</div>
<div class="t2">欢迎来到易和仓淘</div> <div class="t2">欢迎来到宅家有购</div>
</div> </div>
</div> </div>
<div class="btn name"> <div class="btn name">
...@@ -74,7 +74,7 @@ ...@@ -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_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="ind_Ut_r fl">
<div class="t1">嗨！您好<br/>{$Think.session.user_id|get_user}</div> <div class="t1">嗨！您好<br/>{$Think.session.user_id|get_user}</div>
<div class="t2">欢迎来到易和仓淘</div> <div class="t2">欢迎来到宅家有购</div>
</div> </div>
</div> </div>
<div class="btn name"> <div class="btn name">
......
Application/Home/View/default/Product/detail.html
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<input type="hidden" name="now" value="1" id="now"> <input type="hidden" name="now" value="1" id="now">
<input type="hidden" name="gid" value="{$info.id}" id="gid"> <input type="hidden" name="gid" value="{$info.id}" id="gid">
</div> </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>
</div> </div>
</form> </form>
......
Application/Home/View/default/Public/toolbar.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="pubox"> <div class="pubox">
<div class="phone fl"> <div class="phone fl">
<img src="__IMG__/dh_top3.png"> <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>
<div class="home fl"> <div class="home fl">
<img src="__IMG__/dh_top1.png"> <img src="__IMG__/dh_top1.png">
......
Application/Home/View/default/User/register.html
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<div class="danx" style="height:16px; line-height: 16px;"> <div class="danx" style="height:16px; line-height: 16px;">
<input type="checkbox" value='1' name='tongyi' id='tongyi' class="fl">同意 <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> </div>
<a href="javascript:;" class="xiayibu">下一步</a> <a href="javascript:;" class="xiayibu">下一步</a>
</form> </form>
......
Application/User/Conf/config.php
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
define('UC_APP_ID', 1); //应用ID define('UC_APP_ID', 1); //应用ID
define('UC_API_TYPE', 'Model'); //可选值 Model / Service define('UC_API_TYPE', 'Model'); //可选值 Model / Service
define('UC_AUTH_KEY', 'hS1nQ$:i,|y[}*-+XKDFsP~_Z3TR=;o7Ok{IJU6z'); //加密KEY 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:@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:e8T4u3to2GurjjEH@47.108.181.205:3306/bds'); // 数据库连接，使用Model方式调用API必须配置此项
define('UC_TABLE_PREFIX', 'yi_'); // 数据表前缀，使用Model方式调用API必须配置此项 define('UC_TABLE_PREFIX', 'yi_'); // 数据表前缀，使用Model方式调用API必须配置此项
ThinkPHP/Conf/convention.php
...@@ -136,7 +136,8 @@ return array( ...@@ -136,7 +136,8 @@ return array(
'URL_MODEL' => 1, // URL访问模式,可选参数0、1、2、3,代表以下四种模式： 'URL_MODEL' => 1, // URL访问模式,可选参数0、1、2、3,代表以下四种模式：
// 0 (普通模式); 1 (PATHINFO 模式); 2 (REWRITE 模式); 3 (兼容模式) 默认为PATHINFO 模式 // 0 (普通模式); 1 (PATHINFO 模式); 2 (REWRITE 模式); 3 (兼容模式) 默认为PATHINFO 模式
'URL_PATHINFO_DEPR' => '/', // 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_REQUEST_URI' => 'REQUEST_URI', // 获取当前页面地址的系统变量 默认为REQUEST_URI
'URL_HTML_SUFFIX' => 'html', // URL伪静态后缀设置 'URL_HTML_SUFFIX' => 'html', // URL伪静态后缀设置
'URL_DENY_SUFFIX' => 'ico|png|gif|jpg', // URL禁止访问的后缀设置 'URL_DENY_SUFFIX' => 'ico|png|gif|jpg', // URL禁止访问的后缀设置
......
ThinkPHP/Library/Vendor/Wxpay/WxPayPubHelper/WxPay.pub.config.php
...@@ -20,8 +20,8 @@ class WxPayConf_pub ...@@ -20,8 +20,8 @@ class WxPayConf_pub
//=======【证书路径设置】===================================== //=======【证书路径设置】=====================================
//证书路径,注意应该填写绝对路径 //证书路径,注意应该填写绝对路径
const SSLCERT_PATH = 'D:/phpStudy/WWW/yhct/apiclient_cert.pem'; const SSLCERT_PATH = __DIR__ . '/cacert/apiclient_cert.pem';
const SSLKEY_PATH = 'D:/phpStudy/WWW/yhct/apiclient_key.pem'; const SSLKEY_PATH = __DIR__ . '/cacert/apiclient_key.pem';
//=======【异步通知url设置】=================================== //=======【异步通知url设置】===================================
//异步通知url，商户根据实际开发过程设定 //异步通知url，商户根据实际开发过程设定
......
ThinkPHP/Library/Vendor/Wxpay/WxPayPubHelper/WxPayConfig.php
...@@ -34,8 +34,8 @@ class WxPayConfig ...@@ -34,8 +34,8 @@ class WxPayConfig
* API证书下载地址：https://pay.weixin.qq.com/index.php/account/api_cert，下载之前需要安装商户操作证书） * API证书下载地址：https://pay.weixin.qq.com/index.php/account/api_cert，下载之前需要安装商户操作证书）
* @var path * @var path
*/ */
const SSLCERT_PATH = 'D:/phpStudy/WWW/yhct/apiclient_cert.pem'; const SSLCERT_PATH = __DIR__ . '/cacert/apiclient_cert.pem';
const SSLKEY_PATH = 'D:/phpStudy/WWW/yhct/apiclient_key.pem'; const SSLKEY_PATH = __DIR__ . '/cacert/apiclient_key.pem';
//=======【curl代理设置】=================================== //=======【curl代理设置】===================================
/** /**
......
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']; ...@@ -56,12 +56,12 @@ $trade_no = $_POST['trade_no'];
$trade_status = $_POST['trade_status']; $trade_status = $_POST['trade_status'];
error_log($s,3,'111.log'); error_log($s,3,'111.log');
$time = time(); $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) { if (!$link) {
error_log('数据库连接失败', 3, 'db_content.log'); error_log('数据库连接失败', 3, 'db_content.log');
} }
mysql_select_db($config['DB_NAME']); mysqli_select_db($config['DB_NAME']);
mysql_query("SET BAMES UTF8"); mysqli_query("SET BAMES UTF8");
$table1 = $config['DB_PREFIX'] . 'order';//订单 $table1 = $config['DB_PREFIX'] . 'order';//订单
$table2 = $config['DB_PREFIX'] . 'order_goods';//订单商品 $table2 = $config['DB_PREFIX'] . 'order_goods';//订单商品
$table3 = $config['DB_PREFIX'] . 'order_invo';//发票 $table3 = $config['DB_PREFIX'] . 'order_invo';//发票
...@@ -75,25 +75,25 @@ error_log($config,3,'cons.log'); ...@@ -75,25 +75,25 @@ error_log($config,3,'cons.log');
$msg=strpos($out_trade_no,'i'); $msg=strpos($out_trade_no,'i');
if($msg){//存在i 则判断为发票订单 if($msg){//存在i 则判断为发票订单
$sql="UPDATE {$table3} SET status=2 where invo_num='{$out_trade_no}'"; $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.'"'; $sql11='select id from '.$table3.' where invo_num="'.$out_trade_no.'"';
$rows=mysql_query($sql11); $rows=mysqli_query($sql11);
$id=mysql_fetch_array($rows,MYSQL_ASSOC ); $id=mysqli_fetch_array($rows,MYSQLI_ASSOC );
$sq2 = "UPDATE {$table4} SET status=2 where invo_id=".$id['id']; $sq2 = "UPDATE {$table4} SET status=2 where invo_id=".$id['id'];
mysql_query($sq2); mysqli_query($sq2);
}else{//商品订单 }else{//商品订单
$infoSql = 'select order_type from '.$table1.' where order_num="'.$out_trade_no.'"'; $infoSql = 'select order_type from '.$table1.' where order_num="'.$out_trade_no.'"';
$infoRows=mysql_query($infoSql); $infoRows=mysqli_query($infoSql);
$info=mysql_fetch_array($infoRows,MYSQL_ASSOC ); $info=mysqli_fetch_array($infoRows,MYSQLI_ASSOC );
if ($info['order_type'] == 1) { if ($info['order_type'] == 1) {
//设置订单为已经支付 //设置订单为已经支付
$sql = "UPDATE {$table1} SET order_type=2 where order_num='{$out_trade_no}'"; $sql = "UPDATE {$table1} SET order_type=2 where order_num='{$out_trade_no}'";
$sql11='select id from '.$table1.' where order_num="'.$out_trade_no.'"'; $sql11='select id from '.$table1.' where order_num="'.$out_trade_no.'"';
mysql_query($sql); mysqli_query($sql);
$rows=mysql_query($sql11); $rows=mysqli_query($sql11);
$id=mysql_fetch_array($rows,MYSQL_ASSOC ); $id=mysqli_fetch_array($rows,MYSQLI_ASSOC );
$sq2 = "UPDATE {$table2} SET status=2 where order_id=".$id['id']; $sq2 = "UPDATE {$table2} SET status=2 where order_id=".$id['id'];
mysql_query($sq2); mysqli_query($sq2);
//调试用，写文本函数记录程序运行情况是否正常 //调试用，写文本函数记录程序运行情况是否正常
writeLog("$sql", "TRADE_SUCCESS.log"); 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')){ ...@@ -31,6 +31,8 @@ if(!is_file(APP_PATH . 'User/Conf/config.php')){
*/ */
define ( 'RUNTIME_PATH', './Runtime/' ); define ( 'RUNTIME_PATH', './Runtime/' );
define('DEFAULT_MODULE','Home');
/** /**
* 引入核心入口 * 引入核心入口
* ThinkPHP亦可移动到WEB以外的目录 * 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