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

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

@@ -1135,7 +1135,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 ]
             },
             {
-                id: "582487169f5160d0048b4fe7",
+                id: "581fe5a6a84ea0e36c8b45bb",//581fe5a6a84ea0e36c8b45bb//582487169f5160d0048b4fe7
                 name: "双11虹口区日常保洁特价体验",
                 imgSrc: 'http://odulvej8l.bkt.clouddn.com/1%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_rc.jpg"}, {content: "日常清洁"}],
@@ -1144,7 +1144,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 order: 0,
                 type: "9",
                 type_str: "双11虹口区日常保洁特价体验",
-                extra: [
+                /*原来   extra: [
                     {
                         type: "一室一卫",
                         price: "11"
@@ -1181,6 +1181,20 @@ define(['base', '$', 'api'], function (base, $, api) {
                         type: "四层别墅",
                         price: "11"
                     }
+                ],*/
+                extra: [
+                    {
+                        type: "擦玻璃",
+                        price: "80"
+                    },
+                    {
+                        type: "日常清洁两小时",
+                        price: "88"
+                    },
+                    {
+                        type: "家电清洗",
+                        price: "88"
+                    }
                 ],
                 action_user: "",
                 action_time: "",

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

@@ -275,7 +275,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 				/* 如果没有on状态，加上on。 */
 				$(this).addClass('on');
 				/* 删掉其他选择框的on状态 */
-				$(this).parent().siblings().find('.btn').removeClass('on');
+				// $(this).parent().siblings().find('.btn').removeClass('on');
 				/* 填写order */
 				order.appendID = $(this).attr('data-extra-type');
 				order.price = $(this).attr('data-extra-price');

www/webapp/o2o/tpl/secondary/index.html

@@ -25,7 +25,7 @@
 
                                     <div class="extra-service-name">日常清洁</div>
                                 </li>
-                                <li class="Long-term-set">
+                                <li class="Long-term-set btn-product" data-product-type="9">
                                     <!--<img src="http://oduj3utzz.bkt.clouddn.com/Home_btn_clean%20%287%29.png"  width="50px" height="50px">-->
                                     <img src="http://odulvej8l.bkt.clouddn.com/%E9%95%BF%E6%9C%9F%E5%AE%9Aicon-01-01-01.png">