潘浩文 / scoreshop · 提交

转到一个项目

作者 潘浩文
提交 e4f75d0094c2d792f6365e93fcd75c7efcdd7bf5 1 个父辈 192dac10
1 个管道 的构建 通过 耗费 3 秒

1

内嵌 并排对比
正在显示 4 个修改的文件 包含 224 行增加 和 21 行删除
@@ -144,7 +144,7 @@ class PrizeController extends WeChatBaseController @@ -144,7 +144,7 @@ class PrizeController extends WeChatBaseController
144 $this->checkUser(); 144 $this->checkUser();
145 $app = new Application($this->options); 145 $app = new Application($this->options);
146 $js = $app->js; 146 $js = $app->js;
147 - $jss = $js->config(['chooseImage', 'uploadImage', 'previewImage'], $debug = true, $beta = false, $json = true); 147 + $jss = $js->config(['chooseImage', 'uploadImage', 'previewImage'], $debug = false, $beta = false, $json = true);
148 $this->assign('js',$jss); 148 $this->assign('js',$jss);
149 return $this->fetch('getScore'); 149 return $this->fetch('getScore');
150 } 150 }
@@ -22,25 +22,11 @@ class UserController extends WeChatBaseController @@ -22,25 +22,11 @@ class UserController extends WeChatBaseController
22 $this->checkWeChatUserLogin(); 22 $this->checkWeChatUserLogin();
23 } 23 }
24 24
25 - //兑奖记录  
26 - public function prizeRecord(){  
27 - $status=$this->request->param('status');  
28 - $where['p.status']=!empty($status)?$status:0;  
29 - $data=Db::name('prize_order')  
30 - ->alias('po')  
31 - ->join('prize p'.'po.prize_id=p.id')  
32 - ->where($where)  
33 - ->select();  
34 - $this->assign('list',$data);  
35 - return $this->fetch();  
36 - }  
37 -  
38 -  
39 -  
40 25
41 //个人首页 26 //个人首页
42 public function userIndex(){ 27 public function userIndex(){
43 - $last = Db::name('users_score_log')->where(['users_id' => session('wechat_user')['users_id'], 'action' => '签到'])->max('create_time'); 28 + $re=$this->checkUser();
  29 + $last = Db::name('users_score_log')->where(['users_id' => $re['id'], 'action' => '签到'])->max('create_time');
44 if (date('Ymd', time()) > date('Ymd', $last)) { 30 if (date('Ymd', time()) > date('Ymd', $last)) {
45 $is_qiandao=0; 31 $is_qiandao=0;
46 }else{ 32 }else{
@@ -49,7 +35,7 @@ class UserController extends WeChatBaseController @@ -49,7 +35,7 @@ class UserController extends WeChatBaseController
49 $data=Db::name('users')->where('id',session('wechat_user')['users_id'])->find(); 35 $data=Db::name('users')->where('id',session('wechat_user')['users_id'])->find();
50 $this->assign('list',$data); 36 $this->assign('list',$data);
51 $this->assign('qiandao',$is_qiandao); 37 $this->assign('qiandao',$is_qiandao);
52 - return $this->fetch(); 38 + return $this->fetch(':person_center');
53 } 39 }
54 public function scoreRecord(){ 40 public function scoreRecord(){
55 $score=Db::name('users')->where('id',session('wechat_user')['users_id'])->find()['score']; 41 $score=Db::name('users')->where('id',session('wechat_user')['users_id'])->find()['score'];
@@ -256,9 +256,11 @@ @@ -256,9 +256,11 @@
256 </P> 256 </P>
257 </div> 257 </div>
258 <div class="goodtail" > 258 <div class="goodtail" >
259 -  
260 - <!--<p class="good_line"></p>-->  
261 - <!--<p class="good_name">商家详情</p>--> 259 + <div class="goodtail_name">
  260 + <p class="good_line"></p>
  261 + <p class="good_name">活动详情</p>
  262 + <p class="good_line"></p>
  263 + </div>
262 {$list.content} 264 {$list.content}
263 <!--<p class="good_line"></p>--> 265 <!--<p class="good_line"></p>-->
264 <!--<div class="goodtail_img">--> 266 <!--<div class="goodtail_img">-->
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +<head>
  4 + <meta charset="UTF-8">
  5 + <link rel="stylesheet" href="__TMPL__/public/assets/css/base.css">
  6 + <script type="text/javascript" src="__TMPL__/public/assets/js/base.js"></script>
  7 + <title>个人中心</title>
  8 + <style>
  9 + body,html{
  10 + background: #fff;
  11 + }
  12 + .head{
  13 + /*padding: 0.73rem;*/
  14 + position:absolute;
  15 + top:0.73rem;
  16 + left:2.98rem;
  17 + margin: 0 auto;
  18 + }
  19 + .head_img{
  20 + width:1.2rem;
  21 + height:1.2rem;
  22 + margin: 0 auto;
  23 +
  24 + }
  25 + .head_img img{
  26 + width:100%;
  27 + }
  28 + .name{
  29 + color:#000000;
  30 + font-size: 0.3rem;
  31 + font-weight: bold;
  32 + /*width:2rem;*/
  33 + text-align: center;
  34 + margin: 0 auto;
  35 + margin-top: 0.1rem;
  36 + }
  37 + .phone{
  38 + color:#000000;
  39 + font-size: 0.26rem;
  40 + /*width:4rem;*/
  41 + text-align: center;
  42 + margin: 0 auto;
  43 + margin-top: 0.08rem;
  44 + }
  45 + .line{
  46 + width:7.5rem;
  47 + height:0.16rem;
  48 + background: #F5F6FA;
  49 + }
  50 + .list{
  51 + display:flex;
  52 + justify-content: space-between;
  53 + align-items: center;
  54 + padding: 0.31rem 1.51rem;
  55 + }
  56 + .myintegral_num{
  57 + color:#252729;
  58 + font-size: 0.32rem;
  59 + }
  60 + .myintegral_name{
  61 + color:#97A0A8;
  62 + font-size: 0.26rem;
  63 + }
  64 + .personcenter{
  65 + width:7.5rem;
  66 + height:3.19rem;
  67 + }
  68 + .personcenter_img{
  69 + width:4rem;
  70 + height:2.42rem;
  71 + margin: 0 auto;
  72 + padding: 0.36rem 0;
  73 + }
  74 + .personcenter_img img{
  75 + width:100%;
  76 + }
  77 + .member_img{
  78 + width:0.8rem;
  79 + height:0.8rem;
  80 + font-size: 0;
  81 + }
  82 + .member_img img{
  83 + width:100%;
  84 + }
  85 + .member_center{
  86 + color:#252729;
  87 + font-size: 0.24rem;
  88 + font-weight: bold;
  89 + margin-top: 0.15rem;
  90 + }
  91 + .memberlist_item{
  92 + width:5rem;
  93 + display:flex;
  94 + justify-content: space-between;
  95 + align-items: center;
  96 + height:0.99rem;
  97 + border-bottom: 1px solid #f5f5f5;
  98 + }
  99 + .member_people{
  100 + height:3.62rem;
  101 + padding: 0.85rem 0.62rem;
  102 + }
  103 + .member_integral{
  104 + display:flex;
  105 + }
  106 + .searchintegral{
  107 + color:#252729;
  108 + font-size:0.3rem;
  109 + }
  110 + .search_img{
  111 + width:0.15rem;
  112 + height:0.28rem;
  113 + font-size: 0;
  114 + }
  115 + .search_img img{
  116 + width:100%;
  117 + height:100%;
  118 + }
  119 + .personback{
  120 + width:7.5rem;
  121 + height:3.53rem;
  122 + font-size: 0;
  123 + }
  124 + .personback img{
  125 + width:100%;
  126 + }
  127 + </style>
  128 +</head>
  129 +<body>
  130 +<div class="container">
  131 + <p class="personback">
  132 + <img src="__TMPL__/public/assets/images/img/personback.png" alt="">
  133 + </p>
  134 + <div class="head">
  135 +
  136 + <p class="head_img">
  137 + <img src="{:cmf_get_image_preview_url($list.avatar);}" alt="">
  138 + </p>
  139 + <p class="name">{$list.nickname}</p>
  140 + <p class="phone">{$list.mobile}</p>
  141 +
  142 + </div>
  143 + <div class="line"></div>
  144 + <div class="list">
  145 + <div class="myintergral">
  146 + <p class="myintegral_num">{$list.}</p>
  147 + <p class="myintegral_name">我的积分</p>
  148 + </div>
  149 + <div class="myintergral">
  150 + <p class="myintegral_num" >
  151 + <eq name="qiandao" value="1">
  152 + 已签到
  153 + <else />
  154 + 未签到
  155 + </eq>
  156 + </p>
  157 + <p class="myintegral_name">我的签到</p>
  158 + </div>
  159 + </div>
  160 + <div class="line"></div>
  161 + <div class="personcenter">
  162 + <div class="personcenter_img">
  163 + <img src="__TMPL__/public/assets/images/img/peraoncenter.png" alt="">
  164 + </div>
  165 +
  166 + </div>
  167 + <div class="line"></div>
  168 + <div class="member_integral">
  169 + <div class="member_people">
  170 + <p class="member_img">
  171 + <img src="__TMPL__/public/assets/images/img/member.png" alt="">
  172 + </p>
  173 + <p class="member_center">
  174 + 会员中心
  175 + </p>
  176 + </div>
  177 + <div class="member_list">
  178 + <div class="memberlist_item integralquery" >
  179 + <p class="searchintegral">积分查询</p>
  180 + <p class="search_img">
  181 + <img src="img/row.png" alt="">
  182 + </p>
  183 + </div>
  184 + <div class="memberlist_item integralexchange">
  185 + <p class="searchintegral">积分兑换</p>
  186 + <p class="search_img">
  187 + <img src="img/row.png" alt="">
  188 + </p>
  189 + </div>
  190 + <div class="memberlist_item integralrecord">
  191 + <p class="searchintegral">积分记录</p>
  192 + <p class="search_img">
  193 + <img src="img/row.png" alt="">
  194 + </p>
  195 + </div>
  196 + </div>
  197 + </div>
  198 +</div>
  199 +<script type="text/javascript" src="js/jquery.min.js"></script>
  200 +<script>
  201 + //积分查询
  202 + $(".integralquery").click(function(){
  203 + window.location.href='myintegral.html'
  204 + })
  205 + //积分兑换
  206 + $(".integralexchange").click(function(){
  207 + window.location.href='uploadticket.html'
  208 + })
  209 + //积分记录
  210 + $(".integralrecord").click(function(){
  211 + window.location.href='record.html'
  212 + })
  213 +</script>
  214 +</body>
  215 +</html>