首页 发现 帮助
注册 登录
yiguanjia
/
php
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Updated freetoken

north 6 年之前
父节点
afe9fe350b
当前提交
46aae06e64
共有 15 个文件被更改，包括 25 次插入 和 46 次删除
分列视图 显示文件统计
  1. 2 2
      www/protected/commands/AsyncWorkCommand.php
  2. 5 0
      www/protected/controllers/RUserController.php
  3. 1 1
      www/protected/modules/common/views/activity/SinglesDay.php
  4. 1 1
      www/protected/modules/common/views/activity/enterprise.php
  5. 4 4
      www/protected/modules/j/views/web/giftPackage.php
  6. 1 1
      www/protected/modules/j/views/web/serviceIntroduction.php
  7. 2 2
      www/protected/modules/moonclub/views/emp/index.php
  8. 1 1
      www/protected/modules/moonclub/views/reserve/xyhIm.php
  9. 2 2
      www/protected/modules/moonclub/views/web/index (复件).php
  10. 2 2
      www/protected/modules/moonclub/views/web/index(old).php
  11. 1 1
      www/protected/modules/o2o/controllers/MyOrderController.php
  12. 0 26
      www/protected/modules/o2o/controllers/OrderController.php
  13. 1 1
      www/protected/modules/o2o/controllers/TechHomeController.php
  14. 1 1
      www/protected/modules/o2o/views/advisory/im.php
  15. 1 1
      www/protected/modules/o2o/views/advisory/xyhIm.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://odujh0tsx.bkt.clouddn.com/'.$key;
 
+                                $userAr->avatar = 'http://avatar.yiguanjia.me/'.$key;
 
                             }else{
 
-                                $userAr->avatar = 'http://odulcd8g1.bkt.clouddn.com/'.$key;
 
+                                $userAr->avatar = 'http://avatar.yiguanjia.me/'.$key;
 
                             }
 
                         }
 
                     }

+ 5 - 0
www/protected/controllers/RUserController.php
查看文件 

@@ -3,6 +3,11 @@ class RUserController extends AdminController{
 
 
     public function actionIndex()
 
     {
 
+        $users = RUser::findAll();
 
+        foreach ($users as $user) {
 
+            $user->avatar = str_replace('http://odulcd8g1.bkt.clouddn.com','http://avatar.yiguanjia.me',$user->avatar);
 
+            $user->save();
 
+        }
 
         // 订单类型
 
         $type_data = Yii::app()->params['o2o_service'];
 
         $type = CommonFn::getComboboxData($type_data, 100, true, 100);

+ 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://odulvej8l.bkt.clouddn.com/%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.me/%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://odulvej8l.bkt.clouddn.com/%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.me/%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'

+ 4 - 4
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://odulvej8l.bkt.clouddn.com/flexible.min.js"></script>
 
+  <script src="http://pics.yiguanjia.me/flexible.min.js"></script>
 
   <script>
 
     // 我们的数据对象
 
     var vm = new Vue({
 
@@ -48,21 +48,21 @@
 
             name: "巾帼醇种土鸡",
 
             index:0,
 
             urls: {
 
-              0: "http://odulvej8l.bkt.clouddn.com/2018_7_25_01.jpg",
 
+              0: "http://pics.yiguanjia.me/2018_7_25_01.jpg",
 
             }
 
           },
 
           sterilization: {
 
             name: "整房杀菌除螨",
 
             index:1,
 
             urls: {
 
-              0: "http://odulvej8l.bkt.clouddn.com/2018_7_25_02.jpg",
 
+              0: "http://pics.yiguanjia.me/2018_7_25_02.jpg",
 
             }
 
           },
 
           deep_cleaning: {
 
             name: "母婴房深度清洁",
 
             index:2,
 
             urls: {
 
-              0: "http://odulvej8l.bkt.clouddn.com/2018_7_25_03.jpg",
 
+              0: "http://pics.yiguanjia.me/2018_7_25_03.jpg",
 
             }
 
           } 
         }

文件差异内容过多而无法显示
+ 1 - 1
www/protected/modules/j/views/web/serviceIntroduction.php


+ 2 - 2
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://odulvej8l.bkt.clouddn.com/LCalendar.css?v=201708">
 
+  <link rel="stylesheet" href="http://pics.yiguanjia.me/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://odulvej8l.bkt.clouddn.com/LCalendar.js?v=201708"></script>
 
+  <script src="http://pics.yiguanjia.me/LCalendar.js?v=201708"></script>
 
   <style>
 
     html {
 
       height: 100%

+ 1 - 1
www/protected/modules/moonclub/views/reserve/xyhIm.php
查看文件 

@@ -32,7 +32,7 @@
 
 	</script>
 
 </head>
 
 <body>
 
-<img src="http://odulvej8l.bkt.clouddn.com/%E4%BA%8C%E7%BB%B4%E7%A0%81%E8%81%8A%E5%A4%A9-01.jpg" alt="联系我们"
 
+<img src="http://pics.yiguanjia.me/%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://odulvej8l.bkt.clouddn.com/LCalendar.css?v=201708">
 
+  <link rel="stylesheet" href="http://pics.yiguanjia.me/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://odulvej8l.bkt.clouddn.com/LCalendar.js?v=201708"></script>
 
+  <script src="http://pics.yiguanjia.me/LCalendar.js?v=201708"></script>
 
   <style>
 
     html {
 
       height: 100%

+ 2 - 2
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://odulvej8l.bkt.clouddn.com/LCalendar.css?v=201708">
 
+  <link rel="stylesheet" href="http://pics.yiguanjia.me/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://odulvej8l.bkt.clouddn.com/LCalendar.js?v=201708"></script>
 
+  <script src="http://pics.yiguanjia.me/LCalendar.js?v=201708"></script>
 
   <style>
 
     html {
 
       height: 100%

+ 1 - 1
www/protected/modules/o2o/controllers/MyOrderController.php
查看文件 

@@ -189,7 +189,7 @@ class MyOrderController extends CController {
 
             O2oApp::response(false, '用户或订单ID错误', []);
 
         }
 
         $url = get_object_vars(json_decode($url));
 
-        $order_obj->signUrl = 'http://odulcd8g1.bkt.clouddn.com/'.$url['hash'];
 
+        $order_obj->signUrl = 'http://avatar.yiguanjia.me/'.$url['hash'];
 
         $order_obj->status = 6;
 
         $success = $order_obj->save();
 
         O2oApp::response($success, '保存失败，请重试', []);

+ 0 - 26
www/protected/modules/o2o/controllers/OrderController.php
查看文件 

@@ -363,32 +363,6 @@ class  OrderController extends O2oBaseController{
 
             // 支付成功后用户有效订单数增加
 
             if (isset($user_obj->order_count)) {
 
                 $user_obj->order_count += 1;
 
-                //支付成功 判断是否是长期定 start
 
-                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天
 
-
 
-                    if ($order->products[0]['extra']['type']['type'] == "3张（2小时/人）"){
 
-                        for( $i=0;$i<3;$i++) {
 
-                            Service::factory('CouponService')->giveCoupon($u_id, new MongoId("5835527fa84ea02e758b45b7"), $start_time, $end_time);//发放代金券
 
-                        }
 
-                    } else if ($order->products[0]['extra']['type']['type'] == "3张（3小时/人）"){
 
-                        for( $i=0;$i<3;$i++) {
 
-                            Service::factory('CouponService')->giveCoupon($u_id, new MongoId("58356a2aa84ea03b018b46bb"), $start_time, $end_time);//发放代金券
 
-                        }
 
-                    } elseif ($order->products[0]['extra']['type']['type'] == "6张（2小时/人）"){
 
-                        for( $i=0;$i<6;$i++) {
 
-                            Service::factory('CouponService')->giveCoupon($u_id, new MongoId("5835527fa84ea02e758b45b7"), $start_time, $end_time);//发放代金券
 
-                        }
 
-                    } else{
 
-
 
-                        for( $i=0;$i<6;$i++) {
 
-                            Service::factory('CouponService')->giveCoupon($u_id, new MongoId("58356a2aa84ea03b018b46bb"), $start_time, $end_time);//发放代金券
 
-                        }
 
-                    }
 
-                }
 
-                // 长期定end
 
             } else {
 
                 $user_obj->order_count = 1;
 
             }

+ 1 - 1
www/protected/modules/o2o/controllers/TechHomeController.php
查看文件 

@@ -44,7 +44,7 @@ class TechHomeController extends CController {
 
             'eyJzY29wZSI6InRlc3QiLCJkZWFkbGluZSI6MTQ3NDQ0NTg1OTAwfQ==';
 
         $qiniu_url = ENVIRONMENT == 'product' ? 
             // 正式版url前缀
 
-            'http://odulvej8l.bkt.clouddn.com/':
 
+            'http://pics.yiguanjia.me/':
 
             // 测试版url前缀
 
             'http://odujh0tsx.bkt.clouddn.com/';
 
         $data = array(

+ 1 - 1
www/protected/modules/o2o/views/advisory/im.php
查看文件 

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

部分文件因为文件数量过多而无法显示