anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 73f71153a640d738c5654a5c4026ae9304894f39 1 个父辈 be5d1ca4
1 个管道 的构建 通过 耗费 5 秒

bug 修改

内嵌 并排对比
正在显示 5 个修改的文件 包含 115 行增加 和 4 行删除
@@ -251,6 +251,23 @@ class OrderpageController extends WeChatBaseController{ @@ -251,6 +251,23 @@ class OrderpageController extends WeChatBaseController{
251 251
252 } 252 }
253 253
  254 + /**
  255 + * 显示收货地址
  256 + */
  257 + public function go_add_address(){
  258 +
  259 + $uid = cmf_get_current_user_id();
  260 + $data = Db::name('address') -> where("delete_time = 0 and uid =".$uid) -> select() -> toArray();
  261 + if(!empty($data)){
  262 + foreach($data as $key => $val){
  263 + $detailed = explode(',',$val['detailed']);
  264 + $data[$key]['detailed'] = $detailed[0].$detailed[1];
  265 + }
  266 + }
  267 + $this -> assign('data',$data);
  268 + return $this -> fetch();
  269 +
  270 + }
254 271
255 272
256 273
@@ -141,7 +141,7 @@ class PersonalcenterController extends WeChatBaseController{ @@ -141,7 +141,7 @@ class PersonalcenterController extends WeChatBaseController{
141 public function personal_collect(){ 141 public function personal_collect(){
142 142
143 $uid = cmf_get_current_user_id(); 143 $uid = cmf_get_current_user_id();
144 - $data = Db::name('collect') -> where("uid =".$uid) -> select(); 144 + $data = Db::name('collect') -> where("uid =".$uid) -> select() -> toArray();
145 $data_count = count($data); 145 $data_count = count($data);
146 if(!empty($data)){ 146 if(!empty($data)){
147 foreach($data as $key => $val){ 147 foreach($data as $key => $val){
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
  6 + <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
  7 + <meta http-equiv="X-UA-Compatible" content="ie=edge">
  8 + <title>学考无忧-收获地址</title>
  9 + <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css">
  10 + <link rel="stylesheet" href="__TMPL__/public/assets/css/base.css">
  11 +</head>
  12 +
  13 +<body style="background-color:white;">
  14 +<div class="address_box">
  15 + <!-- 顶部 -->
  16 + <div class="ad_top">
  17 + <a href="javascript:history.back(-1)">
  18 + <img class="ad_topImg" src="__TMPL__/public/assets/images/left.png" alt="">
  19 + </a>
  20 + <h1>收货地址</h1>
  21 + <a href="{:url('Personalcenter/add_shop_address')}">
  22 + <p>新增地址</p>
  23 + </a>
  24 + </div>
  25 + <!-- 内容 -->
  26 + <div class="ad_content">
  27 + <ul id="ad_contentUl">
  28 + <volist name="data" id="vo">
  29 + <li ontouchstart="fors()">
  30 + <div class="ad_conBox">
  31 + <div class="ad_con1">
  32 + <p class="ad_conName">{$vo.name}</p>
  33 + <if condition="$vo.default_address eq 1">
  34 + <p class="ad_conMo" style="display:block;">默认</p>
  35 + <else/>
  36 + <p class="ad_conMo">默认</p>
  37 + </if>
  38 +
  39 + <p class="ad_conPhone">{$vo.phone}</p>
  40 + <img class="ad_conImg" src="__TMPL__/public/assets/images/35.png" ontouchstart="address_edit({$vo.id})" alt="">
  41 + </div>
  42 + </div>
  43 + <p class="ad_conAddress">收货地址：{$vo.region}{$vo.detailed}</p>
  44 + <div class="ad_MoRemove">
  45 + <div class="ad_mo" ontouchstart="set_default({$vo.id})">设为默认</div>
  46 + <div class="ad_move" ontouchstart="address_del({$vo.id})">删除</div>
  47 + </div>
  48 + </li>
  49 + </volist>
  50 + </ul>
  51 + </div>
  52 +</div>
  53 +<script src="__TMPL__/public/assets/js/base.js"></script>
  54 +<script src="__TMPL__/public/assets/js/address.js"></script>
  55 +<script src="__TMPL__/public/assets/js/jquery.js"></script>
  56 +<script>
  57 + function fors() {
  58 + console.log(111)
  59 + }
  60 +
  61 + /**
  62 + *点击设置默认
  63 + */
  64 + function set_default(id){
  65 + $.post("{:url('Personalcenter/set_default_address')}",{id:id},function(data){
  66 + if(data){
  67 + }else{
  68 + alert('设置失败!');
  69 + }
  70 + });
  71 + }
  72 +
  73 + /**
  74 + * 点击删除地址
  75 + */
  76 + function address_del(id){
  77 + $.post("{:url('Personalcenter/address_del')}",{id:id},function(data){
  78 + if($data){
  79 + }else{
  80 + alert('删除失败！');
  81 + }
  82 + });
  83 + }
  84 +
  85 + /**
  86 + *编辑地址
  87 + */
  88 + function address_edit(id){
  89 + window.location.href = "{:url('Personalcenter/address_edit')}?id="+id;
  90 + }
  91 +</script>
  92 +</body>
  93 +
  94 +</html>
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 <!-- 头像 --> 89 <!-- 头像 -->
90 <div class="log_top_buddha"> 90 <div class="log_top_buddha">
91 <div class="log_top_buddha_img"> 91 <div class="log_top_buddha_img">
92 - <img src="{$weixin.avatar}" alt="" /> 92 + <img src="{$weixin.avatar}" alt="" style="border-radius: 50%;"/>
93 </div> 93 </div>
94 <div class="log_top_buddha_contant"> 94 <div class="log_top_buddha_contant">
95 <div class="log_top_buddha_contant_one"> 95 <div class="log_top_buddha_contant_one">
@@ -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',2)->find();  
208 - cmf_update_current_user($user);*/ 207 + $user = Db::name('user')->where('id',2)->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 = [