享月会

www/protected/commands/GetKennelDetailWorkCommand.php

@@ -8,54 +8,215 @@
 
 class GetKennelDetailWorkCommand extends CConsoleCommand {
     public function run($args){
-        error_reporting(E_ALL);
+        //error_reporting(E_ERROR);
         ini_set('memory_limit', '256M');
+        //ini_set('mongo.long_as_object',1);
         set_time_limit(0);
-        self::getData();
+        self::getKennel();
 
     }
 
-    public function getData()
+    public function getKennel()
     {
-        $data = array();
-        $data['act'] = 'get_user_balance';
-        $data['page'] = 1;
-        $data['size'] = 15;
-        $data['currency_type'] = 2;
-        $data['recharge_type'] = -1;
-        $url = 'http://m.opencom.cn/ajax/cf_list.php?appid=41807';
-        $cookie = 'UM_distinctid=15bccaf972e1b5-08d94ddabbc11e-396a7807-13c680-15bccaf972fe96; pgv_pvi=8607036416; opencom_uniqid=5909643f83a5d; Hm_lvt_b8c68976fe13d819f264767901121325=1493787711; _qddaz=QD.llwk1x.hu5sy6.j28imwkb; __AdinAll_SSP_UID=69e283776863251851c351e2f5fb3a39; __AdinAll_SSP_NUID=f16139fe947b0a7d80182d0b30e72b03; OpenCom=PyLb51cJswsP0ulwiLzvA0TRhGwXkeAGppX0n0uLf%2BCe3ulyexQRPTeoICuLRZ83RU2miHJHN2n04JeXI8pivHmPESIAsGspJy19E7Sj01HCDOrVXRaaMdJEC%2BSnl21zeyDrk8yp2IgbG7A9UWXaQxJekYp2OuQOxvdY5U2eUcfQ6BEgsSNPmmbqbul1z%2FfyL33omsLJfmb2FylAbafsMW7MvyKWxrMzXDJCEt55f4I%2Bkz6EluHcIFSbsliNmU%2FNtEs3K7saGZ3aNyEQqTeM97fNL%2FLtwcEHQlnKuApVpqX8hb7vb%2BFDq%2ByONGird3L1CKbTSMDy8bqaJ6CqKw%2BMG2EE1ePgyQ3b%2BnH9Xsj%2B6x7%2FpmakDALSZ7XAWKsxORsH9njYEiZWXzHTJQ3fgq6i4CYfMQOSg85pWGjsVYE3cFxc4rcHxU61f7uAXCxOeay1XDkljzDdOBlqd6Cr4gqqrt2Flp4uTDu8yxyJk396DoPmFImjQF5yo%2Bt6SNlGHU2gFUv620nfKEyShX4F%2Fn4UV3m7wjoW1aw2Cd3dnLLZyawufe57pjGmflmhe4nei2%2Br7iCM27tgrRYwVjQxnNHmPfun8Grnk%2F6qquseZ%2FxUx5spnpgliPN1absctRwt5RG%2FE78yGEVx7Wzz1%2FCXsMgBiYuAqlosIYV%2Ff39KVZbVFjXzVf%2F5EO0xECgomSvBZc6jyFWyq5Pu0kPIfYgrtdRE48uYrHZorWGoW9SFKawnF0UCyWmbbLHxsL0gCtIzGQPOa5Qyui7ZMOnI%2FDeectrNetzrFxbJzzosNIiZ1LVB%2FJ3JK%2B1hVmT5vxT7H%2BzGeOkAOMIofqEMGoJhaicKQgjzvyVCpIWZ6ajhwjlcEJTNMwo6nyrhgU0TThUki5kCAJOMNuakEJ0bKSh3E%2Bupp%2FaikX4v8XT8dBI%2B4yIegxaNosb602TUb3%2BbGPLRR13fMIfQTHul7DRVFp0svfu1gMK5Lg%3D%3D; oc_login_name=Sama; oc_login_uid=1575621; oc_reg_time=1452572196; oc_img_id=65194238; PHPSESSID=lgb1q0rrkpkqdeubmh8cvf24s5; tanindex_20160405=2017-06-14';
-        var_dump(self::http_post($data,$url,$cookie));exit;
+        $ids = array('26737', '19744', '7264', '24762', '26243', '21163', '25702', '26552', '25352', '20506', '26346', '26733', '13358', '26609', '26810', '11641', '26406',
+            '25053', '26809', '26770', '26205', '24236', '26539', '24955', '15889', '24187', '12154', '26635', '18058', '24727', '26517', '26536', '21612', '26155', '25251',
+            '25187', '26722', '23874', '16066', '26289', '26731', '18368', '11105', '14849', '16628', '25181', '26489', '25130', '26427', '26245', '22978', '26492',
+            '8855', '21275', '5526', '12401', '26317', '17554', '25565', '26280', '26530', '26410', '26776', '26412', '10290', '26560', '22937', '26594', '26268', '23248',
+            '21521', '26240', '26372', '26653', '26261', '20856', '26470', '24999', '26531', '26534', '15783', '26326', '25745', '22007', '26599', '26253', '26545',
+            '13588', '22358', '26674', '25950', '26474', '22848', '26661', '26555', '26681', '26631', '14496', '26377', '26593', '4113', '26794', '26342', '26696',
+            '26425', '26759', '26327', '25974', '22718', '26683', '12019', '25849', '25291', '25052', '24803', '26451', '26395', '19333', '14448', '26702', '26348', '26529',
+            '25296', '26509', '24060', '26633', '17127', '12685', '26475', '24871', '15031', '25241', '26331', '24724', '26394', '26340', '10606', '26757',
+            '26423', '26026', '23852', '26478', '26133', '19653', '25860', '26668', '26441', '26198', '24083', '26636', '26347', '26226', '26578', '26415', '19249', '24781',
+            '26535', '25430', '26471', '26351', '26780', '26457', '24927', '26788', '26806', '26646', '24796', '26453', '26484', '26499', '25230', '26416', '25104', '25223', '21627', '26516', '24254',
+            '23520', '23117', '26357', '26488', '26704', '23685', '26328', '19194', '2145', '26707', '25341', '20746', '59', '4337', '24098', '26726', '10861', '21888',
+            '24224', '26600', '25090', '15634', '7655', '26504', '26764', '25999', '25967', '26591', '21514', '26184', '19908', '21870', '7927', '26749', '20436', '26361',
+            '21770', '24730', '22868', '18966', '26246', '26449', '25288', '1850', '2872', '21648', '6740', '26501', '16656', '23552', '26659', '16823', '22362', '23444',
+            '26565', '24916', '1774', '25263', '23275', '26494', '26306', '26746', '26111', '26665', '26298', '26431', '24395', '19549'
+        );
+        $petTypesId = array();
+        $petTypes = array();
+        foreach ($ids as $id) {
 
+            $url = "http://pet.appcute.im/api/user/get?id=" . $id;
+            $res = CommonFn::replaceUrl(CommonFn::simple_http($url));
 
-    }
+            $res = json_decode($res, true);
+
+            if ($res['error'] == 10000) {
+
+                $value = $res['data'];
+
+
+                $kennel = new Kennel();
+
+                $kennel->status = 1;
+
+                $kennel->name = $value['nickname'];
+                if ($value['avatar'] == 'http://pet.appcute.im/bundles/cuteapi/static/no.png') {
+                    $value['avatar'] = 'http://icons.maiyizhi.cn/image_default.png';
+                }
+                $kennel->avatar = $value['avatar'];
+                $kennel->join_time = time();
+                $kennel->type = 2;
+
+                $kennel->address = $value['contact']['address'];
+                $kennel->desc = $value['desc'];
+                $kennel->phone = $value['contact']['mobile'];
+                $kennel->from = 'chongwushichang';
+
+                $kennel->save();
+
+                $petUrl = "http://pet.appcute.im/api/user/pets?id=".$id."&limit=500&offset=0";
+
+                $res_pets = CommonFn::replaceUrl(CommonFn::simple_http($petUrl));
+                $res_pets = json_decode($res_pets, true);
+
+                //获取商家宠物 信息
+
+
+                if ($res_pets['error'] == 10000) {
+                    $tmps = $res_pets['data']['values'];
+                    foreach ($tmps as $key=> $tmp) {
+
+
+                        $dealPet = new DealPet();
+
+                        if(in_array($tmp['cat']['id'],$petTypesId)) {
+
+                            $pet_type = PetTypes::model()->get(new MongoId($petTypes[$tmp['cat']['id']]));
+
+                        } else {
+                            $petTypesId[] = $tmp['cat']['id'];
+                            $pet_type = new PetTypes();
+                            $pet_type->name = $tmp['cat']['name'];
+                            if ($tmp['cat']['type'] == 1 ){//猫
+                                $pet_type->parent = new MongoId("546805e40eb9fb32018b45fe");
+                            } else if($tmp['cat']['type'] == 2 ){//狗
+                                $pet_type->parent = new MongoId("54671c4b0eb9fb89048b45f5");
+                            } else {
+                                $pet_type->parent = new MongoId("56a88c7ba84ea0e0478d6d2b");
+                            }
+                            $pet_type->pic = $tmp['cat']['pic'];
+                            $pet_type->level = 2;
+                            $pet_type->save();
+                            $petTypes[$tmp['cat']['id']] = (string)$pet_type->_id;
+                        }
+
+                        $dealPet->pet_type = new MongoId($pet_type->_id);
+
+                        $dealPet->name = $tmp['name'];
+                        $dealPet->status = 1;
+                        $dealPet->price = $tmp['price'];
+                        $dealPet->pics = array();
+                        foreach ($tmp['photos'] as $key =>$v) {
+                            $pic = array();
+                            $size = CommonFn::getPicSize($v);
+                            if (isset($size['width']) && isset($size['height'])) {
+                                $pic['width'] = intval($size['width']);
+                                $pic['height'] = intval($size['height']);
+                            }
 
-    public function http_post($data,$url,$cookie){
-        $str = '';
-        $dat = '';
-        foreach ($data as $key => $value) {
-            $str .= $key.'='.$value.'&';
-            $dat .= $key.'='.urlencode($value).'&';
+                            $pic['url'] = $v;
+                            $dealPet->pics[] = (object)$pic;
+                        }
+
+                        $dealPet->kennel = $kennel->_id;
+                        //$dealPet->pet_type = new MongoId($tmp['pet_type']);
+                        $dealPet->birth_date = intval($tmp['birthday']);
+                        $dealPet->gender = $tmp['sex'];
+                        /*$dealPet->tags = array();
+                        foreach ($tmp['tags'] as $v){
+                            $dealPet->tags[] = $v;
+                        }*/
+                        $father_info = array();
+                        $mother_info = array();
+                        if (isset($tmp['extra']['parents'][0]['pic']))
+                            $father_info['avatar'] = $tmp['extra']['parents'][0]['pic'];
+                        if (isset($tmp['extra']['parents'][1]['pic']))
+                            $mother_info['avatar'] = $tmp['extra']['parents'][1]['pic'];
+
+                        $dealPet->father_info = (object)$father_info;
+                        var_dump($dealPet->father_info);exit;
+                        $dealPet->mother_info = (object)$mother_info;
+                        $dealPet->desc = $tmp['desc'];
+                        $dealPet->vaccine_info = array();
+                        if (isset($tmp['extra'])){
+                            foreach ($tmp['extra']['vaccined'] as $v) {
+
+
+                                $datetime = date_create($v['date'])->format('U');
+                                $vaccine_info['time'] = intval($datetime);
+                                $vaccine_info['brand'] = $v['value'];
+                                $dealPet->vaccine_info[] = (object)$vaccine_info;
+
+                            }
+                        }
+                        $dealPet->add_time = time();
+                        //$dealPet->sort_weight = $tmp['sort_weight'];
+                        //$dealPet->delivery_time = $tmp['delivery_time'];
+                        //$dealPet->delivery_date = $tmp['delivery_date'];
+                        $tmp['deworming_info'] = array();
+                        if (!empty($tmp['parasited'])) {
+
+                            $tmp['deworming_info']['brand'] = $tmp['parasited']['value'];
+                            ;
+                            $tmp['deworming_info']['time'] = intval(date_create($tmp['parasited']['date'])->format('U'));
+                        }
+
+
+                        $dealPet->deworming_info = array();
+                        $dealPet->deworming_info[] = (Object)$tmp['deworming_info'];
+
+                        if (isset($value['videos']['length'])) {
+                            $value['video']['length'] = floatval($value['video']['length']);
+                        }
+                        $dealPet->video = (Object)$tmp['videos'];
+
+                        //$dealPet->carriage = (Object)$tmp['carriage'];
+                        //$dealPet->last_modify = $tmp['last_modify'];
+                        //$dealPet->view_count = $tmp['view_count'];
+                        //$dealPet->contact_count = $tmp['contact_count'];
+                        if ( $tmp['lat'] != 0 && $tmp['lng'] != 0){
+                            $position = CommonFn::GCJTobaidu($tmp['lat'], $tmp['lng']);
+                            $location = $position['lat'] . ',' . $position['lng'];
+
+                            $res = CommonFn::simple_http('http://api.map.baidu.com/geocoder/v2/?ak=B349f0b32ef6e78b2e678f45cb9fddaf&location=' . $location . '&output=json&pois=0');
+                            $info = json_decode($res);
+                            $cityinfo = array();
+                            if ($info || $info->status == 0) {
+                                $info = $info->result->addressComponent;
+                                if (!empty($info->province) && !empty($info->city)) {
+                                    $cityinfo['province'] = $info->province;
+                                    $cityinfo['city'] = $info->city;
+                                    $cityinfo['area'] = $info->district;
+
+                                }
+                            }
+                        }else {
+                            $cityinfo['province'] = '';
+                            $cityinfo['city'] = '';
+                            $cityinfo['area'] = '';
+                        }
+
+                        $tmp['region']['province'] = $cityinfo['province'];
+                        $tmp['region']['city'] = $cityinfo['city'];
+                        $tmp['region']['area'] = $cityinfo['area'];
+
+
+                        $dealPet->region = (Object)$tmp['region'];
+                        //$dealPet->last_deny_reason = $tmp['last_deny_reason'];
+                        $dealPet->from = 'chongwushichang';
+
+                        $dealPet->save();
+                        sleep(1);
+                    }
+                }
+
+
+                sleep(1);
+            }
         }
-        $str = rtrim(trim($str),'&');
-
-        $str .= $str.Yii::app()->params['shMd5Key'];
-
-        $data['sign'] = strtoupper(md5($str));
-        $dat .= 'sign='.urlencode($data['sign']);//构建post 参数
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $dat);
-        curl_setopt($ch,CURLOPT_COOKIE,$cookie);
-
-        $result = curl_exec($ch);
-        curl_close($ch);
-        $res = json_decode($result,true);
-        return $res;
-    }
 
+    }
 }
 

www/protected/components/CommonSMS.php

@@ -22,10 +22,6 @@ class CommonSMS{
             case 'order_pay_success'://订单支付成功后发送短信
                 Service::factory('SendSMSService')->tpl_send_sms(1594484,'#month#='.$params['month'].'&#day#='.$params['day'].'&#address#='.$params['address'].'&#info#='.$params['info'].'&#master#='.$params['master'],$params['mobile']);
                 break;
-            case 'test'://订单支付成功后发送短信
-            $res = Service::factory('SendSMSService')->send_sms('123123','15600266816');
-            var_dump($res);exit;
-            break;
             default:
                 return false;
                 break;

www/protected/controllers/ROrderController.php

@@ -1105,7 +1105,7 @@ class ROrderController extends AdminController{
     {
 
 
-        $excelFile = '/var/www/2.xls';//获取文件名
+        $excelFile = '/var/www/1.xlsx';//获取文件名
         //这里就是导入PHPExcel包了，要用的时候就加这么两句，方便吧
         Yii::$enableIncludePath = false;
         Yii::import('application.extensions.PHPExcel.PHPExcel', 1);
@@ -1117,7 +1117,7 @@ class ROrderController extends AdminController{
         $total_line = $phpexcel->getHighestRow();
         $total_column = $phpexcel->getHighestColumn();
 
-        for ($row = 1; $row <= $total_line; $row++) {
+        for ($row = 2; $row <= $total_line; $row++) {
             $data = array();
             for ($column = 'A'; $column <= $total_column; $column++) {
                 $data[] = trim($phpexcel->getCell($column . $row)->getValue());
@@ -1638,10 +1638,81 @@ class ROrderController extends AdminController{
         CommonFn::SaveViaTempFile($objWriter);
 
     }
-
     public function actionTest(){
-        CommonSMS::send('test');
+        $arr = array(
+            array('', '一班', '二班', '三班','四班'),
+            array('不及格', 20, 30, 40,67),
+            array('良好', 30, 50, 55,67),
+            array('优秀', 15, 17, 20,67)
+        );
+        Yii::$enableIncludePath = false;
+        Yii::import('ext.phpexcel.PHPExcel', 1);
+
+        $objPHPExcel = new PHPExcel();
+        $objSheet = $objPHPExcel->getActiveSheet();
+        $criteria = new EMongoCriteria();
+        $criteria->status('==',1);
+
+        $name = '同比数据分析(月)柱形图.xlsx';
+
+        $objSheet->fromArray($arr);
+
+        //图表
+        $labels = array(
+            new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', null, 1),//一班
+            new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1),//二班
+            new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1),//三班
+            new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$E$1', null, 1),//三班
+            );
+        $xLabels = array(
+            new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$4', null, 3),
+        );
+        $datas = array(
+            new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$B$2:$B$4', null, 4),//取一班的数据
+            new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$4', null, 4),//取二班的数据
+            new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$4', null, 4),//取三班的数据
+            new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$E$2:$E$4', null, 4),//取三班的数据
+
+        );
+
+
+        $series = array(
+            new PHPExcel_Chart_DataSeries(
+                PHPExcel_Chart_DataSeries::TYPE_BARCHART,
+                PHPExcel_Chart_DataSeries::GROUPING_STANDARD,
+                range(0, count($labels)-1),
+                $labels,
+                $xLabels,
+                $datas
+            )
+        ); //图表框架
+
+        $layout=new PHPExcel_Chart_Layout();
+        $layout->setShowVal(true);
+        $areas = new PHPExcel_Chart_PlotArea(null,$series);
+        $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT,$layout,false);
+        $title = new PHPExcel_Chart_Title("同比数据分析");
+        $ytitle = new PHPExcel_Chart_Title("订单数");
+        $chart = new PHPExcel_Chart('line_chart',$title,$legend,$areas,true,false,null,$ytitle);
+        $chart->setTopLeftPosition("A1")->setBottomRightPosition("P31"); //图表位置
+
+        $objSheet->addChart($chart);
+
+
+        $excel = 'Excel2007';
+        $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel,$excel);
+        $objWriter->setIncludeCharts(true); //图表必须
+        // $objWriter->save($dir.'/export.xls'); //生成excel文件
+        CommonFn::browser_export($excel,date('m').$name); //浏览器输出
+
+        CommonFn::SaveViaTempFile($objWriter);
+
     }
 
 
+
+
+
+
+
 }

www/protected/modules/api/controllers/ApiBaseController.php

@@ -50,7 +50,7 @@ class ApiBaseController extends CController{
     //签名验证方法
     //每次GET/POST请求的参数，凡是在这个列表以内的参数名字：["id","app_client_id","time","topic_id","group_id","user_id","post_id"]加上private_key按key字母升序排列拼接,然后md5运算之后生成
     protected function api_check_sign(){
-        return true;
+//        return true;
         $need_args=array('device_id','os_version','api_version','time','channel','app_client_id','app_version','sign');
         $sign_args=array("id","app_client_id","time","topic_id","group_id","user_id","post_id","app_version");
 

www/protected/modules/api/controllers/ShopController.php

@@ -11,15 +11,6 @@ class ShopController extends ApiBaseController{
         return $this->verify();
     }
 
-    /**
-     * 根据搜索值获取地址 json返回
-     */
-    public function actionGetDetailAddressByQuery(){
-        $query = Yii::app()->getRequest()->getParam('query');
-        $res = CommonFn::simple_http("http://api.map.baidu.com/place/v2/suggestion?ak=B349f0b32ef6e78b2e678f45cb9fddaf&output=json&query=$query&region=%E4%B8%8A%E6%B5%B7%E5%B8%82&version=2015121601&_=1498629116496");
-        echo $res;exit;
-    }
-
 
     /**
      * 新增收货地址

www/protected/modules/moonclub/views/reserve/index.php

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <style>
     .f_label {width: 90px;}
     .accordion-body {padding: 0;}
@@ -315,7 +314,7 @@
             columns:[[
                 {field:'user_name', title:'姓名', width:25,sortable:false},
                 {field:'mobile', title:'联系方式', width:50, sortable: true},
-              {field:'homeType', title:'分类', width:50, sortable: true},
+              {field:'homeType', title:'套餐', width:50, sortable: true},
                 {field:'status', title:'状态', width:50, sortable: true,
                     formatter: function(value, row){
                         return get_filed_text(value, status_data);
@@ -486,493 +485,4 @@
 
 
 
-=======
-<style>
-    .f_label {width: 90px;}
-    .accordion-body {padding: 0;}
-    #view_select_position {
-        display:inline-block;
-        padding:1px 4px 1px 4px;
-        border:1px solid #999999;
-        text-decoration:none;
-        color:#333333;
-    }
-</style>
-
-<div id="main">
-    <div region="west" border="false" id="west_panel">
-        <table id="dg_content"></table>
-        <div id="tb_content">
-
-            <div class="tb_line">
-                <span class="tb_label">状态: </span>
-                <input id="filter_status" />
-
-            </div>
-
-
-        </div>
-    </div>
-    <div id="acc_container" class="accordion" region="center">
-        <div region="center" title="详细信息" data-options="iconCls:'icon-save',selected:true">
-            <div class="easyui-layout detail_layout">
-                <div data-options="region:'center'" class="detail_center">
-                    <div class="detail_main">
-                        <form id="content_form" method="post">
-                            <ul>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>ID: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input type="hidden" name="id" id="id"/>
-                                            <span id="id_str"></span>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>咨询类型: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <!--                                            <input type="text" name="mobile" id="edit_denomination" value='' />-->
-                                            <span id="type"></span>
-                                        </div>
-                                    </div>
-                                </li>
-
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>联系方式: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-<!--                                            <input type="text" name="mobile" id="edit_denomination" value='' />-->
-                                            <span id="mobile"></span>
-                                        </div>
-                                    </div>
-                                </li>
-
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>联系地址: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input name="tech_content" id="tech_content" />
-                                        </div>
-                                    </div>
-                                </li>
-
-
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>套餐: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <span id="homeType"></span>
-                                            <!--                                            <input id="edit_order" name="homeType" />-->
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>门店: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <span id="source_type"></span>
-                                            <!--                                            <input id="edit_order" name="homeType" />-->
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>预约时间: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input id="booking_time" type="text" >
-                                            <input type="hidden" name="booking_time" id="booking_time_str"  />
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>预产期: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <span id="num"> </span>
-                                            <!--<input id="edit_order" name="num" />-->
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>状态:</span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input id="setStatus" name="status" />
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <span id="action_info" style="color:green;"></span>
-                                        </div>
-                                    </div>
-                                </li>
-
-                            </ul>
-                        </form>
-                    </div>
-                    <div data-options="region:'south'" class="detail_south">
-                        <div class="detail_toolbar">
-                            <a href="#" class="easyui-linkbutton set_button" iconCls="icon-save" onclick="save_content();return false;">保存</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<div style="display:none;">
-    <div id="refund_tip_dialog" style="padding: 30px 0;">
-        <div style="text-align:center;"><span id="refund_tip"></span></div>
-    </div>
-</div>
-<script language="javascript" type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/coolautosuggest/jquery.coolautosuggest.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/js/coolautosuggest/jquery.coolautosuggest.css" />
-<script type="text/javascript">
-    var jq_dg_content = $('#dg_content');
-    var jq_content_form = $('#content_form');
-    var jq_filter_status = $('#filter_status');
-    var jq_setStatus_add = $('#setStatus_add');
-    var module_router = site_root + '/index.php?r=moonclub/Reserve';
-    var status_data = <?php echo json_encode($status_option); ?>;
-    var jq_setStatus = $('#setStatus');
-    var w_width = $(window).width();
-    var w_height = $(window).height();
-    var jq_ss = $('#ss');
-    var jq_action_info = $('#action_info');
-
-    var jq_add_dialog = $('#add_dialog');
-    var jq_add_form = $('#add_form');
-
-
-    var jq_set_precedence = $('#set_precedence');
-
-
-    var jq_acc = $('#acc_container');
-
-    $(function(){
-
-        jq_acc.accordion({
-            height: w_height - 18,
-            onSelect: function(title) {
-
-            }
-        });
-        jq_filter_status.combobox({
-            width: 100,
-            data: status_data,
-            editable: false,
-            onSelect: function(){
-                search_content();
-            }
-        });
-
-        var buttons = $.extend([], $.fn.datebox.defaults.buttons);
-        buttons[0].text = '确定';
-        buttons[0].handler=function(){
-            var vals = $('#booking_time').datetimebox('spinner').spinner('getValue').split(':');
-            $('#booking_time_str').val(  parseInt($('#booking_time_str').val())-(parseInt($('#booking_time_str').val())+8*3600)%86400 +vals[0]*3600+vals[1]*60);
-
-            var d=new Date(parseInt($('#booking_time_str').val())*1000);
-            $('#booking_time').datetimebox('setText',formatDate(d));
-            $('#booking_time').datetimebox('hidePanel');
-        };
-
-        $('#booking_time').datetimebox({
-            required: false,
-            showSeconds:false,
-            buttons:buttons,
-            onSelect: function(date){
-                var currentDate = new Date();
-                //console.log(date);
-                // if(currentDate>=date){
-                //     $.messager.show({
-                //         title: '提示',
-                //         msg: '必须选择现在之后的日期',
-                //         timeout: 3500,
-                //         showType: 'slide'
-                //     });
-                // }else{
-                $('#booking_time_str').val(date.getTime()/1000);
-                // }
-            }
-        });
-
-
-
-        var buttons = $.extend([], $.fn.datebox.defaults.buttons);
-        buttons[0].text = '确定';
-
-        jq_setStatus.combobox({
-            editable: false,
-            data: status_data
-        });
-
-
-        jq_setStatus_add.combobox({
-            editable: false,
-            data: (function () {
-                var status_data_temp = new Array();
-                $.extend(status_data_temp, status_data);
-                status_data_temp.shift();
-                return status_data_temp;
-            })()
-        });
-
-
-
-
-
-
-
-        var p_width = parseInt(w_width / 2);
-        if (p_width < 520){
-            p_width = 520;
-        }
-        var d_width = p_width - 10;
-        $('#west_panel').css({width : p_width});
-        $('#main').css({width: w_width - 25, height: w_height - 18}).layout();
-
-        jq_ss.searchbox({
-            width: 130,
-            searcher:function(value){
-                search_content();
-            },
-            prompt: '请输入关键字'
-        });
-
-        jq_setStatus.combobox({
-            editable: false,
-            data: status_data
-        });
-
-
-        jq_dg_content.datagrid({
-            url: module_router + '/list',
-            title: '咨询列表',
-            width: d_width,
-            height: w_height - 18,
-            fitColumns: true,
-            autoRowHeight: true,
-            striped: true,
-            toolbar: '#tb_content',
-            singleSelect: true,
-            selectOnCheck: false,
-            checkOnSelect: false,
-            rowStyler: function(index,row){
-                if (row.status==1){
-                    //return 'color:red;';
-                }else if(row.status==-3){
-                    return 'color:green;';
-                }
-            },
-            pagination: true,
-            pageList: [20, 30, 50],
-            pageSize: 20,
-            nowrap: false,
-            idField: 'id',
-            sortName: 'order_time',
-            sortOrder: 'desc',
-            queryParams: get_param_obj(),
-            frozenColumns:[[
-                {field:'ck',checkbox:true}
-            ]],
-            columns:[[
-                {field:'user_name', title:'姓名', width:25,sortable:false},
-                {field:'mobile', title:'联系方式', width:50, sortable: true},
-              {field:'homeType', title:'套餐', width:50, sortable: true},
-                {field:'status', title:'状态', width:50, sortable: true,
-                    formatter: function(value, row){
-                        return get_filed_text(value, status_data);
-                    }
-                },
-                {field:'time', title:'咨询时间', width:70,sortable:true,formatter: function(value, row){
-                    var now=new Date(value*1000);
-
-                    var   month=now.getMonth()+1;
-                    var   date=now.getDate();
-                    var   hour = now.getHours();
-                    return   month+"月"+date+"日"+hour+":00";
-                }
-                }
-            ]],
-
-            onSelect: function(index, row){
-                var data = $.extend({}, row);
-                $('#id_str').html(data.id);
-                $('#id').html(data.id);
-                $('#user_name').html(data.user_name);
-                $('#mobile').html(data.mobile);
-                $('#tech_content').html(data.tech_content);
-                $('#homeType').html(data.homeType);
-                $('#num').html(data.num);
-                $('#type').html(data.type);
-                $('#user_name').html(data.user_name);
-                $('#tech_content').html(data.tech_content);
-                $('#source_type').html(data.source_type);
-                jq_content_form.form('load', data);
-                $('#booking_time').datetimebox('setValue', parse_time(data,'booking_time'));
-                $('#admins_edit_info').html('');
-                if (data['action_user'] != ''){
-                    jq_action_info.html('信息已被编辑: ' + data['action_user'] + ' ' + data['action_time']);
-                } else {
-                    jq_action_info.html('');
-                }
-
-            },
-            onLoadSuccess : function () {
-                $('#booking_time_str').val('');
-                $('#source_type').html('');
-                $('#id_str').html('');
-                $('#id').html('');
-                $('#user_name').html('');
-                $('#mobile').html('');
-                $('#tech_content').html('');
-                $('#homeType').html('');
-                $('#num').html('');
-                $('#type').html('');
-                $('#user_name').html('');
-                $('#tech_content').html('');
-                $('#source_type').html('');
-                jq_action_info.html('');
-            }
-
-        });
-        jq_content_form.form({
-            url: module_router + '/edit',
-            onSubmit: function(param){
-                if ($('#order_id').val() == ""){
-                    return false;
-                }
-                var isValid = $(this).form('validate');
-                if (!isValid){
-                    $.messager.progress('close');
-                }
-                return isValid;
-            },
-            success: function(res){
-                $.messager.progress('close');
-                var res = JSON.parse(res);
-
-                if (res.success){
-                    jq_dg_content.datagrid('reload');
-                }
-                if(res.success){
-                    $.messager.show({
-                        title: '提示',
-                        msg: '保存成功',
-                        timeout: 3500,
-                        showType: 'slide'
-                    });
-
-                    $('#technician_id').val(0);
-                }else{
-                    $.messager.show({
-                        title: '提示',
-                        msg: res.message,
-                        timeout: 3500,
-                        showType: 'slide'
-                    });
-                }
-            }
-        });
-
-        jq_add_form.form({
-            url : module_router + '/add',
-            onSubmit : function (param) {
-                var isValid = $(this).form('validate');
-                if (!isValid){
-                    $.messager.progress('close');
-                }
-                return isValid;
-            },
-            success : function (res) {
-                $.messager.progress('close');
-                var res = JSON.parse(res);
-
-                if (res.success) {
-                    $.messager.show({
-                        title : '提示',
-                        msg : '保存成功',
-                        timeout : 3500,
-                        showType : 'slide'
-                    });
-                    jq_add_dialog.dialog('close');
-                    jq_dg_content.datagrid('reload');
-                } else {
-                    $.messager.show({
-                        title : '提示',
-                        msg : res.message,
-                        timeout : 3500,
-                        showType : 'slide'
-                    });
-                }
-            }
-        });
-
-
-    });
-
-    function save_content(){
-        if ($('#recharge_id').val() == ""){
-            return false;
-        }
-        $.messager.progress();
-        jq_content_form.submit();
-    }
-    function parse_time(data,attr){
-        if(data[attr]){
-            var d=new Date(data[attr]*1000);
-            return formatDate(d);
-        }else{
-            return '';
-        }
-    }
-    function   formatDate(now){
-        var   year=now.getFullYear();
-        var   month=now.getMonth()+1;
-        var   date=now.getDate();
-        var  hour = now.getHours();
-        var  minute = now.getMinutes();
-        return   year+"-"+month+"-"+date+" "+hour+":"+minute;
-    }
-    function search_content(){
-
-        var filter_status = jq_filter_status.combobox('getValue');
-
-        jq_dg_content.datagrid({
-            pageNum: 1,
-            queryParams: {
-                status : filter_status
-            }
-        });
-
-    };
-
-
-
->>>>>>> test
 </script>

www/protected/modules/moonclub/views/web/index.php

@@ -11,29 +11,13 @@
   <meta http-equiv="Pragma" content="no-cache">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <link rel="stylesheet"
-<<<<<<< HEAD
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=2017062901">
-  <link rel="stylesheet"
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=2017062901">
-=======
         href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=201707101718">
   <link rel="stylesheet"
         href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=201707101718">
->>>>>>> test
   <!--      <link rel="stylesheet" href="-->
   <?php //echo Yii::app()->request->baseUrl; ?><!--/webapp/moonclub/dist/css/main.css?v=-->
   <?php ////echo time();?><!--">-->
   <link rel="stylesheet"
-<<<<<<< HEAD
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=2017062901">
-  <!--    <link href="-->
-  <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=2017062901" rel="stylesheet">-->
-  <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css?v=2017062901">
-  <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/LCalendar.css?v=2017062901">
-
-  <!--     <script src="-->
-  <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=2017062901"></script> -->
-=======
         href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=201707101718">
   <!--    <link href="-->
   <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=201707101718" rel="stylesheet">-->
@@ -42,20 +26,13 @@
 
   <!--     <script src="-->
   <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=201707101718"></script> -->
->>>>>>> test
   <link rel="stylesheet"
         href="https://raw.githubusercontent.com/andreruffert/rangeslider.js/develop/dist/rangeslider.css" media="screen"
         title="no title">
   <script
-<<<<<<< HEAD
-    src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=2017062901"></script>
-  <!--<script src="<?php /*echo Yii::app()->request->baseUrl; */?>/js/bootstrap-3.3.7.min.js?v=2017062901"></script>-->
-  <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/LCalendar.js?v=2017062901"></script>
-=======
     src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=201707101718"></script>
   <!--<script src="<?php /*echo Yii::app()->request->baseUrl; */?>/js/bootstrap-3.3.7.min.js?v=201707101718"></script>-->
   <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/LCalendar.js?v=201707101718"></script>
->>>>>>> test
   <style>
     html {
       height: 100%
@@ -210,15 +187,9 @@
       }
     }
   </style>
-<<<<<<< HEAD
-  <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=2017062901"
-          crossOrigin="anonymous"></script>
-  <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=2017062901"></script>
-=======
   <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=201707101718"
           crossOrigin="anonymous"></script>
   <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=201707101718"></script>
->>>>>>> test
   <script type="text/javascript">
     window.bughd = window.bughd || function () {
       };
@@ -255,26 +226,16 @@
       <?php
       if (!empty($userId) && !empty($appToken)) {
         echo '
-<<<<<<< HEAD
-            var wxUserID = localStorage.setItem("wxUserID",  "' . $userId . '");
-            var appToken = localStorage.setItem("appToken", "' . $appToken . '");
-=======
             var xyhwxUserID = localStorage.setItem("xyhwxUserID",  "' . $userId . '");
             var xyhwxAppToken = localStorage.setItem("xyhwxAppToken", "' . $appToken . '");
->>>>>>> test
           ';
       } /*else {
           echo 'localStorage.clear();';
         }*/
       ?>
 
-<<<<<<< HEAD
-      var userID = localStorage.getItem('wxUserID');
-      var appToken = localStorage.getItem('appToken');
-=======
       var userID = localStorage.getItem('xyhwxUserID');
       var appToken = localStorage.getItem('xyhwxAppToken');
->>>>>>> test
       if (!userID || !appToken) {
         localStorage.clear();
         location.href = '<?php echo Yii::app()->request->baseUrl . '/index.php?r=/moonclub/web/wxIndex'; ?>';
@@ -286,11 +247,7 @@
     }
     var debug = false;
 //    var main = '<?php //echo Yii::app()->request->baseUrl;?>///webapp/moonclub/dist/js/main.js?v=20160960804';
-<<<<<<< HEAD
-    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=2017062901';
-=======
     var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=201707101718';
->>>>>>> test
     if (debug) {
       main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=' + (new Date()).getTime();
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';

www/protected/modules/o2o/controllers/OrderController.php

@@ -34,7 +34,7 @@ class  OrderController extends O2oBaseController{
         //活动暂用  start 判断用户是否购买过  test //583247cca84ea01d428b46a1 master//  58324b7e9f5160a4048b5758
         $doubleEleventId = '58324b7e9f5160a4048b5758';
         //$flag_book = 0;
-        /*
+
         if($products[0]['product_id'] == $doubleEleventId) {
 
             $criteria_user = new EMongoCriteria();
@@ -79,11 +79,11 @@ class  OrderController extends O2oBaseController{
                         $total += 1;
                     }
                 }
-            }
+            }*/
 
             //$flag_book = 1;
         }
-        */
+
         //end  //取出双十一活动暂用
 
 
@@ -136,9 +136,7 @@ class  OrderController extends O2oBaseController{
         foreach ($products as $product) {
             if(isset($product['product_id']) && $product['count'] >= 1){
                 $product_temp = array();
-
                 $product_obj = Product::get(new MongoId($product['product_id']));
-
                 if($product_obj){
                     $price += ($product_obj->price*$product['count']);
                     $price += $extra[0]['price']*$product['count'];
@@ -171,17 +169,16 @@ class  OrderController extends O2oBaseController{
                 $weekend_check = (date('w',strtotime($booking_time))==0 || date('w',strtotime($booking_time))==6)?1:0;
                 $booking_hour = date('H',strtotime($booking_time));
                 if($weekend_check){
-
                     if($coupon->workday_limit==1){
-                        CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable').'1');
+                        CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable'));
                     }
                 }else{
                     if($coupon->workday_limit==2){
-                        CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable').'2');
+                        CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable'));
                     }
                 }
                 if($coupon->time_limit_start && $coupon->time_limit_end && ($coupon->time_limit_start > $booking_hour || $coupon->time_limit_end < $booking_hour)){
-                    CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable').'3');
+                    CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable'));
                 }
 
                 $new_user_coupons = Yii::app()->params['new_user_coupons'];
@@ -192,10 +189,10 @@ class  OrderController extends O2oBaseController{
                     $user_coupon->use_time = time();
                     $user_coupon->update(array('status','use_time'),true);
                 }else{
-                    CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable').'4');
+                    CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable'));
                 }
             }else{
-                CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable').'5');
+                CommonFn::requestAjax(false,CommonFn::getMessage('o2o','coupon_unuseable'));
             }
         }
         $order = new ROrder();
@@ -234,7 +231,7 @@ class  OrderController extends O2oBaseController{
             }
             $order->status = 1;
             //start 长期订暂用
-            /*if($order->status == 1 ) {
+            if($order->status == 1 ) {
                 if($products[0]['product_id'] == '5835423fa84ea0ac7a8b4568') {
                     $u_id = new MongoId($user_id);
                     $start_time = date_create("2016-11-11")->format('U');//发放优惠券可用开始时间 2016.11.14
@@ -259,7 +256,7 @@ class  OrderController extends O2oBaseController{
                         }
                     }
                 }
-            }*/
+            }
             //end暂用
             //修改订单状态
             CommonFn::sendOrderSms($order,(string)$order->_id);
@@ -367,7 +364,7 @@ class  OrderController extends O2oBaseController{
             if (isset($user_obj->order_count)) {
                 $user_obj->order_count += 1;
                 //支付成功 判断是否是长期定 start
-                /*if($order->products[0]['product'] == '5835423fa84ea0ac7a8b4568') {
+                if($order->products[0]['product'] == '5835423fa84ea0ac7a8b4568') {
                     $u_id = new MongoId($user_id);
                     $start_time = date_create("2016-11-11")->format('U');//发放优惠券可用开始时间 2016.11.14
                     $end_time = date_create("2016-12-15")->format('U');   //发放优惠券过期时间 17天
@@ -390,7 +387,7 @@ class  OrderController extends O2oBaseController{
                             Service::factory('CouponService')->giveCoupon($u_id, new MongoId("58356a2aa84ea03b018b46bb"), $start_time, $end_time);//发放代金券
                         }
                     }
-                }*/
+                }
                 // 长期定end
             } else {
                 $user_obj->order_count = 1;
@@ -972,22 +969,4 @@ class  OrderController extends O2oBaseController{
         time();
     }
 
-    public function actionBackupData(){
-        $is_del = Yii::app()->request->getParam('del','');
-        if($is_del != md5(md5('is_del'))){
-            exit;
-        }
-        $orders = ROrder::model()->findAll();
-        foreach ($orders as $order) {
-            $order = ROrder::get($order->_id);
-            $order->delete();
-        }
-        $users = RUser::model()->findAll();
-        foreach ($users as $order) {
-            $order = RUser::get($order->_id);
-            $order->delete();
-        }
-
-    }
-
 }

www/protected/modules/o2o/controllers/UserController.php

@@ -9,6 +9,7 @@ class  UserController extends O2oBaseController{
     
     public function actionInfo(){
         $user_id = Yii::app()->getRequest()->getParam("user_id");
+
         if(CommonFn::isMongoId($user_id)){
             $user = Service::factory('UserService')->getUser(new MongoId($user_id),false);
             if($user){

www/protected/modules/o2o/controllers/WebController.php

@@ -7,6 +7,7 @@ class WebController extends O2oBaseController {
 		$home_page = Yii::app()->getRequest()->getParam("home_page",'');
 		$code = Yii::app()->getRequest()->getParam("code");
 		$state = Yii::app()->getRequest()->getParam("state");
+
 		$userId = '';
 		$appToken = '';
 		if($code && $state){
@@ -75,7 +76,6 @@ class WebController extends O2oBaseController {
 				'signPackage' => $signPackage,
 				'userId' => $userId,
 				'appToken' => $appToken,
-                'host' =>  $_SERVER['HTTP_HOST']
 			));
 		}else{
 			/* var_dump(array(
@@ -91,7 +91,6 @@ class WebController extends O2oBaseController {
 				'signPackage' => $signPackage,
 				'userId' => $userId,
 				'appToken' => $appToken,
-                'host' =>  $_SERVER['HTTP_HOST']
 			));
 		}
 	}

www/protected/modules/o2o/models/ROrder.php

@@ -90,7 +90,6 @@ class ROrder extends MongoAr
         "mix"=>array('name' => '混合支付'),  //部分余额支付   部分付款
         "jingbai" => array('name' => '精佰'),
         "other" => array('name' => '其他'),
-        "putao" => array('name' => '葡萄'),
 
     );
 

www/protected/modules/o2o/views/index/index.php

@@ -56,8 +56,6 @@
         location.href = '<?php echo Yii::app()->request->baseUrl."/login/wxOpen&redirect_uri=".$current_uri; ?>';
       }
       document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
-    } else {
-
     }
     if (location.hash == '#rd') {
       location.hash = '';

www/protected/services/SendSMSService.php

@@ -60,7 +60,7 @@ class SendSMSService extends Service{
     * mobile 为接受短信的手机号
     */
     public function send_sms($text, $mobile){
-        $t_mobile = array('15600266816');
+        $t_mobile = array('18521093629');
         if(ENVIRONMENT != 'product' && !in_array($mobile,$t_mobile)){
             return false;
             // $mobile = '18521093629';