init

www/protected/commands/AsyncWorkCommand.php

@@ -76,7 +76,7 @@ class AsyncWorkCommand extends CConsoleCommand{
                     $message_data = array(
                         'from_user' => $from_user,
                         'to_user' => $user_id,
-                        'content' => '感谢您注册握爪，这里是新人必看的<a href="http://www.wozhua.mobi/topic/556551ec0eb9fb131f8b60c1">握爪操作指南</a>，同时一定要遵守<a href="http://www.wozhua.mobi/topic/564d9fdea84ea080498cedaa">握爪社区总规则</a>哦~',
+                        'content' => '感谢您注册壹管家，这里是新人必看的<a href="http://www.wozhua.mobi/topic/556551ec0eb9fb131f8b60c1">壹管家操作指南</a>，同时一定要遵守<a href="http://www.wozhua.mobi/topic/564d9fdea84ea080498cedaa">壹管家社区总规则</a>哦~',
                         'pics' => array(),
                         'voice' => array(),
                         'video'=> array()
@@ -192,7 +192,7 @@ class AsyncWorkCommand extends CConsoleCommand{
                         }
                         FreeTimeRecord::TechUnsetFreetime($order->technician,$unset_time_stamp + 3600);
                     }
-                    // 通知被选择的技师
+                    // 通知被选择的保洁师
                     if ($order->technician) {
                         $tech = TechInfo::get(intval($order->technician));
                         if ($tech->weixin_userid) {
@@ -205,7 +205,7 @@ class AsyncWorkCommand extends CConsoleCommand{
                                 'news' => [
                                     'articles' => [
                                         [
-                                            'title' => '握爪提示-新订单',
+                                            'title' => '壹管家提示-新订单',
                                             'description' => $tech->name.'你好！刚刚有一个新的订单被分配给你，请点击查看。',
                                             'url' => $url_prefix.'/index.php?r=o2o/myOrder/info&order='.(string)$order->_id.'&user='.$tech->_id,
                                         ],

www/protected/commands/GiveCouponsCommand.php

@@ -43,7 +43,7 @@ class GiveCouponsCommand extends CConsoleCommand{
                         if(isset($address['mobile'])){
                             $status = $cache->get('sendsms_'.$address['mobile']);
                             if(!$status){
-                                $sms_data['tpl'] = '【握爪宠物】送你60元代金券，可用于全部上门服务，下单立减→http://t.cn/R2DKttW 回T退订';
+                                $sms_data['tpl'] = '【壹管家宠物】送你60元代金券，可用于全部上门服务，下单立减→http://t.cn/R2DKttW 回T退订';
                                 $sms_data['mobile'] = $address['mobile'];
                                 $list = new ARedisList('send_sms_list');
                                 $list->push(json_encode($sms_data));
@@ -107,7 +107,7 @@ class GiveCouponsCommand extends CConsoleCommand{
     //         }
 
     //         //TODO:发送短信
-    //         $result = $smsservice->send_sms('【握爪宠物】万圣节来袭，握爪送壕礼。新开通SPA、洁牙、药浴。送您240元代金券，点击领取→http://t.cn/R2DKttW 回T退订',$value['address.mobile']);
+    //         $result = $smsservice->send_sms('【壹管家宠物】万圣节来袭，壹管家送壕礼。新开通SPA、洁牙、药浴。送您240元代金券，点击领取→http://t.cn/R2DKttW 回T退订',$value['address.mobile']);
     //         var_dump($result);
     //         sleep(1);
     //     }

www/protected/commands/SendSMSCommand.php

@@ -23,10 +23,10 @@ class SendSMSCommand extends CConsoleCommand{
             $user_info = explode("----", $value);
             if(preg_match("/\d{11}/", $user_info[1])){
                 $user_info[1] = trim($user_info[1]);
-                $result = $smsservice->send_sms('【握爪宠物】炎热酷暑,清凉一夏,下载握爪APP即获248元优惠大礼包,狗狗上门洗护仅10元起,有效期至6.30日,猛戳 http://dwz.cn/wozhua，回T退订',$user_info[1]);
+                $result = $smsservice->send_sms('【壹管家宠物】炎热酷暑,清凉一夏,下载壹管家APP即获248元优惠大礼包,狗狗上门洗护仅10元起,有效期至6.30日,猛戳 http://dwz.cn/wozhua，回T退订',$user_info[1]);
                 if($i==1000){
-                    $result = $smsservice->send_sms('【握爪宠物】炎热酷暑,清凉一夏,下载握爪APP即获248元优惠大礼包,狗狗上门洗护仅10元起,有效期至6.30日,猛戳 http://dwz.cn/wozhua，回T退订','18521093629');
-                    $result = $smsservice->send_sms('【握爪宠物】炎热酷暑,清凉一夏,下载握爪APP即获248元优惠大礼包,狗狗上门洗护仅10元起,有效期至6.30日,猛戳 http://dwz.cn/wozhua，回T退订','18817554864');
+                    $result = $smsservice->send_sms('【壹管家宠物】炎热酷暑,清凉一夏,下载壹管家APP即获248元优惠大礼包,狗狗上门洗护仅10元起,有效期至6.30日,猛戳 http://dwz.cn/wozhua，回T退订','18521093629');
+                    $result = $smsservice->send_sms('【壹管家宠物】炎热酷暑,清凉一夏,下载壹管家APP即获248元优惠大礼包,狗狗上门洗护仅10元起,有效期至6.30日,猛戳 http://dwz.cn/wozhua，回T退订','18817554864');
                 }
                 echo $i++;
                 echo iconv('utf-8', 'gbk', $result);

www/protected/components/CommonSMS.php

@@ -15,7 +15,7 @@ class CommonSMS{
                 break;
 
             case 'dianping_final_order'://点评订单完成后发送短信
-                Service::factory('SendSMSService')->send_sms('【握爪宠物】亲，感谢使用握爪宠物上门服务，下载握爪APP：http://t.cn/R2DKttW  有价值328元的新手礼包哦！回T退订',$params['mobile']);
+                Service::factory('SendSMSService')->send_sms('【壹管家宠物】亲，感谢使用壹管家宠物上门服务，下载壹管家APP：http://t.cn/R2DKttW  有价值328元的新手礼包哦！回T退订',$params['mobile']);
                 break;
 
             case 'final_order'://订单完成后发送短信
@@ -42,6 +42,6 @@ class CommonSMS{
     
 // 862005    
 
-// 【握爪宠物】尊敬的#name#，本次服务已完成。已赠送您#num#个爪币，握爪APP"首页"—>"发现"—>"礼物"中去兑换礼物吧。参与评价，还能获得20元优惠券哦。回T退订
+// 【壹管家宠物】尊敬的#name#，本次服务已完成。已赠送您#num#个爪币，壹管家APP"首页"—>"发现"—>"礼物"中去兑换礼物吧。参与评价，还能获得20元优惠券哦。回T退订
 
 }

www/protected/config/console.php

@@ -6,7 +6,7 @@ if(trim($env) == 'develop'){// 本地配置
     define('ENVIRONMENT', 'test');
     return array(
         'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
-        'name'=>'握爪',
+        'name'=>'壹管家',
         'preload'=>array('log'),
         //中文
         'language' => 'zh_cn',
@@ -84,7 +84,7 @@ if(trim($env) == 'develop'){// 本地配置
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
-            'mongodb_deal' => array(//握爪宠物买卖数据库
+            'mongodb_deal' => array(//壹管家宠物买卖数据库
                 'class'            => 'EMongoDB',
                 'connectionString' => 'mongodb://192.168.1.192:27017',
                 'dbName'           => 'wozhua_deal',
@@ -139,7 +139,7 @@ if(trim($env) == 'develop'){// 本地配置
     define('ENVIRONMENT', 'product');
     return array(
         'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
-        'name'=>'握爪̨',
+        'name'=>'壹管家̨',
         'preload'=>array('log'),
         //中文
         'language' => 'zh_cn',
@@ -217,7 +217,7 @@ if(trim($env) == 'develop'){// 本地配置
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
-            'mongodb_deal' => array(//握爪宠物买卖数据库
+            'mongodb_deal' => array(//壹管家宠物买卖数据库
                 'class'            => 'EMongoDB',
                 'connectionString' => 'mongodb://root:wozhua-2015@10.10.167.16:27017,10.10.193.100:27017,10.10.239.135:27017/admin?replicaSet=udb-cadhnj&readPreference=secondaryPreferred',
                 'dbName'           => 'wozhua_deal',
@@ -272,7 +272,7 @@ if(trim($env) == 'develop'){// 本地配置
     define('ENVIRONMENT', 'test');
     return array(
         'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
-        'name'=>'握爪̨',
+        'name'=>'壹管家̨',
         'preload'=>array('log'),
         //中文
         'language' => 'zh_cn',
@@ -348,7 +348,7 @@ if(trim($env) == 'develop'){// 本地配置
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
-            'mongodb_deal' => array(//握爪̨宠物买卖数据库
+            'mongodb_deal' => array(//壹管家̨宠物买卖数据库
                 'class'            => 'EMongoDB',
                 'connectionString' => 'mongodb://root:wozhua=9527@10.10.221.173:27017',
                 'dbName'           => 'wozhua_deal',

www/protected/controllers/MaterialController.php

@@ -251,7 +251,7 @@ class MaterialController extends AdminController {
         $chars = Yii::app()->request->getParam('user', '');
 
         $MongoDbAuthManager = new CMongoDbAuthManager();
-        $users_id = $MongoDbAuthManager->getAuthUser('技师');
+        $users_id = $MongoDbAuthManager->getAuthUser('保洁师');
 
         $criteria = new EMongoCriteria();
         $criteria->addCond('name', 'or', new MongoRegex('/'.$chars.'/'));

www/protected/controllers/ROrderController.php

@@ -141,15 +141,15 @@ class ROrderController extends AdminController{
         $technician_id = intval(Yii::app()->request->getParam('technician', 0));
         $technician_name = Yii::app()->request->getParam('technician_name', '');
 
-        // 技师信息检查
-        // 根据ID直接查询技师信息(优先使用联想功能)
+        // 保洁师信息检查
+        // 根据ID直接查询保洁师信息(优先使用联想功能)
         if ($technician_id != 0) {
             $technician_obj = TechInfo::get($technician_id);
             if ($technician_obj) {
                 $technicians_id = $technician_obj->_id;
                 $technician_name  = $technician_obj->name;
             } else {
-                CommonFn::requestAjax(false, '技师不存在');
+                CommonFn::requestAjax(false, '保洁师不存在');
             }
         // ID为0时根据输入框信息查询
         } else if ($technician_name != '') {
@@ -160,7 +160,7 @@ class ROrderController extends AdminController{
                 $technician_id = $technician_obj->_id;
                 $technician_name = $technician_obj->name;
             } else {
-                CommonFn::requestAjax(false, '技师不存在');
+                CommonFn::requestAjax(false, '保洁师不存在');
             }
         } else {
             $technician_obj = null;
@@ -206,7 +206,7 @@ class ROrderController extends AdminController{
             $address = $order_info['address']['poi']['name'].$order_info['address']['detail'];
             CommonSMS::send('order_retrieve',array('month'=>$month,'day'=>$day,'address'=>$address,'mobile'=>$order_info['address']['mobile']));
 
-            // 申请退款处理完成后通知技师
+            // 申请退款处理完成后通知保洁师
             if ($technician_obj && $technician_obj->weixin_userid) {
                 $url_prefix = ENVIRONMENT == 'product' ? 'http://api.wozhua.mobi' : 'http://apitest.wozhua.mobi';
                 $wechat = O2oApp::getWechatActive();
@@ -217,7 +217,7 @@ class ROrderController extends AdminController{
                     'news'    => array(
                         'articles' => array(
                             array(
-                                'title' => '握爪提示-订单退款完成',
+                                'title' => '壹管家提示-订单退款完成',
                                 'description' => $technician_obj->name.'你好！用户于'.date('m月d日H:i', $order->apply_refund_time).'申请退款的订单已处理完成。',
                                 'url' => $url_prefix.'/index.php?r=o2o/myOrder/info&order='.$id.'&user='.$technician_id,
                             ),
@@ -240,7 +240,7 @@ class ROrderController extends AdminController{
             //         'news'    => array(
             //             'articles' => array(
             //                 array(
-            //                     'title' => '握爪提示-追加订单退款完成',
+            //                     'title' => '壹管家提示-追加订单退款完成',
             //                     'description' => $technician_obj->name.'你好！用户于'.date('m月d日H:i', $order->apply_refund_time).'申请退款的追加订单已处理完成，请点击下方条目查看详情。',
             //                 ),
             //             ),
@@ -327,7 +327,7 @@ class ROrderController extends AdminController{
                 }
             }
 
-            // 美容师订单统计处理
+            // 保洁师订单统计处理
             if ($technician_obj) {
                 $tech_order_count = $technician_obj->order_count + 1;
                 $technician_obj->order_count = $tech_order_count;
@@ -376,8 +376,8 @@ class ROrderController extends AdminController{
                 $chubaoPush->setUserId($userId);
                 $chubaoPush->setOrderId($id);
                 $chubaoPush->setOrderService($chubaoConfig['service']);
-                $chubaoPush->setOrderTitle('握爪宠物');
-                $chubaoPush->setOrderShortInfo('握爪上门服务-'.$shortInfo);
+                $chubaoPush->setOrderTitle('壹管家宠物');
+                $chubaoPush->setOrderShortInfo('壹管家上门服务-'.$shortInfo);
                 $chubaoPush->setOrderCreateTime(date('YmdHis', $order->order_time));
                 $chubaoPush->setOrderFinishTime('');
                 $chubaoPush->setOrderUrl($chubaoConfig['orderUrl'].'/'.$id);
@@ -423,7 +423,7 @@ class ROrderController extends AdminController{
         $order->remark = $remark;
 
         //$order->station = new MongoId($station);
-        // 是否通知技师
+        // 是否通知保洁师
         $toTech = $order->technician != $technician_id ? true : false;
         $order->technician = $technician_id;
         $order->technician_name = $technician_name;
@@ -432,7 +432,7 @@ class ROrderController extends AdminController{
 
         $success = $order->save(true,$arr_order);
 
-        // 通知技师
+        // 通知保洁师
         if (in_array($status, array(1,2,3,4,5)) && $toTech && $success) {
         // if ($toTech) {
             if ($technician_obj && $technician_obj->weixin_userid) {
@@ -445,7 +445,7 @@ class ROrderController extends AdminController{
                     'news'    => array(
                         'articles' => array(
                             array(
-                                'title' => '握爪提示-新订单',
+                                'title' => '壹管家提示-新订单',
                                 'description' => $technician_obj->name.'你好！刚刚有一个新的订单被分配给你，请点击查看。',
                                 'url' => $url_prefix.'/index.php?r=o2o/myOrder/info&order='.$id.'&user='.$technician_id,
                             ),
@@ -647,7 +647,7 @@ class ROrderController extends AdminController{
         }
 
         //if($channel == 'wz_app' || $channel == 'wx_pub'){
-            //CommonFn::requestAjax(false, '不能录入渠道为握爪微信||握爪APP的订单', array());
+            //CommonFn::requestAjax(false, '不能录入渠道为壹管家微信||壹管家APP的订单', array());
             //exit;
         //}
 
@@ -758,22 +758,22 @@ class ROrderController extends AdminController{
         $key = $list->shift();
     }
     /**
-     * 重新选择技师接口
+     * 重新选择保洁师接口
      */
     public function actionResetTech() {
         $id = Yii::app()->request->getParam('id', '');
         $technician_id = intval(Yii::app()->request->getParam('reset_technician', 0));
         $technician_name = Yii::app()->request->getParam('reset_technician_name', '');
         
-        // 技师信息检查
-        // 根据ID直接查询技师信息(优先使用联想功能)
+        // 保洁师信息检查
+        // 根据ID直接查询保洁师信息(优先使用联想功能)
         if ($technician_id != 0) {
             $technician_obj = TechInfo::get($technician_id);
             if ($technician_obj) {
                 $technician_id = $technician_obj->_id;
                 $technician_name = $technician_obj->name;
             } else {
-                CommonFn::requestAjax(false, '技师不存在');
+                CommonFn::requestAjax(false, '保洁师不存在');
             }
         // ID为0时根据输入框信息查询
         } else if ($technician_name != '') {
@@ -784,10 +784,10 @@ class ROrderController extends AdminController{
                 $technician_id = $technician_obj->_id;
                 $technician_name = $technician_obj->name;
             } else {
-                CommonFn::requestAjax(false, '技师不存在');
+                CommonFn::requestAjax(false, '保洁师不存在');
             }
         } else {
-            CommonFn::requestAjax(false, '技师姓名不能为空');
+            CommonFn::requestAjax(false, '保洁师姓名不能为空');
         }
 
         $orderid = new MongoId($id);
@@ -799,7 +799,7 @@ class ROrderController extends AdminController{
         $success = $order->save(true, array('technician', 'technician_name'));
 
         if ($toTech && $success) {
-            // 发送给被分配技师
+            // 发送给被分配保洁师
             $wechat = O2oApp::getWechatActive();
             $url_prefix = ENVIRONMENT == 'product' ? 'http://api.wozhua.mobi' : 'http://apitest.wozhua.mobi';
             if (!empty($technician_obj->weixin_userid)) {
@@ -810,7 +810,7 @@ class ROrderController extends AdminController{
                     'news'    => array(
                         'articles' => array(
                             array(
-                                'title' => '握爪提示-新订单',
+                                'title' => '壹管家提示-新订单',
                                 'description' => $technician_obj->name.'你好！刚刚有一个新的订单被分配给你，请点击查看。',
                                 'url' => $url_prefix.'/index.php?r=o2o/myOrder/info&order='.$id.'&user='.$technician_id,
                             ),
@@ -820,7 +820,7 @@ class ROrderController extends AdminController{
                 $wechat->sendMessage($wechat_data);
             }
 
-            // 发送给原技师
+            // 发送给原保洁师
             $fromTechObj = TechInfo::get($fromTech);
             if (!empty($fromTechObj) && !empty($fromTechObj->weixin_userid)) {
                 $wechat_data = array(
@@ -830,8 +830,8 @@ class ROrderController extends AdminController{
                     'news'    => array(
                         'articles' => array(
                             array(
-                                'title' => '握爪提示-订单已被重新分配',
-                                'description' => $fromTechObj->name.'你好！预定时间在'.date('m月d日H:i', $order->booking_time).'的订单已被分配给其他美容师。',
+                                'title' => '壹管家提示-订单已被重新分配',
+                                'description' => $fromTechObj->name.'你好！预定时间在'.date('m月d日H:i', $order->booking_time).'的订单已被分配给其他保洁师。',
                                 'url' => $url_prefix.'/index.php?r=o2o/myOrder/info&order='.$id.'&user='.$technician_id,
                             ),
                         ),

www/protected/controllers/RUserController.php

@@ -184,7 +184,7 @@ class RUserController extends AdminController{
     //         $android_data['account'] = (string)$user_id;
 
     //         $ios_data = array();
-    //         $ios_data['alert']   = '系统通知：'.'恭喜你获得一张握爪上门券';
+    //         $ios_data['alert']   = '系统通知：'.'恭喜你获得一张壹管家上门券';
     //         $ios_data['account'] = (string)$user_id;
     //         $ios_data['custom']  = array(
     //             't' => 'a',

www/protected/controllers/StockViewUserController.php

@@ -217,9 +217,9 @@ class StockViewUserController extends AdminController {
         $data = array();
         $criteria_users = new EMongoCriteria($params);
 
-        // 筛选为技师
+        // 筛选为保洁师
         $MongoDbAuthManager = new CMongoDbAuthManager();
-        $users_id = $MongoDbAuthManager->getAuthUser('技师');
+        $users_id = $MongoDbAuthManager->getAuthUser('保洁师');
 
         $criteria_users->name = new MongoRegex('/'.$objectName.'/');
         $criteria_users->_id('in', $users_id);

www/protected/controllers/UserController.php

@@ -137,9 +137,9 @@ class UserController extends AdminController
         $user->email = $email;
         $user->name = $name;
 
-        // 如果角色为技师
+        // 如果角色为保洁师
         if (in_array('保洁师', $roles)) {
-            // 用户信息与美容师信息同步
+            // 用户信息与保洁师信息同步
             $techInfo = TechInfo::get($_id);
             if (!$techInfo) {
                 $techInfo = new TechInfo();

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

@@ -178,7 +178,7 @@ class ConfirmController extends CController{
                    array(
                        array('type'=>'view','name'=>'上门服务','url'=>'http://www.wozhua.mobi/o2o/web/index'),
                        array('type'=>'view','name'=>'下载APP','url'=>'http://t.cn/R2DKttW'),
-                       array('type'=>'click','name'=>'握爪过年','key'=>'WOZHUA_STAR'),
+                       array('type'=>'click','name'=>'壹管家过年','key'=>'WOZHUA_STAR'),
                        )
                );
         $result = $weObj->createMenu($newmenu);

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

@@ -79,7 +79,7 @@ class CommisionController extends AdminController {
         $commision = floatval(Yii::app()->request->getParam('commision', 0));
 
         $time = empty($datetime) ? time() : strtotime($datetime);
-        // 技师处理
+        // 保洁师处理
         // 优先根据userid查询
         if ($user != -1) {
             $userObj = User::get($user);
@@ -134,7 +134,7 @@ class CommisionController extends AdminController {
     }
 
     /**
-     * 异步查询某一技师时间段内提成总和
+     * 异步查询某一保洁师时间段内提成总和
      */
     public function actionCommisionCountOne() {
         $search = Yii::app()->request->getParam('search', '');

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

@@ -85,7 +85,7 @@ class MyOrderController extends CController {
     }
 
     /**
-     * 美容师确认出发
+     * 保洁师确认出发
      */
     public function actionTechSetout() {
         $order = Yii::app()->request->getParam('order', '');
@@ -106,7 +106,7 @@ class MyOrderController extends CController {
     }
 
     /**
-     * 美容师确认上门
+     * 保洁师确认上门
      */
     public function actionTechCome() {
         $order = Yii::app()->request->getParam('order', '');

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

@@ -306,8 +306,8 @@ class  OrderController extends O2oBaseController{
             $orderPush->setUserId($userId);
             $orderPush->setOrderId($order_id);
             $orderPush->setOrderService($chubaoConfig['service']);
-            $orderPush->setTitle('握爪宠物');
-            $orderPush->setShortInfo('握爪上门服务-'.$shortInfo);
+            $orderPush->setTitle('壹管家宠物');
+            $orderPush->setShortInfo('壹管家上门服务-'.$shortInfo);
             $orderPush->setOrderStatus('订单已取消');
             $orderPush->setCreateTime(date('YmdHis', $order->order_time));
             $orderPush->setFinishTime('');
@@ -550,7 +550,7 @@ class  OrderController extends O2oBaseController{
         if($result === false){
             CommonFn::requestAjax(false,'支付遇到点问题了，请稍候再试');
         }else{
-            // 追加订单并付款后通知技师
+            // 追加订单并付款后通知保洁师
             if (!empty($order->technician)) {
                 $techObj = TechInfo::get($order->technician);
                 if (!empty($techObj) && !empty($techObj->weixin_userid)) {
@@ -563,7 +563,7 @@ class  OrderController extends O2oBaseController{
                         'news'    => array(
                             'articles' => array(
                                 array(
-                                    'title' => '握爪提示-新的追加订单',
+                                    'title' => '壹管家提示-新的追加订单',
                                     'description' => $techObj->name.'你好！预定时间在'.date('m月d日H:i', $order->booking_time).'的订单刚刚被用户追加了新的服务，请点击查看。',
                                     'url' => $url_prefix.'/index.php?r=o2o/myOrder/info&order='.(string)$order->_id.'&user='.$order->technician,
                                 ),
@@ -627,7 +627,7 @@ class  OrderController extends O2oBaseController{
         }
 
         if($order->update(array('status','apply_refund_time'),true)){
-            // 发送通知给技师
+            // 发送通知给保洁师
             if (!empty($order->technician)) {
                 $techObj = TechInfo::get($order->technician);
                 if (!empty($techObj) && !empty($techObj->weixin_userid)) {
@@ -640,7 +640,7 @@ class  OrderController extends O2oBaseController{
                         'news'    => array(
                             'articles' => array(
                                 array(
-                                    'title' => '握爪提示-申请退款',
+                                    'title' => '壹管家提示-申请退款',
                                     'description' => $techObj->name.'你好！预定时间在'.date('m月d日H:i', $order->booking_time).'的订单刚刚已被用户申请退款，请点击查看。',
                                     'url' => $url_prefix.'/index.php?r=o2o/myOrder/info&order='.$order_id.'&user='.$order->technician,
                                 ),
@@ -687,14 +687,14 @@ class  OrderController extends O2oBaseController{
             $orderPush->setUserId($userId);
             $orderPush->setOrderId($order_id);
             $orderPush->setOrderService($chubaoConfig['service']);
-            $orderPush->setTitle('握爪宠物');
+            $orderPush->setTitle('壹管家宠物');
 
             $product_list = $order->products;
             $product_id = $product_list[0]['product'];
             $product = Product::get($product_id);
             $o2o_service = Yii::app()->params['o2o_service'];
             $shortInfo = $o2o_service[$product->type]['name'];
-            $orderPush->setOrderShortInfo('握爪上门服务-'.$shortInfo);
+            $orderPush->setOrderShortInfo('壹管家上门服务-'.$shortInfo);
             $orderPush->setOrderStatus('订单已完成');
             $orderPush->setOrderCreateTime(date('YmdHis', $order->order_time));
             $orderPush->setOrderFinishTime(date('YmdHis', time()));
@@ -731,7 +731,7 @@ class  OrderController extends O2oBaseController{
                 CommonSMS::send('final_order',array('name' =>$order->address['name'],'num' =>intval($order->final_price),'mobile'=>$order->address['mobile']));
             }
 
-            // 美容师订单统计
+            // 保洁师订单统计
             if ($order->technician) {
                 $tech_obj = TechInfo::get($order->technician);
                 if ($tech_obj) {
@@ -763,7 +763,7 @@ class  OrderController extends O2oBaseController{
         CommonFn::requestAjax(true,'',$order_info);
     }
 
-    //选择技师
+    //选择保洁师
     public function actionSelectTech(){
         $booking_time = Yii::app()->getRequest()->getParam("booking_time");
         $service_type = json_decode(Yii::app()->getRequest()->getParam("service_type","[]"),true);
@@ -806,7 +806,7 @@ class  OrderController extends O2oBaseController{
         }
         $criteria->status('==', 1);
         $cursor = $user_model->findAll($criteria);
-        //获取满足服务类型美容师列表
+        //获取满足服务类型保洁师列表
         $match_service_tech_list = array();
         $tech_list = array();
         foreach ($cursor as $key => $value) {
@@ -819,7 +819,7 @@ class  OrderController extends O2oBaseController{
         // $LastFreeTimeRecord = FreeTimeRecord::get($last_parse_time);
         // $next_parse_time = strtotime(date('Y-m-d H:00',strtotime($booking_time)))-3600;
         // $NextFreeTimeRecord = FreeTimeRecord::get($next_parse_time);
-        //获取此时段空闲美容师列表
+        //获取此时段空闲保洁师列表
         $free_tech_list = array();
         // $last_free_tech_list = array();
         // $next_free_tech_list = array();
@@ -832,7 +832,7 @@ class  OrderController extends O2oBaseController{
         // if($NextFreeTimeRecord){
         //     $next_free_tech_list = $NextFreeTimeRecord->free_technician;
         // }
-        //空闲且满足服务能力美容师，推荐用户选择
+        //空闲且满足服务能力保洁师，推荐用户选择
         $recommend_tech = array_intersect($match_service_tech_list,$free_tech_list);
         $can_select_tech = array();
         foreach ($recommend_tech as $key => $value) {
@@ -846,7 +846,7 @@ class  OrderController extends O2oBaseController{
             $tmp['favourable_count'] = $tech->favourable_count;
             $can_select_tech[] = $tmp;
         }
-        //满足服务能力，但此时段不空闲，展示给用户此美容师下个空闲时段
+        //满足服务能力，但此时段不空闲，展示给用户此保洁师下个空闲时段
         $service_match_tech = array();
         foreach ($tech_list as $key => $value) {
             $tmp['id'] = $value->_id;

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

@@ -142,7 +142,7 @@ class  ProductController extends O2oBaseController{
         $comment->score = $score;
         $comment->time = time();
 
-        // 技师信息处理
+        // 保洁师信息处理
         // zhouxuchen 2015-12-11
         $technician = empty($order->technician) ? 0 : $order->technician;
         $comment->technician = $technician;
@@ -159,7 +159,7 @@ class  ProductController extends O2oBaseController{
             $coupon_ids[] = '56c5921ca84ea0b3268bd949';
             Service::factory('CouponService')->giveCoupon($order->user,new MongoId($coupon_ids[mt_rand(0,3)]),$start_time,$end_time);
 
-            // 技师操作
+            // 保洁师操作
             if ($technician) {
                 $technicianObj = TechInfo::get($technician);
                 if ($technicianObj && $technicianObj->weixin_userid) {
@@ -172,8 +172,8 @@ class  ProductController extends O2oBaseController{
                         'news'    => array(
                             'articles' => array(
                                 array(
-                                    'title' => '握爪提示-新评价',
-                                    'description' => $technicianObj->name.'你好！你刚刚在握爪O2O服务上收到了一条评分为'.$score.'分的订单评价，请点击查看。',
+                                    'title' => '壹管家提示-新评价',
+                                    'description' => $technicianObj->name.'你好！你刚刚在壹管家O2O服务上收到了一条评分为'.$score.'分的订单评价，请点击查看。',
                                     'url' => $url_prefix.'/index.php?r=o2o/myComment/info&order='.$order_id.'&user='.$technician,
                                 ),
                             ),

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

@@ -1,6 +1,6 @@
 <?php 
 /**
- * 后台美容师管理
+ * 后台保洁师管理
  * zhouxuchen 2016-03-04
  */
 class TechController extends AdminController {
@@ -70,7 +70,7 @@ class TechController extends AdminController {
     }
 
     /**
-     * 编辑美容师基本信息
+     * 编辑保洁师基本信息
      */
     public function actionEdit() {
         $_id          = intval(Yii::app()->request->getParam('_id', 0));
@@ -90,7 +90,7 @@ class TechController extends AdminController {
         $user = User::get($_id);
 
         if (!$tech || !$user) {
-            CommonFn::requestAjax(false, '美容师信息不存在');
+            CommonFn::requestAjax(false, '保洁师信息不存在');
         }
 
         // 微信status更新
@@ -116,7 +116,7 @@ class TechController extends AdminController {
     }
 
     /**
-     * 获取技师可预约时间列表
+     * 获取保洁师可预约时间列表
      */
     public function actionGetTechTimeline() {
         $_id = Yii::app()->request->getParam('_id', 0);
@@ -126,7 +126,7 @@ class TechController extends AdminController {
     }
 
     /**
-     * 修改技师可预约时间
+     * 修改保洁师可预约时间
      */
     public function actionModifyFreetime() {
         $_id = intval(Yii::app()->request->getParam('_id', 0));
@@ -134,7 +134,7 @@ class TechController extends AdminController {
         $old_time_list = Yii::app()->request->getParam('old_time_list', '{}');
 
         if (!TechInfo::get($_id)) {
-            CommonFn::requestAjax(false, '美容师信息不存在', []);
+            CommonFn::requestAjax(false, '保洁师信息不存在', []);
         }
 
         $new_time_list = empty($new_time_list) ? '{}' : $new_time_list;
@@ -197,7 +197,7 @@ class TechController extends AdminController {
     }
 
     /**
-     * 修改技师服务范围
+     * 修改保洁师服务范围
      */
     public function actionModifyCoverage() {
         $_id = intval(Yii::app()->request->getParam('_id', 0));
@@ -205,7 +205,7 @@ class TechController extends AdminController {
 
         $tech = TechInfo::get($_id);
         if (!$tech) {
-            CommonFn::requestAjax(false, '美容师信息不存在');
+            CommonFn::requestAjax(false, '保洁师信息不存在');
         }
 
         $business = [];
@@ -225,7 +225,7 @@ class TechController extends AdminController {
     }
 
     /**
-     * 修改美容师微信端信息
+     * 修改保洁师微信端信息
      */
     public function actionModifyWeixinInfo() {
         $_id = intval(Yii::app()->request->getParam('_id', 0));
@@ -235,7 +235,7 @@ class TechController extends AdminController {
 
         $tech = TechInfo::get($_id);
         if (!$tech) {
-            CommonFn::requestAjax(false, '美容师信息不存在', []);
+            CommonFn::requestAjax(false, '保洁师信息不存在', []);
         }
 
         // 检查userId是否重复
@@ -285,7 +285,7 @@ class TechController extends AdminController {
     }
 
     /**
-     * 选择美容师接口
+     * 选择保洁师接口
      */
     public function actionSelectTech() {
         $chars = Yii::app()->request->getParam('tech', '');
@@ -322,7 +322,7 @@ class TechController extends AdminController {
     }
 
     /**
-     * 复制美容师信息到新表
+     * 复制保洁师信息到新表
      */
     public function actionCopyTech() {
         set_time_limit(0);
@@ -332,7 +332,7 @@ class TechController extends AdminController {
         }
 
         $mongoDbAuthManager = new CMongoDbAuthManager();
-        $tech_ids = $mongoDbAuthManager->getAuthUser('技师');
+        $tech_ids = $mongoDbAuthManager->getAuthUser('保洁师');
 
         $criteria = new EMongoCriteria();
         $criteria->_id('in', $tech_ids);
@@ -356,14 +356,14 @@ class TechController extends AdminController {
             // $tech->coverage = isset($item->coverage) ? $item->coverage : [];
             // $tech->weixin_info = $item->wx_info;
 
-            // 技师接单数（状态为已完成的订单）
+            // 保洁师接单数（状态为已完成的订单）
             $criteria = new EMongoCriteria();
             $criteria->technician('==', $tech->_id);
             $criteria->status('==', 6);
             $rOrders = ROrder::model()->findAll($criteria);
             $tech->order_count = $rOrders->count();
 
-            // 技师好评数（分数为5的评价）
+            // 保洁师好评数（分数为5的评价）
             $criteria = new EMongoCriteria();
             $criteria->score('==', 5);
             $criteria->status('==', 1);
@@ -380,7 +380,7 @@ class TechController extends AdminController {
     }
 
     /**
-     * 美容师统计同步
+     * 保洁师统计同步
      */
     public function actionCopyTechCount() {
         set_time_limit(0);
@@ -394,7 +394,7 @@ class TechController extends AdminController {
             $orders = ROrder::model()->findAll($criteria);
             $item->order_count = $orders->count();
 
-            // 技师好评数
+            // 保洁师好评数
             $criteria = new EMongoCriteria();
             $criteria->score('==', 5);
             $criteria->status('==', 1);

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

@@ -111,14 +111,14 @@ class TechHomeController extends CController {
                 $tech->mobile        = '';
                 $tech->service_type  = [];
 
-                // 技师接单数（状态为已完成的订单）
+                // 保洁师接单数（状态为已完成的订单）
                 $criteria = new EMongoCriteria();
                 $criteria->technician('==', $tech->_id);
                 $criteria->status('==', 6);
                 $rOrders = ROrder::model()->findAll($criteria);
                 $tech->order_count = $rOrders->count();
 
-                // 技师好评数（分数为5的评价）
+                // 保洁师好评数（分数为5的评价）
                 $criteria = new EMongoCriteria();
                 $criteria->score('==', 5);
                 $criteria->status('==', 1);
@@ -134,7 +134,7 @@ class TechHomeController extends CController {
                     CommonFn::requestAjax(true, CommonFn::getMessage('message', 'operation_success'), $data);
                 }
             } else {
-                CommonFn::requestAjax(false, '此美容师不存在');
+                CommonFn::requestAjax(false, '此保洁师不存在');
             }
         }
     }

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

@@ -1,6 +1,6 @@
 <?php 
 /**
- * 技师提成模型
+ * 保洁师提成模型
  * @author zhouxuchen 2015-12-01
  */
 class Commision extends MongoAr {
@@ -8,7 +8,7 @@ class Commision extends MongoAr {
     public $_id;
     public $time;           // 订单完成时间
     public $booking_time;   // 预定时间
-    public $user;           // 技师ID
+    public $user;           // 保洁师ID
     public $order;          // 订单ID
     public $commision;      // 提成价格
     public $type;           // 订单类型
@@ -74,7 +74,7 @@ class Commision extends MongoAr {
     }
 
     /**
-     * 计算单个订单内技师提成
+     * 计算单个订单内保洁师提成
      * @param  Object  $order       : 订单Object(AppendOrder或ROrder)
      * @param  Boolean $type        : 订单类型
      * @param  String  $scheme_name : 提成方案

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

@@ -3,7 +3,7 @@ class FreeTimeRecord extends MongoAr
 {
     public $_id;//时间戳，整点时间戳格式
 
-    public $free_technician = array();//此时间段空闲技师列表
+    public $free_technician = array();//此时间段空闲保洁师列表
 
     public function __construct($scenario='insert'){
         $this->setMongoDBComponent(Yii::app()->getComponent('mongodb_o2o'));
@@ -44,7 +44,7 @@ class FreeTimeRecord extends MongoAr
     }
 
     /**
-     * 获取某个美容师的时间线
+     * 获取某个保洁师的时间线
      * 0: 此时段未设置
      * 1: 此时段已设置且空闲
      * 2: 此时段已预约
@@ -106,7 +106,7 @@ class FreeTimeRecord extends MongoAr
         return $data;
     }
 
-    //设置某时段美容师忙碌
+    //设置某时段保洁师忙碌
     public static function TechUnsetFreetime($tech_id,$time_stamp){
         if($time_stamp > time()+86400*15 || $time_stamp < strtotime('today') ){
             return false;
@@ -126,7 +126,7 @@ class FreeTimeRecord extends MongoAr
         }
     }
 
-    //设置美容师某时段空闲
+    //设置保洁师某时段空闲
     public static function TechsetFreetime($tech_id,$time_stamp){
         if($time_stamp > time()+86400*15 || $time_stamp < strtotime('today') ){
             return false;

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

@@ -54,8 +54,8 @@ class ROrder extends MongoAr
     public $station = '';//服务网点,station的mongoid
 
     public $technicians = array(); // 接单保洁师
-    public $technician = ''; // 接单技师,user的id
-    public $technician_name = ''; // 接单技师姓名
+    public $technician = ''; // 接单保洁师,user的id
+    public $technician_name = ''; // 接单保洁师姓名
 
     public $address = array(); //收货地址信息   包含   province  city  area position detail   name  mobile position
 
@@ -410,7 +410,7 @@ class ROrder extends MongoAr
         parent::afterSave();
 
         $tech = TechInfo::get($this->technician);
-        // 生成技师提成并保存
+        // 生成保洁师提成并保存
         if ($this->status == 6 && !empty($this->technician)) {
             // 订单时间检查
             // 预定时间是否在12月之后
@@ -459,7 +459,7 @@ class ROrder extends MongoAr
                     }
                 }
             }
-            // 提示美容师订单已完成
+            // 提示保洁师订单已完成
             if ($tech && $tech->weixin_userid) {
                 // 检查订单评价是否存在，若存在则不发送
                 $comment = Comment::getByOrder($this->_id);
@@ -473,7 +473,7 @@ class ROrder extends MongoAr
                         'news'    => [
                             'articles' => [
                                 [
-                                    'title' => '握爪提示-订单已完成',
+                                    'title' => '壹管家提示-订单已完成',
                                     'description' => $tech->name.'你好！预定时间在'.date('m月d日H:i', $this->booking_time).'的订单已完成，请点击查看订单情况。',
                                     'url' => $url_prefix.'/index.php?r=o2o/myCommision/info&order='.(string)$order.'&user='.$this->technician.'&type=0',
                                 ],

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

@@ -18,7 +18,7 @@ class Station extends MongoAr
     //public $position=array();   //坐标
     public $address = array(); //地址信息   包含   province  city  area business position detail
 
-    public $beauticians_count=1;  //美容师数量
+    public $beauticians_count=1;  //保洁师数量
     public $coverage = array();//服务范围
 
     public $types = array();//该服务点  支持的服务项目  array( 1=>array("name"=>"宠物洗澡"),2=>array("name"=>"宠物剪毛"),3=>array("name"=>"宠物美容"))

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

@@ -1,7 +1,7 @@
 <?php
 class TechInfo extends MongoAr {
 
-    public $_id;//使用后台用户id作为美容师信息表主键
+    public $_id;//使用后台用户id作为保洁师信息表主键
     public $name;//姓名
     public $desc = '';//描述
     public $avatar;//头像

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

@@ -50,7 +50,7 @@
             <li class="f_item">
                 <div class="box">
                     <div class="f_label">
-                        <span>选择技师:</span>
+                        <span>选择保洁师:</span>
                     </div>
                     <div class="box_flex f_content">
                         <input id="add_username" name="user_name" />
@@ -146,7 +146,7 @@ $(function() {
     // 内容表格
     jq_dg_content.datagrid({
         url: module_router + '/list',
-        title: '技师提成',
+        title: '保洁师提成',
         width: d_width,
         height: w_height - 18,
         fitColumns: true,
@@ -174,7 +174,7 @@ $(function() {
                         return row['booking_time_str'];
                     }
                 },
-                {field: 'user_str', title: '技师姓名', width: 25},
+                {field: 'user_str', title: '保洁师姓名', width: 25},
                 {field: 'commision', title: '提成数量(元)', width: 25},
                 {field: 'type_str', title: '类型', width: 25},
                 {field: 'order', title: '操作', width: 25,
@@ -316,7 +316,7 @@ function searchContent() {
 function checkAddForm() {
     var username = $('#add_username').val();
     if (username.length == 0) {
-        $.messager.alert('提示', '请选择技师');
+        $.messager.alert('提示', '请选择保洁师');
         return false;
     }
 

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>握爪</title>
+  <title>壹管家</title>
   <meta http-equiv="Content-type" content="text/html; 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">

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

@@ -350,7 +350,7 @@ $(function() {
     jq_dg_content.datagrid({
         height: w_height - 18,
         width: d_width,
-        title: '美容师列表',
+        title: '保洁师列表',
         idField: '_id',
         url: module_root + '/list',
         toolbar: '#tb_content',
@@ -629,7 +629,7 @@ function search_content() {
 
 function save_content() {
     if (!$('#content_id_hide').val()) {
-        $.messager.alert('提示', '请选择一个美容师');
+        $.messager.alert('提示', '请选择一个保洁师');
         return false;
     }
 

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

@@ -42,8 +42,8 @@
 <script>
 $(function(){
   /* 初始化参数 */
-  var tech_name   = <?=json_encode($name)?>;          // 美容师姓名
-  var tech_id     = <?=json_encode($_id)?>;           // 美容师后台ID
+  var tech_name   = <?=json_encode($name)?>;          // 保洁师姓名
+  var tech_id     = <?=json_encode($_id)?>;           // 保洁师后台ID
   var token       = <?=json_encode($qiniu_token)?>;   // 七牛上传token
   var url         = <?=json_encode($qiniu_url)?>;     // 七牛上传url_prefix
   var avatar = <?=json_encode($avatar)?>;

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

@@ -3,7 +3,7 @@
 <html>
  
 <head>
-    <title>握爪宠物服务</title>
+    <title>壹管家宠物服务</title>
     <meta http-equiv="Content-type" content="text/html; 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">

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>握爪</title>
+  <title>壹管家</title>
   <meta http-equiv="Content-type" content="text/html; 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">

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

@@ -57,8 +57,8 @@
       <p>2、所有实物奖品会在确认信息后，次日尽快发货（周五及周末抽到的奖品顺延到下个工作日发货）。</p>
       <p>3、所有实物奖品请以实物为准，无质量问题不接受退换货。</p>
       <p>4、所有实物奖品均不需要用户支付运费。</p>
-      <p>5、本活动限握爪APP、握爪微信客户端、新老用户均可参与。</p>
-      <p>6、本活动与苹果公司无关，最终解释权归握爪所有。</p>
+      <p>5、本活动限壹管家APP、壹管家微信客户端、新老用户均可参与。</p>
+      <p>6、本活动与苹果公司无关，最终解释权归壹管家所有。</p>
     </div>
   </div>
   <div class="alert-bg hide"></div>

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

@@ -3,7 +3,7 @@
 <html>
 
 <head>
-    <title>握爪</title>
+    <title>壹管家</title>
     <meta http-equiv="Content-type" content="text/html; 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">

www/protected/views/comment/index.php

@@ -125,7 +125,7 @@
                             <li class="f_item">
                                 <div class="box">
                                     <div class="f_label">
-                                        <span>技师:</span>
+                                        <span>保洁师:</span>
                                     </div>
                                     <div class="box_flex f_content" id="technician_name">
                                     </div>

www/protected/views/rOrder/index.php

@@ -219,7 +219,7 @@
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
-                                            <span>技师选择: </span>
+                                            <span>保洁师选择: </span>
                                         </div>
                                         <div class="box_flex f_content">
                                             <input name="technician_name" style="width: 250px;" id="setTechnician_content"/>
@@ -281,14 +281,14 @@
             <div class="easyui-layout detail_layout">
                 <div data-options="region:'center'" class="detail_center">
                     <div class="detail_main">
-                        <span id="resetTechTip">该订单不支持重新分配技师</span>
+                        <span id="resetTechTip">该订单不支持重新分配保洁师</span>
                         <div id="resetTechDiv" style="display:none;">
                             <form id="resetTec_form" method="post">
                                 <ul>
                                     <li class="f_item">
                                         <div class="box">
                                             <div class="f_label">
-                                                <span>选择技师: </span>
+                                                <span>选择保洁师: </span>
                                             </div>
                                             <div class="box_flex f_content">
                                                 <input name="id" type="hidden" />
@@ -1321,7 +1321,7 @@ function save_content(){
         tec_name = $('#setTechnician_content').val();
         tec_id   = $('#technician_id').val();
         if (tec_name.length == 0 && tec_id.length == 0) {
-            $.messager.alert('提示', '完成订单前请指定技师');
+            $.messager.alert('提示', '完成订单前请指定保洁师');
             return false;
         }
     }
@@ -1360,7 +1360,7 @@ function reset_technician() {
     }
     var name = jq_resetTec_form.find('input[name="reset_technician_name"]').val();
     if (name.length == 0) {
-        $.messager.alert('提示', '请先选择一名技师');
+        $.messager.alert('提示', '请先选择一名保洁师');
         return false;
     }
     $.messager.progress();

www/protected/views/site/index_new.php

@@ -264,7 +264,7 @@ function getMsgCount(){
                 window.clearInterval(title_timer);
                 Tinycon.setBubble(0);
                 title_timer = null;
-                $(document).attr('title','握爪 - 管理后台');
+                $(document).attr('title','壹管家 - 管理后台');
                 if(request_num > 10) request_num = 1;
                 setLocalTime(120000*request_num);
             }

www/protected/views/station/index.php

@@ -65,7 +65,7 @@
                             <li class="f_item">
                                 <div class="box">
                                     <div class="f_label">
-                                        <span>美容师数量: </span>
+                                        <span>保洁师数量: </span>
                                     </div>
                                     <div class="box_flex f_content">
                                         <input type="text" name="beauticians_count" style="width: 250px;"/>
@@ -176,7 +176,7 @@
                 <li class="f_item">
                     <div class="box">
                         <div class="f_label">
-                            <span>美容师数量: </span>
+                            <span>保洁师数量: </span>
                         </div>
                         <div class="box_flex f_content">
                             <input type="text" name="beauticians_count" style="width: 250px;"/>
@@ -495,7 +495,7 @@ $(function(){
             {field:'name', title:'名字', width:30, sortable: false},
             {field:'start_time', title:'开始服务时间', width:30, sortable: true},
             {field:'end_time', title:'结束服务时间', width:30, sortable: true},
-            {field:'beauticians_count', title:'美容师数量', width:20, sortable: true},
+            {field:'beauticians_count', title:'保洁师数量', width:20, sortable: true},
             {field:'status', title:'状态', width:30, sortable: true,
                 formatter: function(value, row){
                     return get_filed_text(value, status_data);

www/webapp/common/js/afui.js

@@ -32,7 +32,7 @@ define(['jquery', 'appframeworkui'], function($, afui){
 		popular_popup: function(options){
 			var defaults = {
 				title: '',
-				text: '欢迎来到握爪',
+				text: '欢迎来到壹管家',
 				buttons : [
 					{
 						text : '我知道了',

www/webapp/common/js/config.js

@@ -92,13 +92,13 @@ define(function (require) {
               }
           });
           wx.onMenuShareTimeline({
-            title: '宠物上门服务，首选握爪APP',
+            title: '宠物上门服务，首选壹管家APP',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });
           wx.onMenuShareAppMessage({
-            title: '宠物上门服务，首选握爪APP',
-            desc: '足不出户，就能享受专业美容师为您家爱宠提供的贴心服务！',
+            title: '宠物上门服务，首选壹管家APP',
+            desc: '足不出户，就能享受专业保洁师为您家爱宠提供的贴心服务！',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });

www/webapp/o2o/dist/js/build/beautician/comment.js

@@ -1 +1 @@
-template("beautician/comment",function(e,t){var n=this,r=n.$each,i=e.comments,s=(e.comment,e.i,n.$escape),o=function(r,i){i=i||e;var s=n.$include(r,i,t);return f+=s,s},u=e.imgW,a=(e.pic,e.review),f="";return r(i,function(e,t){f+=' <li class="table-view-cell"> <div> <div class="user-info-container"> <div class="user-info-btn" data-id="',f+=s(e.user.id),f+='"> <img class="user-avatar" src="',f+=s(e.user.avatar),f+='?imageView2/2/w/60/h/60"/> <span class="user-name">',f+=s(e.user.user_name),f+='</span> </div> </div> <div class="box"> <div class="box-flex-1"> <span class="star-label">评分:</span> ',o("../common/star",e),f+=' </div> <div class="box-flex-1 review-time"> ',f+=s(e.time_str),f+=' </div> </div> <div class="review-content"> ',f+=s(e.content),f+=' </div> <div class="img-preview-list" ',e.pics.length>0&&(f+='style="height:',f+=s(u),f+='px"'),f+="> ",e.pics.length>0&&(f+=" ",r(e.pics,function(t,n){f+=" ",3>n&&(f+=' <div class="width-percent-33"> <div class="img-preview" data-src="',f+=s(t.url),f+='" style="width: ',f+=s(u),f+='px"> <img src="',f+=s(t.url),f+="?imageView2/5/w/",f+=s(2*u),f+="/h/",f+=s(2*u),f+='" alt="" class="img-preview-item"> ',e.pics.length>3&&2==n&&(f+=' <span class="img-count">',f+=s(e.pics.length),f+="</span> "),f+=" </div> </div> "),f+=" "}),f+=" "),f+=" </div> ",""!==e.reply&&(f+=' <div class="reply-content"> 美容师回复：',f+=s(a.reply),f+=" </div> "),f+=" </div> </li> "}),f+=" ",new String(f)});
+template("beautician/comment",function(e,t){var n=this,r=n.$each,i=e.comments,s=(e.comment,e.i,n.$escape),o=function(r,i){i=i||e;var s=n.$include(r,i,t);return f+=s,s},u=e.imgW,a=(e.pic,e.review),f="";return r(i,function(e,t){f+=' <li class="table-view-cell"> <div> <div class="user-info-container"> <div class="user-info-btn" data-id="',f+=s(e.user.id),f+='"> <img class="user-avatar" src="',f+=s(e.user.avatar),f+='?imageView2/2/w/60/h/60"/> <span class="user-name">',f+=s(e.user.user_name),f+='</span> </div> </div> <div class="box"> <div class="box-flex-1"> <span class="star-label">评分:</span> ',o("../common/star",e),f+=' </div> <div class="box-flex-1 review-time"> ',f+=s(e.time_str),f+=' </div> </div> <div class="review-content"> ',f+=s(e.content),f+=' </div> <div class="img-preview-list" ',e.pics.length>0&&(f+='style="height:',f+=s(u),f+='px"'),f+="> ",e.pics.length>0&&(f+=" ",r(e.pics,function(t,n){f+=" ",3>n&&(f+=' <div class="width-percent-33"> <div class="img-preview" data-src="',f+=s(t.url),f+='" style="width: ',f+=s(u),f+='px"> <img src="',f+=s(t.url),f+="?imageView2/5/w/",f+=s(2*u),f+="/h/",f+=s(2*u),f+='" alt="" class="img-preview-item"> ',e.pics.length>3&&2==n&&(f+=' <span class="img-count">',f+=s(e.pics.length),f+="</span> "),f+=" </div> </div> "),f+=" "}),f+=" "),f+=" </div> ",""!==e.reply&&(f+=' <div class="reply-content"> 保洁师回复：',f+=s(a.reply),f+=" </div> "),f+=" </div> </li> "}),f+=" ",new String(f)});

www/webapp/o2o/dist/js/build/beautician/detail.js

@@ -1 +1 @@
-template("beautician/detail",function(e,t){var n=this,r=e.showNavBar,i=e.recommend,s=n.$escape,o=e.avatar,u=e.name,a=e.favor,f=e.desc,l="";return r&&(l+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">美容师详情</h1> </header> '),l+=' <div class="content beautician-detail-content"> <div class="box-container box box-vertical"> <div id="beauticianDetailScroll" class="scroll-container box-flex-1"> <div class="page-content"> ',""!==i&&(l+=' <p class="recommend">当前时间段，该美容师已被预约，推荐时间段&nbsp; ',l+=s(i),l+="</p> "),l+=' <div class="tech-info"> <img src="',l+=s(o),l+='?imageView2/0/w/400/h/400" alt=""> <p class="name">',l+=s(u),l+='</p> <p class="favor">好评数: ',l+=s(a),l+='</p> <p class="desc">',l+=s(f),l+='</p> </div> <div id="tech-comment"> <div class="extra-service-title">用户评价<span></span></div> <ul class="table-view"></ul> <div class="btn-more-container box-center hide"> <a class="btn btn-block btn-more-review">加载更多</a> </div> </div> </div> </div> </div> </div> ',new String(l)});
+template("beautician/detail",function(e,t){var n=this,r=e.showNavBar,i=e.recommend,s=n.$escape,o=e.avatar,u=e.name,a=e.favor,f=e.desc,l="";return r&&(l+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">保洁师详情</h1> </header> '),l+=' <div class="content beautician-detail-content"> <div class="box-container box box-vertical"> <div id="beauticianDetailScroll" class="scroll-container box-flex-1"> <div class="page-content"> ',""!==i&&(l+=' <p class="recommend">当前时间段，该保洁师已被预约，推荐时间段&nbsp; ',l+=s(i),l+="</p> "),l+=' <div class="tech-info"> <img src="',l+=s(o),l+='?imageView2/0/w/400/h/400" alt=""> <p class="name">',l+=s(u),l+='</p> <p class="favor">好评数: ',l+=s(a),l+='</p> <p class="desc">',l+=s(f),l+='</p> </div> <div id="tech-comment"> <div class="extra-service-title">用户评价<span></span></div> <ul class="table-view"></ul> <div class="btn-more-container box-center hide"> <a class="btn btn-block btn-more-review">加载更多</a> </div> </div> </div> </div> </div> </div> ',new String(l)});

www/webapp/o2o/dist/js/build/hire/index.js

@@ -1 +1 @@
-template("hire/index",function(e,t){var n=e.showNavBar,r="";return n&&(r+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">招贤纳士</h1> </header> '),r+=' <div class="content" id="placeOrderScroll"> <div class="top-content"> <p>招募上门宠物美容师</p> </div> <div class="page-content"> <div class="logo-box"> <div class="logo"></div> <h2>握爪宠物</h2> <h3>专业宠物服务平台</h3> </div> <div class="des"> <p>岗位职责</p> <p>资深美容师：独立操作各种宠物造型的修剪工作。</p> <p>美容师助理：独立完成宠物洗澡工作。</p> <br> <p class="bold">公司福利</p> <p class="bold">1.远高于传统美容店的底薪。</p> <p class="bold">2.全上海各区都有宿舍，就近安排住宿。</p> <p class="bold">3.完善的晋升机制，对业绩考评优秀的美容师，公司将统一组织培训深造、考级。</p> <br> ',r+=n?' <p class="bold">联系电话: <a class="service-telephone">021-62109097</a> </p> ':' <p class="bold">联系电话: <a href="tel:021-62109097">021-62109097</a> </p> ',r+=" <br> </div> </div> </div> ",new String(r)});
+template("hire/index",function(e,t){var n=e.showNavBar,r="";return n&&(r+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">招贤纳士</h1> </header> '),r+=' <div class="content" id="placeOrderScroll"> <div class="top-content"> <p>招募上门宠物保洁师</p> </div> <div class="page-content"> <div class="logo-box"> <div class="logo"></div> <h2>壹管家宠物</h2> <h3>专业宠物服务平台</h3> </div> <div class="des"> <p>岗位职责</p> <p>资深保洁师：独立操作各种宠物造型的修剪工作。</p> <p>保洁师助理：独立完成宠物洗澡工作。</p> <br> <p class="bold">公司福利</p> <p class="bold">1.远高于传统美容店的底薪。</p> <p class="bold">2.全上海各区都有宿舍，就近安排住宿。</p> <p class="bold">3.完善的晋升机制，对业绩考评优秀的保洁师，公司将统一组织培训深造、考级。</p> <br> ',r+=n?' <p class="bold">联系电话: <a class="service-telephone">021-62109097</a> </p> ':' <p class="bold">联系电话: <a href="tel:021-62109097">021-62109097</a> </p> ',r+=" <br> </div> </div> </div> ",new String(r)});

www/webapp/o2o/dist/js/build/myCoupon/index.js

@@ -1 +1 @@
-template("myCoupon/index",function(e,t){var n=this,r=e.showNavBar,i=n.$each,s=e.coupons,o=(e.coupon,e.i,function(r,i){i=i||e;var s=n.$include(r,i,t);return u+=s,s}),u="";return r&&(u+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">我的优惠券</h1> </header> '),u+=' <div class="content" id="myCouponScroll"> <div class="scroller"> <div class="page-content"> <div class="coupon-form"> <div class="coupon-code-item"> <input type="tel" name="coupon-code" id="coupon-code" placeholder="请输入兑换码"> </div> <button class="btn-coupon">兑换</button> </div> <div class="coupon-items"> <p class="coupon-info">兑换码的获取请随时关注握爪的优惠活动。</p> ',i(s.useable_coupons,function(e,t){u+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ',o("./cell",e),u+=" </li> </ul> </div> "}),u+=" ",i(s.used_coupons,function(e,t){u+=' <div class="card coupon-card used"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ',o("./cell",e),u+=" </li> </ul> </div> "}),u+=" ",i(s.overtime_coupons,function(e,t){u+=' <div class="card coupon-card disabled"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ',o("./cell",e),u+=" </li> </ul> </div> "}),u+=" </div> </div> </div> </div>",new String(u)});
+template("myCoupon/index",function(e,t){var n=this,r=e.showNavBar,i=n.$each,s=e.coupons,o=(e.coupon,e.i,function(r,i){i=i||e;var s=n.$include(r,i,t);return u+=s,s}),u="";return r&&(u+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">我的优惠券</h1> </header> '),u+=' <div class="content" id="myCouponScroll"> <div class="scroller"> <div class="page-content"> <div class="coupon-form"> <div class="coupon-code-item"> <input type="tel" name="coupon-code" id="coupon-code" placeholder="请输入兑换码"> </div> <button class="btn-coupon">兑换</button> </div> <div class="coupon-items"> <p class="coupon-info">兑换码的获取请随时关注壹管家的优惠活动。</p> ',i(s.useable_coupons,function(e,t){u+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ',o("./cell",e),u+=" </li> </ul> </div> "}),u+=" ",i(s.used_coupons,function(e,t){u+=' <div class="card coupon-card used"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ',o("./cell",e),u+=" </li> </ul> </div> "}),u+=" ",i(s.overtime_coupons,function(e,t){u+=' <div class="card coupon-card disabled"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ',o("./cell",e),u+=" </li> </ul> </div> "}),u+=" </div> </div> </div> </div>",new String(u)});

www/webapp/o2o/dist/js/build/picker/coupon.js

@@ -1 +1 @@
-template("picker/coupon",function(e,t){var n=this,r=e.showNavBar,i=n.$escape,s=e.title,o=n.$each,u=e.options,a=(e.option,e.i,function(r,i){i=i||e;var s=n.$include(r,i,t);return l+=s,s}),f=e.unuseables,l="";return r&&(l+=' <header class="bar bar-nav"> <a href="javascript:void(0)" class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">',l+=i(s),l+="</h1> </header> "),l+=' <div class="content" id="pickerScroll"> <div class="scroller"> <div class="page-content"> <div class="coupon-form"> <div class="coupon-code-item"> <input type="tel" name="coupon-code" id="coupon-code" placeholder="请输入兑换码"> </div> <button class="btn-coupon">兑换</button> </div> <p class="coupon-info">兑换码的获取请随时关注握爪的优惠活动。</p> <div class="card-list"> ',o(u,function(e,t){l+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option" data-value="',l+=i(e.id),l+='"> ',a("../myCoupon/cell",e),l+=" </a> </li> </ul> </div> "}),l+=" </div> ",f.length>0&&(l+=' <div class="card-list"> <p class="coupon-line">当前时段不可用</p> ',o(f,function(e,t){l+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option unable" data-value="',l+=i(e.id),l+='"> ',a("../myCoupon/cell",e),l+=" </a> </li> </ul> </div> "}),l+=" </div> "),l+=' <div class="card"> <ul class="table-view"> <li class="table-view-cell"> <a class="picker-option" data-value=""> 不使用优惠券 </a> </li> </ul> </div> </div> </div> </div>',new String(l)});
+template("picker/coupon",function(e,t){var n=this,r=e.showNavBar,i=n.$escape,s=e.title,o=n.$each,u=e.options,a=(e.option,e.i,function(r,i){i=i||e;var s=n.$include(r,i,t);return l+=s,s}),f=e.unuseables,l="";return r&&(l+=' <header class="bar bar-nav"> <a href="javascript:void(0)" class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">',l+=i(s),l+="</h1> </header> "),l+=' <div class="content" id="pickerScroll"> <div class="scroller"> <div class="page-content"> <div class="coupon-form"> <div class="coupon-code-item"> <input type="tel" name="coupon-code" id="coupon-code" placeholder="请输入兑换码"> </div> <button class="btn-coupon">兑换</button> </div> <p class="coupon-info">兑换码的获取请随时关注壹管家的优惠活动。</p> <div class="card-list"> ',o(u,function(e,t){l+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option" data-value="',l+=i(e.id),l+='"> ',a("../myCoupon/cell",e),l+=" </a> </li> </ul> </div> "}),l+=" </div> ",f.length>0&&(l+=' <div class="card-list"> <p class="coupon-line">当前时段不可用</p> ',o(f,function(e,t){l+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option unable" data-value="',l+=i(e.id),l+='"> ',a("../myCoupon/cell",e),l+=" </a> </li> </ul> </div> "}),l+=" </div> "),l+=' <div class="card"> <ul class="table-view"> <li class="table-view-cell"> <a class="picker-option" data-value=""> 不使用优惠券 </a> </li> </ul> </div> </div> </div> </div>',new String(l)});

www/webapp/o2o/dist/js/build/product/reviewList.js

@@ -1 +1 @@
-template("product/reviewList",function(e,t){var n=this,r=n.$each,i=e.reviews,s=(e.review,e.i,n.$escape),o=function(r,i){i=i||e;var s=n.$include(r,i,t);return a+=s,s},u=e.imgW,a=(e.pic,"");return r(i,function(e,t){a+=' <li class="table-view-cell"> <div> <div class="user-info-container"> <div class="user-info-btn" data-id="',a+=s(e.user.id),a+='"> <img class="user-avatar" src="',a+=s(e.user.avatar),a+='?imageView2/2/w/60/h/60"/> <span class="user-name">',a+=s(e.user.user_name),a+='</span> </div> </div> <div class="box"> <div class="box-flex-1"> <span class="star-label">评分:</span> ',o("../common/star",e),a+=' </div> <div class="box-flex-1 review-time"> ',a+=s(e.time_str),a+=' </div> </div> <div class="review-content"> ',a+=s(e.content),a+=' </div> <div class="img-preview-list" ',e.pics.length>0&&(a+='style="height:',a+=s(u),a+='px"'),a+="> ",e.pics.length>0&&(a+=" ",r(e.pics,function(t,n){a+=" ",3>n&&(a+=' <div class="width-percent-33"> <div class="img-preview" data-src="',a+=s(t.url),a+='" style="width: ',a+=s(u),a+='px"> <img src="',a+=s(t.url),a+="?imageView2/5/w/",a+=s(2*u),a+="/h/",a+=s(2*u),a+='" alt="" class="img-preview-item"> ',e.pics.length>3&&2==n&&(a+=' <span class="img-count">',a+=s(e.pics.length),a+="</span> "),a+=" </div> </div> "),a+=" "}),a+=" "),a+=" </div> ",""!==e.reply&&(a+=' <div class="reply-content"> 握爪回复：',a+=s(e.reply),a+=" </div> "),a+=" </div> </li> "}),a+=" ",new String(a)});
+template("product/reviewList",function(e,t){var n=this,r=n.$each,i=e.reviews,s=(e.review,e.i,n.$escape),o=function(r,i){i=i||e;var s=n.$include(r,i,t);return a+=s,s},u=e.imgW,a=(e.pic,"");return r(i,function(e,t){a+=' <li class="table-view-cell"> <div> <div class="user-info-container"> <div class="user-info-btn" data-id="',a+=s(e.user.id),a+='"> <img class="user-avatar" src="',a+=s(e.user.avatar),a+='?imageView2/2/w/60/h/60"/> <span class="user-name">',a+=s(e.user.user_name),a+='</span> </div> </div> <div class="box"> <div class="box-flex-1"> <span class="star-label">评分:</span> ',o("../common/star",e),a+=' </div> <div class="box-flex-1 review-time"> ',a+=s(e.time_str),a+=' </div> </div> <div class="review-content"> ',a+=s(e.content),a+=' </div> <div class="img-preview-list" ',e.pics.length>0&&(a+='style="height:',a+=s(u),a+='px"'),a+="> ",e.pics.length>0&&(a+=" ",r(e.pics,function(t,n){a+=" ",3>n&&(a+=' <div class="width-percent-33"> <div class="img-preview" data-src="',a+=s(t.url),a+='" style="width: ',a+=s(u),a+='px"> <img src="',a+=s(t.url),a+="?imageView2/5/w/",a+=s(2*u),a+="/h/",a+=s(2*u),a+='" alt="" class="img-preview-item"> ',e.pics.length>3&&2==n&&(a+=' <span class="img-count">',a+=s(e.pics.length),a+="</span> "),a+=" </div> </div> "),a+=" "}),a+=" "),a+=" </div> ",""!==e.reply&&(a+=' <div class="reply-content"> 壹管家回复：',a+=s(e.reply),a+=" </div> "),a+=" </div> </li> "}),a+=" ",new String(a)});

www/webapp/o2o/dist/js/build/success/index.js

@@ -1 +1 @@
-template("success/index",function(e,t){var n=e.showNavBar,r=e.WX,i="";return n&&(i+=' <header class="bar bar-nav"> <h1 class="title">支付成功</h1> </header> '),i+=" ",i+=r?' <div class="content content-padded"> <div class="padding-top-bottom"> <p> <svg version="1.1" id="icon-success" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve"> <circle fill="#87C34B" cx="15" cy="15" r="15"/> <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="12.791,18.624 6.604,12.437 4.571,14.469 10.758,20.656 12.791,22.689 14.824,20.656 25.828,9.652 23.795,7.619 "/> </svg> 支付完成，等待美容师上门为您服务吧！ </p> </div> <div class="border-top"> <p>服务：<span class="order-name">宠物洗澡（猫）</span></p> <p>时间：<span class="order-time">2015年7月10日 10:00</span></p> </div> <div class="border-top"> <p>实付： <span class="order-result">58元</span></p> </div> <div class="box-center btn-group"> <a class="btn btn-positive my-order">我的预约</a> <a class="btn btn-positive btn-home">继续购买</a> </div> </div> ':' <div class="content content-padding"> <div class="box-center"> <p>订单支付成功，稍后会有握爪工作人员联系你~</p> </div> <a class="btn btn-positive btn-block my-order">查看我的预约</a> </div> ',new String(i)});
+template("success/index",function(e,t){var n=e.showNavBar,r=e.WX,i="";return n&&(i+=' <header class="bar bar-nav"> <h1 class="title">支付成功</h1> </header> '),i+=" ",i+=r?' <div class="content content-padded"> <div class="padding-top-bottom"> <p> <svg version="1.1" id="icon-success" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve"> <circle fill="#87C34B" cx="15" cy="15" r="15"/> <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="12.791,18.624 6.604,12.437 4.571,14.469 10.758,20.656 12.791,22.689 14.824,20.656 25.828,9.652 23.795,7.619 "/> </svg> 支付完成，等待保洁师上门为您服务吧！ </p> </div> <div class="border-top"> <p>服务：<span class="order-name">宠物洗澡（猫）</span></p> <p>时间：<span class="order-time">2015年7月10日 10:00</span></p> </div> <div class="border-top"> <p>实付： <span class="order-result">58元</span></p> </div> <div class="box-center btn-group"> <a class="btn btn-positive my-order">我的预约</a> <a class="btn btn-positive btn-home">继续购买</a> </div> </div> ':' <div class="content content-padding"> <div class="box-center"> <p>订单支付成功，稍后会有壹管家工作人员联系你~</p> </div> <a class="btn btn-positive btn-block my-order">查看我的预约</a> </div> ',new String(i)});

www/webapp/o2o/dist/js/page/activities/cat.js

@@ -1 +1 @@
-define(["template","native","config","user"],function(e,t,n,r){function i(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"握爪上门服务",body:"",init:function(t,s){var o=this,u=$(document),a="http://wozhua-others.qiniudn.com/2016-01-04-detail-2.jpg",f=e("activities/cat",{showNavBar:!n.isWX&&!n.isChubao,src:a}),l=new Image;l.src=a,u.trigger("spa:openloader"),l.onload=function(){u.trigger("spa:closeloader"),$(".spa-page-body",o).html(f),setTimeout(function(){t.scroll=new IScroll("#activities-scroll")},50)},r.activities.visited_order0122=!0,r.setCache("activities"),$.newTouch(".back-button",function(e){i.call(this,e)},o),o.on("tapBackButton",function(e){i.call(this,e)}),o.on("swipeRight",function(e){i.call(this,e)}),s.resolve()}}});
+define(["template","native","config","user"],function(e,t,n,r){function i(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"壹管家上门服务",body:"",init:function(t,s){var o=this,u=$(document),a="http://wozhua-others.qiniudn.com/2016-01-04-detail-2.jpg",f=e("activities/cat",{showNavBar:!n.isWX&&!n.isChubao,src:a}),l=new Image;l.src=a,u.trigger("spa:openloader"),l.onload=function(){u.trigger("spa:closeloader"),$(".spa-page-body",o).html(f),setTimeout(function(){t.scroll=new IScroll("#activities-scroll")},50)},r.activities.visited_order0122=!0,r.setCache("activities"),$.newTouch(".back-button",function(e){i.call(this,e)},o),o.on("tapBackButton",function(e){i.call(this,e)}),o.on("swipeRight",function(e){i.call(this,e)}),s.resolve()}}});

www/webapp/o2o/dist/js/page/address/addressList.js

@@ -1 +1 @@
-define(["template","native","config","address","user","api","order"],function(e,t,n,r,i,s,o){function u(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"placeOrder"})}var a={};return{title:"握爪上门服务",body:"",init:function(e,t){var n=this,f=$(document);$.newTouch(".back-button",function(e){u.call(this,e)},n),n.on("tapBackButton",function(e){u.call(this,e)}),n.on("swipeRight",function(e){u.call(this,e)}),$.newTouch(".address-item",function(e){var t=$(this),n=$(this).data("id"),u=$(this).data("index");s.checkAddress({address_id:n,user_id:i.id},function(e){if(e.success){var t=e.data.station;o.set("address",r.list[u],!0),o.set("stationID",t,!0),f.trigger("spa:navigate",{hash:"placeOrder"}),o.beautician.name="请选择",o.beautician.id=""}else f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})},n),$.newTouch(".btn-add",function(e){console.log(a.callback),f.trigger("spa:navigate",{hash:"addressAdd",pushData:{needReload:!0},callback:a.callback})},n),$.newTouch(".btn-edit",function(e){var t=$(this),n=$(this).data("id"),r=$(this).data("index");f.trigger("spa:navigate",{hash:"addressDetail",pushData:{addressIndex:r,addressID:n,needReload:!0},callback:{onSelect:function(e){}}})},n),t.resolve()},beforeopen:function(t,s){var o=this,u=$(document),f=t.pushData;a.needReload=f.hasOwnProperty("needReload")?f.needReload:!1,a.callback=t.callback,r.getList({request_from:"weixin",user_id:i.id},function(t){if(t.success){var i=e("address/list/index",{showNavBar:!n.isWX&&!n.isChubao,addText:"添加地址",addresses:r.list});$(".spa-page-body",o).html(i),a.scroll&&(a.scroll.destroy(),a.scroll=null),setTimeout(function(){a.scroll=new IScroll("#addressListScroll")},10)}}),s.resolve()},afteropen:function(e,t){t.resolve()}}});
+define(["template","native","config","address","user","api","order"],function(e,t,n,r,i,s,o){function u(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"placeOrder"})}var a={};return{title:"壹管家上门服务",body:"",init:function(e,t){var n=this,f=$(document);$.newTouch(".back-button",function(e){u.call(this,e)},n),n.on("tapBackButton",function(e){u.call(this,e)}),n.on("swipeRight",function(e){u.call(this,e)}),$.newTouch(".address-item",function(e){var t=$(this),n=$(this).data("id"),u=$(this).data("index");s.checkAddress({address_id:n,user_id:i.id},function(e){if(e.success){var t=e.data.station;o.set("address",r.list[u],!0),o.set("stationID",t,!0),f.trigger("spa:navigate",{hash:"placeOrder"}),o.beautician.name="请选择",o.beautician.id=""}else f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})},n),$.newTouch(".btn-add",function(e){console.log(a.callback),f.trigger("spa:navigate",{hash:"addressAdd",pushData:{needReload:!0},callback:a.callback})},n),$.newTouch(".btn-edit",function(e){var t=$(this),n=$(this).data("id"),r=$(this).data("index");f.trigger("spa:navigate",{hash:"addressDetail",pushData:{addressIndex:r,addressID:n,needReload:!0},callback:{onSelect:function(e){}}})},n),t.resolve()},beforeopen:function(t,s){var o=this,u=$(document),f=t.pushData;a.needReload=f.hasOwnProperty("needReload")?f.needReload:!1,a.callback=t.callback,r.getList({request_from:"weixin",user_id:i.id},function(t){if(t.success){var i=e("address/list/index",{showNavBar:!n.isWX&&!n.isChubao,addText:"添加地址",addresses:r.list});$(".spa-page-body",o).html(i),a.scroll&&(a.scroll.destroy(),a.scroll=null),setTimeout(function(){a.scroll=new IScroll("#addressListScroll")},10)}}),s.resolve()},afteropen:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/agreement.js

@@ -1 +1 @@
-define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"placeOrder"})}return{title:"握爪上门服务",body:"",init:function(i,s){var o=this,u=$(document),a=e("agreement/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",o).html(a),setTimeout(function(){i.scroll=new IScroll("#agreementScroll")},50),$.newTouch(".back-button",function(e){r.call(this,e)},o),o.on("tapBackButton",function(e){r.call(this,e)}),o.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("4000328170")},o),s.resolve()}}});
+define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"placeOrder"})}return{title:"壹管家上门服务",body:"",init:function(i,s){var o=this,u=$(document),a=e("agreement/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",o).html(a),setTimeout(function(){i.scroll=new IScroll("#agreementScroll")},50),$.newTouch(".back-button",function(e){r.call(this,e)},o),o.on("tapBackButton",function(e){r.call(this,e)}),o.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("4000328170")},o),s.resolve()}}});

www/webapp/o2o/dist/js/page/appendPay.js

@@ -1 +1 @@
-define(["$","template","api","native","config","user"],function(e,t,n,r,i,s){function o(t){e(document).trigger("spa:navigate",{hash:"myOrder/1",pushData:{dontNeedReload:!0,animate:"slideOutDown"}})}return{title:"握爪上门服务",body:"",init:function(t,u){var a=this,f=e(document);e.newTouch(".pay-option",function(t){t.preventDefault();var n=e(this).data("value");e(".btn-pay",a).attr("data-pay-channel",n),e(this).addClass("checked").parent().siblings().find("a").removeClass("checked")},a),e.newTouch(".btn-pay",function(t){t.preventDefault();var o=a.data("orderID"),u=a.data("appendID"),l=e(this).attr("data-pay-channel");i.isWX&&(l="wx_pub");if(!l)return;f.trigger("spa:openloader"),n.getAppendPayCharge({user_id:s.id,order_id:o,pay_channel:l,append_id:u},function(e){f.trigger("spa:closeloader");if(e.success){var t=s.getOrderInfo(o),n={orderInfo:t,charge:e.data};r.pay(n,function(e){e.success?f.trigger("spa:navigate",{hash:"paySuccess"}):f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})}else f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})},a),e.newTouch(".cancel-button",function(e){e.preventDefault(),o(a.data("backHash"))},a),a.on("tapBackButton",function(e){e.preventDefault(),o(a.data("backHash"))}),u.resolve()},beforeopen:function(n,o){var u=this,a=n.pushData,f=a.orderID,l=a.appendID;u.data("appendID",l),u.data("orderID",f);var c=s.appendOrder;if(!i.isWX&&!i.isChubao)r.isWxAppInstalled(function(n){var r=!0;n.success&&!n.isInstalled&&(r=!1),i.appVersion<"2.2"&&(r=!1);var s=t("pay/index",{showWX:r,showNavBar:!i.isWX&&!i.isChubao,orderType:c.products_str,orderprice:c.price});e(".spa-page-body",u).html(s),o.resolve()});else{var h=t("pay/index",{showNavBar:!i.isWX&&!i.isChubao,wxPub:!0,orderType:c.products_str,orderprice:c.price});e(".spa-page-body",u).html(h),o.resolve()}}}});
+define(["$","template","api","native","config","user"],function(e,t,n,r,i,s){function o(t){e(document).trigger("spa:navigate",{hash:"myOrder/1",pushData:{dontNeedReload:!0,animate:"slideOutDown"}})}return{title:"壹管家上门服务",body:"",init:function(t,u){var a=this,f=e(document);e.newTouch(".pay-option",function(t){t.preventDefault();var n=e(this).data("value");e(".btn-pay",a).attr("data-pay-channel",n),e(this).addClass("checked").parent().siblings().find("a").removeClass("checked")},a),e.newTouch(".btn-pay",function(t){t.preventDefault();var o=a.data("orderID"),u=a.data("appendID"),l=e(this).attr("data-pay-channel");i.isWX&&(l="wx_pub");if(!l)return;f.trigger("spa:openloader"),n.getAppendPayCharge({user_id:s.id,order_id:o,pay_channel:l,append_id:u},function(e){f.trigger("spa:closeloader");if(e.success){var t=s.getOrderInfo(o),n={orderInfo:t,charge:e.data};r.pay(n,function(e){e.success?f.trigger("spa:navigate",{hash:"paySuccess"}):f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})}else f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})},a),e.newTouch(".cancel-button",function(e){e.preventDefault(),o(a.data("backHash"))},a),a.on("tapBackButton",function(e){e.preventDefault(),o(a.data("backHash"))}),u.resolve()},beforeopen:function(n,o){var u=this,a=n.pushData,f=a.orderID,l=a.appendID;u.data("appendID",l),u.data("orderID",f);var c=s.appendOrder;if(!i.isWX&&!i.isChubao)r.isWxAppInstalled(function(n){var r=!0;n.success&&!n.isInstalled&&(r=!1),i.appVersion<"2.2"&&(r=!1);var s=t("pay/index",{showWX:r,showNavBar:!i.isWX&&!i.isChubao,orderType:c.products_str,orderprice:c.price});e(".spa-page-body",u).html(s),o.resolve()});else{var h=t("pay/index",{showNavBar:!i.isWX&&!i.isChubao,wxPub:!0,orderType:c.products_str,orderprice:c.price});e(".spa-page-body",u).html(h),o.resolve()}}}});

www/webapp/o2o/dist/js/page/beautician.js

@@ -1 +1 @@
-define(["$","template","user","config","order","IScroll"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"placeOrder"})}var u={};return{title:"握爪上门服务",body:"",init:function(t,n){var r=this,s=e(document);e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".btn-check",function(t){if(e(this).parent().hasClass("disabled"))return;var n=e(this).parent().attr("data-id"),r=e(this).parent().attr("data-name");i.beautician.name=r,i.beautician.id=n,s.trigger("spa:navigate",{hash:"placeOrder"})},r),e.newTouch(".btn-recommend",function(e){i.beautician.name="系统推荐",i.beautician.id="",s.trigger("spa:navigate",{hash:"placeOrder"})},r),e.newTouch(".select-item",function(t){var n=e(this).attr("data-recommend"),r=e(this).attr("data-id"),i=e(this).attr("data-name"),o=e(this).attr("data-desc"),a=e(this).attr("data-favor"),f=e(this).attr("data-avatar");s.trigger("spa:navigate",{hash:"beautician-detail",pushData:{id:r,name:i,desc:o,favor:a,avatar:f,recommend:n,extraService:u.extraService}})},r),n.resolve()},beforeopen:function(i,o){var a=this,f=i.pushData,l=e(document);u.extraService=f.extraService;var c={showNavBar:!r.isWX&&!r.isChubao,can:n.selectTech.can,match:n.selectTech.match},h=t("beautician/index",c);a.find(".spa-page-body").html(h),setTimeout(function(){i.scroll=new s("#beauticianScroll")},500),o.resolve()},afteropen:function(e,t){i.extraService=u.extraService,t.resolve()}}});
+define(["$","template","user","config","order","IScroll"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"placeOrder"})}var u={};return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,s=e(document);e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".btn-check",function(t){if(e(this).parent().hasClass("disabled"))return;var n=e(this).parent().attr("data-id"),r=e(this).parent().attr("data-name");i.beautician.name=r,i.beautician.id=n,s.trigger("spa:navigate",{hash:"placeOrder"})},r),e.newTouch(".btn-recommend",function(e){i.beautician.name="系统推荐",i.beautician.id="",s.trigger("spa:navigate",{hash:"placeOrder"})},r),e.newTouch(".select-item",function(t){var n=e(this).attr("data-recommend"),r=e(this).attr("data-id"),i=e(this).attr("data-name"),o=e(this).attr("data-desc"),a=e(this).attr("data-favor"),f=e(this).attr("data-avatar");s.trigger("spa:navigate",{hash:"beautician-detail",pushData:{id:r,name:i,desc:o,favor:a,avatar:f,recommend:n,extraService:u.extraService}})},r),n.resolve()},beforeopen:function(i,o){var a=this,f=i.pushData,l=e(document);u.extraService=f.extraService;var c={showNavBar:!r.isWX&&!r.isChubao,can:n.selectTech.can,match:n.selectTech.match},h=t("beautician/index",c);a.find(".spa-page-body").html(h),setTimeout(function(){i.scroll=new s("#beauticianScroll")},500),o.resolve()},afteropen:function(e,t){i.extraService=u.extraService,t.resolve()}}});

www/webapp/o2o/dist/js/page/coming.js

@@ -1 +1 @@
-define(["$","template","product","order","cart","native","helper","user","api","config","address","IScroll"],function(e,t,n,r,i,s,o,u,a,f,l,c){function h(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"握爪上门服务",body:"",init:function(t,n){var r=t.pushData.productType,i=this,s=e(document);e.newTouch(".back-button",function(e){h.call(this,e)},i),i.on("tapBackButton",function(e){h.call(this,e)}),i.on("swipeRight",function(e){h.call(this,e)}),n.resolve()},beforeopen:function(r,i){var s=this,o=r.pushData,u=e(document);o.needReset=!1;var a=o.productType,l={showNavBar:!f.isWX&&!f.isChubao,prodcutTitle:n.getProductTitle(a)},c=t("coming/index",l);s.find(".spa-page-body").html(c),i.resolve(),f.isWX&&wx.ready(function(){wx.onMenuShareTimeline({title:"宠物上门服务，首选握爪APP",link:"http://www.wozhua.mobi/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",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"})})}}});
+define(["$","template","product","order","cart","native","helper","user","api","config","address","IScroll"],function(e,t,n,r,i,s,o,u,a,f,l,c){function h(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"壹管家上门服务",body:"",init:function(t,n){var r=t.pushData.productType,i=this,s=e(document);e.newTouch(".back-button",function(e){h.call(this,e)},i),i.on("tapBackButton",function(e){h.call(this,e)}),i.on("swipeRight",function(e){h.call(this,e)}),n.resolve()},beforeopen:function(r,i){var s=this,o=r.pushData,u=e(document);o.needReset=!1;var a=o.productType,l={showNavBar:!f.isWX&&!f.isChubao,prodcutTitle:n.getProductTitle(a)},c=t("coming/index",l);s.find(".spa-page-body").html(c),i.resolve(),f.isWX&&wx.ready(function(){wx.onMenuShareTimeline({title:"宠物上门服务，首选壹管家APP",link:"http://www.wozhua.mobi/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",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"})})}}});

www/webapp/o2o/dist/js/page/desc.js

@@ -1 +1 @@
-define(["$","template","product","config"],function(e,t,n,r){function i(){e(document).trigger("spa:navigate",{hash:"product"})}return{title:"握爪上门服务",body:"",init:function(t,n){var r=this,s=e(document);r.on("swipeRight",function(e){e.preventDefault(),i.call(this)}),e.newTouch(".back-button",function(e){e.preventDefault(),i.call(this)},r),r.on("tapBackButton",function(e){e.preventDefault(),i.call(this)}),n.resolve()},beforeopen:function(i,s){var o=this,u=e(document),a=i.pushData,f=a.productType,l=t("desc/index",{productDic:n.productDic,petTypes:n.productGroup[f],title:n.getGroupName(f),desc:n.getGroupDesc(f),steps:n.getGroupStep(f),showNavBar:!r.isWX&&!r.isChubao});e(".spa-page-body",o).html(l),i.scroll&&(i.scroll.destroy(),i.scroll=null),setTimeout(function(){i.scroll=new IScroll("#descScroll")},50),s.resolve()}}});
+define(["$","template","product","config"],function(e,t,n,r){function i(){e(document).trigger("spa:navigate",{hash:"product"})}return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,s=e(document);r.on("swipeRight",function(e){e.preventDefault(),i.call(this)}),e.newTouch(".back-button",function(e){e.preventDefault(),i.call(this)},r),r.on("tapBackButton",function(e){e.preventDefault(),i.call(this)}),n.resolve()},beforeopen:function(i,s){var o=this,u=e(document),a=i.pushData,f=a.productType,l=t("desc/index",{productDic:n.productDic,petTypes:n.productGroup[f],title:n.getGroupName(f),desc:n.getGroupDesc(f),steps:n.getGroupStep(f),showNavBar:!r.isWX&&!r.isChubao});e(".spa-page-body",o).html(l),i.scroll&&(i.scroll.destroy(),i.scroll=null),setTimeout(function(){i.scroll=new IScroll("#descScroll")},50),s.resolve()}}});

www/webapp/o2o/dist/js/page/hire.js

@@ -1 +1 @@
-define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:""})}return{title:"握爪美容师招聘",body:"",init:function(i,s){var o=this,u=$(document),a=e("hire/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",o).html(a),setTimeout(function(){i.scroll=new IScroll("#hireScroll")},50),$.newTouch(".back-button",function(e){r.call(this,e)},o),o.on("tapBackButton",function(e){r.call(this,e)}),o.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("021-62109097")},o),s.resolve()}}});
+define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:""})}return{title:"壹管家保洁师招聘",body:"",init:function(i,s){var o=this,u=$(document),a=e("hire/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",o).html(a),setTimeout(function(){i.scroll=new IScroll("#hireScroll")},50),$.newTouch(".back-button",function(e){r.call(this,e)},o),o.on("tapBackButton",function(e){r.call(this,e)}),o.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("021-62109097")},o),s.resolve()}}});

www/webapp/o2o/dist/js/page/orderDone.js

@@ -1 +1 @@
-define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})}return{title:"握爪上门服务",body:"",init:function(t,i){var s=this,o=$(document),u=e("myOrder/finish",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",s).html(u),$.newTouch(".back-button",function(e){r.call(this,e)},s),s.on("tapBackButton",function(e){r.call(this,e)}),s.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".to-order",function(e){o.trigger("spa:navigate",{hash:"myOrder/2",pushData:{needReload:!0}})},s),i.resolve()}}});
+define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})}return{title:"壹管家上门服务",body:"",init:function(t,i){var s=this,o=$(document),u=e("myOrder/finish",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",s).html(u),$.newTouch(".back-button",function(e){r.call(this,e)},s),s.on("tapBackButton",function(e){r.call(this,e)}),s.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".to-order",function(e){o.trigger("spa:navigate",{hash:"myOrder/2",pushData:{needReload:!0}})},s),i.resolve()}}});

www/webapp/o2o/dist/js/page/picker.js

@@ -1 +1 @@
-define(["$","template","order","config","user","api"],function(e,t,n,r,i,s){function o(t){e(document).trigger("spa:navigate",{hash:t})}var u={};return{title:"握爪上门服务",body:"",init:function(n,r){var u=this,a=e(document);e.newTouch(".back-button",function(e){e.preventDefault();var t=n.pushData;o.call(this,t.backHash)},u),u.on("tapBackButton",function(e){e.preventDefault();var t=n.pushData;o.call(this,t.backHash)}),e.newTouch(".picker-option",function(){event.preventDefault();if(e(this).hasClass("unable"))return;var t=n.pushData;a.trigger("spa:navigate",{hash:t.backHash}),n.callback&&e.isFunction(n.callback.onSelect)&&n.callback.onSelect(e(this).data("value"))},u),e.newTouch(".btn-coupon",function(r){r.preventDefault();var o=n.pushData,f=e("#coupon-code",u).val();if(f.length<8){a.trigger("spa:openpanel",["simpleAlert",{message:"请输入有效的兑换码"}]);return}e(this).val(""),i.exchangeCoupon(f,function(e){a.trigger("spa:openloader"),e.success?s.getCouponList({products:o.products,type:o.type,user_id:i.id},function(e){a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:e.message}]);if(e.success){i.orderCoupons=e.data;var n=t("picker/cell",{options:e.data});u.find(".card-list").html(n)}}):(a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:e.message}]))})},u),r.resolve()},beforeopen:function(e,n){var i=this,s=e.pushData;if(s.needReload){s.needReload=!1;var o=s.temp?s.temp:"picker/index",u=t(o,{options:s.options,unuseables:s.unuseables,title:s.title,showNavBar:!r.isWX&&!r.isChubao});i.find(".spa-page-body").html(u),e.scroll&&(e.scroll.destroy(),e.scroll=null),setTimeout(function(){e.scroll=new IScroll("#pickerScroll")},10)}n.resolve()}}});
+define(["$","template","order","config","user","api"],function(e,t,n,r,i,s){function o(t){e(document).trigger("spa:navigate",{hash:t})}var u={};return{title:"壹管家上门服务",body:"",init:function(n,r){var u=this,a=e(document);e.newTouch(".back-button",function(e){e.preventDefault();var t=n.pushData;o.call(this,t.backHash)},u),u.on("tapBackButton",function(e){e.preventDefault();var t=n.pushData;o.call(this,t.backHash)}),e.newTouch(".picker-option",function(){event.preventDefault();if(e(this).hasClass("unable"))return;var t=n.pushData;a.trigger("spa:navigate",{hash:t.backHash}),n.callback&&e.isFunction(n.callback.onSelect)&&n.callback.onSelect(e(this).data("value"))},u),e.newTouch(".btn-coupon",function(r){r.preventDefault();var o=n.pushData,f=e("#coupon-code",u).val();if(f.length<8){a.trigger("spa:openpanel",["simpleAlert",{message:"请输入有效的兑换码"}]);return}e(this).val(""),i.exchangeCoupon(f,function(e){a.trigger("spa:openloader"),e.success?s.getCouponList({products:o.products,type:o.type,user_id:i.id},function(e){a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:e.message}]);if(e.success){i.orderCoupons=e.data;var n=t("picker/cell",{options:e.data});u.find(".card-list").html(n)}}):(a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:e.message}]))})},u),r.resolve()},beforeopen:function(e,n){var i=this,s=e.pushData;if(s.needReload){s.needReload=!1;var o=s.temp?s.temp:"picker/index",u=t(o,{options:s.options,unuseables:s.unuseables,title:s.title,showNavBar:!r.isWX&&!r.isChubao});i.find(".spa-page-body").html(u),e.scroll&&(e.scroll.destroy(),e.scroll=null),setTimeout(function(){e.scroll=new IScroll("#pickerScroll")},10)}n.resolve()}}});

www/webapp/o2o/dist/js/page/productInfo.js

@@ -1 +1 @@
-define(["$","template","product","cart","api","order","user","config","review","native","IScroll"],function(e,t,n,r,i,s,o,u,a,f,l){function c(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"product",pushData:{type:h.productType,needReload:h.needReload,fromHome:h.fromHome}})}var h={};return{title:"握爪上门服务",body:"",init:function(t,n){var r=t.pushData.productType,i=this,s=e(document);e.newTouch(".back-button",function(e){c.call(this,e)},i),i.on("tapBackButton",function(e){c.call(this,e)}),i.on("swipeRight",function(e){c.call(this,e)}),n.resolve()},beforeopen:function(r,i){var s=this,o=r.requestData[0],a=r.pushData,f=e(document);h.productType=parseFloat(o),h.needReload=a.needReload,h.fromHome=a.fromHome;var c={showNavBar:!u.isWX&&!u.isChubao,tips:n.getGroupDesc(parseFloat(o))},p=t("product/info",c);s.find(".spa-page-body").html(p),setTimeout(function(){h.scroll=new l("#productInfoScroll")},50),i.resolve()}}});
+define(["$","template","product","cart","api","order","user","config","review","native","IScroll"],function(e,t,n,r,i,s,o,u,a,f,l){function c(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"product",pushData:{type:h.productType,needReload:h.needReload,fromHome:h.fromHome}})}var h={};return{title:"壹管家上门服务",body:"",init:function(t,n){var r=t.pushData.productType,i=this,s=e(document);e.newTouch(".back-button",function(e){c.call(this,e)},i),i.on("tapBackButton",function(e){c.call(this,e)}),i.on("swipeRight",function(e){c.call(this,e)}),n.resolve()},beforeopen:function(r,i){var s=this,o=r.requestData[0],a=r.pushData,f=e(document);h.productType=parseFloat(o),h.needReload=a.needReload,h.fromHome=a.fromHome;var c={showNavBar:!u.isWX&&!u.isChubao,tips:n.getGroupDesc(parseFloat(o))},p=t("product/info",c);s.find(".spa-page-body").html(p),setTimeout(function(){h.scroll=new l("#productInfoScroll")},50),i.resolve()}}});

www/webapp/o2o/dist/js/page/refund.js

@@ -1 +1 @@
-define(["template","native","config","user"],function(e,t,n,r){function i(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"myOrder/1"})}return{title:"握爪上门服务",body:"",init:function(e,n){var s=this,o=$(document);$.newTouch(".back-button",function(e){i.call(this,e)},s),s.on("tapBackButton",function(e){i.call(this,e)}),s.on("swipeRight",function(e){i.call(this,e)}),$.newTouch(".btn-refund",function(e){var t=$(this).attr("data-order-id");r.refundOrder(t,function(e){e.success&&o.trigger("spa:navigate",{hash:"refund-success"})})},s),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("021-62109097")},s),n.resolve()},beforeopen:function(t,i){var s=this,o=$(document),u=t.pushData.refundType,a=t.pushData.refundIndex,f=t.pushData.refundIndex,l=e("myOrder/refund",{showNavBar:!n.isWX&&!n.isChubao,order:r.orders[1].data[a]});$(".spa-page-body",s).html(l),i.resolve()},afteropen:function(e,t){t.resolve()}}});
+define(["template","native","config","user"],function(e,t,n,r){function i(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:"myOrder/1"})}return{title:"壹管家上门服务",body:"",init:function(e,n){var s=this,o=$(document);$.newTouch(".back-button",function(e){i.call(this,e)},s),s.on("tapBackButton",function(e){i.call(this,e)}),s.on("swipeRight",function(e){i.call(this,e)}),$.newTouch(".btn-refund",function(e){var t=$(this).attr("data-order-id");r.refundOrder(t,function(e){e.success&&o.trigger("spa:navigate",{hash:"refund-success"})})},s),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("021-62109097")},s),n.resolve()},beforeopen:function(t,i){var s=this,o=$(document),u=t.pushData.refundType,a=t.pushData.refundIndex,f=t.pushData.refundIndex,l=e("myOrder/refund",{showNavBar:!n.isWX&&!n.isChubao,order:r.orders[1].data[a]});$(".spa-page-body",s).html(l),i.resolve()},afteropen:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/refundSuccess.js

@@ -1 +1 @@
-define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:""})}return{title:"握爪上门服务",body:"",init:function(i,s){var o=this,u=$(document),a=e("success/refund",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",o).html(a),$.newTouch(".back-button",function(e){r.call(this,e)},o),o.on("tapBackButton",function(e){r.call(this,e)}),o.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("400-0328-170")},o),s.resolve()}}});
+define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:""})}return{title:"壹管家上门服务",body:"",init:function(i,s){var o=this,u=$(document),a=e("success/refund",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",o).html(a),$.newTouch(".back-button",function(e){r.call(this,e)},o),o.on("tapBackButton",function(e){r.call(this,e)}),o.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("400-0328-170")},o),s.resolve()}}});

www/webapp/o2o/dist/js/page/success.js

@@ -1 +1 @@
-define(["template","user","config"],function(e,t,n){return{title:"握爪上门服务",body:"",init:function(r,i){var s=this,o=$(document),u=e("success/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",s).html(u),$.newTouch(".my-order",function(e){e.preventDefault(),t.checkLogin(function(){o.trigger("spa:navigate",{hash:"myOrder/1",pushData:{animate:"slideOutDown",needReload:!0}})})},s),$.newTouch(".btn-home",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:""})},s),s.on("tapBackButton",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{animate:"slideOutDown"}})}),i.resolve()}}});
+define(["template","user","config"],function(e,t,n){return{title:"壹管家上门服务",body:"",init:function(r,i){var s=this,o=$(document),u=e("success/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",s).html(u),$.newTouch(".my-order",function(e){e.preventDefault(),t.checkLogin(function(){o.trigger("spa:navigate",{hash:"myOrder/1",pushData:{animate:"slideOutDown",needReload:!0}})})},s),$.newTouch(".btn-home",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:""})},s),s.on("tapBackButton",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{animate:"slideOutDown"}})}),i.resolve()}}});

www/webapp/o2o/js/api.js

@@ -527,7 +527,7 @@ define(['config', 'base'], function(config, base) {
     });
   };
 
-  // 选择美容师
+  // 选择保洁师
   API.prototype.selectTech = function(data, callback) {
     var that = this;
     $.signAjax({

www/webapp/o2o/js/model/product.js

@@ -121,7 +121,7 @@ define(['base', '$', 'api'], function (base, $, api) {
           '如有特殊要求，提交订单时请在“备注”一栏填写您的具体要求。',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额。',
           '狗狗开毛结超过20分钟以上，将按60元/小时收费。',
-          '预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       case 2: // 剃光
@@ -137,7 +137,7 @@ define(['base', '$', 'api'], function (base, $, api) {
           '如有特殊要求，提交订单时请在“备注”一栏填写您的具体要求。',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额。',
           '狗狗开毛结超过20分钟以上，将按60元/小时收费。',
-          '预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ]
         break;
       case 3: // 美容
@@ -153,7 +153,7 @@ define(['base', '$', 'api'], function (base, $, api) {
           '如有特殊要求，提交订单时请在“备注”一栏填写您的具体要求。',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额。',
           '狗狗开毛结超过20分钟以上，将按60元/小时收费。',
-          '预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       case 4: // 洁牙
@@ -170,7 +170,7 @@ define(['base', '$', 'api'], function (base, $, api) {
           '若您家中有多只狗狗需要同时预约的话，请您选择相应的宠物类型和服务时间分别下单。',
           '如有特殊要求，提交订单时请在“备注”一栏填写您的具体要求。',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额。',
-          '预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       case 5: // SPA
@@ -184,10 +184,10 @@ define(['base', '$', 'api'], function (base, $, api) {
         ];
         notes = [
           '若您家中有多只狗狗需要同时预约的话，请您选择相应的宠物类型和服务时间分别下单。',
-          '浴泥SPA和浴盐SPA为二选一项目，下单的时候请在备注栏写明您想预约的服务（如浴盐SPA），如未注明将以握爪客服安排为准。',
+          '浴泥SPA和浴盐SPA为二选一项目，下单的时候请在备注栏写明您想预约的服务（如浴盐SPA），如未注明将以壹管家客服安排为准。',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额。',
           '狗狗开毛结超过20分钟以上，将按60元/小时收费。',
-          '预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       case 6: // 训犬
@@ -198,10 +198,10 @@ define(['base', '$', 'api'], function (base, $, api) {
         ];
         notes = [
           '上门服务后一周内，宠物主人可以寻求电话指导；',
-          '不良行为不是一天就形成的，纠正需要时间，后续需要主人不断调教训练，握爪不对狗狗的最终结果负责；',
+          '不良行为不是一天就形成的，纠正需要时间，后续需要主人不断调教训练，壹管家不对狗狗的最终结果负责；',
           '如有特殊要求，提交订单时请在“备注”一栏填写 您的具体要求；',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额；',
-          '预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       case 7: // 断尾
@@ -211,10 +211,10 @@ define(['base', '$', 'api'], function (base, $, api) {
         ];
         notes = [
           '由于个体差异较大，宠物断尾还是有一定风险性的，对于无法预见的意外情况，服务人员将及时处理，力争将风险降到最低限度；',
-          '气门芯脱落后，宠物主人须及时通知握爪客服，因宠物主人操作不当导致幼犬尾部发炎，本公司不承担任何责任；',
+          '气门芯脱落后，宠物主人须及时通知壹管家客服，因宠物主人操作不当导致幼犬尾部发炎，本公司不承担任何责任；',
           '如有特殊要求，提交订单时请在“备注”一栏填写您的具体要求；',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额；',
-          '请提前三天预约，预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '请提前三天预约，预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       case 8: // 碳酸浴
@@ -230,7 +230,7 @@ define(['base', '$', 'api'], function (base, $, api) {
           '若您家中有多只狗狗需要同时预约的话，请您选择相应的宠物类型和服务时间分别下单；',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额；',
           '狗狗开毛结超过20分钟以上，将按60元/小时收取；',
-          '请提前1天预约，预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '请提前1天预约，预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       case 11: // 驱虫
@@ -248,7 +248,7 @@ define(['base', '$', 'api'], function (base, $, api) {
           '一般在幼犬猫断奶后就应首次驱虫，幼犬猫最好每月驱虫1次，成年犬猫每3个月驱虫1次。',
           '如有特殊要求，提交订单时请在“备注”一栏填写您的具体要求。',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额。',
-          '预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       case 12: // 药浴
@@ -265,7 +265,7 @@ define(['base', '$', 'api'], function (base, $, api) {
           '如有特殊要求，提交订单时请在“备注”一栏填写您的具体要求。',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额。',
           '狗狗开毛结超过20分钟以上，将按60元/小时收取。',
-          '预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       case 13: // 染色
@@ -282,7 +282,7 @@ define(['base', '$', 'api'], function (base, $, api) {
           '如有特殊要求，提交订单时请在“备注”一栏填写您的具体要求。',
           '预约时间两小时内取消订单或宠物具有攻击性无法正常服务的，将扣除50%订单金额。',
           '狗狗开毛结超过20分钟以上，将按60元/小时收取。',
-          '预约时间仅供参考，具体上门时间请以握爪客服安排为准。'
+          '预约时间仅供参考，具体上门时间请以壹管家客服安排为准。'
         ];
         break;
       default:

www/webapp/o2o/js/page/activities/cat.js

@@ -11,7 +11,7 @@ define(['template', 'native', 'config', 'user'], function (template, native, con
   }
 
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var $view = this;

www/webapp/o2o/js/page/address/addressList.js

@@ -9,7 +9,7 @@ define(['template', 'native', 'config', 'address', 'user', 'api', 'order'], func
   var cachePageData = {}; //page内部的数据传递
 
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var $view = this;

www/webapp/o2o/js/page/address/addressPoi.js

@@ -18,7 +18,7 @@ define(['$', 'template', 'native', 'config', 'address', 'helper', 'bdmapapi'], f
 	var cachePageData = {}; //page内部的数据传递
 
 	return {
-		title: '握爪上门服务',
+		title: '壹管家上门服务',
 		body: '',
 		init: function (pageData, dtd) {
 			var $view = this;

www/webapp/o2o/js/page/agreement.js

@@ -8,7 +8,7 @@ define(['template', 'native', 'config'], function (template, native, config) {
 	}
 
 	return {
-		title: '握爪上门服务',
+		title: '壹管家上门服务',
 		body: '',
 		init: function (pageData, dtd) {
 			var $view = this;

www/webapp/o2o/js/page/append.js

@@ -14,7 +14,7 @@ define(['$', 'template', 'product', 'order', 'cart', 'native', 'helper', 'user',
     extraCost: 0
   }; //page内部的数据传递
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var $view = this;

www/webapp/o2o/js/page/appendPay.js

@@ -9,7 +9,7 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
     });
   }
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var $view = this;

www/webapp/o2o/js/page/beautician.js

@@ -1,4 +1,4 @@
-// 选择美容师
+// 选择保洁师
 define(['$', 'template', 'user', 'config', 'order', 'IScroll'], function ($, template, user, config, order, IScroll) {
 
   function back(event) {
@@ -11,7 +11,7 @@ define(['$', 'template', 'user', 'config', 'order', 'IScroll'], function ($, tem
   var cachePageData = {};
 
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       // var productType = pageData.pushData.productType;

www/webapp/o2o/js/page/beauticianDetail.js

@@ -1,4 +1,4 @@
-// 选择美容师
+// 选择保洁师
 define(['$', 'template', 'user', 'config', 'order', 'IScroll', 'review', 'native'], function ($, template, user, config, order, IScroll, review, native) {
 
   function back(event) {
@@ -29,7 +29,7 @@ define(['$', 'template', 'user', 'config', 'order', 'IScroll', 'review', 'native
   var cachePageData = {};
 
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       // var productType = pageData.pushData.productType;

www/webapp/o2o/js/page/coming.js

@@ -11,7 +11,7 @@ define(['$', 'template', 'product', 'order', 'cart', 'native', 'helper', 'user',
   }
 
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var productType = pageData.pushData.productType;
@@ -49,13 +49,13 @@ define(['$', 'template', 'product', 'order', 'cart', 'native', 'helper', 'user',
       if (config.isWX) {
         wx.ready(function(){
           wx.onMenuShareTimeline({
-            title: '宠物上门服务，首选握爪APP',
+            title: '宠物上门服务，首选壹管家APP',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });
           wx.onMenuShareAppMessage({
-            title: '宠物上门服务，首选握爪APP',
-            desc: '足不出户，就能享受专业美容师为您家爱宠提供的贴心服务！',
+            title: '宠物上门服务，首选壹管家APP',
+            desc: '足不出户，就能享受专业保洁师为您家爱宠提供的贴心服务！',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });

www/webapp/o2o/js/page/desc.js

@@ -6,7 +6,7 @@ define(['$', 'template', 'product', 'config'], function ($, template, product, c
 	}
 
 	return {
-		title: '握爪上门服务',
+		title: '壹管家上门服务',
 		body: '',
 		init: function (pageData, dtd) {
 			var $view = this;

www/webapp/o2o/js/page/hire.js

@@ -8,7 +8,7 @@ define(['template', 'native', 'config'], function (template, native, config) {
 	}
 
 	return {
-		title: '握爪美容师招聘',
+		title: '壹管家保洁师招聘',
 		body: '',
 		init: function (pageData, dtd) {
 			var $view = this;

www/webapp/o2o/js/page/home.js

@@ -5,7 +5,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config'], func
   }
 
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var $view = this;

www/webapp/o2o/js/page/myCoupon.js

@@ -22,7 +22,7 @@ define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, us
   }
 
 	return {
-		title: '握爪上门服务',
+		title: '壹管家上门服务',
 		body: '',
 		init: function (pageData, dtd) {
 			var $view = this;
@@ -106,13 +106,13 @@ define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, us
       if (config.isWX) {
         wx.ready(function(){
           wx.onMenuShareTimeline({
-            title: '宠物上门服务，首选握爪APP',
+            title: '宠物上门服务，首选壹管家APP',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });
           wx.onMenuShareAppMessage({
-            title: '宠物上门服务，首选握爪APP',
-            desc: '足不出户，就能享受专业美容师为您家爱宠提供的贴心服务！',
+            title: '宠物上门服务，首选壹管家APP',
+            desc: '足不出户，就能享受专业保洁师为您家爱宠提供的贴心服务！',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });

www/webapp/o2o/js/page/myOrder.js

@@ -57,7 +57,7 @@ define(['$', 'template', 'user', 'config', 'native', 'IScroll'], function ($, te
 
   var t = 0;
 	return {
-		title: '握爪上门服务',
+		title: '壹管家上门服务',
 		body: '',
 		init: function (pageData, dtd) {
 			var $view = this;
@@ -282,13 +282,13 @@ define(['$', 'template', 'user', 'config', 'native', 'IScroll'], function ($, te
       if (config.isWX) {
         wx.ready(function(){
           wx.onMenuShareTimeline({
-            title: '宠物上门服务，首选握爪APP',
+            title: '宠物上门服务，首选壹管家APP',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });
           wx.onMenuShareAppMessage({
-            title: '宠物上门服务，首选握爪APP',
-            desc: '足不出户，就能享受专业美容师为您家爱宠提供的贴心服务！',
+            title: '宠物上门服务，首选壹管家APP',
+            desc: '足不出户，就能享受专业保洁师为您家爱宠提供的贴心服务！',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });

www/webapp/o2o/js/page/myOrderDetail.js

@@ -10,7 +10,7 @@ define(['$', 'template', 'user', 'config', 'native', 'IScroll', 'BMap'], functio
   var cachePageData = {};
   var getPoiFn;
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var productType = pageData.pushData.productType;

www/webapp/o2o/js/page/orderDone.js

@@ -11,7 +11,7 @@ define(['template', 'native', 'config'], function (template, native, config) {
 	}
 
 	return {
-		title: '握爪上门服务',
+		title: '壹管家上门服务',
 		body: '',
 		init: function (pageData, dtd) {
 			var $view = this;

www/webapp/o2o/js/page/pay.js

@@ -10,7 +10,7 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
   }
 
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var $view = this;

www/webapp/o2o/js/page/picker.js

@@ -8,7 +8,7 @@ define(['$', 'template', 'order', 'config', 'user', 'api'], function ($, templat
   var cachePageData = {};
 
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var $view = this;

www/webapp/o2o/js/page/placeOrder.js

@@ -219,7 +219,7 @@ define(['$', 'template', 'product', 'order', 'cart', 'native', 'helper', 'user',
     }
   }; //page内部的数据传递
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       // var productType = cachePageData.productType;
@@ -371,7 +371,7 @@ define(['$', 'template', 'product', 'order', 'cart', 'native', 'helper', 'user',
           order.set('productID', '');
         }
 
-        // 重置美容师选择
+        // 重置保洁师选择
         resetTech($view);
 
         pageData.scroll.refresh();
@@ -432,7 +432,7 @@ define(['$', 'template', 'product', 'order', 'cart', 'native', 'helper', 'user',
         }
         payCharge();
 
-        // 重置美容师选择
+        // 重置保洁师选择
         resetTech($view);
 
         pageData.scroll.refresh();
@@ -488,7 +488,7 @@ define(['$', 'template', 'product', 'order', 'cart', 'native', 'helper', 'user',
         }
       }, $view);
 
-      // 选择美容师
+      // 选择保洁师
       $.newTouch('.show-beautician-picker', function (event) {
         if (!order.address || !order.address.address_id) {
           $doc.trigger('spa:openpanel', ['simpleAlert', {
@@ -1099,13 +1099,13 @@ define(['$', 'template', 'product', 'order', 'cart', 'native', 'helper', 'user',
       if (config.isWX) {
         wx.ready(function(){
           wx.onMenuShareTimeline({
-            title: '宠物上门' + product.getWXShare(type).name + '，首选握爪APP',
+            title: '宠物上门' + product.getWXShare(type).name + '，首选壹管家APP',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: product.getWXShare(type).className
           });
           wx.onMenuShareAppMessage({
-            title: '宠物上门' + product.getWXShare(type).name + '，首选握爪APP',
-            desc: '足不出户，就能享受专业美容师为您家爱宠提供的' + product.getWXShare(type).name + '服务！',
+            title: '宠物上门' + product.getWXShare(type).name + '，首选壹管家APP',
+            desc: '足不出户，就能享受专业保洁师为您家爱宠提供的' + product.getWXShare(type).name + '服务！',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: product.getWXShare(type).className
           });

www/webapp/o2o/js/page/product.js

@@ -286,13 +286,13 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
       if (config.isWX) {
         wx.ready(function(){
           wx.onMenuShareTimeline({
-            title: '宠物上门' + product.getWXShare(type).name + '，首选握爪APP',
+            title: '宠物上门' + product.getWXShare(type).name + '，首选壹管家APP',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: product.getWXShare(type).className
           });
           wx.onMenuShareAppMessage({
-            title: '宠物上门' + product.getWXShare(type).name + '，首选握爪APP',
-            desc: '足不出户，就能享受专业美容师为您家爱宠提供的' + product.getWXShare(type).name + '服务！',
+            title: '宠物上门' + product.getWXShare(type).name + '，首选壹管家APP',
+            desc: '足不出户，就能享受专业保洁师为您家爱宠提供的' + product.getWXShare(type).name + '服务！',
             link: 'http://www.wozhua.mobi/o2o/web/index',
             imgUrl: product.getWXShare(type).className
           });

www/webapp/o2o/js/page/productInfo.js

@@ -14,7 +14,7 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 
   var cachePageData = {}; //page内部的数据传递
   return {
-    title: '握爪上门服务',
+    title: '壹管家上门服务',
     body: '',
     init: function (pageData, dtd) {
       var productType = pageData.pushData.productType;