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{ @@ -37,7 +37,7 @@ class SalesmanorderController extends AdminBaseController{
37 if(!empty($_POST['grade'])){ 37 if(!empty($_POST['grade'])){
38 $where['grade'] = $_POST['grade']; 38 $where['grade'] = $_POST['grade'];
39 } 39 }
40 - $data = Db::name('indent') -> where($where) -> paginate(12); 40 + $data = Db::name('indent') -> where($where) -> paginate(12);
41 $data_arr = $data -> toArray(); 41 $data_arr = $data -> toArray();
42 }else{ 42 }else{
43 $data = Db::name('indent') -> where('indent_type',2) -> paginate(12); 43 $data = Db::name('indent') -> where('indent_type',2) -> paginate(12);
@@ -45,8 +45,11 @@ class SalesmanorderController extends AdminBaseController{ @@ -45,8 +45,11 @@ class SalesmanorderController extends AdminBaseController{
45 } 45 }
46 $money = 0; 46 $money = 0;
47 foreach($data_arr['data'] as $key => $val){ 47 foreach($data_arr['data'] as $key => $val){
48 - $data_arr['data'][$key]['grade_class'] = $val['school'].'-'.$val['grade'].$val['class'];  
49 - $money += $data_arr['data'][$key]['money']; 48 + if($val['state'] == 2 || $val['state'] == 3 || $val['state'] == 5){
  49 + $data_arr['data'][$key]['grade_class'] = $val['school'].'-'.$val['grade'].$val['class'];
  50 + $money += $data_arr['data'][$key]['money'];
  51 + }
  52 +
50 } 53 }
51 $data_school = Db::name('indent') -> group('school') -> where('indent_type',2) -> select() -> toArray(); 54 $data_school = Db::name('indent') -> group('school') -> where('indent_type',2) -> select() -> toArray();
52 foreach($data_school as $key => $val){ 55 foreach($data_school as $key => $val){
@@ -20,21 +20,26 @@ class OrderpageController extends WeChatBaseController{ @@ -20,21 +20,26 @@ class OrderpageController extends WeChatBaseController{
20 20
21 $indet_id = $this -> request -> param(); 21 $indet_id = $this -> request -> param();
22 $uid = cmf_get_current_user_id(); 22 $uid = cmf_get_current_user_id();
23 - $address = Db::name('address') -> where("uid=".$uid." and default_address=1 and delete_time = 0") -> find();  
24 - if(empty($address)){  
25 - $this -> assign('address',4); 23 + if(!empty($indet_id['address_id'])){
  24 + $address = Db::name('address') -> where('id',$indet_id['address_id']) -> find();
  25 + $this -> assign('address',$address);
26 }else{ 26 }else{
27 - $address_arr = explode(',',$address['detailed']);  
28 - $address['detailed'] = $address_arr[0].$address_arr[1];  
29 - $indet_data = Db::name('indent') -> where("id",$indet_id['indet_id']) -> find();  
30 - if($indet_data['state'] == 4){  
31 - $indet_data_update['id'] = $indet_id['indet_id'];  
32 - $indet_data_update['indent_address'] = $address['id'];  
33 - $indet_data_update['name'] = $address['name'];  
34 - $indet_data_update['phone'] = $address['phone'];  
35 - Db::name('indent') -> update($indet_data_update); 27 + $address = Db::name('address') -> where("uid=".$uid." and default_address=1 and delete_time = 0") -> find();
  28 + if(empty($address)){
  29 + $this -> assign('address',4);
  30 + }else{
  31 + $address_arr = explode(',',$address['detailed']);
  32 + $address['detailed'] = $address_arr[0].$address_arr[1];
  33 + $indet_data = Db::name('indent') -> where("id",$indet_id['indet_id']) -> find();
  34 + if($indet_data['state'] == 4){
  35 + $indet_data_update['id'] = $indet_id['indet_id'];
  36 + $indet_data_update['indent_address'] = $address['id'];
  37 + $indet_data_update['name'] = $address['name'];
  38 + $indet_data_update['phone'] = $address['phone'];
  39 + Db::name('indent') -> update($indet_data_update);
  40 + }
  41 + $this -> assign('address',$address);
36 } 42 }
37 - $this -> assign('address',$address);  
38 } 43 }
39 44
40 $data = Db::name('indent_goods') -> where('indent_id',$indet_id['indet_id']) -> select() -> toArray(); 45 $data = Db::name('indent_goods') -> where('indent_id',$indet_id['indet_id']) -> select() -> toArray();
@@ -262,6 +267,7 @@ class OrderpageController extends WeChatBaseController{ @@ -262,6 +267,7 @@ class OrderpageController extends WeChatBaseController{
262 */ 267 */
263 public function go_add_address(){ 268 public function go_add_address(){
264 269
  270 + $indent_id = $this -> request -> param();
265 $uid = cmf_get_current_user_id(); 271 $uid = cmf_get_current_user_id();
266 $data = Db::name('address') -> where("delete_time = 0 and uid =".$uid) -> select() -> toArray(); 272 $data = Db::name('address') -> where("delete_time = 0 and uid =".$uid) -> select() -> toArray();
267 if(!empty($data)){ 273 if(!empty($data)){
@@ -270,6 +276,7 @@ class OrderpageController extends WeChatBaseController{ @@ -270,6 +276,7 @@ class OrderpageController extends WeChatBaseController{
270 $data[$key]['detailed'] = $detailed[0].$detailed[1]; 276 $data[$key]['detailed'] = $detailed[0].$detailed[1];
271 } 277 }
272 } 278 }
  279 + $this -> assign('indent_id',$indent_id['indent_id']);
273 $this -> assign('data',$data); 280 $this -> assign('data',$data);
274 return $this -> fetch(); 281 return $this -> fetch();
275 282
@@ -360,6 +360,7 @@ class PersonalcenterController extends WeChatBaseController{ @@ -360,6 +360,7 @@ class PersonalcenterController extends WeChatBaseController{
360 $uid = cmf_get_current_user_id(); 360 $uid = cmf_get_current_user_id();
361 $balance = Db::name('my_user') -> where("uid",$uid) -> find(); 361 $balance = Db::name('my_user') -> where("uid",$uid) -> find();
362 $balance['balance'] = $balance['balance'] - $balance['balance']*0.006; 362 $balance['balance'] = $balance['balance'] - $balance['balance']*0.006;
  363 + $balance['balance'] = sprintf("%.2f", $balance['balance']);
363 $money_income = Db::name("money_income") -> where('uid',$uid) -> select(); 364 $money_income = Db::name("money_income") -> where('uid',$uid) -> select();
364 $cumulative_money = 0; 365 $cumulative_money = 0;
365 foreach ($money_income as $key => $val){ 366 foreach ($money_income as $key => $val){
@@ -496,6 +497,7 @@ class PersonalcenterController extends WeChatBaseController{ @@ -496,6 +497,7 @@ class PersonalcenterController extends WeChatBaseController{
496 497
497 $uid = cmf_get_current_user_id(); 498 $uid = cmf_get_current_user_id();
498 $my_user = Db::name('my_user') -> where('uid',$uid) -> find(); 499 $my_user = Db::name('my_user') -> where('uid',$uid) -> find();
  500 + //搜索老师下级学生用户
499 $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(); 501 $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();
500 foreach ($student as $key => $val){ 502 foreach ($student as $key => $val){
501 $data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray(); 503 $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{ @@ -518,6 +520,18 @@ class PersonalcenterController extends WeChatBaseController{
518 $res = null; 520 $res = null;
519 } 521 }
520 $this -> assign('res',$res); 522 $this -> assign('res',$res);
  523 + //搜索老师用户
  524 + $teacher_avatar = Db::name('user') -> where('id',$uid) -> find();
  525 + $teacher = Db::name('indent') -> where('uid',$uid) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
  526 + foreach($teacher as $key => $val){
  527 + $teacher_data[$key]['user_name'] = $teacher_avatar['user_nickname'];
  528 + $teacher_data[$key]['avatar'] = $teacher_avatar['avatar'];
  529 + $tea_money_income = Db::name('money_income') -> where("indent_id =".$val['id']." and uid = ".$uid) -> select() -> toArray();
  530 + $money = 0;
  531 + foreach ($tea_money_income as $key2 => $val2){
  532 +
  533 + }
  534 + }
521 535
522 return $this -> fetch(); 536 return $this -> fetch();
523 537
@@ -8,6 +8,11 @@ @@ -8,6 +8,11 @@
8 <title>学考无忧-收获地址</title> 8 <title>学考无忧-收获地址</title>
9 <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css"> 9 <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css">
10 <link rel="stylesheet" href="__TMPL__/public/assets/css/base.css"> 10 <link rel="stylesheet" href="__TMPL__/public/assets/css/base.css">
  11 + <style>
  12 + .haha{
  13 +
  14 + }
  15 + </style>
11 </head> 16 </head>
12 17
13 <body style="background-color:white;"> 18 <body style="background-color:white;">
@@ -49,8 +54,8 @@ @@ -49,8 +54,8 @@
49 </volist>--> 54 </volist>-->
50 <volist name="data" id="vo"> 55 <volist name="data" id="vo">
51 <li> 56 <li>
52 - <div id="" style="display: flex;justify-content: flex-start;align-items: center;">  
53 - <div style="width: 0.4rem;height: 0.4rem;margin-right: 0.25rem;" class="select_img"> 57 + <div class="" style="display: flex;justify-content: flex-start;align-items: center;">
  58 + <div style="width: 0.4rem;height: 0.4rem;margin-right: 0.25rem;" class="select_img" data-id="{$vo.id}">
54 <img src="__TMPL__/public/assets/images/39_0.png" style="width:100%;height: 100%;" /> 59 <img src="__TMPL__/public/assets/images/39_0.png" style="width:100%;height: 100%;" />
55 </div> 60 </div>
56 <div class="contant" style="width: 6rem;"> 61 <div class="contant" style="width: 6rem;">
@@ -77,13 +82,28 @@ @@ -77,13 +82,28 @@
77 </volist> 82 </volist>
78 </ul> 83 </ul>
79 </div> 84 </div>
80 - <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> 85 + <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>
81 </div> 86 </div>
82 <script src="__TMPL__/public/assets/js/base.js"></script> 87 <script src="__TMPL__/public/assets/js/base.js"></script>
83 <script src="__TMPL__/public/assets/js/address.js"></script> 88 <script src="__TMPL__/public/assets/js/address.js"></script>
84 <script src="__TMPL__/public/assets/js/address(1).js"></script> 89 <script src="__TMPL__/public/assets/js/address(1).js"></script>
85 <script src="__TMPL__/public/assets/js/jquery.js"></script> 90 <script src="__TMPL__/public/assets/js/jquery.js"></script>
86 <script> 91 <script>
  92 + /**
  93 + *点击确认
  94 + */
  95 + function deter_sub(){
  96 +
  97 + id = $('.haha').attr('data-id');
  98 + if(typeof(id) == 'undefined'){
  99 + window.location.href = "{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}";
  100 + }else{
  101 + window.location.href = "{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}?address_id="+id;
  102 + }
  103 +
  104 + }
  105 +</script>
  106 +<script>
87 $("#btn").click(function(){ 107 $("#btn").click(function(){
88 console.log("确定成功") 108 console.log("确定成功")
89 }) 109 })
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <div class="order_adImg"> 37 <div class="order_adImg">
38 <img src="__TMPL__/public/assets/images/31.png" alt=""> 38 <img src="__TMPL__/public/assets/images/31.png" alt="">
39 </div> 39 </div>
40 - <p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address')}">去添加</a></p> 40 + <p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address',array('indent_id'=>$indent_id))}">去添加</a></p>
41 </div> 41 </div>
42 <else/> 42 <else/>
43 <div class="order_addressYes"> 43 <div class="order_addressYes">
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <p class="or_address_detailed" id="detailed">{$address.region}{$address.detailed}</p> 52 <p class="or_address_detailed" id="detailed">{$address.region}{$address.detailed}</p>
53 </div> 53 </div>
54 <div class="or_addressYesImg2"> 54 <div class="or_addressYesImg2">
55 - <a href="{:url('Personalcenter/shop_address')}"> 55 + <a href="{:url('Orderpage/go_add_address',array('indent_id'=>$indent_id))}">
56 <img src="__TMPL__/public/assets/images/29.png" alt=""> 56 <img src="__TMPL__/public/assets/images/29.png" alt="">
57 </a> 57 </a>
58 </div> 58 </div>
@@ -38,6 +38,24 @@ @@ -38,6 +38,24 @@
38 <div class="recordNum">佣金+{$vo.total_money}</div> 38 <div class="recordNum">佣金+{$vo.total_money}</div>
39 </li> 39 </li>
40 </volist> 40 </volist>
  41 + <volist name="" id="">
  42 + <li>
  43 + <div class="recordImg">
  44 + <img src="{$vo.avatar}" alt="">
  45 + </div>
  46 + <div class="recordTxt">
  47 + <div class="recordTxt1 one-txt-cut">{$vo.user_name}</div>
  48 + <if condition="$vo.indent_type eq 1">
  49 + <div class="recordTxt2">平台订单</div>
  50 + </if>
  51 + <if condition="$vo.indent_type eq 2">
  52 + <div class="recordTxt2">业务员订单</div>
  53 + </if>
  54 + <p class="recordTxt3">{$vo.create_time|date="Y-m-d H:i:s",###}</p>
  55 + </div>
  56 + <div class="recordNum">佣金+{$vo.total_money}</div>
  57 + </li>
  58 + </volist>
41 </ul> 59 </ul>
42 </div> 60 </div>
43 <!-- 底部更多 --> 61 <!-- 底部更多 -->
@@ -191,20 +191,36 @@ @@ -191,20 +191,36 @@
191 <script src="__TMPL__/public/assets/js/jquery.js"></script> 191 <script src="__TMPL__/public/assets/js/jquery.js"></script>
192 <script src="__TMPL__/public/assets/js/base.js"></script> 192 <script src="__TMPL__/public/assets/js/base.js"></script>
193 <script> 193 <script>
  194 + <!--验证弹窗-->
  195 + var state;
  196 + $.post("{:url('Personalcenter/id_first_withdrawal')}",{},function(data){
  197 + state = data
  198 + });
  199 + $(".log_seven_btn_contant").click(function() {
  200 + console.log(state);
  201 + if(state != false){
  202 + $(".tx_maskPhone").css("display","block");
  203 + }else{
  204 + $(".tx_mask").css("display","block");
  205 + return false;
  206 + }
  207 + });
194 /** 208 /**
195 *手机号验证点击确定时 209 *手机号验证点击确定时
196 */ 210 */
197 function Message_validation(){ 211 function Message_validation(){
198 yzm = $('#Ver_code').val(); 212 yzm = $('#Ver_code').val();
199 phone = $('#phone').val(); 213 phone = $('#phone').val();
200 - if(yzm == ''){  
201 - alert('请输入验证码');  
202 - }else if(phone == ''){ 214 + if(phone == ''){
203 alert('请输入手机号'); 215 alert('请输入手机号');
  216 + }else if(yzm == ''){
  217 + alert('请输入验证码');
204 }else{ 218 }else{
205 $.post("{:url('Personalcenter/is_money_code')}",{yzm:yzm},function(data){ 219 $.post("{:url('Personalcenter/is_money_code')}",{yzm:yzm},function(data){
206 - if(data){  
207 - 220 + console.log(data)
  221 + if(data != false){
  222 + $(".tx_maskPhone").css("display","none");
  223 + $(".tx_mask").css("display","block");
208 }else{ 224 }else{
209 alert('验证码错误!'); 225 alert('验证码错误!');
210 226
@@ -249,19 +265,7 @@ @@ -249,19 +265,7 @@
249 } 265 }
250 </script> 266 </script>
251 <script> 267 <script>
252 - <!--验证弹窗-->  
253 - var state;  
254 - $.post("{:url('Personalcenter/id_first_withdrawal')}",{},function(data){  
255 - state = data  
256 - });  
257 - $(".log_seven_btn_contant").click(function() {  
258 - if(state != false){  
259 - $(".tx_maskPhone").css("display","block");  
260 - }else{  
261 - $(".tx_mask").css("display","block");  
262 - return false;  
263 - }  
264 - }); 268 +
265 // 提现弹窗 269 // 提现弹窗
266 $(".tx_maskYeah").click(function () { 270 $(".tx_maskYeah").click(function () {
267 271
@@ -269,25 +273,25 @@ @@ -269,25 +273,25 @@
269 $(".tx_maskPhone").css("display","none"); 273 $(".tx_maskPhone").css("display","none");
270 274
271 }); 275 });
272 - 276 +// var data;
  277 +// $.post("{:url('Personalcenter/is_money_code')}",{yzm:yzm},function(data){
  278 +// data = data
  279 +// }),
273 // 手机验证弹窗 280 // 手机验证弹窗
274 - $(".tx_maskYes").click(function(){  
275 - var data  
276 - $.post("{:url('Personalcenter/is_money_code')}",{yzm:yzm},function(data){  
277 - data = data  
278 - },  
279 - var one = $("#phone").val();  
280 - var two = $("#Ver_code").val();  
281 - if(one!=""&&two!=""&&two!=data){  
282 - $(".tx_maskPhone").css("display","none");  
283 - $(".tx_mask").css("display","block")  
284 - }else{  
285 - return false;  
286 - console.log(123)  
287 - }  
288 -  
289 -  
290 - }); 281 +// $(".tx_maskYes").click(function(){
  282 +// var one = $("#phone").val();
  283 +// var two = $("#Ver_code").val();
  284 +//
  285 +// if(one!=""&&two!=""&&two!=data){
  286 +// $(".tx_maskPhone").css("display","none");
  287 +// $(".tx_mask").css("display","block")
  288 +// }else{
  289 +// return false;
  290 +// console.log(123)
  291 +// }
  292 +//
  293 +//
  294 +// });
291 function checkPhone() { 295 function checkPhone() {
292 var phone = document.getElementById('phone').value; 296 var phone = document.getElementById('phone').value;
293 if(!(/^1[34578]\d{9}$/.test(phone))) { 297 if(!(/^1[34578]\d{9}$/.test(phone))) {
@@ -64,9 +64,11 @@ document.addEventListener('DOMContentLoaded', function() { @@ -64,9 +64,11 @@ document.addEventListener('DOMContentLoaded', function() {
64 imgs[i].addEventListener('touchstart',function(){ 64 imgs[i].addEventListener('touchstart',function(){
65 if($(this).attr('src') == host+'images/39_0.png'){ 65 if($(this).attr('src') == host+'images/39_0.png'){
66 $(this).attr('src',host+'images/73.png').parents('li').siblings().find('.select_img img').attr('src',host+'images/39_0.png'); 66 $(this).attr('src',host+'images/73.png').parents('li').siblings().find('.select_img img').attr('src',host+'images/39_0.png');
  67 + $('.haha').removeClass("haha");
  68 + $(this).parents(".select_img").addClass("haha");
  69 +
67 }else{ 70 }else{
68 - $(this).attr('src',host+'images/39_0.png')  
69 - 71 + $(this).attr('src',host+'images/39_0.png');
70 } 72 }
71 }) 73 })
72 } 74 }
@@ -204,8 +204,13 @@ class WeChatBaseController extends BaseController @@ -204,8 +204,13 @@ class WeChatBaseController extends BaseController
204 */ 204 */
205 public function checkWeChatUserLogin() 205 public function checkWeChatUserLogin()
206 { 206 {
  207 +<<<<<<< HEAD
207 // $user = Db::name('user')->where('id',4)->find(); 208 // $user = Db::name('user')->where('id',4)->find();
208 // cmf_update_current_user($user); 209 // cmf_update_current_user($user);
  210 +=======
  211 + /*$user = Db::name('user')->where('id',5)->find();
  212 + cmf_update_current_user($user);*/
  213 +>>>>>>> 519483a8ea7d8435b0c84d0f2d956c6de1b06ec3
209 $userId = cmf_get_current_user_id(); 214 $userId = cmf_get_current_user_id();
210 if (empty($userId)) { 215 if (empty($userId)) {
211 $config = [ 216 $config = [