change name sports-steps

data/model/room.model.php

@@ -177,22 +177,47 @@ class roomModel extends Model
         return $this->table('room_apply')->where(['apply_id' => $apply])->update(["viewer"=> $viewer,"step" => $step]);
     }
     ////////////////////////////////////////////
-    public function roomSports($cond,$field="*",$page=20,$order='sports_id desc') {
-        return $this->table('room_sports')->field($field)->where($cond)->page($page)->order($order)->limit($page)->select();
+    public function roomSteps($cond,$field="*",$page=20,$order='steps_id desc') {
+        return $this->table('room_steps')->field($field)->where($cond)->page($page)->order($order)->limit($page)->select();
     }
-    public function findSports($cond,$field="*"){
-        return $this->table('room_sports')->field($field)->where($cond)->find();
+    public function findSteps($cond,$field="*"){
+        return $this->table('room_steps')->field($field)->where($cond)->find();
     }
-    public function addSports($room,$member,$sports,$datetime){
-        return $this->table('room_sports')->insert(['room_id' => $room,'member_id' => $member,'sports' => $sports,"date_stamp"=>$datetime]);
+    public function addSteps($room,$member,$steps,$datetime){
+        return $this->table('room_steps')->insert(['room_id' => $room,'member_id' => $member,'steps' => $steps,"date_stamp"=>$datetime]);
     }
-    public function editSports($cond,$updata){
-        return $this->table('room_sports')->where($cond)->update($updata);
+    public function editSteps($cond,$updata){
+        return $this->table('room_steps')->where($cond)->update($updata);
     }
-    public function totalSports($room,$member){
-       return $this->table('room_sports')->where(['room_id' => $room,'member_id' => $member])->sum('sports');
+    public function totalSteps($room,$member){
+       return $this->table('room_steps')->where(['room_id' => $room,'member_id' => $member])->sum('steps');
     }
-    public function totalRoomSports($room){
-        return $this->table('room_participant')->where(['room_id' => $room])->sum('sports');
+    public function totalRoomSteps($room){
+        return $this->table('room_participant')->where(['room_id' => $room])->sum('steps');
+    }
+
+    /////////////////
+    public function findCerts()
+    {
+
+    }
+    public function addCerts($ctype,$room_id,$short_name,$full_name,$cname,$cmobile,$cmail,$cinfo,$cimage)
+    {
+        $insertData = [
+            "ctype"   =>$ctype,
+            "room_id" => $room_id,
+            "short_name" => $short_name,
+            "full_name"  => $full_name,
+            "cname"     => $cname,
+            "cmobile"   => $cmobile,
+            "cmail"     => $cmail,
+            "cinfo"     => $cinfo,
+            "cimage"    => $cimage
+        ];
+        return $this->table('room_certs')->insert($insertData);
+    }
+    public function editCerts()
+    {
+
     }
 }

data/resource/mobile/talk/js/room_sports.js

@@ -29,17 +29,17 @@ $(function () {
             var room_sport_list = "";
             var mine_sport = "";
             if(roomSportList.curpage > 1) {
-                for(var i=0;i<this.listDatas.sports.length;i++) {
+                for(var i=0;i<this.listDatas.steps.length;i++) {
                     roomSportList.rankingIndex++;
                     room_sport_list += "<div class=\"weui-cell\">\n" +
                         "                <div class=\"index_num\">"+roomSportList.rankingIndex+"</div>\n" +
                         "                <div class=\"weui-cell__hd\">\n" +
-                        "                    <img src=\""+this.listDatas.sports[i].avatar+"\">\n" +
+                        "                    <img src=\""+this.listDatas.steps[i].avatar+"\">\n" +
                         "                </div>\n" +
                         "                <div class=\"weui-cell__bd\">\n" +
-                        "                    <p>"+this.listDatas.sports[i].nickname+"</p>\n" +
+                        "                    <p>"+this.listDatas.steps[i].nickname+"</p>\n" +
                         "                </div>\n" +
-                        "                <div class=\"weui-cell__ft walk_num\">"+this.listDatas.sports[i].sports+"</div>\n" +
+                        "                <div class=\"weui-cell__ft walk_num\">"+this.listDatas.steps[i].steps+"</div>\n" +
                         "            </div>";
                 }
                 $(id).append(room_sport_list);
@@ -51,33 +51,33 @@ $(function () {
                     "                </div>" +
                     "                <div class=\"weui-cell__bd\">" +
                     "                    <p class=\"mine_name\">"+this.listDatas.user.nickname+"</p>" +
-                    "                    <p class=\"abstract\">第"+this.listDatas.user.ranking+"名"+this.listDatas.user.sports+"步</p>" +
+                    "                    <p class=\"abstract\">第"+this.listDatas.user.ranking+"名"+this.listDatas.user.steps+"步</p>" +
                     "                </div>" +
                     "                <div class=\"weui-cell__ft\">" +
-                    "                    <a href=\"/mobile/index.php?act=member_talk&op=member_sports\" class=\"weui-btn weui-btn_mini weui-btn_primary\">捐赠步数</a>" +
+                    "                    <a href=\"/mobile/index.php?act=member_talk&op=steps_detail\" class=\"weui-btn weui-btn_mini weui-btn_primary\">捐赠步数</a>" +
                     "                </div>" +
                     "            </div>";
                 $('#mine_ranking').append(mine_sport);
-                for(var i=0;i<this.listDatas.sports.length;i++) {
+                for(var i=0;i<this.listDatas.steps.length;i++) {
                     roomSportList.rankingIndex++;
                     room_sport_list += "<div class=\"weui-cell\">\n" +
                         "                <div class=\"index_num\">"+roomSportList.rankingIndex+"</div>\n" +
                         "                <div class=\"weui-cell__hd\">\n" +
-                        "                    <img src=\""+this.listDatas.sports[i].avatar+"\">\n" +
+                        "                    <img src=\""+this.listDatas.steps[i].avatar+"\">\n" +
                         "                </div>\n" +
                         "                <div class=\"weui-cell__bd\">\n" +
-                        "                    <p>"+this.listDatas.sports[i].nickname+"</p>\n" +
+                        "                    <p>"+this.listDatas.steps[i].nickname+"</p>\n" +
                         "                </div>\n" +
-                        "                <div class=\"weui-cell__ft walk_num\">"+this.listDatas.sports[i].sports+"</div>\n" +
+                        "                <div class=\"weui-cell__ft walk_num\">"+this.listDatas.steps[i].steps+"</div>\n" +
                         "            </div>"
                 }
                 $(id).append(room_sport_list);
-                $('#room_sports_list .index_num').eq(0).addClass("em");
-                $('#room_sports_list .index_num').eq(1).addClass("em");
-                $('#room_sports_list .index_num').eq(2).addClass("em");
-                $('#room_sports_list .walk_num').eq(0).addClass("em");
-                $('#room_sports_list .walk_num').eq(1).addClass("em");
-                $('#room_sports_list .walk_num').eq(2).addClass("em");
+                $('#room_steps_list .index_num').eq(0).addClass("em");
+                $('#room_steps_list .index_num').eq(1).addClass("em");
+                $('#room_steps_list .index_num').eq(2).addClass("em");
+                $('#room_steps_list .walk_num').eq(0).addClass("em");
+                $('#room_steps_list .walk_num').eq(1).addClass("em");
+                $('#room_steps_list .walk_num').eq(2).addClass("em");
             }
 
 
@@ -85,7 +85,7 @@ $(function () {
         };
     };
 
-    var roomSportList = new RoomSportList({act:"member_talk",op:"ajax_room_sports"},"#room_sports_list","#load_state",true);
+    var roomSportList = new RoomSportList({act:"member_talk",op:"ajax_room_steps"},"#room_steps_list","#load_state",true);
     roomSportList.init();
 
 });

helper/room/tpl_group_home.php

@@ -114,7 +114,7 @@ class tpl_group_home
                         <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_goods.png\" alt=\"\">
                     </div>
                     <div class=\"weui-flex__item group_sport\">
-                        <a href=\"/mobile/index.php?act=member_talk&op=room_sports&talk_id={$this->room_id}\">
+                        <a href=\"/mobile/index.php?act=member_talk&op=room_steps&talk_id={$this->room_id}\">
                             <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_sport.png\" alt=\"\">
                         </a>
                     </div>";

mobile/control/member_talk.php

@@ -942,26 +942,26 @@ class member_talkControl extends mbMemberControl
     }
 
     ///////////////////////////////////////////////
-    public function room_sportsOp(){
-        return self::outsuccess(null,'talk/room_sports');
+    public function room_stepsOp(){
+        return self::outsuccess(null,'talk/room_steps');
     }
 
-    public function ajax_room_sportsOp()
+    public function ajax_room_stepsOp()
     {
         try
         {
             $room_id = intval($_GET['room_id']);
             $mod_room = Model('room');
             $userid = session_helper::memberid();
-            $item = $mod_room->getRoomParts(["room_id"=>$room_id,"member_id"=>$userid,"state"=>0],'room_id,member_id,sports',1);
+            $item = $mod_room->getRoomParts(["room_id"=>$room_id,"member_id"=>$userid,"state"=>0],'room_id,member_id,steps',1);
             if(empty($item)) return self::outerr(errcode::ErrParamter,"错误的群信息");
 
-            $user_sports = $this->user_sports($item[0]);
+            $user_steps = $this->user_steps($item[0]);
 
-            $sports = [];
+            $steps = [];
             $hasmore = false;
             $per_page = 20;
-            $items = $mod_room->getRoomParts(["room_id"=>$room_id,"state"=>0],'member_id,sports',$per_page,'sports desc');
+            $items = $mod_room->getRoomParts(["room_id"=>$room_id,"state"=>0],'member_id,steps',$per_page,'steps desc');
             if(!empty($items))
             {
                 foreach ($items as $k => $sport)
@@ -969,39 +969,39 @@ class member_talkControl extends mbMemberControl
                     $info = new member_info($sport['member_id']);
                     $member = $info->filter();
 
-                    $sports[$k]['member_id'] = $sport['member_id'];
-                    $sports[$k]['sports'] = $sport['sports'];
-                    $sports[$k]['avatar'] = $member['avatar'];
-                    $sports[$k]['is_man'] = $member['is_man'];
-                    $sports[$k]['nickname'] = $member['nickname'];
+                    $steps[$k]['member_id'] = $sport['member_id'];
+                    $steps[$k]['steps'] = $sport['steps'];
+                    $steps[$k]['avatar'] = $member['avatar'];
+                    $steps[$k]['is_man'] = $member['is_man'];
+                    $steps[$k]['nickname'] = $member['nickname'];
                 }
-                if(count($sports) >= $per_page) $hasmore = true;
+                if(count($steps) >= $per_page) $hasmore = true;
             }
 
-            return self::outsuccess(["user"=>$user_sports,"sports"=>$sports,"mobile_page"=>["hasmore"=>$hasmore,"curpage"=>$this->cur_page]]);
+            return self::outsuccess(["user"=>$user_steps,"steps"=>$steps,"mobile_page"=>["hasmore"=>$hasmore,"curpage"=>$this->cur_page]]);
 
         } catch (Exception $ex) {
             return self::outerr(errcode::ErrParamter);
         }
     }
 
-    private function user_sports($room_parti)
+    private function user_steps($room_parti)
     {
         $info = new member_info($room_parti['member_id']);
         $member = $info->filter();
 
-        $user_sports["member_id"] = $member['member_id'];
-        $user_sports['avatar'] = $member['avatar'];
-        $user_sports['is_man'] = $member['is_man'];
-        $user_sports['nickname'] = $member['nickname'];
-        $user_sports["sports"] = $room_parti['sports'];
-        $ranks = Model('room')->getRoomParts(["room_id"=>$room_parti['room_id'],"state"=>0,"sports"=>['gt',$room_parti['sports']]],'member_id',false,'sports desc');
-        $user_sports["ranking"] = count($ranks)+1;
+        $user_steps["member_id"] = $member['member_id'];
+        $user_steps['avatar'] = $member['avatar'];
+        $user_steps['is_man'] = $member['is_man'];
+        $user_steps['nickname'] = $member['nickname'];
+        $user_steps["steps"] = $room_parti['steps'];
+        $ranks = Model('room')->getRoomParts(["room_id"=>$room_parti['room_id'],"state"=>0,"steps"=>['gt',$room_parti['steps']]],'member_id',false,'steps desc');
+        $user_steps["ranking"] = count($ranks)+1;
 
-        return $user_sports;
+        return $user_steps;
     }
 
-    public function member_sportsOp(){
+    public function steps_detailOp(){
         $mid = session_helper::memberid();
         $info = new member_info($mid);
         $member = $info->filter();
@@ -1010,17 +1010,17 @@ class member_talkControl extends mbMemberControl
         $first = $today - 86400 * 6;
 
         $mod_room = Model('room');
-        $items = $mod_room->roomSports(["member_id"=>$mid,"date_stamp"=>[['gt',$first-1],['lt',$today+1]]],'*',7);
-        $sports_info = [];
+        $items = $mod_room->roomSteps(["member_id"=>$mid,"date_stamp"=>[['gt',$first-1],['lt',$today+1]]],'*',7);
+        $steps_info = [];
         if(!empty($items)){
             foreach ($items as $item){
-                $sports_info[$item['date_stamp']] = $item;
+                $steps_info[$item['date_stamp']] = $item;
             }
         }
 
-        $charts = $this->sports_charts($first,$sports_info);
+        $charts = $this->steps_charts($first,$steps_info);
 
-        $room_sports = [];
+        $room_steps = [];
         $rooms = $mod_room->getRoomParts(["member_id"=>$mid,"state"=>0],'room_id',false);
         if(!empty($rooms))
         {
@@ -1031,9 +1031,9 @@ class member_talkControl extends mbMemberControl
 
                 $room['avatar'] = $rinfo->avatar();
                 $room['name'] = $rinfo->name();
-                $room['sports'] = $mod_room->totalRoomSports($room['room_id']);
+                $room['steps'] = $mod_room->totalRoomSteps($room['room_id']);
 
-                $room_sports[] = $room;
+                $room_steps[] = $room;
             }
         }
 
@@ -1043,11 +1043,11 @@ class member_talkControl extends mbMemberControl
             "avatar"=>$member['avatar'],
             "nickname"=>$member['nickname'],
             "charts"=>$charts,
-            "room_sports"=>$room_sports],
-            'talk/member_sports');
+            "room_steps"=>$room_steps],
+            'talk/steps_detail');
     }
 
-    private function sports_charts($first_date,$sports_info)
+    private function steps_charts($first_date,$steps_info)
     {
         $charts = [];
         for ($i=0; $i<7; $i++ )
@@ -1061,21 +1061,21 @@ class member_talkControl extends mbMemberControl
 
             $charts["date"][] = date('d',$key);
 
-            if(isset($sports_info[$key])){
-                $charts["sports"][] = intval($sports_info[$key]['sports']);
+            if(isset($steps_info[$key])){
+                $charts["steps"][] = intval($steps_info[$key]['steps']);
             }else{
-                $charts["sports"][] = 0;
+                $charts["steps"][] = 0;
             }
         }
 
         return $charts;
     }
     
-    public function donate_sportsOp()
+    public function donate_stepsOp()
     {
         $room_id = intval($_GET['room_id']);
-        $sports = intval($_GET['sports']);
-        if($room_id <=0 || $sports <=0 ) {
+        $steps = intval($_GET['steps']);
+        if($room_id <=0 || $steps <=0 ) {
             return self::outerr(errcode::ErrParamter,"错误的参数");
         }
 
@@ -1088,17 +1088,17 @@ class member_talkControl extends mbMemberControl
             return self::outerr(errcode::ErrParamter,"您不在此群中");
         }
 
-        $item = $mod_room->findSports(['room_id'=>$room_id,"member_id"=>$user,"date_stamp"=>$today]);
+        $item = $mod_room->findSteps(['room_id'=>$room_id,"member_id"=>$user,"date_stamp"=>$today]);
         if(empty($item)) {
-            $res = $mod_room->addSports($room_id,$user,$sports,$today);
+            $res = $mod_room->addSteps($room_id,$user,$steps,$today);
         } else {
-            $res = $mod_room->editSports($item['sports_id'],["sports"=>$sports]);
+            $res = $mod_room->editSteps($item['steps_id'],["steps"=>$steps]);
         }
 
         if($res)
         {
-            $total_sports = $mod_room->totalSports($room_id,$user);
-            $mod_room->editRoomParts(['room_id'=>$room_id,"member_id"=>$user,"state"=>0],["sports"=>$total_sports]);
+            $total_steps = $mod_room->totalSteps($room_id,$user);
+            $mod_room->editRoomParts(['room_id'=>$room_id,"member_id"=>$user,"state"=>0],["steps"=>$total_steps]);
             return self::outsuccess(null,"捐赠成功");
         }else{
             return self::outerr(errcode::ErrTalk,"捐赠失败");
@@ -1117,10 +1117,59 @@ class member_talkControl extends mbMemberControl
             return;
         }
     }
-    public function commit_certsOp(){
 
+    public function commit_certsOp()
+    {
+        $cmobile = intval($_GET['cmobile']);
+        $code = trim($_GET['code']);
+        $cmail = trim($_GET['cmail']);
+
+        $validator = new Validator();
+        $validator->setValidate(Validator::verify_mobile($cmobile));
+        $validator->setValidate(Validator::verify_smscode($code));
+        $err = $validator->validate();
+
+        $ctype = intval($_GET['ctype']);
+        $room_id = intval($_GET['room_id']);
+
+        $short_name = trim($_GET['short_name']);
+        $full_name = trim($_GET['full_name']);
+
+        $cname = trim($_GET['cname']);
+
+        if(preg_match('/^([.a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\\.[a-zA-Z0-9_-])+/',$cmail)) {
+
+        }
+        $cinfo = trim($_GET['cinfo']);
+
+        $cimage = $this->upload_cimage();
+        if($cimage === false){
+            return self::outerr(errcode::ErrUploadFileFailed);
+        }
+
+        $mod_room = Model('room');
+        $insertId = $mod_room->addCerts($ctype,$room_id,$short_name,$full_name,$cname,$cmobile,$cmail,$cinfo,$cimage);
+
+        if($insertId){
+            return self::outsuccess(null);
+        }else{
+            return self::outerr(errcode::ErrUploadFileFailed);
+        }
     }
 
+    private function upload_cimage()
+    {
+        $upload_dir = 'room/certs/';
+
+        $uploader = new room\uploader();
+        $res = $uploader->upfile($upload_dir,$info);
+
+        if($res) {
+            return '/data/upload/'.$upload_dir . $info['msg'].'?tm='.time();
+        } else {
+            return false;
+        }
+    }
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     public function share_bonusOp()
     {

mobile/templates/default/talk/room_sports.php

@@ -24,7 +24,7 @@
             font-weight: 400;
         }
 
-        #room_sports_list .weui-cell {
+        #room_steps_list .weui-cell {
             padding: 10px 15px 10px 5px;
         }
 
@@ -93,7 +93,7 @@
 
 <div class="weui-cells" id="mine_ranking"></div>
 
-<div class="weui-cells" id="room_sports_list"></div>
+<div class="weui-cells" id="room_steps_list"></div>
 
 <div id="load_state"></div>
 
@@ -102,7 +102,7 @@
 <script src="https://cdn.bootcss.com/jquery-weui/1.2.0/js/jquery-weui.min.js?<?php echo bonus_version(); ?>"></script>
 <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/utility.js?<?php echo bonus_version(); ?>"></script>
 <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/js/talk_room.js?<?php echo bonus_version(); ?>"></script>
-<script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/js/room_sports.js?<?php echo bonus_version(); ?>"></script>
+<script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/js/room_steps.js?<?php echo bonus_version(); ?>"></script>
 </body>
 </html>
 

mobile/templates/default/talk/member_sports.php

@@ -20,7 +20,7 @@
             margin: 0 auto;
         }
 
-        #mine_sports {
+        #mine_steps {
             background: url("<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/echarts_bg.png") no-repeat;
             background-size: 100% 100%;
         }
@@ -96,7 +96,7 @@
 
 <div class="sport_echarts">
     <div class="today_num"></div>
-    <div class="mine_sports" id="mine_sports"></div>
+    <div class="mine_steps" id="mine_steps"></div>
 </div>
 
 
@@ -106,14 +106,14 @@
     <div class="weui-cells">
 
         <?php
-            foreach ($output['room_sports'] as $room) {
+            foreach ($output['room_steps'] as $room) {
                 echo "<div class=\"weui-cell\">
                         <div class=\"weui-cell__hd\">
                             <img src=\"{$room['avatar']}\">
                         </div>
                         <div class=\"weui-cell__bd\">
                             <p>{$room['name']}</p>
-                            <p class='week_total'>本周累计步数：{$room['sports']}</p>
+                            <p class='week_total'>本周累计步数：{$room['steps']}</p>
                         </div>
                         <div class=\"weui-cell__ft\">
                             <a href=\"javascript:void(0)\" data-roomId=\"".$room['room_id']."\" class=\"weui-btn weui-btn_mini weui-btn_primary donate\">选择</a>
@@ -136,7 +136,7 @@
         var bridge = new Bridge();
 
         var jsInit = {
-            action:"step_get_now"
+            action:"read_steps"
         };
         bridge.call_native_handler('on_native_click', JSON.stringify(jsInit),function(res){
             var datas = JSON.parse(res);
@@ -148,17 +148,17 @@
             var docmentWidth = $(document).width();
             var echartsWidth= docmentWidth-(docmentWidth*0.2);
             var echartsHigth = echartsWidth*9/16;
-            $('#mine_sports').css({width:echartsWidth+"px",height:echartsHigth+"px"});
+            $('#mine_steps').css({width:echartsWidth+"px",height:echartsHigth+"px"});
             $('.sport_echarts').css({width:echartsWidth+"px",height:echartsHigth+"px"});
         };
         set_echarts_size();
 
 
         var dateList = <?php echo json_encode($output['charts']['date'])?>;
-        var sportsList =<?php echo json_encode($output['charts']['sports'])?>;
+        var stepsList =<?php echo json_encode($output['charts']['steps'])?>;
         var month = "<?php echo $output['charts']['month']; ?>";
 
-        var mySportEcharts = echarts.init(document.getElementById('mine_sports'));
+        var mySportEcharts = echarts.init(document.getElementById('mine_steps'));
 
         var option = {
             xAxis: {
@@ -180,7 +180,7 @@
                 show: false
             },
             series: [{
-                data: sportsList,
+                data: stepsList,
                 type: 'line',
                 itemStyle: {
                     normal: {
@@ -206,10 +206,10 @@
                 text: '确定将您的步数捐赠到该群？',
                 onOK: function () {
                     $.get("/mobile/index.php",{
-                        op:'donate_sports',
+                        op:'donate_steps',
                         act:'member_talk',
                         client_type:'ajax',
-                        sports:todaySport,
+                        steps:todaySport,
                         room_id:room_id
                     },function(res){
                         var datas = JSON.parse(res);