功能调试

@@ -16,6 +16,12 @@
                 </div>
             </div>
             <div class="control-group">
+                <label class="control-label">链接地址</label>
+                <div class="controls">
+                    <input type="text" name="href">
+                </div>
+            </div>
+            <div class="control-group">
                 <label class="control-label">描述</label>
                 <div class="controls">
                     <textarea name="description" rows="5" cols="30"></textarea>

@@ -18,6 +18,12 @@
                 </div>
             </div>
             <div class="control-group">
+                <label class="control-label">链接地址</label>
+                <div class="controls">
+                    <input type="text" name="href" value="{$href}">
+                </div>
+            </div>
+            <div class="control-group">
                 <label class="control-label">描述</label>
                 <div class="controls">
                     <textarea name="description" rows="5" cols="57">{$description}</textarea>

@@ -37,9 +37,10 @@ class MessageController extends AdminbaseController {
     public function add_post(){
         if(IS_POST){
             $_POST['userids'] = implode(',', I('post.userids'));
-            $_POST['content'] = htmlspecialchars_decode(I('post.content'));
-            if ($this->message_model->create()!==false) {
-                if ($this->message_model->add()!==false) {
+            $_POST['content'] = htmlspecialchars_decode($_POST['content']);
+            $_POST['ctime'] = time();
+            if ($this->message_model->create($_POST)!==false) {
+                if ($this->message_model->add($_POST)!==false) {
                     $this->success("添加成功！", U("Message/index"));
                 } else {
                     $this->error("添加失败！");
@@ -64,9 +65,10 @@ class MessageController extends AdminbaseController {
     public function edit_post(){
         if (IS_POST) {
             $_POST['userids'] = implode(',', I('post.userids'));
-            $_POST['content'] = htmlspecialchars_decode(I('post.content'));
-            if ($this->message_model->create()!==false) {
-                if ($this->message_model->save()!==false) {
+            $_POST['content'] = htmlspecialchars_decode($_POST['content']);
+            $_POST['utime'] = time();
+            if ($this->message_model->create($_POST)!==false) {
+                if ($this->message_model->save($_POST)!==false) {
                     $this->success("保存成功！");
                 } else {
                     $this->error("保存失败！");

@@ -44,6 +44,7 @@ class SuccessorController extends AdminbaseController {
                 $this->error("请选择一个分类！");
             }
             $successor=I("post.post");
+            $successor['sort_path'] = M('Product')->where(array('id'=>$successor['sort_id']))->getField('path');
             $successor['content']=htmlspecialchars_decode($successor['content']);
             $successor['ctime'] = time();
             if(!$this->successor_model->create($successor)){
@@ -84,6 +85,7 @@ class SuccessorController extends AdminbaseController {
             $id=intval(I('post.id'));
 
             $successor=I("post.post");
+            $successor['sort_path'] = M('Product')->where(array('id'=>$successor['sort_id']))->getField('path');
             $successor['content']=htmlspecialchars_decode($successor['content']);
             $successor['ctime'] = time();
             $successor['utime'] = time();

@@ -236,7 +236,7 @@ class HomebaseController extends AppframeController {
         $input->SetTime_start(date("YmdHis"));
         $input->SetTime_expire(date("YmdHis", time() + 600));
         $input->SetGoods_tag(1);//$orderInfo['price_count']
-        $input->SetNotify_url(U('User/Cart/notify','',true,true));
+        $input->SetNotify_url(U('Portal/Notify/notify_web','',true,true));
         $input->SetTrade_type("JSAPI");
         $input->SetOpenid($openId);
         $order = \WxPayApi::unifiedOrder($input);

@@ -18,6 +18,7 @@ class MessageModel extends CommonModel {
         array('title', 'require', '标题不能为空', 1, 'regex', CommonModel::MODEL_BOTH),
 //        array('smeta', 'require', '缩略图不能为空', 1, 'regex', CommonModel::MODEL_BOTH),
         array('userids', 'require', '接收用户不能为空', 1, 'regex', CommonModel::MODEL_BOTH),
+        array('href', 'url', '链接地址格式错误', 2, 'regex', CommonModel::MODEL_BOTH),
         array('description', 'require', '描述不能为空', 1, 'regex', CommonModel::MODEL_BOTH),
         array('content', 'require', '内容不能为空', 1, 'regex', CommonModel::MODEL_BOTH),
     );
@@ -31,7 +32,7 @@ class MessageModel extends CommonModel {
         if($user_id) {
             $where['userids'] = array('like', '%'.$user_id.'%');
         }
-        return $this->where($where)->select();
+        return $this->where($where)->order(array('ctime'=>'DESC'))->select();
     }
 
     // 获取站内信详情

@@ -23,6 +23,6 @@ class MessageUserLogModel extends CommonModel {
     public function check($user_id, $message_id) {
         $where['user_id'] = $user_id;
         $where['message_id'] = $message_id;
-        $this->where($where)->count();
+        return $this->where($where)->count();
     }
 }
\ No newline at end of file

+<?php
+/**
+ * Created by PhpStorm.
+ * User: 29925
+ * Date: 2018/5/15
+ * Time: 16:04
+ */
+
+namespace Portal\Controller;
+
+use Common\Controller\HomebaseController;
+
+class AlipayController extends HomebaseController {
+
+    function _initialize() {
+        parent::_initialize(); // TODO: Change the autogenerated stub
+        require_once VENDOR_PATH.'alipay/config.php';
+        require_once VENDOR_PATH.'alipay/pagepay/service/AlipayTradeService.php';
+        require_once VENDOR_PATH.'alipay/pagepay/buildermodel/AlipayTradePagePayContentBuilder.php';
+        $this->config = $config;
+    }
+
+    public function alipay() {
+        $config = $this->config;
+        //商户订单号，商户网站订单系统中唯一订单号，必填
+        $out_trade_no = trim(I('get.order_sn'));
+
+        //订单名称，必填
+        $subject = trim(I('get.name'));
+
+        //付款金额，必填
+//        $total_amount = trim(I('get.price'));
+        $total_amount = trim(0.01);
+
+        //商品描述，可空
+        $body = '';
+
+        //构造参数
+        $payRequestBuilder = new \AlipayTradePagePayContentBuilder();
+        $payRequestBuilder->setBody($body);
+        $payRequestBuilder->setSubject($subject);
+        $payRequestBuilder->setTotalAmount($total_amount);
+        $payRequestBuilder->setOutTradeNo($out_trade_no);
+
+        $aop = new \AlipayTradeService($config);
+
+        /**
+         * pagePay 电脑网站支付请求
+         * @param $builder 业务参数，使用buildmodel中的对象生成。
+         * @param $return_url 同步跳转地址，公网可以访问
+         * @param $notify_url 异步通知地址，公网可以访问
+         * @return $response 支付宝返回的信息
+         */
+        $response = $aop->pagePay($payRequestBuilder,$config['return_url'],$config['notify_url']);
+
+        //输出表单
+        var_dump($response);
+    }
+
+    // 回调
+    public function notify_url() {
+        $config = $this->config;
+        $arr=$_POST;
+        $alipaySevice = new \AlipayTradeService($config);
+        $alipaySevice->writeLog(var_export($_POST,true));
+        $result = $alipaySevice->check($arr);
+        if($result) {
+            F('alipay_notify', $_POST);
+            //商户订单号
+
+            $out_trade_no = $_POST['out_trade_no'];
+
+            //支付宝交易号
+
+            $trade_no = $_POST['trade_no'];
+
+            //交易状态
+            $trade_status = $_POST['trade_status'];
+
+
+            if($_POST['trade_status'] == 'TRADE_FINISHED') {
+
+                //判断该笔订单是否在商户网站中已经做过处理
+                //如果没有做过处理，根据订单号（out_trade_no）在商户网站的订单系统中查到该笔订单的详细，并执行商户的业务程序
+                //请务必判断请求时的total_amount与通知时获取的total_fee为一致的
+                //如果有做过处理，不执行商户的业务程序
+
+                //注意：
+                //退款日期超过可退款期限后（如三个月可退款），支付宝系统发送该交易状态通知
+            }
+            else if ($_POST['trade_status'] == 'TRADE_SUCCESS') {
+                //判断该笔订单是否在商户网站中已经做过处理
+                //如果没有做过处理，根据订单号（out_trade_no）在商户网站的订单系统中查到该笔订单的详细，并执行商户的业务程序
+                //请务必判断请求时的total_amount与通知时获取的total_fee为一致的
+                //如果有做过处理，不执行商户的业务程序
+                //注意：
+                //付款完成后，支付宝系统发送该交易状态通知
+            }
+        }
+    }
+
+    //
+    public function return_url() {
+        $config = $this->config;
+        $arr = $_GET;
+        $alipaySevice = new \AlipayTradeService($config);
+        $result = $alipaySevice->check($arr);
+        var_dump($_GET);
+        var_dump($result);
+        if ($result) {
+            //商户订单号
+            $out_trade_no = htmlspecialchars($_GET['out_trade_no']);
+
+            //支付宝交易号
+            $trade_no = htmlspecialchars($_GET['trade_no']);
+        }
+    }
+}
\ No newline at end of file

@@ -27,6 +27,9 @@ class NotifyController extends HomebaseController {
         if($base->CheckSign() == true){
             if ($data["return_code"] == "SUCCESS") {
                 $where['order_sn'] = $data['attach'];
+                if(!$where['order_sn']) {
+                    $where['order_sn'] = $data['out_trade_no'];
+                }
                 $where['price_count'] = $data['total_fee'];
                 $info['pay_sort'] = 1;
                 $info['ptime'] = time();

@@ -32,10 +32,68 @@ class SuccessorController extends HomebaseController {
         $this->assign('sex', array('1'=>'男', '2'=>'女'));
         $this->assign('level', array('国家级', '省市级', '地区及', '县级'));
         $this->assign('search',I('get.'));
-        $this->_lists(array('is_del'=>0));
+        $where['is_del'] = 0;
+        if(I('get.product')){
+            $where['sort_path'] = array('like','0-'.I('get.product').'%');
+        }
+        if(I('get.product_son')){
+            $where['sort_id'] = I('get.product_son');
+        }
+        if(I('get.sex')){
+            $where['sex'] = I('get.sex');
+        }
+        if(I('get.level')){
+            $where['level'] = I('get.level');
+        }
+        if(I('get.region')){
+            $where['region'] = I('get.region');
+        }
+        if(I('get.nation')){
+            $where['nation'] = I('get.nation');
+        }
+        $this->searchArray(I('get.'));
+        $this->_lists($where);
         $this->display();
     }
 
+    // 处理搜索条件数据
+    private function searchArray($get) {
+        // 各筛选条件url处理
+        // 一级分类
+        $url['product_all'] = $get;
+        unset($url['product_all']['product']);
+        unset($url['product_all']['product_son']);
+        $url['product_search'] = $get;
+        unset($url['product_search']['product']);
+        // 二级分类
+        $url['son_all'] = $get;
+        unset($url['son_all']['product_son']);
+        $url['son_search'] = $get;
+        unset($url['son_search']['product_son']);
+        // 性别
+        $url['sex_all'] = $get;
+        unset($url['sex_all']['sex']);
+        $url['sex_search'] = $get;
+        unset($url['sex_search']['sex']);
+        // 级别
+        $url['level_all'] = $get;
+        unset($url['level_all']['sex']);
+        $url['level_search'] = $get;
+        unset($url['level_search']['sex']);
+        // 区域
+        $url['region_all'] = $get;
+        unset($url['region_all']['sex']);
+        $url['region_search'] = $get;
+        unset($url['region_search']['sex']);
+        // 民族
+        $url['nation_all'] = $get;
+        unset($url['nation_all']['sex']);
+        $url['nation_search'] = $get;
+        unset($url['nation_search']['sex']);
+        $this->assign('search_url',$url);
+        return $url;
+    }
+
     // 传承人详情
     public function detail(){
         $id = I('get.id',0,'intval');

@@ -339,6 +339,7 @@ class CartController extends MemberbaseController {
             $orderInfo['goods_ids'] = $this->order_detail_model->where(array('order_sn'=>$orderInfo['order_sn']))->getField('goods_id',true);
             $return = $this->wxpay($orderInfo,'订单支付');
             $this->assign('qrcode',base64_encode($return['code_url']));
+            $this->assign('alipay_url',U('Portal/Alipay/alipay',array('order_sn'=>$orderInfo['order_sn'],'name'=>'订单支付','price'=>$orderInfo['price_count'])));
             $this->assign('orderInfo',$orderInfo);
             $this->display();
         } else {

@@ -18,4 +18,10 @@ class CenterController extends MemberbaseController {
         $this->assign('top',$top);
     	$this->display(':center');
     }
+
+    // 退换货页面
+    public function returns() {
+        $this->assign('policy','active');
+        $this->display(':return');
+    }
 }

@@ -4,7 +4,7 @@ namespace User\Controller;
 use Common\Controller\HomebaseController;
 
 class IndexController extends HomebaseController {
-    
+
     // 前台用户首页 (公开)
 	public function index() {
 	    

@@ -27,7 +27,7 @@ class MessageController extends MemberbaseController {
         $list = $this->message_model->getList($this->userid);
         foreach($list as $k=>$v) {
             $read = $this->message_user_log_model->check($this->userid,$v['id']);
-            if($read) {
+            if(!$read) {
                 $unreadList[] = $v;
                 unset($list[$k]);
             }
@@ -43,8 +43,8 @@ class MessageController extends MemberbaseController {
         if(!$id) {
             $this->error('参数错误');
         }
-        $info = $this->message_model->getInfo($this->userid);
-        if(!$info) {
+        $msgInfo = $this->message_model->getInfo($this->userid);
+        if(!$msgInfo) {
             $this->error('未授权查看该站内信');
         }
         $read = $this->message_user_log_model->check($this->userid,$id);
@@ -54,7 +54,7 @@ class MessageController extends MemberbaseController {
             $info['rtime'] = time();
             $this->message_user_log_model->add($info);
         }
-        $this->assign('messageInfo',$info);
+        $this->assign($info);
         $this->display();
     }
 }
\ No newline at end of file

@@ -83,16 +83,87 @@ class ProfileController extends MemberbaseController {
 
     // 修改绑定1
     public function old_mobile() {
+	    $time = microtime();
+	    $token = '#'.sha1(strtoupper(md5($this->userid.$time)));
+	    $this->user_model->where(array('id'=>$this->userid))->save(array('token'=>$token));
+	    session('time',$time);
 	    $this->display();
     }
 
+    /**
+     * 验证原手机号码
+     * @param mobile 手机号码
+     * @param code 验证码
+     */
+    public function do_old_mobile() {
+        if(IS_AJAX) {
+            $mobile = I('post.mobile');
+            $code = I('post.code');
+            $code_model = D('Common/Code');
+            $user_mobile = $this->user_model->where(array('id'=>$this->userid))->getField('mobile');
+            if($mobile!=$user_mobile) {
+                $this->ajaxReturn(array('status'=>false, 'msg'=>'手机号码错误'));
+            }
+            if(!$code_model->getInfo($mobile, $code, time())) {
+                $this->ajaxReturn(array('status'=>false, 'msg'=>'验证码不正确'));
+            }
+            $this->ajaxReturn(array('status'=>true,'msg'=>'成功','data'=>U('User/Profile/new_mobile')));
+        } else {
+            $this->error('非法操作');
+        }
+    }
+
     // 修改绑定2
     public function new_mobile() {
+        $time = session('time');
+        if(!$time) {
+            redirect(U('User/Profile/old_mobile'));
+        }
+        $token = $this->user_model->where(array('id'=>$this->userid))->getField('token');
+        $this_token = '#'.sha1(strtoupper(md5($this->userid.$time)));
+        if($token != $this_token) {
+            $this->error('非法操作');
+        }
         $this->display();
     }
 
+    /**
+     * 修改新手机号码
+     * @param mobile 手机号码
+     * @param code 验证码
+     */
+    public function do_new_mobile() {
+        if(IS_AJAX) {
+            $mobile = I('post.mobile');
+            $code = I('post.code');
+            $code_model = D('Common/Code');
+            if(!$code_model->getInfo($mobile, $code, time())) {
+                $this->ajaxReturn(array('status'=>false, 'msg'=>'验证码不正确'));
+            }
+            $result = $this->user_model->where(array('id'=>$this->userid))->save(array('mobile'=>$mobile));
+            if(!$result) {
+                $this->ajaxReturn(array('status'=>false,'msg'=>'更换失败，请重试'));
+            }
+            $user = $this->user_model->where(array('id'=>$this->userid))->find();
+            session('user',$user);
+            $this->ajaxReturn(array('status'=>true,'msg'=>'成功','data'=>U('User/Profile/ok_mobile')));
+        } else {
+            $this->error('非法操作');
+        }
+    }
+
     // 修改绑定3
     public function ok_mobile() {
+        $time = session('time');
+        if(!$time) {
+            redirect(U('User/Profile/edit'));
+        }
+        $token = $this->user_model->where(array('id'=>$this->userid))->getField('token');
+        $this_token = '#'.sha1(strtoupper(md5($this->userid.$time)));
+        if($token != $this_token) {
+            $this->error('非法操作');
+        }
+        session('time','');
         $this->display();
     }
     
@@ -101,6 +172,60 @@ class ProfileController extends MemberbaseController {
 		$this->assign($this->user);
     	$this->display();
     }
+
+    /**
+     * 原手机号发送短信
+     * @param mobile 手机号码
+     */
+    public function old_check() {
+        if(IS_AJAX) {
+            $mobile = I('post.mobile');
+            $user_mobile = $this->user_model->where(array('id'=>$this->userid))->getField('mobile');
+            if($mobile!=$user_mobile) {
+                $this->ajaxReturn(array('status'=>false, 'msg'=>'手机号码错误'));
+            }
+            $this->send($mobile);
+        } else {
+            $this->error('非法操作');
+        }
+    }
+
+    /**
+     * 新手机号发送短信
+     * @param mobile 手机号码
+     */
+    public function new_check() {
+        if(IS_AJAX) {
+            $mobile = I('post.mobile');
+            $count = $this->user_model->where(array('mobile'=>$mobile))->count();
+            if($count) {
+                $this->ajaxReturn(array('status'=>false, 'msg'=>'手机号码已存在'));
+            }
+            $this->send($mobile);
+        } else {
+            $this->error('非法操作');
+        }
+    }
+
+    /**
+     * 发送短信
+     * @param mobile 手机号码
+     */
+    private function send($mobile) {
+        $info['mobile'] = I('post.mobile');
+        $where['mobile'] = $info['mobile'];
+        $info['code'] = $this->generate_code(6);
+//            $result = explode(',', $this->sendSMS($info['mobile'], $info['code']));
+//            if($result[0] != 1) {
+//                $this->ajaxReturn(array('status'=>false, 'msg'=>'发送失败', 'data'=>$result));
+//            }
+        //如发送成功，将短信发送记录入表中
+        $info['ctime'] = time();
+        $info['otime'] = time()+600;
+        $code_model = D('Common/Code');
+        $code_model->add($info);
+        $this->ajaxReturn(array('status'=>true, 'msg'=>'发送成功', 'code'=>$info['code']));
+    }
     
     // 用户头像上传
     public function avatar_upload(){

@@ -27,9 +27,10 @@
                 <div class="filter-body">
                     <div class="filter-v-list">
                         <ul class="f-valueList">
-                            <li class="active"><a href="">全部</a></li>
+                            <li class="<empty name='search.product'>active</empty>"><a href="{:U('index',$search_url['product_all'])}">全部</a></li>
                             <volist name="product" id="vo">
-                                <li><a href="">{$vo.name}</a></li>
+                                <php>$search_url['product_search']['product'] = $vo['id'];</php>
+                                <li class="<if condition='$search[product] eq $vo[id]'>active</if>"><a href="{:U('index',$search_url['product_search'])}">{$vo.name}</a></li>
                             </volist>
                         </ul>
                     </div>
@@ -41,9 +42,10 @@
                     <div class="filter-body">
                         <div class="filter-v-list">
                             <ul class="f-valueList">
-                                <li class="active"><a href="">全部</a></li>
+                                <li class="<empty name='search.product_son'>active</empty>"><a href="{:U('index',$search_url['son_all'])}">全部</a></li>
                                 <volist name="product_son" id="vo">
-                                    <li><a href="">{$vo.name}</a></li>
+                                    <php>$search_url['son_search']['product_son'] = $vo['id'];</php>
+                                    <li class="<if condition='$search[product_son] eq $vo[id]'>active</if>"><a href="{:U('index',$search_url['son_search'])}">{$vo.name}</a></li>
                                 </volist>
                             </ul>
                         </div>
@@ -55,9 +57,10 @@
                 <div class="filter-body">
                     <div class="filter-v-list">
                         <ul class="f-valueList">
-                            <li class="active"><a href="">全部</a></li>
+                            <li class="<empty name='search.sex'>active</empty>"><a href="{:U('index',$search_url['sex_all'])}">全部</a></li>
                             <volist name="sex" id="vo">
-                                <li><a href="">{$vo}</a></li>
+                                <php>$search_url['sex_search']['sex'] = $key;</php>
+                                <li class="<if condition='$search[sex] eq $key'>active</if>"><a href="{:U('index',$search_url['sex_search'])}">{$vo}</a></li>
                             </volist>
                         </ul>
                     </div>
@@ -68,9 +71,10 @@
                 <div class="filter-body">
                     <div class="filter-v-list">
                         <ul class="f-valueList">
-                            <li class="active"><a href="">全部</a></li>
+                            <li class="<empty name='search.level'>active</empty>"><a href="{:U('index',$search_url['level_all'])}">全部</a></li>
                             <volist name="level" id="vo">
-                                <li><a href="">{$vo}</a></li>
+                                <php>$search_url['level_search']['level'] = $vo;</php>
+                                <li class="<eq name='search.level' value='vo'>active</eq>"><a href="{:U('index',$search_url['level_search'])}">{$vo}</a></li>
                             </volist>
                         </ul>
                     </div>
@@ -81,9 +85,10 @@
                 <div class="filter-body">
                     <div class="filter-v-list">
                         <ul class="f-valueList">
-                            <li class="active"><a href="">全部</a></li>
+                            <li class="<empty name='search.region'>active</empty>"><a href="{:U('index',$search_url['region_all'])}">全部</a></li>
                             <volist name="region" id="vo">
-                                <li><a href="">{$vo.name}</a></li>
+                                <php>$search_url['region_search']['region'] = $vo['name'];</php>
+                                <li class="<if condition='$search[region] eq $vo[name]'>active</if>"><a href="{:U('index',$search_url['region_search'])}">{$vo.name}</a></li>
                             </volist>
                         </ul>
                     </div>
@@ -97,9 +102,10 @@
                 <div class="filter-body">
                     <div class="filter-v-list">
                         <ul class="f-valueList">
-                            <li class="active"><a href="">全部</a></li>
+                            <li class="<empty name='search.nation'>active</empty>"><a href="{:U('index',$search_url['nation_all'])}">全部</a></li>
                             <volist name="nation" id="vo">
-                                <li><a href="">{$vo.name}</a></li>
+                                <php>$search_url['nation_search']['nation'] = $vo['name'];</php>
+                                <li class="<if condition='$search[nation] eq $vo[name]'>active</if>"><a href="{:U('index',$search_url['nation_search'])}">{$vo.name}</a></li>
                             </volist>
                         </ul>
                     </div>

@@ -26,11 +26,13 @@ $(function(){
     $('.wechat-radio').change(function(){
         if($(this).is(":checked")){
             $('.pay-in-weixin').show();
+            $('.pay-button').hide();
         }
     });
     $('.alipay-radio').change(function(){
         if($(this).is(":checked")){
             $('.pay-in-weixin').hide();
+            $('.pay-button').show();
         }
     });
 

@@ -62,7 +62,7 @@
                 </div>
             </div>
             <div class="pay-footer">
-                <a href="javascript:;" class="pay-button">去付款</a>
+                <a href="{$alipay_url}" class="pay-button">去付款</a>
                 <div class="pay-price">应付总额：<span>¥<i>{$orderInfo.price_count}</i></span></div>
             </div>
         </div>

@@ -31,20 +31,15 @@
                     <div class="site-msg">
                         <ul>
                             <li>
-                                <div class="msg-title">这场比赛厉害了，头奖8万你还不来？</div>
+                                <div class="msg-title">{$title}</div>
                                 <div class="msg-desc">
-                                    这场比赛厉害了，头奖8万你还不来？<br />
-                                    距腾讯王卡品牌形象创意设计征集大赛结束仅剩6天！<br />
-                                    王的形象，由你主宰！这是一场关于“大王”的创意风暴~<br />
-                                    创意不限，脑洞不限！<br />
-                                    是呆萌可爱还是时尚酷炫全都看你的。<br />
-                                    天下英才速来献计，快来画出你心中的大王~
+                                    {$content}
                                 </div>
                                 <div class="msg-footer">
                                     <div class="msg-link">
-                                        链接网址：<a href="">http://www.zcool.com.cn/event/wangka/</a>
+                                        <notempty name="href">链接网址：<a href="{$href}" target="_blank">{$href}</a></notempty>
                                     </div>
-                                    <div class="msg-time">2018-2-23  12:23</div>
+                                    <div class="msg-time">{:date('Y-m-d H:i',$ctime)}</div>
                                 </div>
                             </li>
                         </ul>

@@ -34,76 +34,36 @@
                     <!--信-->
                     <div class="site-msg">
                         <ul>
-                            <li>
-                                <div class="msg-title">这场比赛厉害了，头奖8万你还不来？</div>
-                                <div class="msg-desc">
-                                    这场比赛厉害了，头奖8万你还不来？<br />
-                                    距腾讯王卡品牌形象创意设计征集大赛结束仅剩6天！<br />
-                                    王的形象，由你主宰！这是一场关于“大王”的创意风暴~<br />
-                                    创意不限，脑洞不限！<br />
-                                    是呆萌可爱还是时尚酷炫全都看你的。<br />
-                                    天下英才速来献计，快来画出你心中的大王~
-                                </div>
-                                <div class="msg-footer">
-                                    <div class="msg-link">
-                                        链接网址：<a href="">http://www.zcool.com.cn/event/wangka/</a>
+                            <volist name="unReadMessageList" id="vo">
+                                <li>
+                                    <div class="msg-title">{$vo.title}</div>
+                                    <div class="msg-desc">
+                                        <a href="{:U('detail',array('id'=>$vo['id']))}">{$vo.description}</a>
                                     </div>
-                                    <div class="msg-time">2018-2-23  12:23</div>
-                                </div>
-                            </li>
-                            <li>
-                                <div class="msg-title">公告</div>
-                                <div class="msg-desc">
-                                    这场比赛厉害了，头奖8万你还不来？<br />
-                                    距腾讯王卡品牌形象创意设计征集大赛结束仅剩6天！<br />
-                                    王的形象，由你主宰！这是一场关于“大王”的创意风暴~<br />
-                                    创意不限，脑洞不限！<br />
-                                    是呆萌可爱还是时尚酷炫全都看你的。<br />
-                                    天下英才速来献计，快来画出你心中的大王~
-                                </div>
-                                <div class="msg-footer">
-                                    <div class="msg-link">
-                                        链接网址：<a href="">http://www.zcool.com.cn/event/wangka/</a>
+                                    <div class="msg-footer">
+                                        <div class="msg-link">
+                                            <notempty name="vo.href"><a href="{$vo.href}" target="_blank">{$vo.href}</a></notempty>
+                                        </div>
+                                        <div class="msg-time">{:date('Y-m-d H:i',$vo['ctime'])}</div>
                                     </div>
-                                    <div class="msg-time">2018-2-23  12:23</div>
-                                </div>
-                            </li>
+                                </li>
+                            </volist>
                         </ul>
                         <ul>
-                            <li>
-                                <div class="msg-title">这场比赛厉害了，头奖8万你还不来？</div>
-                                <div class="msg-desc">
-                                    这场比赛厉害了，头奖8万你还不来？<br />
-                                    距腾讯王卡品牌形象创意设计征集大赛结束仅剩6天！<br />
-                                    王的形象，由你主宰！这是一场关于“大王”的创意风暴~<br />
-                                    创意不限，脑洞不限！<br />
-                                    是呆萌可爱还是时尚酷炫全都看你的。<br />
-                                    天下英才速来献计，快来画出你心中的大王~
-                                </div>
-                                <div class="msg-footer">
-                                    <div class="msg-link">
-                                        链接网址：<a href="">http://www.zcool.com.cn/event/wangka/</a>
+                            <volist name="messageList" id="vo">
+                                <li>
+                                    <div class="msg-title">{$vo.title}</div>
+                                    <div class="msg-desc">
+                                        <a href="{:U('detail',array('id'=>$vo['id']))}">{$vo.description}</a>
                                     </div>
-                                    <div class="msg-time">2018-2-23  12:23</div>
-                                </div>
-                            </li>
-                            <li>
-                                <div class="msg-title">公告</div>
-                                <div class="msg-desc">
-                                    这场比赛厉害了，头奖8万你还不来？<br />
-                                    距腾讯王卡品牌形象创意设计征集大赛结束仅剩6天！<br />
-                                    王的形象，由你主宰！这是一场关于“大王”的创意风暴~<br />
-                                    创意不限，脑洞不限！<br />
-                                    是呆萌可爱还是时尚酷炫全都看你的。<br />
-                                    天下英才速来献计，快来画出你心中的大王~
-                                </div>
-                                <div class="msg-footer">
-                                    <div class="msg-link">
-                                        链接网址：<a href="">http://www.zcool.com.cn/event/wangka/</a>
+                                    <div class="msg-footer">
+                                        <div class="msg-link">
+                                            <notempty name="vo.href"><a href="{$vo.href}" target="_blank">{$vo.href}</a></notempty>
+                                        </div>
+                                        <div class="msg-time">{:date('Y-m-d H:i',$vo['ctime'])}</div>
                                     </div>
-                                    <div class="msg-time">2018-2-23  12:23</div>
-                                </div>
-                            </li>
+                                </li>
+                            </volist>
                         </ul>
                     </div>
                 </div>

@@ -82,7 +82,6 @@
         </div>
     </div>
 </div>
-<tc_include file="Public:script"/>
 <!-- js -->
 <script src="__TMPL__Public/assets/js/jquery.min.js"></script>
 <script src="__TMPL__Public/assets/js/mm.js"></script>

@@ -47,19 +47,19 @@
                         <div class="mm-row">
                             <div class="hd">请输入新手机号：</div>
                             <div class="bd">
-                                <input type="text" value="" class="mm-input" />
+                                <input type="text" name="mobile" value="" class="mm-input" />
                             </div>
                         </div>
                         <div class="mm-row">
                             <div class="hd">短信验证码：</div>
                             <div class="bd">
-                                <input type="text" value="" class="mm-input mm-code-input" />
-                                <input type="button" class="btnCode" id="btn" value="点击获取" onclick="settime(this)" />
+                                <input type="text" name="code" value="" class="mm-input mm-code-input" />
+                                <input type="button" class="btnCode" id="btn" value="点击获取" />
                             </div>
                         </div>
                     </div>
                     <div class="mm-form-footer">
-                        <a href="" class="btn-submit">保存</a>
+                        <a href="javascript:;" class="btn-submit">保存</a>
                     </div>
                 </div>
             </div>
@@ -83,7 +83,7 @@
             return false;
         }
         $.ajax({
-            url:"{:U('Register/send')}",
+            url:"{:U('new_check')}",
             type:"POST",
             data:{
                 mobile:mobile
@@ -119,10 +119,7 @@
             ,1000)
     }
     $('.btn-submit').click(function(){
-        var btn = $(this);
-        var text = btn.text();
         var mobile = $('input[name=mobile]').val();
-        var password = $('input[name=password]').val();
         var code = $('input[name=code]').val();
         /*正则表达式*/
         var AuglyTest_phone = /^1(3|4|5|7|8)\d{9}$/;
@@ -131,32 +128,22 @@
             return false;
         }
         $.ajax({
-            url:"{:U('doregister')}",
+            url:"{:U('do_new_mobile')}",
             type:"POST",
             data:{
                 mobile:mobile,
-                password:password,
                 code:code
             },
             dateType:"json",
-            beforeSend: function () {
-                // Handle the beforeSend event
-                btn.val('注册中...').attr('disabled', true);
-            },
             success:function (data) {
                 if(data.status) {
-                    alert(data.msg);
-                    location.reload();
+                    location.href = data.data;
                 } else {
                     alert(data.msg);
                 }
             },
             error: function (data, status, e) {   //提交失败自动执行的处理函数
                 alert(e);
-            },
-            complete: function () {
-                // Handle the complete event
-                btn.val(text).attr('disabled', false);
             }
         })
     });

@@ -46,7 +46,7 @@
                     <div class="mm-details-tips">
                         <div class="tips-hd"><span class="sucess">更改绑定手机号成功！</span></div>
                         <div class="tips-link">
-                            <a href="">返回首页 ></a>
+                            <a href="{:U('User/Center/index')}">返回首页 ></a>
                         </div>
                     </div>
                 </div>
@@ -55,6 +55,7 @@
     </div>
 </div>
 <tc_include file="Public:footer"/>
+<script src="__TMPL__Public/assets/js/jquery.min.js"></script>
 <tc_include file="Public:script"/>
 </body>
 </html>

@@ -47,19 +47,19 @@
                         <div class="mm-row">
                             <div class="hd">请输入原手机号：</div>
                             <div class="bd">
-                                <input type="text" value="" class="mm-input" />
+                                <input type="text" name="mobile" value="" class="mm-input" />
                             </div>
                         </div>
                         <div class="mm-row">
                             <div class="hd">短信验证码：</div>
                             <div class="bd">
-                                <input type="text" value="" class="mm-input mm-code-input" />
-                                <input type="button" class="btnCode" id="btn" value="点击获取" onclick="settime(this)" />
+                                <input type="text" name="code" value="" class="mm-input mm-code-input" />
+                                <input type="button" class="btnCode" id="btn" value="点击获取" />
                             </div>
                         </div>
                     </div>
                     <div class="mm-form-footer">
-                        <a href="" class="btn-submit">下一步</a>
+                        <a href="javascript:;" class="btn-submit">下一步</a>
                     </div>
                 </div>
             </div>
@@ -83,7 +83,7 @@
             return false;
         }
         $.ajax({
-            url:"{:U('Register/send')}",
+            url:"{:U('old_check')}",
             type:"POST",
             data:{
                 mobile:mobile
@@ -119,10 +119,7 @@
             ,1000)
     }
     $('.btn-submit').click(function(){
-        var btn = $(this);
-        var text = btn.text();
         var mobile = $('input[name=mobile]').val();
-        var password = $('input[name=password]').val();
         var code = $('input[name=code]').val();
         /*正则表达式*/
         var AuglyTest_phone = /^1(3|4|5|7|8)\d{9}$/;
@@ -131,32 +128,23 @@
             return false;
         }
         $.ajax({
-            url:"{:U('doregister')}",
+            url:"{:U('do_old_mobile')}",
             type:"POST",
             data:{
                 mobile:mobile,
-                password:password,
                 code:code
             },
             dateType:"json",
-            beforeSend: function () {
-                // Handle the beforeSend event
-                btn.val('注册中...').attr('disabled', true);
-            },
             success:function (data) {
+                console.log(data);
                 if(data.status) {
-                    alert(data.msg);
-                    location.reload();
+                    location.href = data.data;
                 } else {
                     alert(data.msg);
                 }
             },
             error: function (data, status, e) {   //提交失败自动执行的处理函数
                 alert(e);
-            },
-            complete: function () {
-                // Handle the complete event
-                btn.val(text).attr('disabled', false);
             }
         })
     });

@@ -42,7 +42,7 @@
                 <a href="{:U('User/Message/index')}" class="mm-nav-item"><img src="__TMPL__Public/assets/images/my_leftmenu_icon9.png"/>站内信</a>
             </li>
             <li class="{$policy}">
-                <a href="" class="mm-nav-item"><img src="__TMPL__Public/assets/images/my_leftmenu_icon10.png"/>退换货</a>
+                <a href="{:U('User/Center/returns')}" class="mm-nav-item"><img src="__TMPL__Public/assets/images/my_leftmenu_icon10.png"/>退换货</a>
             </li>
             <li>
                 <a href="{:U('user/index/logout')}" class="mm-nav-item"><img src="__TMPL__Public/assets/images/my_leftmenu_icon11.png"/>退出登录</a>

+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>pc个人中心_退换货</title>
+    <link href="__TMPL__Public/assets/css/reset.css" rel="stylesheet" type="text/css" />
+    <link href="__TMPL__Public/assets/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="__TMPL__Public/assets/css/member.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<tc_include file="Public:header"/>
+<tc_include file="Public:nav"/>
+<!--mm-container-->
+<div class="mm-container">
+    <div class="main clearfix">
+        <tc_include file="User:left"/>
+        <!--main-->
+        <div class="mm-main">
+            <!--概况-->
+            <div class="panel same-height">
+                <div class="panel-header">
+                    <div class="panel-title">退换货</div>
+                    <div class="breadcrumb">
+                        您当前的位置：<a href="">个人中心</a> > <a href="">退换货</a>
+                    </div>
+                </div>
+                <div class="panel-body panel-msg">
+                    <!--信-->
+                    <div>
+                        <ul>
+                            <li>
+                                <div class="msg-desc">
+                                    退换货请拨打电话：13111111111
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<tc_include file="Public:footer"/>
+<!-- js -->
+<script src="__TMPL__Public/assets/js/jquery.min.js"></script>
+<script src="__TMPL__Public/assets/js/jquery.SuperSlide.js"></script>
+<script src="__TMPL__Public/assets/js/mm.js"></script>
+<script type="text/javascript">
+    jQuery(".panel-msg").slide({titCell:".msg-tabs li",mainCell:".site-msg",trigger:"click"});
+</script>
+<tc_include file="Public:script"/>
+</body>
+</html>

@@ -193,7 +193,7 @@
                             paySign: data.data.paySign, // 支付签名
                             success: function (res) {
                                 // 支付成功后的回调函数
-                                alert(1);
+                                alert('支付成功');
                             },
                             error: function (data, status, e) {   //提交失败自动执行的处理函数
                                 alert(e);