Charlie 9 years ago
parent
commit
bc24c9bf02

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

@@ -175,7 +175,7 @@ class AsyncWorkCommand extends CConsoleCommand{
                         }else{
                             $info = '我们正在为您安排';
                         }
-                        $master = '美容师';//训犬师
+                        $master = '保洁师';//训犬师
                         CommonSMS::send('order_pay_success',array('month'=>$month,'day'=>$day,'address'=>$address,'info'=>$info,'master'=>$master,'mobile'=>$order_info['address']['mobile']));
                         $cache->set($key,1,86400);
                     }

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

@@ -4,7 +4,7 @@
  * User: charlie
  * Date: 13-11-29
  * Time: 下午4:47
- * 美容师、摄影师、训犬师等
+ * 保洁师、摄影师、训犬师等
  */
 class Master extends MongoAr
 {
@@ -15,7 +15,7 @@ class Master extends MongoAr
     public $user;//对应的后台帐号
     public $ruser;//对应的前端帐号
 
-    public $type; //"beautician"=> 美容
+    public $type; //"beautician"=> 保洁
 
     public $name;//名字
     public $city_info = array();          ////用户所属的城市信息  "province"=>"上海","city"=>"上海","area"=>"浦东"    或者   "province"=>"江苏","city"=>"苏州","area"="昆山"

+ 1 - 1
www/webapp/o2o/js/model/order.js

@@ -33,7 +33,7 @@ define(['base', '$', 'native', 'product', 'api'], function (base, $, native, pro
     this.serviceName = '';
     this.servicePrice = '';
     this.appendID = '';
-    this.beautician = { // 美容
+    this.beautician = { // 保洁
       name: '请选择',
       id: ''
     };