测试

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

@@ -1135,106 +1135,101 @@ define(['base', '$', 'api'], function (base, $, api) {
                 ]
             },
             {
-                id: "58085f4b9f5160a9048b490e",
-                name: "租房大扫除",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/8%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E9%A6%96%E5%9B%BE%E6%94%B9.jpg',
-                desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
+                id: "581fe5a6a84ea0e36c8b45bb",
+                name: "活动产品",
+                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: "日常清洁"}],
                 status: 1,
                 is_extra: 0,
                 order: 0,
-                type: "8",
-                type_str: "租房大扫除",
+                type: "9",
+                type_str: "日常清洁",
                 extra: [
                     {
-                        type: "客厅清洁",
-                        price: "100"
+                        type: "一室一卫",
+                        price: "98"
                     },
                     {
-                        type: "厨房清洁",
-                        price: "150"
+                        type: "两室一卫",
+                        price: "118"
                     },
                     {
-                        type: "卧室清洁",
-                        price: "100"
+                        type: "两室两卫",
+                        price: "138"
                     },
                     {
-                        type: "卫生间清洁",
-                        price: "150"
-                    }
-                ],
-                action_user: "",
-                action_time: "",
-                action_log: "",
-                pics: [
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/8%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E9%A6%96%E5%9B%BE%E6%94%B9.jpg",
-                        width: 720,
-                        height: 562
+                        type: "三室两卫",
+                        price: "158"
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_02%28720x404%29.jpg",
-                        width: 720,
-                        height: 404
+                        type: "四室三卫",
+                        price: "228"
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_03%28720x783%29.jpg",
-                        width: 720,
-                        height: 783
+                        type: "200-250平米",
+                        price: "298"
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_04%28720x1048%29.jpg",
-                        width: 720,
-                        height: 1048
+                        type: "200-300平米",
+                        price: "398"
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_05%28720x915%29.jpg",
-                        width: 720,
-                        height: 915
+                        type: "三层别墅",
+                        price: "498"
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_06%28720x758%29.jpg",
-                        width: 720,
-                        height: 758
+                        type: "四层别墅",
+                        price: "598"
+                    }
+                ],
+                action_user: "",
+                action_time: "",
+                action_log: "",
+                pics: [
+                    {
+                        url: "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",
+                        width: 537,
+                        height: 537
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_07%28720x1129%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_1%28720x1165%29.jpg",
                         width: 720,
-                        height: 1129
+                        height: 1165
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_08%28720x1213%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_2%28720x1129%29.jpg",
                         width: 720,
-                        height: 1213
+                        height: 1129
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_09%28720x657%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_3%28720x1127%29.jpg",
                         width: 720,
-                        height: 657
+                        height: 1127
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_10%28720x720%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_4%28720x1178%29.jpg",
                         width: 720,
-                        height: 720
+                        height: 1178
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_11%28720x1104%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_5%28720x1246%29.jpg",
                         width: 720,
-                        height: 1104
+                        height: 1246
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_12%28720x951%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_6%28720x520%29.jpg",
                         width: 720,
-                        height: 951
+                        height: 520
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_13%28720x812%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_7%28720x644%29.jpg",
                         width: 720,
-                        height: 812
+                        height: 644
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_14%28720x850%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_8%28720x1257%29.jpg",
                         width: 720,
-                        height: 850
+                        height: 644
                     }
                 ]
             }

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

@@ -57,7 +57,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 		var placeOrderScroll;
 		setTimeout(function () {
 			pageData.scroll = new IScroll('#placeOrderScroll');
-			if (product.type_str == "日常清洁") {
+			if (product.name == "活动产品") {
 				console.log("正常");
 				$('.show-time-picker').css('display', 'none');
 			}
@@ -688,7 +688,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 				}
 
 				// 必须先选择时间
-				if (!order.bookingDate && product.type_str !== "日常清洁") {
+				if (!order.bookingDate && product.name !== "活动产品") {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择服务时间'
 					}]);
@@ -786,7 +786,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 					return;
 				}
 
-				if (!order.bookingTimeStr&&product.type_str !== "日常清洁") {
+				if (!order.bookingTimeStr && product.name !== "活动产品") {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择上门时间'
 					}]);

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

@@ -25,11 +25,11 @@
 
                                     <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">
 
-                                    <div class="extra-service-name">长期订</div>
+                                    <div class="extra-service-name">双十一</div>
                                 </li>
                                 <li class="btn-product" data-product-type="2">
                                     <!--<img src="http://oduj3utzz.bkt.clouddn.com/Home_btn_clean%20%282%29.png"  width="50px" height="50px">-->