From e4f75d0094c2d792f6365e93fcd75c7efcdd7bf5 Mon Sep 17 00:00:00 2001
From: 潘浩文 <phw@bronet.cn>
Date: Tue, 23 Oct 2018 09:42:35 +0800
Subject: [PATCH] 1
---
app/portal/controller/PrizeController.php | 2 +-
app/user/controller/UserController.php | 20 +++-----------------
public/themes/simpleboot3/portal/brand/brand_detail.html | 8 +++++---
public/themes/simpleboot3/user/person_center.html | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 224 insertions(+), 21 deletions(-)
create mode 100644 public/themes/simpleboot3/user/person_center.html
diff --git a/app/portal/controller/PrizeController.php b/app/portal/controller/PrizeController.php
index e84d511..7063b26 100644
--- a/app/portal/controller/PrizeController.php
+++ b/app/portal/controller/PrizeController.php
@@ -144,7 +144,7 @@ class PrizeController extends WeChatBaseController
$this->checkUser();
$app = new Application($this->options);
$js = $app->js;
- $jss = $js->config(['chooseImage', 'uploadImage', 'previewImage'], $debug = true, $beta = false, $json = true);
+ $jss = $js->config(['chooseImage', 'uploadImage', 'previewImage'], $debug = false, $beta = false, $json = true);
$this->assign('js',$jss);
return $this->fetch('getScore');
}
diff --git a/app/user/controller/UserController.php b/app/user/controller/UserController.php
index eebc905..49d1578 100644
--- a/app/user/controller/UserController.php
+++ b/app/user/controller/UserController.php
@@ -22,25 +22,11 @@ class UserController extends WeChatBaseController
$this->checkWeChatUserLogin();
}
- //兑奖记录
- public function prizeRecord(){
- $status=$this->request->param('status');
- $where['p.status']=!empty($status)?$status:0;
- $data=Db::name('prize_order')
- ->alias('po')
- ->join('prize p'.'po.prize_id=p.id')
- ->where($where)
- ->select();
- $this->assign('list',$data);
- return $this->fetch();
- }
-
-
-
//个人首页
public function userIndex(){
- $last = Db::name('users_score_log')->where(['users_id' => session('wechat_user')['users_id'], 'action' => '签到'])->max('create_time');
+ $re=$this->checkUser();
+ $last = Db::name('users_score_log')->where(['users_id' => $re['id'], 'action' => '签到'])->max('create_time');
if (date('Ymd', time()) > date('Ymd', $last)) {
$is_qiandao=0;
}else{
@@ -49,7 +35,7 @@ class UserController extends WeChatBaseController
$data=Db::name('users')->where('id',session('wechat_user')['users_id'])->find();
$this->assign('list',$data);
$this->assign('qiandao',$is_qiandao);
- return $this->fetch();
+ return $this->fetch(':person_center');
}
public function scoreRecord(){
$score=Db::name('users')->where('id',session('wechat_user')['users_id'])->find()['score'];
diff --git a/public/themes/simpleboot3/portal/brand/brand_detail.html b/public/themes/simpleboot3/portal/brand/brand_detail.html
index b295808..d6242f2 100644
--- a/public/themes/simpleboot3/portal/brand/brand_detail.html
+++ b/public/themes/simpleboot3/portal/brand/brand_detail.html
@@ -256,9 +256,11 @@
</P>
</div>
<div class="goodtail" >
-
- <!--<p class="good_line"></p>-->
- <!--<p class="good_name">商家详情</p>-->
+ <div class="goodtail_name">
+ <p class="good_line"></p>
+ <p class="good_name">活动详情</p>
+ <p class="good_line"></p>
+ </div>
{$list.content}
<!--<p class="good_line"></p>-->
<!--<div class="goodtail_img">-->
diff --git a/public/themes/simpleboot3/user/person_center.html b/public/themes/simpleboot3/user/person_center.html
new file mode 100644
index 0000000..b33f43a
--- /dev/null
+++ b/public/themes/simpleboot3/user/person_center.html
@@ -0,0 +1,215 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <link rel="stylesheet" href="__TMPL__/public/assets/css/base.css">
+ <script type="text/javascript" src="__TMPL__/public/assets/js/base.js"></script>
+ <title>个人中心</title>
+ <style>
+ body,html{
+ background: #fff;
+ }
+ .head{
+ /*padding: 0.73rem;*/
+ position:absolute;
+ top:0.73rem;
+ left:2.98rem;
+ margin: 0 auto;
+ }
+ .head_img{
+ width:1.2rem;
+ height:1.2rem;
+ margin: 0 auto;
+
+ }
+ .head_img img{
+ width:100%;
+ }
+ .name{
+ color:#000000;
+ font-size: 0.3rem;
+ font-weight: bold;
+ /*width:2rem;*/
+ text-align: center;
+ margin: 0 auto;
+ margin-top: 0.1rem;
+ }
+ .phone{
+ color:#000000;
+ font-size: 0.26rem;
+ /*width:4rem;*/
+ text-align: center;
+ margin: 0 auto;
+ margin-top: 0.08rem;
+ }
+ .line{
+ width:7.5rem;
+ height:0.16rem;
+ background: #F5F6FA;
+ }
+ .list{
+ display:flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0.31rem 1.51rem;
+ }
+ .myintegral_num{
+ color:#252729;
+ font-size: 0.32rem;
+ }
+ .myintegral_name{
+ color:#97A0A8;
+ font-size: 0.26rem;
+ }
+ .personcenter{
+ width:7.5rem;
+ height:3.19rem;
+ }
+ .personcenter_img{
+ width:4rem;
+ height:2.42rem;
+ margin: 0 auto;
+ padding: 0.36rem 0;
+ }
+ .personcenter_img img{
+ width:100%;
+ }
+ .member_img{
+ width:0.8rem;
+ height:0.8rem;
+ font-size: 0;
+ }
+ .member_img img{
+ width:100%;
+ }
+ .member_center{
+ color:#252729;
+ font-size: 0.24rem;
+ font-weight: bold;
+ margin-top: 0.15rem;
+ }
+ .memberlist_item{
+ width:5rem;
+ display:flex;
+ justify-content: space-between;
+ align-items: center;
+ height:0.99rem;
+ border-bottom: 1px solid #f5f5f5;
+ }
+ .member_people{
+ height:3.62rem;
+ padding: 0.85rem 0.62rem;
+ }
+ .member_integral{
+ display:flex;
+ }
+ .searchintegral{
+ color:#252729;
+ font-size:0.3rem;
+ }
+ .search_img{
+ width:0.15rem;
+ height:0.28rem;
+ font-size: 0;
+ }
+ .search_img img{
+ width:100%;
+ height:100%;
+ }
+ .personback{
+ width:7.5rem;
+ height:3.53rem;
+ font-size: 0;
+ }
+ .personback img{
+ width:100%;
+ }
+ </style>
+</head>
+<body>
+<div class="container">
+ <p class="personback">
+ <img src="__TMPL__/public/assets/images/img/personback.png" alt="">
+ </p>
+ <div class="head">
+
+ <p class="head_img">
+ <img src="{:cmf_get_image_preview_url($list.avatar);}" alt="">
+ </p>
+ <p class="name">{$list.nickname}</p>
+ <p class="phone">{$list.mobile}</p>
+
+ </div>
+ <div class="line"></div>
+ <div class="list">
+ <div class="myintergral">
+ <p class="myintegral_num">{$list.}</p>
+ <p class="myintegral_name">我的积分</p>
+ </div>
+ <div class="myintergral">
+ <p class="myintegral_num" >
+ <eq name="qiandao" value="1">
+ 已签到
+ <else />
+ 未签到
+ </eq>
+ </p>
+ <p class="myintegral_name">我的签到</p>
+ </div>
+ </div>
+ <div class="line"></div>
+ <div class="personcenter">
+ <div class="personcenter_img">
+ <img src="__TMPL__/public/assets/images/img/peraoncenter.png" alt="">
+ </div>
+
+ </div>
+ <div class="line"></div>
+ <div class="member_integral">
+ <div class="member_people">
+ <p class="member_img">
+ <img src="__TMPL__/public/assets/images/img/member.png" alt="">
+ </p>
+ <p class="member_center">
+ 会员中心
+ </p>
+ </div>
+ <div class="member_list">
+ <div class="memberlist_item integralquery" >
+ <p class="searchintegral">积分查询</p>
+ <p class="search_img">
+ <img src="img/row.png" alt="">
+ </p>
+ </div>
+ <div class="memberlist_item integralexchange">
+ <p class="searchintegral">积分兑换</p>
+ <p class="search_img">
+ <img src="img/row.png" alt="">
+ </p>
+ </div>
+ <div class="memberlist_item integralrecord">
+ <p class="searchintegral">积分记录</p>
+ <p class="search_img">
+ <img src="img/row.png" alt="">
+ </p>
+ </div>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="js/jquery.min.js"></script>
+<script>
+ //积分查询
+ $(".integralquery").click(function(){
+ window.location.href='myintegral.html'
+ })
+ //积分兑换
+ $(".integralexchange").click(function(){
+ window.location.href='uploadticket.html'
+ })
+ //积分记录
+ $(".integralrecord").click(function(){
+ window.location.href='record.html'
+ })
+</script>
+</body>
+</html>
--
libgit2 0.24.0