init

www/protected/commands/GiveCouponsCommand.php

@@ -82,36 +82,6 @@ class GiveCouponsCommand extends CConsoleCommand{
         }
 
 
-    //     //从订单表中获取数据
-    //     $mongo = new MongoClient(DB_CONNETC);
-    //     $db = $mongo->wozhua_o2o;
-    //     $collection = $db->selectCollection('orders');
-    //     $keys = array("address.mobile" => 1);
-    //     $initial = array("count" => 0,"name" => '');
-    //     $reduce = "function (obj, prev) {
-    //                     prev.count++;
-    //                     prev.name=obj.address.name;
-    //                     if(obj.channel=='wz_app' || obj.channel=='wx_pub'){
-    //                         prev.channel=obj.channel;
-    //                         prev.user=obj.user;
-    //                     }
-    //                 }";
-    //     //根据用户手机号汇总数据，手机号去重，获取收货地址中的用户名，如果是app内下单的用户则记下用户id
-    //     $g = $collection->group($keys, $initial, $reduce);
-
-    //     $smsservice = Service::factory('SendSMSService');
-    //     foreach ($g['retval'] as $value) {
-    //         //应用内下单用户直接发放优惠券
-    //         if(isset($value['channel']) && ($value['channel'] == 'wz_app' || $value['channel'] == 'wx_pub')){
-    //             var_dump($this->SendCoupon($value['user'],$coupon_ids,$start_time,$end_time));
-    //         }
-
-    //         //TODO:发送短信
-    //         $result = $smsservice->send_sms('【壹管家宠物】万圣节来袭，壹管家送壕礼。新开通SPA、洁牙、药浴。送您240元代金券，点击领取→http://t.cn/R2DKttW 回T退订',$value['address.mobile']);
-    //         var_dump($result);
-    //         sleep(1);
-    //     }
-
     }
 
 

www/protected/config/console.php

@@ -65,7 +65,7 @@ if(trim($env) == 'develop'){// 本地配置
             ),
             'mongodb_analysis' => array(//统计分析的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://192.168.1.192:27017',
+                'connectionString' => 'mongodb://127.0.0.1:27017',
                 'dbName'           => 'analysis',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
@@ -207,18 +207,18 @@ if(trim($env) == 'develop'){// 本地配置
                 'qiniuConfig' => array(
                     'ak'=>'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr',
                     'sk'=>'mLtD4GhBjQt_llcgx4rKlhAts9j8iJ0Qa5VmNyi2',
-                    'icons'=>'wozhua-icons',//后台可能上传一些图标    如宠物种类的图标    活动banner   圈子的图标
-                    'pics'=>'wozhua-pics',//后台和app上  上传到帖子、回帖里面的图片
-                    'avatars'=>'wozhua-avatars',//用户的头像
-                    'others'=>'wozhua-others',//其他类型的图片
-                    'voice'=>'wozhua-voice',//音频文件
-                    'video'=>'wozhua-video'//音频文件
+                    'icons'=>'icons',
+                    'pics'=>'pics',
+                    'avatars'=>'avatars',//用户的头像
+                    'others'=>'others',//其他类型的图片
+                    'voice'=>'voice',//音频文件
+                    'video'=>'video'//音频文件
                 )
             )
         )
     );
 }else{//测试配置
-    define('DB_CONNETC', 'mongodb://root:wozhua=9527@10.9.198.18:27017');
+    define('DB_CONNETC', 'mongodb://root:Yiguanjia6101@10.9.198.18:27017');
     define('ENVIRONMENT', 'test');
     return array(
         'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
@@ -257,7 +257,7 @@ if(trim($env) == 'develop'){// 本地配置
             ),
             'mongodb_data' => array(//管理后台的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.198.18:27017',
                 'dbName'           => 'data',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
@@ -265,7 +265,7 @@ if(trim($env) == 'develop'){// 本地配置
             ),
             'mongodb_o2o' => array(//o2o的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.198.18:27017',
                 'dbName'           => 'fuwu',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
@@ -273,7 +273,7 @@ if(trim($env) == 'develop'){// 本地配置
             ),
             'mongodb' => array(//管理后台的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.198.18:27017',
                 'dbName'           => 'backend',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
@@ -281,7 +281,7 @@ if(trim($env) == 'develop'){// 本地配置
             ),
             'mongodb_analysis' => array(//统计分析的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.198.18:27017',
                 'dbName'           => 'analysis',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,

www/protected/config/test.php

@@ -13,7 +13,7 @@ return CMap::mergeArray(
             ),
             'mongodb_data' => array(//管理后台的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.198.18:27017',
                 'dbName'           => 'data',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
@@ -21,7 +21,7 @@ return CMap::mergeArray(
             ),
             'mongodb_o2o' => array(//o2o的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.198.18:27017',
                 'dbName'           => 'fuwu',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
@@ -51,8 +51,8 @@ return CMap::mergeArray(
                 'qiniuConfig' => array(
                     'ak'=>'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr',
                     'sk'=>'mLtD4GhBjQt_llcgx4rKlhAts9j8iJ0Qa5VmNyi2',
-                    'icons'=>'icons',//后台可能上传一些图标 如宠物种类的图标 活动banner 圈子的图标
-                    'pics'=>'pics',//后台和app上  上传到帖子、回帖里面的图片
+                    'icons'=>'icons',
+                    'pics'=>'pics',
                     'avatars'=>'avatars',//用户的头像
                     'video'=>'video'//音频文件
                 ),

www/protected/modules/common/controllers/ConfirmController.php

@@ -5,78 +5,8 @@ class ConfirmController extends CController{
         $input_data = json_decode(file_get_contents("php://input"), true);
         $input_data = $input_data['data']['object'];
         if($input_data['object'] == 'charge'&& $input_data['paid']==true){
-            if($input_data['subject'] == '附加服务'){
-                $a_order = AppendOrder::get(new MongoId($input_data['order_no']));
-                if($a_order && $a_order->status == 0){
-                    $a_order->charge_id = $input_data['id'];
-                    $a_order->pay_channel = $input_data['channel'];
-                    $a_order->status = 1;
-                    if($a_order->update(array('charge_id','pay_channel','status'),true)){
-                        echo 'success';
-                        die();
-                    }
-                }
-                echo 'fail';
-                die();
-            }
-            if ($input_data['subject'] == '带我回家-支付') {
-                $deal_order = DealOrder::get(new MongoId($input_data['order_no']));
-                if ($deal_order && $deal_order->status == 0) {
-                    // 订单修改
-                    $deal_order->chargeid = $input_data['id'];
-                    $deal_order->pay_channel = $input_data['channel'];
-                    $deal_order->pay_time = time();
-                    $deal_order->status = 1;
-
-                    // 宠物修改
-                    $pet = DealPet::get($deal_order->pet);
-                    $pet->status = 3;
-
-                    // 商家订单增加
-                    $kennel = Kennel::get($deal_order->kennel);
-                    $kennel->order_count += 1;
-                    $kennel->save();
-
-                    if ($deal_order->save() && $pet->save()) {
-                        echo 'success';
-                        die;
-                    }
-                }
-                echo 'fail';
-                die;
-            }
-            if ($input_data['subject'] == '带我回家-首款支付') {
-                $deal_earnest_order = DealChildOrder::get(new MongoId($input_data['order_no']));
-                if ($deal_earnest_order && $deal_earnest_order->status == 0) {
-                    $deal_earnest_order->chargeid = $input_data['id'];
-                    $deal_earnest_order->pay_channel = $input_data['channel'];
-                    $deal_earnest_order->pay_time = time();
-                    $deal_earnest_order->status = 1;
-                    // 后续操作在DealChildOrder::afterSave()中
-                    if ($deal_earnest_order->save()) {
-                        echo 'success';
-                        die;
-                    }
-                }
-                echo 'fail';
-                die;
-            }
-            if ($input_data['subject'] == '带我回家-尾款支付') {
-                $deal_final_order = DealChildOrder::get(new MongoId($input_data['order_no']));
-                if ($deal_final_order && $deal_final_order->status == 0) {
-                    $deal_final_order->chargeid = $input_data['id'];
-                    $deal_final_order->pay_channel = $input_data['channel'];
-                    $deal_final_order->pay_time = time();
-                    $deal_final_order->status = 1;
-                    // 后续操作在DealChildOrder::afterSave()中
-                    if ($deal_final_order->save()) {
-                        echo 'success';
-                        die;
-                    }
-                }
-                echo 'fail';
-                die;
-            }
+       
+  
             //TODO update database
             $order = ROrder::get(new MongoId($input_data['order_no']));
             if(!$order || $order->status == -1){
@@ -142,85 +72,6 @@ class ConfirmController extends CController{
     }
 
 
-    public function actionConvVideo(){
-        $input_data = json_decode(file_get_contents("php://input"), true);
-        file_put_contents('/data/qiniulog.json',var_export($input_data,true),FILE_APPEND);
-        $id = $input_data['id'];
-        if($id){
-            $cache = new ARedisCache();
-            $topic_id = $cache->get($id);
-            $topic = Topic::get(new MongoId($topic_id));
-            $qiniu_config = Yii::app()->params['qiniuConfig'];
-            if($topic && isset($topic->video)){
-                $key = str_replace('http://'.$qiniu_config['video'].'.qiniudn.com/','',$topic->video['url']);
-                $new_key = 'af'.$key;
-                $topic->video['url'] = 'http://'.$qiniu_config['video'].'.qiniudn.com/'.$new_key;
-                $topic->update(array('video'),true);
-            }
-        }
-    }
-
-    public function actionUserFollow(){
-        $path = Yii::getPathOfAlias('application');
-        require_once($path."/vendors/weixin/wechat.class.php");
-        $wxConfig = Yii::app()->params['wxConfig'];
-        $options = array(
-               'token'=>'kkzH33eWEuP383uuKuQ366uKPwwzpE37', //填写你设定的key
-               'encodingaeskey'=>'2MACh0Ww6nDHDtH4pHEwgfRnCnctGVtNA0Bumvw5nkA', //填写加密用的EncodingAESKey
-               'appid'=>$wxConfig['appId'], //填写高级调用功能的app id
-               'appsecret'=>$wxConfig['appSecret'], //填写高级调用功能的密钥
-           );
-        $weObj = new Wechat($options);
-        $weObj->valid();
-        $menu = $weObj->getMenu();
-        $newmenu =  array(
-               "button"=>
-                   array(
-                       array('type'=>'view','name'=>'上门服务','url'=>'http://common.yiguanjia.me/o2o/web/index'),
-                       array('type'=>'view','name'=>'下载APP','url'=>'http://t.cn/R2DKttW'),
-                       array('type'=>'click','name'=>'壹管家过年','key'=>'WOZHUA_STAR'),
-                       )
-               );
-        $result = $weObj->createMenu($newmenu);
-        $data = $weObj->getRev()->getRevData();
-        if(isset($data['FromUserName']) && !empty($data['FromUserName'])){
-            if($data['Event'] == 'subscribe'){
-                // @file_put_contents('/data/subscribe.log',$data['FromUserName'].'--'.$data['Event']."\n",FILE_APPEND);
-                $criteria = new EMongoCriteria();
-                $criteria->wx_pub_openid('==',$data['FromUserName']);
-                $user = RUser::model()->find($criteria); 
-                if($user){
-                    $user->wx_have_follow = 1;
-                    $user->update(array('wx_have_follow'),true);
-                }else{
-                    // @file_put_contents('/data/subscribe_error.log',$data['FromUserName'].'--'.$data['Event']."\n",FILE_APPEND);
-                }
-            }elseif($data['Event']=='unsubscribe'){
-                // @file_put_contents('/data/subscribe.log',$data['FromUserName'].'--'.$data['Event']."\n",FILE_APPEND);
-                $criteria = new EMongoCriteria();
-                $criteria->wx_pub_openid('==',$data['FromUserName']);
-                $user = RUser::model()->find($criteria); 
-                if($user){
-                    $user->wx_have_follow = 0;
-                    $user->update(array('wx_have_follow'),true);
-                }else{
-                    // @file_put_contents('/data/subscribe_error.log',$data['FromUserName'].'--'.$data['Event']."\n",FILE_APPEND);
-                }
-            }elseif($data['Event']=='CLICK' && $data['EventKey']=='WOZHUA_STAR'){
-                $criteria = new EMongoCriteria();
-                $criteria->wx_pub_openid('==',$data['FromUserName']);
-                $user = RUser::model()->find($criteria); 
-                if($user && $user->wx_have_follow != 1){
-                    $user->wx_have_follow = 1;
-                    $user->update(array('wx_have_follow'),true);
-                }
-                $weObj->text("晒萌宠照，赢Apple watch，参与活动请点击：http://t.cn/RbgjgPK")->reply(); 
-            }
-            if(time() - $data['CreateTime'] < 2 && $data['Event'] == 'subscribe'){
-                $weObj->text("晒萌宠照，赢Apple watch，参与活动请点击：http://t.cn/RbgjgPK")->reply(); 
-            }
-        }
-    }
 
 
 }

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

@@ -52,8 +52,8 @@ $(function(){
   var apiUrl = 'http:// api.yiguanjia.me';
   if (location.host == ' apitest.yiguanjia.me') {
     apiUrl = 'http:// apitest.yiguanjia.me';
-  } else if (location.host == 'api.wozhuadev.mobi') {
-    apiUrl = 'http://api.wozhuadev.mobi';
+  } else if (location.host == 'api.yiguanjiadev.me') {
+    apiUrl = 'http://api.yiguanjiadev.me';
   }
 
   function edit() {

www/protected/modules/o2o/views/web/baiduLogin.php

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Document</title>
-</head>
-<body>
-  <script>
-    alert(1)
-  </script>
-</body>
-</html>

www/protected/modules/o2o/views/web/dealIndex.php

@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>带我回家</title>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-  <meta name="format-detection" content="telephone=no, email=no">
-  <link rel="stylesheet" href="//static.wozhua.mobi/webapp/deal/app.5de2f4b7f490471927749f98be92b2ef.css">
-  <script type="text/javascript" id="wxMain" data-sign="<?php echo @htmlentities(json_encode($signPackage)); ?>"></script>
-  <script>
-    (function(){
-      var ua = navigator.userAgent.toLowerCase();
-      if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-        document.write('<script src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>')
-        <?php
-        if(!empty($userId)){
-          echo '
-              var wxUserID = localStorage.setItem("wxUserID",  "'.$userId.'");
-              var appToken = localStorage.setItem("appToken", "'.$appToken.'");
-            ';
-        }
-        ?>
-        var userID = localStorage.getItem('wxUserID');
-        var appToken = localStorage.getItem('appToken');
-        if (!userID || !appToken) {
-          localStorage.removeItem('wxUserID')
-          localStorage.removeItem('appToken')
-          location.href = '<?php echo Yii::app()->request->baseUrl . '/o2o/web/wxIndex&home_page=deal'; ?>';
-        }
-      }
-    })();
-  </script>
-</head>
-<body>
-<div id="app"></div>
-<div style="display: none">
-  <script type="text/javascript">
-    var cnzz_protocol = (("https:" == document.location.protocol) ? " https://" : " http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1258816013'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s4.cnzz.com/stat.php%3Fid%3D1258816013%26show%3Dpic1' type='text/javascript'%3E%3C/script%3E"));
-    var _czc = _czc || [];
-    _czc.push(["_setAccount", "1258816013"]);
-  </script>
-</div>
-<script src="//static.wozhua.mobi/webapp/deal/vendor.bundle.56fadcd4236271011341.js"></script>
-<script src="//static.wozhua.mobi/webapp/deal/app.b10327dec2b1f2df397b.js"></script>
-<?php
-require_once 'cs.php';
-echo '<img src="'._cnzzTrackPageView(1258816013).'" width="0" height="0"/>';
-?>
-</body>
-</html>

www/protected/modules/o2o/views/web/lotteryIndex.php

@@ -1,162 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>豪礼大放送</title>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-  <meta http-equiv="Pragma" content="no-cache">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <script>
-    (function(){
-      var ua = navigator.userAgent.toLowerCase();
-      if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-        <?php
-          if(!empty($userId)){
-            echo '
-              var wxUserID = localStorage.setItem("wxUserID",  "'.$userId.'");
-              var appToken = localStorage.setItem("appToken", "'.$appToken.'");
-            ';
-          }
-        ?>
-        var userID = localStorage.getItem('wxUserID');
-        var appToken = localStorage.getItem('appToken');
-        if (!userID || !appToken) {
-          localStorage.clear();
-          location.href = '<?php echo Yii::app()->request->baseUrl . '/o2o/web/wxIndex&home_page=lottery'; ?>';
-        }
-      }
-    })();
-  </script>
-  <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/activities/lucky/css/style.css?v=2015111302">
-</head>
-<body>
-  <div class="container">
-    <div class="main-title"></div>
-    <div class="rotate">
-      <div class="rotate-content">
-        <ul class="presents"></ul>
-        <div class="pointer"></div>
-      </div>
-      <div class="present1"></div>
-      <div class="present2"></div>
-    </div>
-    <div class="info">
-      <div class="msg available-times">您今天还有<span>3</span>次抽奖机会</div>
-      <div class="btn-share">分享给朋友</div>
-    </div>
-    <div class="result result-top">
-      <div class="title">获奖用户</div>
-      <ul></ul>
-    </div>
-    <div class="rule">
-      <div class="rule-title">活动规则</div>
-      活动规则
-      <p>1、所有实物奖品（颜色随机）、客服会在1-3天内和您联系，确认发货事宜。若一周内联系不上您，则视为自动放弃。</p>
-      <p>2、所有实物奖品会在确认信息后，次日尽快发货（周五及周末抽到的奖品顺延到下个工作日发货）。</p>
-      <p>3、所有实物奖品请以实物为准，无质量问题不接受退换货。</p>
-      <p>4、所有实物奖品均不需要用户支付运费。</p>
-      <p>5、本活动限壹管家APP、壹管家微信客户端、新老用户均可参与。</p>
-      <p>6、本活动与苹果公司无关，最终解释权归壹管家所有。</p>
-    </div>
-  </div>
-  <div class="alert-bg hide"></div>
-  <div class="alert alert-phone hide" id="alert-phone">
-    <div class="alert-header">
-      <div class="header-content">
-        <div class="dog"></div>
-        <span>为了方便您奖品领取<br>请填写手机号</span>
-      </div>
-      <div class="btn-close icon-close"></div>
-    </div>
-    <div class="alert-body">
-      <input type="tel" name="" id="phone" placeholder="请输入11位手机号">
-      <div class="btn-active btn-submit disable">确定</div>
-    </div>
-  </div>
-  <div class="alert alert-result hide" id="alert-result">
-    <div class="alert-header">
-      <div class="header-content">
-        <p class="msg-title msg-title-with-icon">
-          <svg class="surprise-left">
-            <path id="XMLID_6_" fill="#FFEE58" d="M23.778,24.298c0,0-14.39-2.143-18.202,6.897l-4.3-2.743
-              C1.275,28.452,10.455,18.62,23.778,24.298z"/>
-            <path id="XMLID_5_" fill="#FFEE58" d="M23.656,23.848c0,0-3.981-13.993,4.493-18.939l-3.277-3.909
-              C24.872,1.001,16.306,11.369,23.656,23.848z"/>
-            <path id="XMLID_4_" fill="#FFEE58" d="M23.513,23.596c0,0-11.899-11.196-9.93-17.524l4.471-0.456
-              C18.053,5.616,13.883,10.234,23.513,23.596z"/>
-            <path id="XMLID_3_" fill="#FFEE58" d="M23.397,23.728c0,0-16.114-13.052-22.787-10.795l0.731,4.969
-              C1.34,17.902,5.444,13.217,23.397,23.728z"/>
-          </svg>
-          <strong>您抽到了</strong>
-          <svg class="surprise-right">
-            <path id="XMLID_6_" fill="#FFEE58" d="M4.981,24.298c0,0,14.39-2.143,18.202,6.897l4.3-2.743
-              C27.483,28.452,18.304,18.62,4.981,24.298z"/>
-            <path id="XMLID_5_" fill="#FFEE58" d="M5.102,23.848c0,0,3.981-13.993-4.493-18.939l3.277-3.909
-              C3.886,1.001,12.453,11.369,5.102,23.848z"/>
-            <path id="XMLID_4_" fill="#FFEE58" d="M5.245,23.596c0,0,11.899-11.196,9.93-17.524l-4.471-0.456
-              C10.705,5.616,14.876,10.234,5.245,23.596z"/>
-            <path id="XMLID_3_" fill="#FFEE58" d="M5.362,23.728c0,0,16.114-13.052,22.787-10.795l-0.731,4.969
-              C27.418,17.902,23.314,13.217,5.362,23.728z"/>
-          </svg>
-        </p>
-        <p class="msg-title msg-rewards"><strong>xxxxxxx 一个</strong></p>
-        <p class="msg-title msg-tips"></p>
-        <div class="division-line"></div>
-        <p class="msg">工作人员会根据您填写的手机号与您联系，为您派送奖品。</p>
-      </div>
-      <div class="btn-close icon-close"></div>
-    </div>
-    <div class="alert-body">
-      <div class="btn-active btn-close">OK</div>
-    </div>
-  </div>
-  <div class="alert alert-result2 hide" id="alert-result2">
-    <div class="alert-header">
-      <div class="header-content">
-        <p class="msg-tips">手气不好~再试一次~</p>
-        <svg class="sad">
-          <g>
-            <path fill="#FFFFFF" d="M19.985,40.059c11.045,0,20-8.956,20-20c0-11.046-8.955-20-20-20c-11.04,0-20,8.954-20,20
-            C-0.015,31.103,8.945,40.059,19.985,40.059L19.985,40.059z M20.043,1.8c8.97,0,18.3,9.284,18.3,18.26
-            c0,8.974-9.33,18.262-18.3,18.262c-8.975,0-18.31-9.289-18.31-18.262C1.733,11.083,11.07,1.8,20.043,1.8L20.043,1.8z M9.985,12.559
-            c0-1.378,1.122-2.498,2.505-2.498c1.377,0,2.495,1.12,2.495,2.498s-1.118,2.498-2.495,2.498
-            C11.108,15.056,9.985,13.936,9.985,12.559L9.985,12.559z M24.985,12.559c0-1.378,1.118-2.498,2.5-2.498
-            c1.382,0,2.505,1.12,2.505,2.498s-1.123,2.498-2.505,2.498C26.103,15.056,24.985,13.936,24.985,12.559L24.985,12.559z
-             M11.323,28.758l-2.055-0.135c2.188-3.633,6.167-6.066,10.718-6.066c4.55,0,8.535,2.433,10.722,6.066l-1.947,0.135
-            c-1.533-2.548-5.538-4.348-8.715-4.348C16.855,24.407,12.85,26.21,11.323,28.758L11.323,28.758z M11.323,28.758" />
-          </g>
-        </svg>
-      </div>
-      <div class="btn-close icon-close"></div>
-    </div>
-    <div class="alert-body">
-      <div class="btn-active btn-close">再试一次</div>
-    </div>
-  </div>
-  <div class="alert-share hide">
-  </div>
-  <script id="graceMain" src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/require.js" data-main="<?php echo Yii::app()->request->baseUrl; ?>/webapp/activities/lucky/dist/js/main.js?v=2015111304"></script>
-  <script id="wxMain" data-sign="<?php echo htmlentities(json_encode($signPackage)); ?>"></script>
-  <script id="rewards-data" type="text/html">
-    {{each rewards as value i}}
-    <li style="-webkit-transform: rotateZ({{i * 45}}deg);">
-      <p>{{value.name}}</p>
-      <img src="{{value.pic}}" height="27" width="27" alt="">
-    </li>
-    {{/each}}
-  </script>
-  <script id="luckyers-data" type="text/html">
-    {{each luckyers as value i}}
-    <li>
-        <img src="{{value.reward_info.pic}}" alt="">
-        <span>恭喜</span>
-        <span class="phone">{{value.user.mobile}}</span>
-        <span>获得{{value.reward_info.name}}</span>
-    </li>
-    {{/each}}
-  </script>
-</div>
-</body>
-</html>

www/protected/modules/o2o/views/web/newDealIndex.php

@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>带我回家</title>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-  <script>
-    (function(){
-      var ua = navigator.userAgent.toLowerCase();
-      if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-        <?php
-          if(!empty($userId)){
-            echo '
-              var wxUserID = localStorage.setItem("wxUserID",  "'.$userId.'");
-              var appToken = localStorage.setItem("appToken", "'.$appToken.'");
-            ';
-          }
-        ?>
-        var userID = localStorage.getItem('wxUserID');
-        var appToken = localStorage.getItem('appToken');
-        if (!userID || !appToken) {
-          localStorage.removeItem('wxUserID')
-          localStorage.removeItem('appToken')
-          location.href = '<?php echo Yii::app()->request->baseUrl . '/o2o/web/wxIndex&home_page=newDeal'; ?>';
-        }
-        location.href = '/index.php?r=deal/index'
-      }
-    })();
-  </script>
-</head>
-<body>
-</body>
-</html>

www/protected/modules/o2o/views/web/voteIndex.php

@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>晒萌宠新年照，赢Apple watch</title>
-  <meta charset="UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-	<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-  <meta http-equiv="Pragma" content="no-cache">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <link rel="stylesheet" href="/webapp/vote/dist/build.min.css?v=2016020105">
-</head>
-
-<body>
-  <div id="app"></div>
-  <script>var floatDownloadUrl = 'http://common.yiguanjia.me/index.php?r=common/Download/redirect'</script>
-  <script src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/vote/dist/jweixin-1.0.0.js?v=2015092401"></script>
-  <script id="graceMain"></script>
-  <script type="text/javascript" id="wxMain" data-sign="<?php echo htmlentities(json_encode($signPackage)); ?>"></script>
-	<script>
-    (function(){
-  		var ua = navigator.userAgent.toLowerCase();
-      if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-        <?php
-          if(!empty($userId)){
-            echo '
-              var wxUserID = localStorage.setItem("wxUserID",  "'.$userId.'");
-              var appToken = localStorage.setItem("appToken", "'.$appToken.'");
-            ';
-          }
-        ?>
-        var userID = localStorage.getItem('wxUserID');
-        var appToken = localStorage.getItem('appToken');
-        if (!userID || !appToken) {
-          localStorage.clear();
-          location.href = '<?php echo Yii::app()->request->baseUrl . '/o2o/web/wxIndex&home_page=vote'; ?>';
-        }
-  			document.getElementById('graceMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/vote/dist/build.js?v=2016020205';
-      } else {
-        var imgUrl = {
-          pc: 'http://wozhua-others.qiniudn.com/20160201-pc.png',
-          mobile: 'http://wozhua-others.qiniudn.com/20160201-web.png'
-        }
-        var app = document.getElementById('app');
-        var image = document.createElement('img');
-        var css;
-        var isWin = (navigator.platform == 'Win32') || (navigator.platform == 'Windows');
-        var isMac = (navigator.platform == 'Mac68K') || (navigator.platform == 'MacPPC') || (navigator.platform == 'Macintosh') || (navigator.platform == 'MacIntel');
-        if (isWin || isMac) {
-          css = '#app {text-align: center;}#app img {width: 100%;max-width: 640px;}';
-          app.style = 'text-align: center';
-          image.style = 'width: 100%; max-width: 640px;';
-          image.src = imgUrl.pc;
-        } else {
-          css = '#app {position: absolute;left: 0;right: 0;top: 0;bottom: 0;background: url(http://wozhua-others.qiniudn.com/20160201-web.png?interlace/1) no-repeat;background-size: cover;background-color: #f2f2f2;}';
-        }
-        var j = document.createElement("style");
-        j.type = "text/css";
-        j.innerHTML = css;
-        document.getElementsByTagName("head")[0].appendChild(j)
-        app.appendChild(image);
-      }
-    })();
-  </script>
-    <?php require_once 'cs.php';echo '<img src="'._cnzzTrackPageView(1255565427).'" width="0" height="0"/>';?>
-</body>
-</html>

www/webapp/common/js/config-native.js

@@ -29,15 +29,15 @@ define(['require'], function(require) {
   //新的方式判断客户端环境，新版本稳定一段时间后切换判断方式
   if (newCheck) {
     var userAgent = navigator.userAgent;
-    if (userAgent.indexOf('WoZhuaClient/1') > -1) {
+    if (userAgent.indexOf('Client/1') > -1) {
       isIOS = true;
-    } else if (userAgent.indexOf('WoZhuaClient/2') > -1) {
+    } else if (userAgent.indexOf('Client/2') > -1) {
       isAndroid = true;
     }
-    var re = /WoZhuaVersion\/[0-9.]+/g;
+    var re = /Version\/[0-9.]+/g;
     r = re.exec(userAgent);
     if (r !== null) {
-      appVersion = r[0].replace('WoZhuaVersion/', '');
+      appVersion = r[0].replace('Version/', '');
     }
   } else {
     var isWin = (navigator.platform == 'Win32') || (navigator.platform == 'Windows');

www/webapp/common/js/config.js

@@ -152,15 +152,15 @@ define(function (require) {
   //新的方式判断客户端环境，新版本稳定一段时间后切换判断方式
   if (newCheck) {
     var userAgent = navigator.userAgent;
-    if (userAgent.indexOf('WoZhuaClient/1') > -1) {
+    if (userAgent.indexOf('Client/1') > -1) {
       isIOS = true;
-    } else if (userAgent.indexOf('WoZhuaClient/2') > -1) {
+    } else if (userAgent.indexOf('Client/2') > -1) {
       isAndroid = true;
     }
-    var re = /WoZhuaVersion\/[0-9.]+/g;
+    var re = /Version\/[0-9.]+/g;
     r = re.exec(userAgent);
     if (r !== null) {
-      appVersion = r[0].replace('WoZhuaVersion/', '');
+      appVersion = r[0].replace('Version/', '');
     }
   } else {
     var isWin = (navigator.platform == 'Win32') || (navigator.platform == 'Windows');

www/webapp/common/js/jq_extend.js

@@ -18,7 +18,7 @@ define(['config', 'native', 'zepto'], function(config, native, $) {
 			//根据域名判断使用ajax还是jsonP
 			autoAjax: function(param) {
 				param['no_sign'] = 1;
-				if (location.host == 'wozhua.mobi') {
+				if (location.host == 'yiguanjia.me') {
 					$.ajax(param);
 				} else {
 					// api接口增加版本号

www/webapp/o2o/js/panel/postReview.js

@@ -12,7 +12,7 @@ define(['$', 'template', 'autosize', 'order', 'api', 'config', 'native', 'user']
     return 0;
   }
   var cachePageData = {
-    bucket: 'wozhua-pics',
+    bucket: 'pics',
     token: ''
   }
   var images = {
@@ -213,7 +213,7 @@ define(['$', 'template', 'autosize', 'order', 'api', 'config', 'native', 'user']
       };
 
       if (config.test) {
-        cachePageData.bucket = 'wozhua-test'
+        cachePageData.bucket = 'test'
       }
       api.gettoken({
         request_from: 'weixin',