anyv / xkeasy · 提交

转到一个项目

作者 王晓刚
提交 73f79aebc084c5adad1c364b7a9755e66218d332 2 个父辈 ab148bf9 519483a8
1 个管道 的构建 通过 耗费 0 秒

Merge branch 'master' of http://114.215.101.231:8099/anyv/xkeasy into wangxiaogang 

# Conflicts:
#	simplewind/cmf/controller/WeChatBaseController.php
内嵌 并排对比
正在显示 9 个修改的文件 包含 132 行增加 和 59 行删除
... ... @@ -37,7 +37,7 @@ class SalesmanorderController extends AdminBaseController{
if(!empty($_POST['grade'])){
$where['grade'] = $_POST['grade'];
}
$data = Db::name('indent') -> where($where) -> paginate(12);
$data = Db::name('indent') -> where($where) -> paginate(12);
$data_arr = $data -> toArray();
}else{
$data = Db::name('indent') -> where('indent_type',2) -> paginate(12);
... ... @@ -45,8 +45,11 @@ class SalesmanorderController extends AdminBaseController{
}
$money = 0;
foreach($data_arr['data'] as $key => $val){
$data_arr['data'][$key]['grade_class'] = $val['school'].'-'.$val['grade'].$val['class'];
$money += $data_arr['data'][$key]['money'];
if($val['state'] == 2 || $val['state'] == 3 || $val['state'] == 5){
$data_arr['data'][$key]['grade_class'] = $val['school'].'-'.$val['grade'].$val['class'];
$money += $data_arr['data'][$key]['money'];
}
}
$data_school = Db::name('indent') -> group('school') -> where('indent_type',2) -> select() -> toArray();
foreach($data_school as $key => $val){
... ...
... ... @@ -20,21 +20,26 @@ class OrderpageController extends WeChatBaseController{
$indet_id = $this -> request -> param();
$uid = cmf_get_current_user_id();
$address = Db::name('address') -> where("uid=".$uid." and default_address=1 and delete_time = 0") -> find();
if(empty($address)){
$this -> assign('address',4);
if(!empty($indet_id['address_id'])){
$address = Db::name('address') -> where('id',$indet_id['address_id']) -> find();
$this -> assign('address',$address);
}else{
$address_arr = explode(',',$address['detailed']);
$address['detailed'] = $address_arr[0].$address_arr[1];
$indet_data = Db::name('indent') -> where("id",$indet_id['indet_id']) -> find();
if($indet_data['state'] == 4){
$indet_data_update['id'] = $indet_id['indet_id'];
$indet_data_update['indent_address'] = $address['id'];
$indet_data_update['name'] = $address['name'];
$indet_data_update['phone'] = $address['phone'];
Db::name('indent') -> update($indet_data_update);
$address = Db::name('address') -> where("uid=".$uid." and default_address=1 and delete_time = 0") -> find();
if(empty($address)){
$this -> assign('address',4);
}else{
$address_arr = explode(',',$address['detailed']);
$address['detailed'] = $address_arr[0].$address_arr[1];
$indet_data = Db::name('indent') -> where("id",$indet_id['indet_id']) -> find();
if($indet_data['state'] == 4){
$indet_data_update['id'] = $indet_id['indet_id'];
$indet_data_update['indent_address'] = $address['id'];
$indet_data_update['name'] = $address['name'];
$indet_data_update['phone'] = $address['phone'];
Db::name('indent') -> update($indet_data_update);
}
$this -> assign('address',$address);
}
$this -> assign('address',$address);
}
$data = Db::name('indent_goods') -> where('indent_id',$indet_id['indet_id']) -> select() -> toArray();
... ... @@ -262,6 +267,7 @@ class OrderpageController extends WeChatBaseController{
*/
public function go_add_address(){
$indent_id = $this -> request -> param();
$uid = cmf_get_current_user_id();
$data = Db::name('address') -> where("delete_time = 0 and uid =".$uid) -> select() -> toArray();
if(!empty($data)){
... ... @@ -270,6 +276,7 @@ class OrderpageController extends WeChatBaseController{
$data[$key]['detailed'] = $detailed[0].$detailed[1];
}
}
$this -> assign('indent_id',$indent_id['indent_id']);
$this -> assign('data',$data);
return $this -> fetch();
... ...
... ... @@ -360,6 +360,7 @@ class PersonalcenterController extends WeChatBaseController{
$uid = cmf_get_current_user_id();
$balance = Db::name('my_user') -> where("uid",$uid) -> find();
$balance['balance'] = $balance['balance'] - $balance['balance']*0.006;
$balance['balance'] = sprintf("%.2f", $balance['balance']);
$money_income = Db::name("money_income") -> where('uid',$uid) -> select();
$cumulative_money = 0;
foreach ($money_income as $key => $val){
... ... @@ -496,6 +497,7 @@ class PersonalcenterController extends WeChatBaseController{
$uid = cmf_get_current_user_id();
$my_user = Db::name('my_user') -> where('uid',$uid) -> find();
//搜索老师下级学生用户
$student = Db::name('my_user') -> alias('a') -> field("a.*,b.user_nickname,b.avatar") -> join("user b","a.uid = b.id",'LEFT') -> where("a.pid",$my_user['id']) -> select() -> toArray();
foreach ($student as $key => $val){
$data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
... ... @@ -518,6 +520,18 @@ class PersonalcenterController extends WeChatBaseController{
$res = null;
}
$this -> assign('res',$res);
//搜索老师用户
$teacher_avatar = Db::name('user') -> where('id',$uid) -> find();
$teacher = Db::name('indent') -> where('uid',$uid) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
foreach($teacher as $key => $val){
$teacher_data[$key]['user_name'] = $teacher_avatar['user_nickname'];
$teacher_data[$key]['avatar'] = $teacher_avatar['avatar'];
$tea_money_income = Db::name('money_income') -> where("indent_id =".$val['id']." and uid = ".$uid) -> select() -> toArray();
$money = 0;
foreach ($tea_money_income as $key2 => $val2){
}
}
return $this -> fetch();
... ...
... ... @@ -8,6 +8,11 @@
<title>学考无忧-收获地址</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/base.css">
<style>
.haha{
}
</style>
</head>
<body style="background-color:white;">
... ... @@ -49,8 +54,8 @@
</volist>-->
<volist name="data" id="vo">
<li>
<div id="" style="display: flex;justify-content: flex-start;align-items: center;">
<div style="width: 0.4rem;height: 0.4rem;margin-right: 0.25rem;" class="select_img">
<div class="" style="display: flex;justify-content: flex-start;align-items: center;">
<div style="width: 0.4rem;height: 0.4rem;margin-right: 0.25rem;" class="select_img" data-id="{$vo.id}">
<img src="__TMPL__/public/assets/images/39_0.png" style="width:100%;height: 100%;" />
</div>
<div class="contant" style="width: 6rem;">
... ... @@ -77,13 +82,28 @@
</volist>
</ul>
</div>
<div id='btn' style="width: 1.5rem;height: 0.8rem;background:linear-gradient(344deg,rgba(255,78,0,1) 0%,rgba(255,157,45,1) 100%);border-radius: 0.025rem;text-align: center;line-height: 0.8rem;font-size: 0.3rem;color: #fff;margin: 0.5rem 0.5rem 0 auto;">确定</div>
<div onclick="deter_sub()" style="width: 1.5rem;height: 0.8rem;background:linear-gradient(344deg,rgba(255,78,0,1) 0%,rgba(255,157,45,1) 100%);border-radius: 0.025rem;text-align: center;line-height: 0.8rem;font-size: 0.3rem;color: #fff;margin: 0.5rem 0.5rem 0 auto;">确定</div>
</div>
<script src="__TMPL__/public/assets/js/base.js"></script>
<script src="__TMPL__/public/assets/js/address.js"></script>
<script src="__TMPL__/public/assets/js/address(1).js"></script>
<script src="__TMPL__/public/assets/js/jquery.js"></script>
<script>
/**
*点击确认
*/
function deter_sub(){
id = $('.haha').attr('data-id');
if(typeof(id) == 'undefined'){
window.location.href = "{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}";
}else{
window.location.href = "{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}?address_id="+id;
}
}
</script>
<script>
$("#btn").click(function(){
console.log("确定成功")
})
... ...
... ... @@ -37,7 +37,7 @@
<div class="order_adImg">
<img src="__TMPL__/public/assets/images/31.png" alt="">
</div>
<p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address')}">去添加</a></p>
<p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address',array('indent_id'=>$indent_id))}">去添加</a></p>
</div>
<else/>
<div class="order_addressYes">
... ... @@ -52,7 +52,7 @@
<p class="or_address_detailed" id="detailed">{$address.region}{$address.detailed}</p>
</div>
<div class="or_addressYesImg2">
<a href="{:url('Personalcenter/shop_address')}">
<a href="{:url('Orderpage/go_add_address',array('indent_id'=>$indent_id))}">
<img src="__TMPL__/public/assets/images/29.png" alt="">
</a>
</div>
... ...
... ... @@ -38,6 +38,24 @@
<div class="recordNum">佣金+{$vo.total_money}</div>
</li>
</volist>
<volist name="" id="">
<li>
<div class="recordImg">
<img src="{$vo.avatar}" alt="">
</div>
<div class="recordTxt">
<div class="recordTxt1 one-txt-cut">{$vo.user_name}</div>
<if condition="$vo.indent_type eq 1">
<div class="recordTxt2">平台订单</div>
</if>
<if condition="$vo.indent_type eq 2">
<div class="recordTxt2">业务员订单</div>
</if>
<p class="recordTxt3">{$vo.create_time|date="Y-m-d H:i:s",###}</p>
</div>
<div class="recordNum">佣金+{$vo.total_money}</div>
</li>
</volist>
</ul>
</div>
<!-- 底部更多 -->
... ...
... ... @@ -191,20 +191,36 @@
<script src="__TMPL__/public/assets/js/jquery.js"></script>
<script src="__TMPL__/public/assets/js/base.js"></script>
<script>
<!--验证弹窗-->
var state;
$.post("{:url('Personalcenter/id_first_withdrawal')}",{},function(data){
state = data
});
$(".log_seven_btn_contant").click(function() {
console.log(state);
if(state != false){
$(".tx_maskPhone").css("display","block");
}else{
$(".tx_mask").css("display","block");
return false;
}
});
/**
*手机号验证点击确定时
*/
function Message_validation(){
yzm = $('#Ver_code').val();
phone = $('#phone').val();
if(yzm == ''){
alert('请输入验证码');
}else if(phone == ''){
if(phone == ''){
alert('请输入手机号');
}else if(yzm == ''){
alert('请输入验证码');
}else{
$.post("{:url('Personalcenter/is_money_code')}",{yzm:yzm},function(data){
if(data){
console.log(data)
if(data != false){
$(".tx_maskPhone").css("display","none");
$(".tx_mask").css("display","block");
}else{
alert('验证码错误!');
... ... @@ -249,19 +265,7 @@
}
</script>
<script>
<!--验证弹窗-->
var state;
$.post("{:url('Personalcenter/id_first_withdrawal')}",{},function(data){
state = data
});
$(".log_seven_btn_contant").click(function() {
if(state != false){
$(".tx_maskPhone").css("display","block");
}else{
$(".tx_mask").css("display","block");
return false;
}
});
// 提现弹窗
$(".tx_maskYeah").click(function () {
... ... @@ -269,25 +273,25 @@
$(".tx_maskPhone").css("display","none");
});
// var data;
// $.post("{:url('Personalcenter/is_money_code')}",{yzm:yzm},function(data){
// data = data
// }),
// 手机验证弹窗
$(".tx_maskYes").click(function(){
var data
$.post("{:url('Personalcenter/is_money_code')}",{yzm:yzm},function(data){
data = data
},
var one = $("#phone").val();
var two = $("#Ver_code").val();
if(one!=""&&two!=""&&two!=data){
$(".tx_maskPhone").css("display","none");
$(".tx_mask").css("display","block")
}else{
return false;
console.log(123)
}
});
// $(".tx_maskYes").click(function(){
// var one = $("#phone").val();
// var two = $("#Ver_code").val();
//
// if(one!=""&&two!=""&&two!=data){
// $(".tx_maskPhone").css("display","none");
// $(".tx_mask").css("display","block")
// }else{
// return false;
// console.log(123)
// }
//
//
// });
function checkPhone() {
var phone = document.getElementById('phone').value;
if(!(/^1[34578]\d{9}$/.test(phone))) {
... ...
... ... @@ -64,9 +64,11 @@ document.addEventListener('DOMContentLoaded', function() {
imgs[i].addEventListener('touchstart',function(){
if($(this).attr('src') == host+'images/39_0.png'){
$(this).attr('src',host+'images/73.png').parents('li').siblings().find('.select_img img').attr('src',host+'images/39_0.png');
$('.haha').removeClass("haha");
$(this).parents(".select_img").addClass("haha");
}else{
$(this).attr('src',host+'images/39_0.png')
$(this).attr('src',host+'images/39_0.png');
}
})
}
... ...
... ... @@ -204,8 +204,13 @@ class WeChatBaseController extends BaseController
*/
public function checkWeChatUserLogin()
{
<<<<<<< HEAD
// $user = Db::name('user')->where('id',4)->find();
// cmf_update_current_user($user);
=======
/*$user = Db::name('user')->where('id',5)->find();
cmf_update_current_user($user);*/
>>>>>>> 519483a8ea7d8435b0c84d0f2d956c6de1b06ec3
$userId = cmf_get_current_user_id();
if (empty($userId)) {
$config = [
... ...