Merge branch 'master' of git.oschina.net:yiguanjia/php

www/protected/config/test.php

@@ -57,8 +57,8 @@ return CMap::mergeArray(
                     'video'=>'video'//音频文件
                 ),
                 'wxConfig' => array(
-                    'appId' => 'wxc65ce3e1f0fdc9b5',
-                    'appSecret' => 'b6f4b6c7f750fa2f996e7e80462c577a'
+                    'appId' => 'wxdf484451c6545804',
+                    'appSecret' => '2444967463a640385716e99a700d3f45'
                 )
             )
         )

www/protected/config/yiguanjia_const.php

@@ -47,6 +47,7 @@ $wz['o2o_service'] = array(
     6=>array("name"=>"新居开荒"),
     8=>array("name"=>"母婴房清洁"),
     9=>array("name"=>"租房清洁"),
+    10=>array("name"=>"擦玻璃"),
 );
 
 $wz['service_type_option'] = array(
@@ -58,6 +59,7 @@ $wz['service_type_option'] = array(
     6=>array("name"=>"新居开荒"),
     8=>array("name"=>"母婴房清洁"),
     9=>array("name"=>"租房清洁"),
+    10=>array("name"=>"擦玻璃"),
 );
 //新手礼包
 $wz['new_user_coupon_ids'] = array(