north 5 anos atrás
pai
commit
3d6623afa3
37 arquivos alterados com 74 adições e 74 exclusões
  1. 2 2
      www/protected/commands/AsyncWorkCommand.php
  2. 1 1
      www/protected/commands/GiveCouponsCommand.php
  3. 1 1
      www/protected/config/yiguanjia_const.php
  4. 3 3
      www/protected/controllers/ROrderController.php
  5. 1 1
      www/protected/controllers/RUserController.php
  6. 1 1
      www/protected/models/RegisterForm.php
  7. 2 2
      www/protected/models/data/Slide.php
  8. 2 2
      www/protected/modules/ch/views/web/giftPackage.php
  9. 11 11
      www/protected/modules/ch/views/web/index.php
  10. 0 0
      www/protected/modules/ch/views/web/serviceIntroduction.php
  11. 1 1
      www/protected/modules/common/controllers/ActivityController.php
  12. 1 1
      www/protected/modules/common/views/activity/SinglesDay.php
  13. 1 1
      www/protected/modules/common/views/activity/enterprise.php
  14. 6 6
      www/protected/modules/construction/views/web/giftPackage.php
  15. 1 1
      www/protected/modules/construction/views/web/index.php
  16. 1 1
      www/protected/modules/construction/views/web/serviceIntroduction.php
  17. 6 6
      www/protected/modules/j/views/web/giftPackage.php
  18. 1 1
      www/protected/modules/j/views/web/index.php
  19. 1 1
      www/protected/modules/j/views/web/serviceIntroduction.php
  20. 3 3
      www/protected/modules/moonclub/views/emp/index.php
  21. 1 1
      www/protected/modules/moonclub/views/reserve/xyhIm.php
  22. 2 2
      www/protected/modules/moonclub/views/web/index (复件).php
  23. 4 4
      www/protected/modules/moonclub/views/web/index(old).php
  24. 1 1
      www/protected/modules/moonclub/views/web/index.php
  25. 1 1
      www/protected/modules/o2o/controllers/MyCommentController.php
  26. 1 1
      www/protected/modules/o2o/controllers/MyCommisionController.php
  27. 2 2
      www/protected/modules/o2o/controllers/MyOrderController.php
  28. 2 2
      www/protected/modules/o2o/controllers/OrderController.php
  29. 1 1
      www/protected/modules/o2o/controllers/ProductController.php
  30. 2 2
      www/protected/modules/o2o/controllers/TechHomeController.php
  31. 1 1
      www/protected/modules/o2o/models/ROrder.php
  32. 1 1
      www/protected/modules/o2o/views/advisory/im.php
  33. 1 1
      www/protected/modules/o2o/views/advisory/xyhIm.php
  34. 3 3
      www/protected/modules/o2o/views/techHome/index.php
  35. 1 1
      www/protected/modules/o2o/views/web/index.php
  36. 2 2
      www/protected/modules/y/views/default/index.php
  37. 2 2
      www/protected/services/PayService.php

+ 2 - 2
www/protected/commands/AsyncWorkCommand.php

@@ -40,9 +40,9 @@ class AsyncWorkCommand extends CConsoleCommand{
                             file_put_contents(APP_PATH.'/download/log/after_user_reg.log',var_export($err,true),FILE_APPEND);
                         } else {
                             if(YII_DEBUG == true){
-                                $userAr->avatar = 'http://avatar.yiguanjia.me/'.$key;
+                                $userAr->avatar = 'http://avatar.yiguanjia.club/'.$key;
                             }else{
-                                $userAr->avatar = 'http://avatar.yiguanjia.me/'.$key;
+                                $userAr->avatar = 'http://avatar.yiguanjia.club/'.$key;
                             }
                         }
                     }

+ 1 - 1
www/protected/commands/GiveCouponsCommand.php

@@ -54,7 +54,7 @@ class GiveCouponsCommand extends CConsoleCommand{
                 }else{
                     $data = array();
                     $time_str = CommonFn::sgmdate("Y年n月d日", time(),1);
-                    $data['content'] = '送你60元代金券,可用于全部上门服务,下单立减→<a href="http://common.yiguanjia.me/index.php?r=o2o/web/index&need_header=0">点击这里</a>预约';
+                    $data['content'] = '送你60元代金券,可用于全部上门服务,下单立减→<a href="http://common.yiguanjia.club/index.php?r=o2o/web/index&need_header=0">点击这里</a>预约';
                     $data['title'] = '系统通知';
                     $data['custom'] = array(
                         'type'=>'user_status',

+ 1 - 1
www/protected/config/yiguanjia_const.php

@@ -30,7 +30,7 @@ $wz['O2oCommentListPageSize'] = 10;//产品评论分页大小
 
 $wz['app'] = 'web';
 
-$wz['adminEmail'] = 'service@yiguanjia.me';
+$wz['adminEmail'] = 'service@yiguanjia.club';
 $wz['xyhGiftNumber'] = '4008800365';
 $wz['xyhGiftDate'] = 2;
 

+ 3 - 3
www/protected/controllers/ROrderController.php

@@ -297,7 +297,7 @@ class ROrderController extends AdminController{
             foreach ($technician_ids as $key => $technician_id) {
                 $technician_obj = TechInfo::get($technician_id);
                 if ($technician_obj && $technician_obj->weixin_userid) {
-                    $url_prefix = ENVIRONMENT == 'product' ? 'http://api.yiguanjia.me' : 'http://apitest.yiguanjia.me';
+                    $url_prefix = ENVIRONMENT == 'product' ? 'http://api.yiguanjia.club' : 'http://apitest.yiguanjia.club';
                     $wechat = O2oApp::getWechatActive();
                     $wechat_data = array(
                         'touser' => $technician_obj->weixin_userid,
@@ -432,7 +432,7 @@ class ROrderController extends AdminController{
                 $technician_obj = TechInfo::get($technician_id);
 
                 if ($technician_obj && $technician_obj->weixin_userid) {
-                    $url_prefix = ENVIRONMENT == 'product' ? 'http://api.yiguanjia.me' : 'http://apitest.yiguanjia.me';
+                    $url_prefix = ENVIRONMENT == 'product' ? 'http://api.yiguanjia.club' : 'http://apitest.yiguanjia.club';
                     $wechat = O2oApp::getWechatActive();
                     $wechat_data = array(
                         'touser' => $technician_obj->weixin_userid,
@@ -771,7 +771,7 @@ class ROrderController extends AdminController{
             foreach ($technician_objs as $technician_obj) {
                 // 发送给被分配保洁师
                 $wechat = O2oApp::getWechatActive();
-                $url_prefix = ENVIRONMENT == 'product' ? 'http://api.yiguanjia.me' : 'http://apitest.yiguanjia.me';
+                $url_prefix = ENVIRONMENT == 'product' ? 'http://api.yiguanjia.club' : 'http://apitest.yiguanjia.club';
                 if (!empty($technician_obj->weixin_userid)) {
                     $wechat_data = array(
                         'touser' => $technician_obj->weixin_userid,

+ 1 - 1
www/protected/controllers/RUserController.php

@@ -11,7 +11,7 @@ class RUserController extends AdminController{
     {
 //        $users = RUser::model()->findAll();
 //        foreach ($users as $user) {
-//            $user->avatar = str_replace('http://odulcd8g1.bkt.clouddn.com','http://avatar.yiguanjia.me',$user->avatar);
+//            $user->avatar = str_replace('http://odulcd8g1.bkt.clouddn.com','http://avatar.yiguanjia.club',$user->avatar);
 //            $user->save();
 //        }
         // 订单类型

+ 1 - 1
www/protected/models/RegisterForm.php

@@ -74,7 +74,7 @@ class RegisterForm extends CFormModel
         $user->last_login = 0;
         $user->login_times = 0;
         $user->_id = $user->get_new_id();
-        if ($user->email == 'admin@yiguanjia.me'){ //设置默认的超级管理员
+        if ($user->email == 'admin@yiguanjia.club'){ //设置默认的超级管理员
         	$auth = Yii::app()->authManager;
         	$user->status = 1;
         	if (!$auth->getAuthItem($auth->super_admin)){

+ 2 - 2
www/protected/models/data/Slide.php

@@ -104,8 +104,8 @@ class Slide extends MongoAr
             $newRow['obj'] = $row['obj'];
         // 暂时不上线 2015-12-24    
             if(empty($newRow['obj']['url'])){
-                $newRow['obj']['url'] = 'http://www.yiguanjia.me';
-                $newRow['obj']['id'] = 'http://www.yiguanjia.me';
+                $newRow['obj']['url'] = 'http://www.yiguanjia.club';
+                $newRow['obj']['id'] = 'http://www.yiguanjia.club';
             } else {
                 $newRow['obj']['id'] = $newRow['obj']['url'];
             }

+ 2 - 2
www/protected/modules/ch/views/web/giftPackage.php

@@ -71,10 +71,10 @@
           this.nameShow = this.oldNameShow == _ ? "" : _, this.oldNameShow = this.oldNameShow == _ ? "" : _
         },
         back() {
-          location.href = "http://common.yiguanjia.me/index.php?r=j/web/index"
+          location.href = "http://common.yiguanjia.club/index.php?r=j/web/index"
         },
         exchange() {
-          location.href = "http://common.yiguanjia.me/index.php?r=j/web/index/#/exchange"
+          location.href = "http://common.yiguanjia.club/index.php?r=j/web/index/#/exchange"
         }
       }
     });

+ 11 - 11
www/protected/modules/ch/views/web/index.php

@@ -14,20 +14,20 @@
     <meta name="viewport"
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link href=http://common.yiguanjia.me/webapp/safety/dome/css/personal.edf9ca5c.css rel=prefetch>
-    <link href=http://common.yiguanjia.me/webapp/safety/dome/js/personal.b7f6bd7e.js rel=prefetch>
-    <link href=http://common.yiguanjia.me/webapp/safety/dome/css/app.36ca7fe4.css rel=preload as=style>
-    <link href=http://common.yiguanjia.me/webapp/safety/dome/css/chunk-vendors.03324911.css rel=preload as=style>
-    <link href=http://common.yiguanjia.me/webapp/safety/dome/js/app.f33befe0.js rel=preload as=script>
-    <link href=http://common.yiguanjia.me/webapp/safety/dome/js/chunk-vendors.262e0564.js rel=preload as=script>
-    <link href=http://common.yiguanjia.me/webapp/safety/dome/css/chunk-vendors.03324911.css rel=stylesheet>
-    <link href=http://common.yiguanjia.me/webapp/safety/dome/css/app.36ca7fe4.css rel=stylesheet>
+    <link href=http://common.yiguanjia.club/webapp/safety/dome/css/personal.edf9ca5c.css rel=prefetch>
+    <link href=http://common.yiguanjia.club/webapp/safety/dome/js/personal.b7f6bd7e.js rel=prefetch>
+    <link href=http://common.yiguanjia.club/webapp/safety/dome/css/app.36ca7fe4.css rel=preload as=style>
+    <link href=http://common.yiguanjia.club/webapp/safety/dome/css/chunk-vendors.03324911.css rel=preload as=style>
+    <link href=http://common.yiguanjia.club/webapp/safety/dome/js/app.f33befe0.js rel=preload as=script>
+    <link href=http://common.yiguanjia.club/webapp/safety/dome/js/chunk-vendors.262e0564.js rel=preload as=script>
+    <link href=http://common.yiguanjia.club/webapp/safety/dome/css/chunk-vendors.03324911.css rel=stylesheet>
+    <link href=http://common.yiguanjia.club/webapp/safety/dome/css/app.36ca7fe4.css rel=stylesheet>
 </head>
 <body>
 <!--vue-->
 <div id=app></div>
-<script src=http://common.yiguanjia.me/webapp/safety/dome/js/chunk-vendors.262e0564.js></script>
-<script src=http://common.yiguanjia.me/webapp/safety/dome/js/app.f33befe0.js></script>
+<script src=http://common.yiguanjia.club/webapp/safety/dome/js/chunk-vendors.262e0564.js></script>
+<script src=http://common.yiguanjia.club/webapp/safety/dome/js/app.f33befe0.js></script>
 </body>
 
 <!--vue-end-->
@@ -67,7 +67,7 @@
       if (uri.indexOf('state=yiguanjia') > -1 && userID2 && appToken2) {
         const path = window.localStorage.getItem('__H5__firstPath__');
         const toPath = window.localStorage.getItem('__H5__toPath__');
-        window.location.href = 'http://common.yiguanjia.me/index.php?r=ch/web/index';
+        window.location.href = 'http://common.yiguanjia.club/index.php?r=ch/web/index';
         if (toPath === 'need' && path) {
           // 用户授权之后,首次跳转
           window.location.href = path;

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
www/protected/modules/ch/views/web/serviceIntroduction.php


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

@@ -35,7 +35,7 @@ class ActivityController extends O2oBaseController
   //扫码跳转11元订单页面,回掉微信接口,注册用户信息,然后生成订单
   public function actionScanCoupon()
   {
-    //$this->redirect('http://common.yiguanjia.me/index.php?r=o2o/web/index');
+    //$this->redirect('http://common.yiguanjia.club/index.php?r=o2o/web/index');
     var_dump(intval(date_create("2016-11-11")->format('U')));
     var_dump(time());
   }

+ 1 - 1
www/protected/modules/common/views/activity/SinglesDay.php

@@ -22,7 +22,7 @@
 <body ng-controller="myctrl">
 <div class="">
   <!--  <img style="width: 100%"-->
-  <!--       src="http://pics.yiguanjia.me/%E6%B0%91%E5%AE%BF%E4%BF%9D%E6%B4%81%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"-->
+  <!--       src="http://pics.yiguanjia.club/%E6%B0%91%E5%AE%BF%E4%BF%9D%E6%B4%81%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"-->
   <!--       alt="">-->
   <h1></h1>
   <form action="index.php?r=common/Activity/saveAdvisory" method='post'

+ 1 - 1
www/protected/modules/common/views/activity/enterprise.php

@@ -22,7 +22,7 @@
 <body ng-controller="myctrl">
 <div class="">
   <!--  <img style="width: 100%"-->
-  <!--       src="http://pics.yiguanjia.me/%E6%B0%91%E5%AE%BF%E4%BF%9D%E6%B4%81%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"-->
+  <!--       src="http://pics.yiguanjia.club/%E6%B0%91%E5%AE%BF%E4%BF%9D%E6%B4%81%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"-->
   <!--       alt="">-->
   <h1></h1>
   <form action="index.php?r=common/Activity/ScanCoupon" method='post'

+ 6 - 6
www/protected/modules/construction/views/web/giftPackage.php

@@ -34,7 +34,7 @@
   </div>
   <!-- js -->
   <script src="https://cdn.jsdelivr.net/npm/vue@2.5.16/dist/vue.js"></script>
-  <script src="http://pics.yiguanjia.me/flexible.min.js"></script>
+  <script src="http://pics.yiguanjia.club/flexible.min.js"></script>
   <script>
     // 我们的数据对象
     var vm = new Vue({
@@ -48,21 +48,21 @@
             name: "巾帼醇种土鸡",
             index:0,
             urls: {
-              0: "http://pics.yiguanjia.me/2018_7_25_01.jpg",
+              0: "http://pics.yiguanjia.club/2018_7_25_01.jpg",
             }
           },
           sterilization: {
             name: "整房杀菌除螨",
             index:1,
             urls: {
-              0: "http://pics.yiguanjia.me/2018_7_25_02.jpg",
+              0: "http://pics.yiguanjia.club/2018_7_25_02.jpg",
             }
           },
           deep_cleaning: {
             name: "母婴房深度清洁",
             index:2,
             urls: {
-              0: "http://pics.yiguanjia.me/2018_7_25_03.jpg",
+              0: "http://pics.yiguanjia.club/2018_7_25_03.jpg",
             }
           } 
         }
@@ -78,10 +78,10 @@
           window.scrollTo(0, 58 * index);
         },
         back() {
-          location.href = "http://common.yiguanjia.me/index.php?r=j/web/index"
+          location.href = "http://common.yiguanjia.club/index.php?r=j/web/index"
         },
         exchange() {
-          location.href = "http://common.yiguanjia.me/index.php?r=j/web/index/#/exchange"
+          location.href = "http://common.yiguanjia.club/index.php?r=j/web/index/#/exchange"
         }
       }
     });

+ 1 - 1
www/protected/modules/construction/views/web/index.php

@@ -58,7 +58,7 @@
       }
 
       if (uri.indexOf('state=yiguanjia') > -1 && userID1 && appToken1) {
-        window.location.href = 'http://common.yiguanjia.me/index.php?r=construction/web/index';
+        window.location.href = 'http://common.yiguanjia.club/index.php?r=construction/web/index';
       }
       document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
     }

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
www/protected/modules/construction/views/web/serviceIntroduction.php


+ 6 - 6
www/protected/modules/j/views/web/giftPackage.php

@@ -34,7 +34,7 @@
   </div>
   <!-- js -->
   <script src="https://cdn.jsdelivr.net/npm/vue@2.5.16/dist/vue.js"></script>
-  <script src="http://pics.yiguanjia.me/flexible.min.js"></script>
+  <script src="http://pics.yiguanjia.club/flexible.min.js"></script>
   <script>
     // 我们的数据对象
     var vm = new Vue({
@@ -48,21 +48,21 @@
             name: "巾帼醇种土鸡",
             index:0,
             urls: {
-              0: "http://pics.yiguanjia.me/2018_7_25_01.jpg",
+              0: "http://pics.yiguanjia.club/2018_7_25_01.jpg",
             }
           },
           sterilization: {
             name: "整房杀菌除螨",
             index:1,
             urls: {
-              0: "http://pics.yiguanjia.me/2018_7_25_02.jpg",
+              0: "http://pics.yiguanjia.club/2018_7_25_02.jpg",
             }
           },
           deep_cleaning: {
             name: "母婴房深度清洁",
             index:2,
             urls: {
-              0: "http://pics.yiguanjia.me/2018_7_25_03.jpg",
+              0: "http://pics.yiguanjia.club/2018_7_25_03.jpg",
             }
           } 
         }
@@ -78,10 +78,10 @@
           window.scrollTo(0, 58 * index);
         },
         back() {
-          location.href = "http://common.yiguanjia.me/index.php?r=j/web/index"
+          location.href = "http://common.yiguanjia.club/index.php?r=j/web/index"
         },
         exchange() {
-          location.href = "http://common.yiguanjia.me/index.php?r=j/web/index/#/exchange"
+          location.href = "http://common.yiguanjia.club/index.php?r=j/web/index/#/exchange"
         }
       }
     });

+ 1 - 1
www/protected/modules/j/views/web/index.php

@@ -64,7 +64,7 @@
       }
 
       if (uri.indexOf('state=yiguanjia') > -1 && userID1 && appToken1) {
-        window.location.href='http://common.yiguanjia.me/index.php?r=j/web/index';
+        window.location.href='http://common.yiguanjia.club/index.php?r=j/web/index';
       }
       document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
     }

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
www/protected/modules/j/views/web/serviceIntroduction.php


+ 3 - 3
www/protected/modules/moonclub/views/emp/index.php

@@ -20,7 +20,7 @@
   <!--    <link href="-->
   <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=201708011" rel="stylesheet">-->
   <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css?v=201708">
-  <link rel="stylesheet" href="http://pics.yiguanjia.me/LCalendar.css?v=201708">
+  <link rel="stylesheet" href="http://pics.yiguanjia.club/LCalendar.css?v=201708">
 <!-- js -->
   <!--     <script src="-->
   <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=201708011"></script> -->
@@ -30,7 +30,7 @@
   <script
     src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=201708"></script>
   <!--<script src="<?php /*echo Yii::app()->request->baseUrl; */ ?>/js/bootstrap-3.3.7.min.js?v=201708"></script>-->
-  <script src="http://pics.yiguanjia.me/LCalendar.js?v=201708"></script>
+  <script src="http://pics.yiguanjia.club/LCalendar.js?v=201708"></script>
   <style>
     html {
       height: 100%
@@ -240,7 +240,7 @@
         location.href = '<?php echo Yii::app()->request->baseUrl . '/index.php?r=/moonclub/emp/wxIndex'; ?>';
       }
       if (localStorage.getItem('flag') && userID && appToken ) {
-        location.href = 'http://common.yiguanjia.me/index.php?r=moonclub/web/index#employe';
+        location.href = 'http://common.yiguanjia.club/index.php?r=moonclub/web/index#employe';
       }
       document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
     }

+ 1 - 1
www/protected/modules/moonclub/views/reserve/xyhIm.php

@@ -32,7 +32,7 @@
 	</script>
 </head>
 <body>
-<img src="http://pics.yiguanjia.me/%E4%BA%8C%E7%BB%B4%E7%A0%81%E8%81%8A%E5%A4%A9-01.jpg" alt="联系我们"
+<img src="http://pics.yiguanjia.club/%E4%BA%8C%E7%BB%B4%E7%A0%81%E8%81%8A%E5%A4%A9-01.jpg" alt="联系我们"
      style="width: 100%;margin-top: -0.2rem">
 </body>
 

+ 2 - 2
www/protected/modules/moonclub/views/web/index (复件).php

@@ -20,7 +20,7 @@
   <!--    <link href="-->
     <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170901104" rel="stylesheet">-->
   <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css?v=201708">
-  <link rel="stylesheet" href="http://pics.yiguanjia.me/LCalendar.css?v=201708">
+  <link rel="stylesheet" href="http://pics.yiguanjia.club/LCalendar.css?v=201708">
   <!-- js -->
   <!--     <script src="-->
     <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=20170901104"></script> -->
@@ -31,7 +31,7 @@
   <script
     src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=201708"></script>
   <!--<script src="<?php /*echo Yii::app()->request->baseUrl; */ ?>/js/bootstrap-3.3.7.min.js?v=201708"></script>-->
-  <script src="http://pics.yiguanjia.me/LCalendar.js?v=201708"></script>
+  <script src="http://pics.yiguanjia.club/LCalendar.js?v=201708"></script>
   <style>
     html {
       height: 100%

+ 4 - 4
www/protected/modules/moonclub/views/web/index(old).php

@@ -20,7 +20,7 @@
   <!--    <link href="-->
     <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=2017102300" rel="stylesheet">-->
   <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css?v=201708">
-  <link rel="stylesheet" href="http://pics.yiguanjia.me/LCalendar.css?v=201708">
+  <link rel="stylesheet" href="http://pics.yiguanjia.club/LCalendar.css?v=201708">
   <!-- js -->
   <link rel="stylesheet"
         href="https://raw.githubusercontent.com/andreruffert/rangeslider.js/develop/dist/rangeslider.css?v=201708"
@@ -28,7 +28,7 @@
         title="no title">
   <script
     src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=201708"></script>
-  <script src="http://pics.yiguanjia.me/LCalendar.js?v=201708"></script>
+  <script src="http://pics.yiguanjia.club/LCalendar.js?v=201708"></script>
   <style>
     html {
       height: 100%
@@ -249,9 +249,9 @@
       href = 'service-info';
     }
     if (test) {
-      location.href = "http://common.yiguanjia.me/index.php?r=moonclub/web/index#"+ href;
+      location.href = "http://common.yiguanjia.club/index.php?r=moonclub/web/index#"+ href;
     } else {
-      location.href = "http://common.yiguanjia.me/index.php?r=moonclub/web/index#"+ href;
+      location.href = "http://common.yiguanjia.club/index.php?r=moonclub/web/index#"+ href;
     }
   }, false);
 </script>-->

+ 1 - 1
www/protected/modules/moonclub/views/web/index.php

@@ -24,7 +24,7 @@
 
   </style>
   <!-- vue~资源域名-->
-  <?php $host = 'http://common.yiguanjia.me/'; ?>
+  <?php $host = 'http://common.yiguanjia.club/'; ?>
   <!-- vue~资源版本号 -->
   <?php // $newVersion = time() /*时间戳*/ ?>
   <?php $newVersion = 2018070204 ?>

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

@@ -22,7 +22,7 @@ class MyCommentController extends CController {
                     $this->render('error', ['msg' => '未查询到用户']);die;
                 }
             } else {
-                $reditect = "api.yiguanjia.me/index.php?r=o2o/myComment/checkUserid";
+                $reditect = "api.yiguanjia.club/index.php?r=o2o/myComment/checkUserid";
                 $reditect = urlencode($reditect);
                 $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx08ddb347281baf39&redirect_uri='.$reditect.'&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
             }

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

@@ -22,7 +22,7 @@ class MyCommisionController extends CController {
                     $this->render('error', ['msg' => '未查询到用户']);die;
                 }
             } else {
-                $reditect = "api.yiguanjia.me/index.php?r=o2o/myCommision/checkUserid";
+                $reditect = "api.yiguanjia.club/index.php?r=o2o/myCommision/checkUserid";
                 $reditect = urlencode($reditect);
                 $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx08ddb347281baf39&redirect_uri='.$reditect.'&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
                 }

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

@@ -20,7 +20,7 @@ class MyOrderController extends CController {
                     $this->render('error', ['msg' => '未查询到用户']);die;
                 }
             } else {
-                $reditect = "api.yiguanjia.me/index.php?r=o2o/myOrder/checkUserid";
+                $reditect = "api.yiguanjia.club/index.php?r=o2o/myOrder/checkUserid";
                 $reditect = urlencode($reditect);
                 $this->redirect('https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx08ddb347281baf39&redirect_uri='.$reditect.'&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
             }
@@ -189,7 +189,7 @@ class MyOrderController extends CController {
             O2oApp::response(false, '用户或订单ID错误', []);
         }
         $url = get_object_vars(json_decode($url));
-        $order_obj->signUrl = 'http://avatar.yiguanjia.me/'.$url['hash'];
+        $order_obj->signUrl = 'http://avatar.yiguanjia.club/'.$url['hash'];
         $order_obj->status = 6;
         $success = $order_obj->save();
         O2oApp::response($success, '保存失败,请重试', []);

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

@@ -642,7 +642,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.yiguanjia.me' : 'http:// apitest.yiguanjia.me';
+                    $url_prefix = ENVIRONMENT == 'product' ? 'http:// api.yiguanjia.club' : 'http:// apitest.yiguanjia.club';
                     $wechat_data = array(
                         'touser'  => $techObj->weixin_userid,
                         'msgtype' => 'news',
@@ -692,7 +692,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.yiguanjia.me' : 'http:// apitest.yiguanjia.me';
+                    $url_prefix = ENVIRONMENT == 'product' ? 'http:// api.yiguanjia.club' : 'http:// apitest.yiguanjia.club';
                     $wechat_data = array(
                         'touser'  => $techObj->weixin_userid,
                         'msgtype' => 'news',

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

@@ -163,7 +163,7 @@ class  ProductController extends O2oBaseController{
                 if ($technician) {
                     $technicianObj = TechInfo::get($technician['technician_id']);
                     if ($technicianObj && $technicianObj->weixin_userid) {
-                        $url_prefix = ENVIRONMENT == 'product' ? 'http://api.yiguanjia.me' : 'http://apitest.yiguanjia.me';
+                        $url_prefix = ENVIRONMENT == 'product' ? 'http://api.yiguanjia.club' : 'http://apitest.yiguanjia.club';
                         $wechat = O2oApp::getWechatObj();
                         $wechat_data = array(
                             'touser' => $technicianObj->weixin_userid,

+ 2 - 2
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.yiguanjia.me%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.club%2Findex.php%3Fr%3Do2o%2FtechHome%2FcheckUserid&response_type=code&scope=snsapi_base&state=5e2b4706179f774e94903e1213d2222e#wechat_redirect');
             }
         } else {
             $userid = Yii::app()->request->getParam('weixin_userid', '');
@@ -44,7 +44,7 @@ class TechHomeController extends CController {
             'eyJzY29wZSI6InRlc3QiLCJkZWFkbGluZSI6MTQ3NDQ0NTg1OTAwfQ==';
         $qiniu_url = ENVIRONMENT == 'product' ? 
             // 正式版url前缀
-            'http://pics.yiguanjia.me/':
+            'http://pics.yiguanjia.club/':
             // 测试版url前缀
             'http://odujh0tsx.bkt.clouddn.com/';
         $data = array(

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

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

+ 1 - 1
www/protected/modules/o2o/views/advisory/im.php

@@ -32,7 +32,7 @@
   </script>
 </head>
 <body>
-  <img src="http://pics.yiguanjia.me/1110%E4%BA%8C%E7%BB%B4%E7%A0%81.jpg" alt="联系我们" style="width: 100%;margin-top: -0.2rem">
+  <img src="http://pics.yiguanjia.club/1110%E4%BA%8C%E7%BB%B4%E7%A0%81.jpg" alt="联系我们" style="width: 100%;margin-top: -0.2rem">
 <div class="prevent-scroll">
   <div class="box my-action">
     <!--首页-->

+ 1 - 1
www/protected/modules/o2o/views/advisory/xyhIm.php

@@ -32,7 +32,7 @@
 	</script>
 </head>
 <body>
-<img src="http://pics.yiguanjia.me/%E4%BA%8C%E7%BB%B4%E7%A0%81%E8%81%8A%E5%A4%A9-01.jpg" alt="联系我们"
+<img src="http://pics.yiguanjia.club/%E4%BA%8C%E7%BB%B4%E7%A0%81%E8%81%8A%E5%A4%A9-01.jpg" alt="联系我们"
      style="width: 100%;margin-top: -0.2rem">
 </body>
 

+ 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.yiguanjia.me';
-  if (location.host == ' apitest.yiguanjia.me') {
-    apiUrl = 'http:// apitest.yiguanjia.me';
+  var apiUrl = 'http:// api.yiguanjia.club';
+  if (location.host == ' apitest.yiguanjia.club') {
+    apiUrl = 'http:// apitest.yiguanjia.club';
   } else if (location.host == 'api.yiguanjiadev.me') {
     apiUrl = 'http://api.yiguanjiadev.me';
   }

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

@@ -92,7 +92,7 @@
       }
       var uri = location.href
       if (uri.indexOf('state=yiguanjia') > -1 && userID && appToken) {
-        window.location.href='http://common.yiguanjia.me/index.php?r=o2o/web/index';
+        window.location.href='http://common.yiguanjia.club/index.php?r=o2o/web/index';
       }
       document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
     }

+ 2 - 2
www/protected/modules/y/views/default/index.php

@@ -14,8 +14,8 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <!-- vue~资源域名-->
   <!--admin.yiguanjiadev.me-->
-<!--  commontest.yiguanjia.me-->
-  <?php $host = 'common.yiguanjia.me';?>
+<!--  commontest.yiguanjia.club-->
+  <?php $host = 'common.yiguanjia.club';?>
   <!-- vue~资源版本号 -->
   <?php $newVersion = 2017111000?>
   <link rel="stylesheet" id="app_css" href="http://<?php echo $host ?>/webapp/Y/home/static/css/app.css?v=<?php echo $newVersion?>">

+ 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://common.yiguanjia.me/success',
-                    'cancel_url' => 'http://common.yiguanjia.me/cancel'
+                    'success_url' => 'http://common.yiguanjia.club/success',
+                    'cancel_url' => 'http://common.yiguanjia.club/cancel'
                 );
                 break;
             case 'upmp_wap':

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff