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

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

@@ -812,13 +812,13 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: "57e0e0879f5160b8048b4571",
                 price: "8",
-                name: "新居开荒-每平米",
+                name: "新居开荒",
                 imgSrc: 'http://odulvej8l.bkt.clouddn.com/5%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_kh.jpg"}, {content: '新居开荒'}],
                 status: 1,
                 is_extra: 0,
                 order: 0,
-                type: "5",
+                type: "6",
                 type_str: "新居开荒",
                 action_user: "",
                 action_time: "",
@@ -889,13 +889,13 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: "57fb4a909f5160b2048b4a0e",
                 price: "10",
-                name: "擦玻璃-每平米",
+                name: "擦玻璃",
                 imgSrc: 'http://odulvej8l.bkt.clouddn.com/6%E6%93%A6%E7%8E%BB%E7%92%83%E9%A6%96%E5%9B%BE2.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_kh.jpg"}, {content: '擦玻璃'}],
                 status: 1,
                 is_extra: 0,
                 order: 0,
-                type: "6",
+                type: "10",
                 type_str: "擦玻璃",
                 action_user: "",
                 action_time: "",
@@ -977,7 +977,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 status: 1,
                 is_extra: 0,
                 order: 200,
-                type: "7",
+                type: "8",
                 type_str: "母婴房清洁",
                 extra: [
                     {
@@ -1038,7 +1038,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 status: 1,
                 is_extra: 0,
                 order: 0,
-                type: "8",
+                type: "9",
                 type_str: "租房清洁",
                 extra: [
                     {
@@ -1143,7 +1143,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 status: 1,
                 is_extra: 0,
                 order: 0,
-                type: "9",
+                type: "11",
                 type_str: "日常保洁2小时体验",
                 action_user: "",
                 action_time: "",
@@ -1195,7 +1195,8 @@ define(['base', '$', 'api'], function (base, $, api) {
                         height: 644
                     }
                 ]
-            },
+            }
+            /*,
 	          {
 		        id: "5835418aa84ea0a7748b4587",
 		        name: "小时工单次",
@@ -1204,7 +1205,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 		        status: 1,
 		        is_extra: 0,
 		        order: 0,
-		        type: "10",
+		        type: "12",
 		        type_str: "长期订",
 		        extra: [
 			        {
@@ -1387,7 +1388,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 				        height: 850
 			        }
 		        ]
-	        }
+	        }*/
         ];
         //列出所有的产品
         Product.prototype.getListAll = function (userID, callback) {