Charlie před 8 roky
rodič
revize
775d8e3ac8

+ 2 - 38
www/protected/modules/api/controllers/CommonController.php

@@ -477,7 +477,7 @@ class CommonController extends ApiBaseController {
             $data['hot_keywords'] = $hot_keys;
             $data['report_reason'] = Yii::app()->params['report_reason'];
             $data['certify_url'] = isset(Yii::app()->params['certify_url'])?Yii::app()->params['certify_url']:'';
-            $data['tool_box_url'] = 'http://www.wozhua.mobi/webapp/pet';
+            $data['tool_box_url'] = 'http://common.yiguanjia.me/webapp/pet';
             $data['deal_url'] = 'http://'.$host.'/o2o/web/index/deal?need_header=0';
             $pic_edit = Service::factory('VariableService')->getVariable('pic_edit');
             $data['pic_edit'] = intval($pic_edit);
@@ -519,43 +519,7 @@ class CommonController extends ApiBaseController {
         CommonFn::requestAjax($success, $message, $data);
     }
 
-    public function actionReport() {
-        $user   = Yii::app()->request->getParam('user_id', '');
-        $reason = Yii::app()->request->getParam('reason', '');
-        $time   = time();
-
-        $to_user_id  = Yii::app()->request->getParam('to_user_id', '');
-        $topic_id    = Yii::app()->request->getParam('topic_id', '');
-
-        if ((empty($to_user_id) && empty($topic_id))                // 举报对象
-            || empty($user) || empty($reason)) {                    // 举报用户和理由
-            CommonFn::requestAjax(false, '参数不全', array());
-        }
-
-        $type      = empty($to_user_id) ? 'topic' : 'user';
-        $object    = empty($to_user_id) ? $topic_id : $to_user_id;
-        $object_id = new MongoId($object);
-        $user_id   = new MongoId($user);
-        $reports   = Report::getByUser($user_id, $object_id);
-        if ($reports != false) {
-            $reports->next();
-            $report = $reports->current();
-            if ($report->status == 0) {
-                CommonFn::requestAjax(false, '已经举报过了哦', array());
-            }
-        }
-
-        $report = new Report();
-        $report->type   = $type;
-        $report->object = $object_id;
-        $report->user   = $user_id;
-        $report->reason = $reason;
-        $report->time   = $time;
-
-        $success = $report->insert();
-        $message = $success ? '举报成功' : '举报失败';
-        CommonFn::requestAjax($success, $message, array());
-    }
+    
 
     public function actionCustomeParam() {
         $user_id   = Yii::app()->request->getParam('user_id', '');

+ 1 - 1
www/protected/modules/common/controllers/ConfirmController.php

@@ -176,7 +176,7 @@ class ConfirmController extends CController{
         $newmenu =  array(
                "button"=>
                    array(
-                       array('type'=>'view','name'=>'上门服务','url'=>'http://www.wozhua.mobi/o2o/web/index'),
+                       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'),
                        )

+ 1 - 1
www/protected/modules/o2o/controllers/MyCommentController.php

@@ -22,7 +22,7 @@ class MyCommentController extends CController {
                     $this->render('error', ['msg' => '未查询到用户']);die;
                 }
             } else {
-                $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxedb2ce71dfee8aa5&redirect_uri=api.wozhua.mobi%2Findex.php%3Fr%3Do2o%2FmyComment%2FcheckUserid&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
+                $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxedb2ce71dfee8aa5&redirect_uri= api.yiguanjia.me%2Findex.php%3Fr%3Do2o%2FmyComment%2FcheckUserid&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
             }
         } else {
             $userid = Yii::app()->request->getParam('weixin_userid', '');

+ 1 - 1
www/protected/modules/o2o/controllers/MyCommisionController.php

@@ -22,7 +22,7 @@ class MyCommisionController extends CController {
                     $this->render('error', ['msg' => '未查询到用户']);die;
                 }
             } else {
-                $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxedb2ce71dfee8aa5&redirect_uri=api.wozhua.mobi%2Findex.php%3Fr%3Do2o%2FmyCommision%2FcheckUserid&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
+                $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxedb2ce71dfee8aa5&redirect_uri= api.yiguanjia.me%2Findex.php%3Fr%3Do2o%2FmyCommision%2FcheckUserid&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
             }
         } else {
             $userid = Yii::app()->request->getParam('weixin_userid', '');

+ 1 - 1
www/protected/modules/o2o/controllers/MyOrderController.php

@@ -19,7 +19,7 @@ class MyOrderController extends CController {
                     $this->render('error', ['msg' => '未查询到用户']);die;
                 }
             } else {
-                $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxedb2ce71dfee8aa5&redirect_uri=api.wozhua.mobi%2Findex.php%3Fr%3Do2o%2FmyOrder%2FcheckUserid&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
+                $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxedb2ce71dfee8aa5&redirect_uri= api.yiguanjia.me%2Findex.php%3Fr%3Do2o%2FmyOrder%2FcheckUserid&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
             }
         } else {
             $userid = Yii::app()->request->getParam('weixin_userid', '');

+ 2 - 2
www/protected/modules/o2o/controllers/OrderController.php

@@ -556,7 +556,7 @@ class  OrderController extends O2oBaseController{
                 $techObj = TechInfo::get($order->technician);
                 if (!empty($techObj) && !empty($techObj->weixin_userid)) {
                     $wechat = O2oApp::getWechatActive();
-                    $url_prefix = ENVIRONMENT == 'product' ? 'http://api.wozhua.mobi' : 'http://apitest.wozhua.mobi';
+                    $url_prefix = ENVIRONMENT == 'product' ? 'http:// api.yiguanjia.me' : 'http:// apitest.yiguanjia.me';
                     $wechat_data = array(
                         'touser'  => $techObj->weixin_userid,
                         'msgtype' => 'news',
@@ -633,7 +633,7 @@ class  OrderController extends O2oBaseController{
                 $techObj = TechInfo::get($order->technician);
                 if (!empty($techObj) && !empty($techObj->weixin_userid)) {
                     $wechat = O2oApp::getWechatActive();
-                    $url_prefix = ENVIRONMENT == 'product' ? 'http://api.wozhua.mobi' : 'http://apitest.wozhua.mobi';
+                    $url_prefix = ENVIRONMENT == 'product' ? 'http:// api.yiguanjia.me' : 'http:// apitest.yiguanjia.me';
                     $wechat_data = array(
                         'touser'  => $techObj->weixin_userid,
                         'msgtype' => 'news',

+ 1 - 1
www/protected/modules/o2o/controllers/TechHomeController.php

@@ -22,7 +22,7 @@ class TechHomeController extends CController {
                     $this->render('error', ['msg' => '未查询到用户']);die;
                 }
             } else {
-                $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxedb2ce71dfee8aa5&redirect_uri=api.wozhua.mobi%2Findex.php%3Fr%3Do2o%2FtechHome%2FcheckUserid&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
+                $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxedb2ce71dfee8aa5&redirect_uri= api.yiguanjia.me%2Findex.php%3Fr%3Do2o%2FtechHome%2FcheckUserid&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
             }
         } else {
             $userid = Yii::app()->request->getParam('weixin_userid', '');

+ 1 - 1
www/protected/modules/o2o/models/ROrder.php

@@ -390,7 +390,7 @@ class ROrder extends MongoAr
                 $comment = Comment::getByOrder($this->_id);
                 if (!$comment) {
                     $wechat = O2oApp::getWechatActive();
-                    $url_prefix = ENVIRONMENT == 'product' ? 'http://api.wozhua.mobi' : 'http://apitest.wozhua.mobi';
+                    $url_prefix = ENVIRONMENT == 'product' ? 'http:// api.yiguanjia.me' : 'http:// apitest.yiguanjia.me';
                     $wechat_data = [
                         'touser'  => $tech->weixin_userid,
                         'msgtype' => 'news',

+ 3 - 3
www/protected/modules/o2o/views/techHome/index.php

@@ -49,9 +49,9 @@ $(function(){
   var avatar = <?=json_encode($avatar)?>;
   var intro = <?=json_encode($desc)?>;
   var cropImg = '';
-  var apiUrl = 'http://api.wozhua.mobi';
-  if (location.host == 'apitest.wozhua.mobi') {
-    apiUrl = 'http://apitest.wozhua.mobi';
+  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';
   }

+ 1 - 1
www/protected/modules/o2o/views/web/voteIndex.php

@@ -13,7 +13,7 @@
 
 <body>
   <div id="app"></div>
-  <script>var floatDownloadUrl = 'http://www.wozhua.mobi/index.php?r=common/Download/redirect'</script>
+  <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>

+ 2 - 2
www/protected/services/PayService.php

@@ -36,8 +36,8 @@ class PayService extends Service{
         switch ($channel) {
             case 'alipay_wap':
                 $extra = array(
-                    'success_url' => 'http://www.wozhua.mobi/success',
-                    'cancel_url' => 'http://www.wozhua.mobi/cancel'
+                    'success_url' => 'http://common.yiguanjia.me/success',
+                    'cancel_url' => 'http://common.yiguanjia.me/cancel'
                 );
                 break;
             case 'upmp_wap':

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

@@ -14,13 +14,13 @@ define(['require'], function(require) {
     isWX = false;
 
   var uri = location.href;
-  if (uri.indexOf('www.wozhua.mobi') > -1) {
+  if (uri.indexOf('common.yiguanjia.me') > -1) {
     test = false;
   }
   if (test) {
-    apiPath = 'http://apitest.wozhua.mobi';
+    apiPath = 'http:// apitest.yiguanjia.me';
   } else {
-    apiPath = 'http://api.wozhua.mobi';
+    apiPath = 'http:// api.yiguanjia.me';
   }
 
   var ua = navigator.userAgent.toLowerCase();

+ 5 - 5
www/webapp/common/js/config.js

@@ -16,13 +16,13 @@ define(function (require) {
     isWX = false;
 
   var uri = location.href;
-  if (uri.indexOf('www.wozhua.mobi') > -1) {
+  if (uri.indexOf('common.yiguanjia.me') > -1) {
     test = false;
   }
   if (test) {
-    apiPath = 'http://apitest.wozhua.mobi';
+    apiPath = 'http:// apitest.yiguanjia.me';
   } else {
-    apiPath = 'http://api.wozhua.mobi';
+    apiPath = 'http:// api.yiguanjia.me';
   }
 
   var ua = navigator.userAgent.toLowerCase();
@@ -93,13 +93,13 @@ define(function (require) {
           });
           wx.onMenuShareTimeline({
             title: '宠物上门服务,首选壹管家APP',
-            link: 'http://www.wozhua.mobi/o2o/web/index',
+            link: 'http://common.yiguanjia.me/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });
           wx.onMenuShareAppMessage({
             title: '宠物上门服务,首选壹管家APP',
             desc: '足不出户,就能享受专业保洁师为您家爱宠提供的贴心服务!',
-            link: 'http://www.wozhua.mobi/o2o/web/index',
+            link: 'http://common.yiguanjia.me/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });
         });

+ 3 - 3
www/webapp/common/js/native-lite.js

@@ -90,8 +90,8 @@ define(['require', 'helper', 'config'], function (require, helper, config) {
       var param = {
         "share_title": title,
         "share_string": content,
-        "share_img_url": img_url ? encodeURI(img_url) : 'http://www.wozhua.mobi/images/logo.png',
-        "share_url": url ? encodeURI(url) : 'http://www.wozhua.mobi',
+        "share_img_url": img_url ? encodeURI(img_url) : 'http://common.yiguanjia.me/images/logo.png',
+        "share_url": url ? encodeURI(url) : 'http://common.yiguanjia.me',
         "share_app_id": app_id
       };
       var _callback = 'NativeCallback.share';
@@ -210,7 +210,7 @@ define(['require', 'helper', 'config'], function (require, helper, config) {
         return false;
       }
       var param = {
-        url: 'http://www.wozhua.mobi'
+        url: 'http://common.yiguanjia.me'
       };
       if (typeof new_param === 'undefined') {
         new_param = {};

+ 3 - 3
www/webapp/common/js/native.js

@@ -140,8 +140,8 @@ define(function (require) {
 			var param = {
 				"share_title": title,
 				"share_string": content,
-				"share_img_url": img_url ? encodeURI(img_url) : 'http://www.wozhua.mobi/images/logo.png',
-				"share_url": url ? encodeURI(url) : 'http://www.wozhua.mobi',
+				"share_img_url": img_url ? encodeURI(img_url) : 'http://common.yiguanjia.me/images/logo.png',
+				"share_url": url ? encodeURI(url) : 'http://common.yiguanjia.me',
 				"share_app_id": app_id
 			};
 			var _callback = 'NativeCallback.share';
@@ -283,7 +283,7 @@ define(function (require) {
 				return false;
 			}
 			var param = {
-				url: 'http://www.wozhua.mobi'
+				url: 'http://common.yiguanjia.me'
 			};
 			if (typeof new_param === 'undefined') {
 				new_param = {};

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/config.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/native.js


+ 4 - 4
www/webapp/o2o/module/pay/deal.html

@@ -104,7 +104,7 @@
             <a class="btn btn-positive btn-pay">立即支付</a>
           </div>
           <div class="box-center btn-group j-pay-result">
-            <a href="http://www.wozhua.mobi/o2o/web/index/deal#!/myorder/all" class="btn btn-positive my-order">我的订单</a>
+            <a href="http://common.yiguanjia.me/o2o/web/index/deal#!/myorder/all" class="btn btn-positive my-order">我的订单</a>
           </div>
         </div>
       </div>
@@ -114,9 +114,9 @@
   <script>
     if (location.search.length > 1) {
       var uri = location.href;
-      var dealdomain = 'http://www.wozhua.mobi/';
-      if (uri.indexOf('wwwtest.wozhua.mobi') > -1) {
-        dealdomain = 'http://wwwtest.wozhua.mobi/';
+      var dealdomain = 'http://common.yiguanjia.me/';
+      if (uri.indexOf('commontest.yiguanjia.me') > -1) {
+        dealdomain = 'http://commontest.yiguanjia.me/';
         $('.my-order').attr('href', dealdomain + 'o2o/web/index/deal#!/myorder/all');
         // $('.btn-home').attr('href', dealdomain + 'web/index.html#!/list/1');
       }

+ 1 - 1
www/webapp/o2o/module/pay/newDeal.html

@@ -115,7 +115,7 @@
     if (location.search.length > 1) {
       var uri = location.href;
       var dealdomain = 'http://f.wozhua.mobi/';
-      if (uri.indexOf('wwwtest.wozhua.mobi') > -1) {
+      if (uri.indexOf('commontest.yiguanjia.me') > -1) {
         dealdomain = 'http://ftest.wozhua.mobi/';
         $('.my-order').attr('href', dealdomain + '/deal#!/myorder/all');
         // $('.btn-home').attr('href', dealdomain + 'web/index.html#!/list/1');

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů