正在显示
3 个修改的文件
包含
16 行增加
和
15 行删除
@@ -285,12 +285,13 @@ class OrderpageController extends WeChatBaseController{ | @@ -285,12 +285,13 @@ class OrderpageController extends WeChatBaseController{ | ||
285 | public function get_school(){ | 285 | public function get_school(){ |
286 | $user_id = cmf_get_current_user_id(); | 286 | $user_id = cmf_get_current_user_id(); |
287 | $my_user = Db::name('my_user')->where('uid',$user_id)->find(); | 287 | $my_user = Db::name('my_user')->where('uid',$user_id)->find(); |
288 | + $my_user2 = Db::name('my_user')->where('id',$my_user['pid'])->find(); | ||
288 | $area = $this->request->param('area',0); | 289 | $area = $this->request->param('area',0); |
289 | if(empty($area)){ | 290 | if(empty($area)){ |
290 | $this->error('缺少必要参数'); | 291 | $this->error('缺少必要参数'); |
291 | } | 292 | } |
292 | $where['region'] = ['like',"%$area%"]; | 293 | $where['region'] = ['like',"%$area%"]; |
293 | - $where['uid'] = ['eq',$my_user['pid']]; | 294 | + $where['uid'] = ['eq',$my_user2['uid']]; |
294 | $data = Db::name('school')->where($where)->select(); | 295 | $data = Db::name('school')->where($where)->select(); |
295 | $this->success('SUCCESS','',$data); | 296 | $this->success('SUCCESS','',$data); |
296 | } | 297 | } |
@@ -271,9 +271,9 @@ | @@ -271,9 +271,9 @@ | ||
271 | </div> | 271 | </div> |
272 | </if> | 272 | </if> |
273 | <elseif condition="$vo.state eq 3"/> | 273 | <elseif condition="$vo.state eq 3"/> |
274 | - <div class="log_three_bottom" data-indent-id="{$vo.id}"> | ||
275 | - 已完成啦 | ||
276 | - </div> | 274 | + <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">--> |
275 | + <!--已完成啦--> | ||
276 | + <!--</div>--> | ||
277 | </if> | 277 | </if> |
278 | </div> | 278 | </div> |
279 | </div> | 279 | </div> |
@@ -347,9 +347,9 @@ | @@ -347,9 +347,9 @@ | ||
347 | </a> | 347 | </a> |
348 | </if> | 348 | </if> |
349 | <elseif condition="$vo.state eq 3"/> | 349 | <elseif condition="$vo.state eq 3"/> |
350 | - <div class="log_three_bottom" data-indent-id="{$vo.id}"> | ||
351 | - 已完成啦 | ||
352 | - </div> | 350 | + <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">--> |
351 | + <!--已完成啦--> | ||
352 | + <!--</div>--> | ||
353 | </if> | 353 | </if> |
354 | </div> | 354 | </div> |
355 | </div> | 355 | </div> |
@@ -423,9 +423,9 @@ | @@ -423,9 +423,9 @@ | ||
423 | </a> | 423 | </a> |
424 | </if> | 424 | </if> |
425 | <elseif condition="$vo.state eq 3"/> | 425 | <elseif condition="$vo.state eq 3"/> |
426 | - <div class="log_three_bottom" data-indent-id="{$vo.id}"> | ||
427 | - 已完成啦 | ||
428 | - </div> | 426 | + <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">--> |
427 | + <!--已完成啦--> | ||
428 | + <!--</div>--> | ||
429 | </if> | 429 | </if> |
430 | </div> | 430 | </div> |
431 | </div> | 431 | </div> |
@@ -651,9 +651,9 @@ | @@ -651,9 +651,9 @@ | ||
651 | } | 651 | } |
652 | } else { | 652 | } else { |
653 | var state = '已完成'; | 653 | var state = '已完成'; |
654 | - var html_bottom = "<div class=\"log_three_bottom\" data-indent-id=\"\"+result[i].id+\"\">\n" + | ||
655 | - "\t\t\t\t\t\t\t\t\t\t已完成啦\n" + | ||
656 | - "\t\t\t\t\t\t\t\t\t</div>"; | 654 | + // var html_bottom = "<div class=\"log_three_bottom\" data-indent-id=\"\"+result[i].id+\"\">\n" + |
655 | + // "\t\t\t\t\t\t\t\t\t\t已完成啦\n" + | ||
656 | + // "\t\t\t\t\t\t\t\t\t</div>"; | ||
657 | } | 657 | } |
658 | var indent_goods_data = result[i].indent_goods; | 658 | var indent_goods_data = result[i].indent_goods; |
659 | var indent_goods_html = ''; | 659 | var indent_goods_html = ''; |
@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController | @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController | ||
204 | */ | 204 | */ |
205 | public function checkWeChatUserLogin() | 205 | public function checkWeChatUserLogin() |
206 | { | 206 | { |
207 | - /*$user = Db::name('user')->where('id',5)->find(); | ||
208 | - cmf_update_current_user($user);*/ | 207 | + $user = Db::name('user')->where('id',4)->find(); |
208 | + cmf_update_current_user($user); | ||
209 | $userId = cmf_get_current_user_id(); | 209 | $userId = cmf_get_current_user_id(); |
210 | if (empty($userId)) { | 210 | if (empty($userId)) { |
211 | $config = [ | 211 | $config = [ |
-
请 注册 或 登录 后发表评论