Procházet zdrojové kódy

部分页面改动

洪海涛 před 8 roky
rodič
revize
e56ff77cbb

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/css/ratchetOverloading.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/css/main.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/model/product.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/model/user.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/page/myCoupon.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/js/build/template.js


+ 1359 - 1444
www/webapp/o2o/js/model/product.js

@@ -2,1459 +2,1374 @@
  * 商品模型
  */
 define(['base', '$', 'api'], function (base, $, api) {
-    var Product = function () {
-        if (typeof Product.instance === 'object') {
-            return Product.instance;
-        }
-        Product.instance = this;
-        this.storagePrefix = 'product_';//存储前缀
+	var Product = function () {
+		if (typeof Product.instance === 'object') {
+			return Product.instance;
+		}
+		Product.instance = this;
+		this.storagePrefix = 'product_';//存储前缀
 
-        /* 我新加的 */
-        /* this.allList = [
-         {
-         id: "57e0dffc9f5160dd048b4568",
-         name: "日常清洁",
-         imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_02.png',
-         desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_rc.jpg"}, {content: "日常清洁"}],
-         status: 1,
-         is_extra: 0,
-         order: 0,
-         type: "1",
-         type_str: "日常清洁",
-         extra: [
-         {
-         type: "一室一卫",
-         price: "98"
-         },
-         {
-         type: "两室一卫",
-         price: "118"
-         },
-         {
-         type: "两室两卫",
-         price: "138"
-         },
-         {
-         type: "三室两卫",
-         price: "158"
-         },
-         {
-         type: "四室三卫",
-         price: "228"
-         },
-         {
-         type: "200-250平米",
-         price: "298"
-         },
-         {
-         type: "200-300平米",
-         price: "398"
-         },
-         {
-         type: "三层别墅",
-         price: "498"
-         },
-         {
-         type: "四层别墅",
-         price: "598"
-         }
-         ],
-         action_user: "",
-         action_time: "",
-         action_log: "",
-         pics: [
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/Advertising_02.png",
-         width: 537,
-         height: 537
-         },
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/a_01.png",
-         width: 720,
-         height: 1165
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/ada69b8adb17b1475912214579.png",
-         width: 720,
-         height: 1129
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/rcqj_xqy_03.jpg",
-         width: 720,
-         height: 1127
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/03c6e0266e4661475977941220.png",
-         width: 720,
-         height: 1178
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/1e3638af93cab1475977951089.jpg",
-         width: 720,
-         height: 1246
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/cfd996a3783d11475977959884.png",
-         width: 720,
-         height: 520
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/d67ff4fcad4bc1475977977827.png",
-         width: 720,
-         height: 644
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/78ce92ec0d52d1475977966417.png",
-         width: 720,
-         height: 644
-         }
-         ]
-         },
-         {
-         id: "57e0e0189f5160dc048b4568",
-         name: "深度清洁",
-         imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_01.png',
-         desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_sd.jpg"}, {content: "深度清洁"}],
-         status: 1,
-         is_extra: 0,
-         order: 0,
-         type: "2",
-         type_str: "深度清洁",
-         extra: [
-         {
-         type: "卧室清洁",
-         price: "188"
-         },
-         {
-         type: "客厅清洁",
-         price: "288"
-         },
-         {
-         type: "厨房清洁",
-         price: "388"
-         },
-         {
-         type: "卫生间清洁",
-         price: "188"
-         }
-         ],
-         action_user: "",
-         action_time: "",
-         action_log: "",
-         pics: [
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/Advertising_01.png",
-         width: 658,
-         height: 663
-         },
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/a_01.png",
-         width: 720,
-         height: 1165
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/e295c92da2e7c1475913803198.png",
-         width: 720,
-         height: 1129
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/363f18ed617211475913944488.jpg",
-         width: 720,
-         height: 1246
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/64a1375694e091475913947183.png",
-         width: 720,
-         height: 715
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/8cf32629eece91475913957779.png",
-         width: 720,
-         height: 674
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/0ef470cf13ea51475914131334.jpg",
-         width: 720,
-         height: 786
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/341746e8065381475978339748.jpg",
-         width: 720,
-         height: 832
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/beb99ec9850041475978342874.jpg",
-         width: 720,
-         height: 1178
-         }
-         ]
-         },
-         {
-         id: "57e0e0369f5160b1048b456b",
-         name: "除螨杀菌",
-         imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_04.png',
-         desc: [{content: 'http://odqeoyzxd.bkt.clouddn.com/image/image_etsj.jpg'}, {content: "除螨杀菌"}],
-         status: 1,
-         is_extra: 0,
-         order: 0,
-         type: "3",
-         type_str: "除螨杀菌",
-         extra: [
-         {
-         type: "儿童床",
-         price: "80"
-         },
-         {
-         type: "布艺窗帘",
-         price: "100"
-         },
-         {
-         type: "整床除螨",
-         price: "180"
-         },
-         {
-         type: "整套布艺沙发",
-         price: "160"
-         }
-         ],
-         action_user: "",
-         action_time: "",
-         action_log: "",
-         pics: [
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/Advertising_04.png",
-         width: 658,
-         height: 663
-         },
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/a_01.png",
-         width: 720,
-         height: 1129
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/5536a4677fb781475914511648.jpg",
-         width: 720,
-         height: 1697
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/58eb5a44603191475914516767.jpg",
-         width: 720,
-         height: 1246
-         }
-         ]
-         },
-         {
-         id: "57e0e04e9f5160af048b456b",
-         name: "家电清洗",
-         imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_05.png',
-         desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
-         status: 1,
-         is_extra: 0,
-         order: 0,
-         type: "4",
-         type_str: "家电清洗",
-         extra: [
-         {
-         type: "微波炉",
-         price: "60"
-         },
-         {
-         type: "洗衣机",
-         price: "100"
-         },
-         {
-         type: "油烟机",
-         price: "120"
-         },
-         {
-         type: "挂式空调",
-         price: "100"
-         },
-         {
-         type: "立式空调",
-         price: "130"
-         },
-         {
-         type: "冰箱-单开门",
-         price: "100"
-         },
-         {
-         type: "冰箱-双开门",
-         price: "130"
-         }
-         ],
-         action_user: "",
-         action_time: "",
-         action_log: "",
-         pics: [
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/Advertising_05.png",
-         width: 537,
-         height: 537
-         },
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/a_01.png",
-         width: 720,
-         height: 1165
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/0f29fa9bf28161475979068565.jpg",
-         width: 720,
-         height: 844
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/205de28a664c21475979065361.png",
-         width: 720,
-         height: 1129
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/f17ecbfe231231475979073441.jpg",
-         width: 720,
-         height: 1204
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/30daa83d817761475979080897.jpg",
-         width: 720,
-         height: 1246
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/3ee87b41d9d241475979077357.png",
-         width: 720,
-         height: 1257
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/06e7de122aab21475979086760.png",
-         width: 720,
-         height: 647
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/2973a12ec9a0f1475979093617.jpg",
-         width: 720,
-         height: 786
-         }
-         ]
-         },
-         {
-         id: "57e0e0879f5160b8048b4571",
-         price: "8",
-         name: "新居开荒-每平米",
-         imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_03.png',
-         desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_kh.jpg"}, {content: '新居开荒'}],
-         status: 1,
-         is_extra: 0,
-         order: 0,
-         type: "5",
-         type_str: "新居开荒",
-         action_user: "",
-         action_time: "",
-         action_log: "",
-         pics: [
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/Advertising_03.png",
-         width: 658,
-         height: 663
-         },
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92-01.jpg",
-         width: 720,
-         height: 10637
-         }
-         ]
-         }, {
-         id: "57fb4a909f5160b2048b4a0e",
-         price: "10",
-         name: "擦玻璃-每平米",
-         imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E5%A3%B9%E7%AE%A1%E5%AE%B6%E6%93%A6%E7%8E%BB%E7%92%83%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: "6",
-         type_str: "擦玻璃",
-         action_user: "",
-         action_time: "",
-         action_log: "",
-         pics: [
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5.jpg",
-         width: 720,
-         height: 11906
-         }
-         ]
-         },
-         {
-         id: "57e3a5a49f5160c9048b457c",
-         price: "",
-         name: "母婴房清洁",
-         imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_06.png',
-         desc: [{content: "http://7oxep6.com2.z0.glb.clouddn.com/0e287e871c3831474536840941.jpg"}, {content: '母婴房清洁'}],
-         status: 1,
-         is_extra: 0,
-         order: 200,
-         type: "7",
-         type_str: "母婴房清洁",
-         extra: [
-         {
-         type: "整间日常清洁",
-         price: "388"
-         },
-         {
-         type: "整间深度清洁",
-         price: "888"
-         }
-         ],
-         action_user: "",
-         action_time: "",
-         action_log: "",
-         pics: [
-         {
-         url: "http://odulvej8l.bkt.clouddn.com/Advertising_06.png",
-         width: 576,
-         height: 484
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/2a28708adeba61475912920337.jpg",
-         width: 730,
-         height: 522
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/49b77d125873d1475913063652.jpg",
-         width: 730,
-         height: 791
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/48787438272821475913069079.jpg",
-         width: 730,
-         height: 823
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/5f027131794191475913084173.jpg",
-         width: 730,
-         height: 808
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/0eb339c6872641475913124202.jpg",
-         width: 730,
-         height: 1196
-         },
-         {
-         url: "http://oduj3utzz.bkt.clouddn.com/1c48dcac293c31475913147997.jpg",
-         width: 730,
-         height: 1111
-         }
-         ]
-         },
-         {
-         id: "58085f4b9f5160a9048b490e",
-         name: "租房大扫除",
-         imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E5%A3%B9%E7%AE%A1%E5%AE%B6%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E9%A6%96%E5%9B%BE.jpg',
-         desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
-         status: 1,
-         is_extra: 0,
-         order: 0,
-         type: "8",
-         type_str: "租房大扫除",
-         extra: [
-         {
-         type: "客厅清洁",
-         price: "100"
-         },
-         {
-         type: "厨房清洁",
-         price: "150"
-         },
-         {
-         type: "卧室清洁",
-         price: "100"
-         },
-         {
-         type: "卫生间清洁",
-         price: "150"
-         }
-         ],
-         action_user: "",
-         action_time: "",
-         action_log: "",
-         pics: [
-         {
-         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.jpg",
-         width: 720,
-         height: 11906
-         }
-         ]
-         }
-         ];*/
-        /*图片压缩*/
-        this.allList = [
-            {
-                id: "57e0dffc9f5160dd048b4568",
-                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: "1",
-                type_str: "日常清洁",
-                extra: [
-                    {
-                        type: "一室一卫",
-                        price: "98"
-                    },
-                    {
-                        type: "两室一卫",
-                        price: "118"
-                    },
-                    {
-                        type: "两室两卫",
-                        price: "138"
-                    },
-                    {
-                        type: "三室两卫",
-                        price: "158"
-                    },
-                    {
-                        type: "四室三卫",
-                        price: "228"
-                    },
-                    {
-                        type: "200-250平米",
-                        price: "298"
-                    },
-                    {
-                        type: "200-300平米",
-                        price: "398"
-                    },
-                    {
-                        type: "三层别墅",
-                        price: "498"
-                    },
-                    {
-                        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/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_1%28720x1165%29.jpg",
-                        width: 720,
-                        height: 1165
-                    },
-                    {
-                        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: 1129
-                    },
-                    {
-                        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: 1127
-                    },
-                    {
-                        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: 1178
-                    },
-                    {
-                        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: 1246
-                    },
-                    {
-                        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: 520
-                    },
-                    {
-                        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: 644
-                    },
-                    {
-                        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: 644
-                    }
-                ]
-            },
-            {
-                id: "57e0e0189f5160dc048b4568",
-                name: "深度清洁",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/2%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
-                desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_sd.jpg"}, {content: "深度清洁"}],
-                status: 1,
-                is_extra: 0,
-                order: 0,
-                type: "2",
-                type_str: "深度清洁",
-                extra: [
-                    {
-                        type: "卧室清洁",
-                        price: "188"
-                    },
-                    {
-                        type: "客厅清洁",
-                        price: "288"
-                    },
-                    {
-                        type: "厨房清洁",
-                        price: "388"
-                    },
-                    {
-                        type: "卫生间清洁",
-                        price: "188"
-                    }
-                ],
-                action_user: "",
-                action_time: "",
-                action_log: "",
-                pics: [
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/2%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg",
-                        width: 750,
-                        height: 585
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_1%28720x1165%29.jpg",
-                        width: 720,
-                        height: 1165
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_2%28720x1129%29.jpg",
-                        width: 720,
-                        height: 1129
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_3%28720x1246%29.jpg",
-                        width: 720,
-                        height: 1246
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_4%28720x715%29.jpg",
-                        width: 720,
-                        height: 715
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_5%28720x674%29.jpg",
-                        width: 720,
-                        height: 674
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_6%28720x786%29.jpg",
-                        width: 720,
-                        height: 786
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_7%28720x832%29.jpg",
-                        width: 720,
-                        height: 832
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_8%28720x1178%29.jpg",
-                        width: 720,
-                        height: 1178
-                    }
-                ]
-            },
-            {
-                id: "57e0e0369f5160b1048b456b",
-                name: "除螨杀菌",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/3%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C%E9%A6%96%E5%9B%BE.jpg',
-                desc: [{content: 'http://odqeoyzxd.bkt.clouddn.com/image/image_etsj.jpg'}, {content: "除螨杀菌"}],
-                status: 1,
-                is_extra: 0,
-                order: 0,
-                type: "3",
-                type_str: "除螨杀菌",
-                extra: [
-                    {
-                        type: "儿童床",
-                        price: "80"
-                    },
-                    {
-                        type: "布艺窗帘",
-                        price: "100"
-                    },
-                    {
-                        type: "整床除螨",
-                        price: "180"
-                    },
-                    {
-                        type: "整套布艺沙发",
-                        price: "160"
-                    }
-                ],
-                action_user: "",
-                action_time: "",
-                action_log: "",
-                pics: [
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/3%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C%E9%A6%96%E5%9B%BE.jpg",
-                        width: 720,
-                        height: 585
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_1%28720+1165%29.jpg",
-                        width: 720,
-                        height: 1165
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_2%28720+1697%29.jpg",
-                        width: 720,
-                        height: 1697
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_3%28720+1246%29.jpg",
-                        width: 720,
-                        height: 1246
-                    }
-                ]
-            },
-            {
-                id: "57e0e04e9f5160af048b456b",
-                name: "家电清洗",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/4%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97%E9%A6%96%E5%9B%BE.jpg',
-                desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
-                status: 1,
-                is_extra: 0,
-                order: 0,
-                type: "4",
-                type_str: "家电清洗",
-                extra: [
-                    {
-                        type: "微波炉",
-                        price: "60"
-                    },
-                    {
-                        type: "洗衣机",
-                        price: "100"
-                    },
-                    {
-                        type: "油烟机",
-                        price: "120"
-                    },
-                    {
-                        type: "挂式空调",
-                        price: "100"
-                    },
-                    {
-                        type: "立式空调",
-                        price: "130"
-                    },
-                    {
-                        type: "冰箱-单开门",
-                        price: "100"
-                    },
-                    {
-                        type: "冰箱-双开门",
-                        price: "130"
-                    }
-                ],
-                action_user: "",
-                action_time: "",
-                action_log: "",
-                pics: [
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/4%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97%E9%A6%96%E5%9B%BE.jpg",
-                        width: 720,
-                        height: 585
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_1%28720+1165%29.jpg",
-                        width: 720,
-                        height: 1165
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_2%28720+844%29.jpg",
-                        width: 720,
-                        height: 844
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_3%28720+1129%29.jpg",
-                        width: 720,
-                        height: 1129
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_4%28720+1204%29.jpg",
-                        width: 720,
-                        height: 1204
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_5%28720+1246%29.jpg",
-                        width: 720,
-                        height: 1246
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_6%28720+1257%29.jpg",
-                        width: 720,
-                        height: 1257
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_7%28720+674%29.jpg",
-                        width: 720,
-                        height: 647
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_8%28720+786%29.jpg",
-                        width: 720,
-                        height: 786
-                    }
-                ]
-            },
-            {
-                id: "57e0e0879f5160b8048b4571",
-                price: "8",
-                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: "6",
-                type_str: "新居开荒",
-                action_user: "",
-                action_time: "",
-                action_log: "",
-                pics: [
-                    {
-                        url: "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",
-                        width: 750,
-                        height: 585
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_01%28720x1209%29.jpg",
-                        width: 720,
-                        height: 1209
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_02%28720x1041%29.jpg",
-                        width: 720,
-                        height: 1041
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_03%28720x1264%29.jpg",
-                        width: 720,
-                        height: 1264
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_04%28720x1295%29.jpg",
-                        width: 720,
-                        height: 1295
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_05%28720x685%29.jpg",
-                        width: 720,
-                        height: 685
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_06%28720x717%29.jpg",
-                        width: 720,
-                        height: 717
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_07%28720x685%29.jpg",
-                        width: 720,
-                        height: 685
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_08%28720x1083%29.jpg",
-                        width: 720,
-                        height: 1083
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_09%28720x915%29.jpg",
-                        width: 720,
-                        height: 915
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_10%28720x785%29.jpg",
-                        width: 720,
-                        height: 785
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_11%28720x958%29.jpg",
-                        width: 720,
-                        height: 958
-                    }
-                ]
-            },
-            {
-                id: "57fb4a909f5160b2048b4a0e",
-                price: "10",
-                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: "10",
-                type_str: "擦玻璃",
-                action_user: "",
-                action_time: "",
-                action_log: "",
-                pics: [
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/6%E6%93%A6%E7%8E%BB%E7%92%83%E9%A6%96%E5%9B%BE2.jpg",
-                        width: 720,
-                        height: 560
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_02%28720+587%29.jpg",
-                        width: 720,
-                        height: 587
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_03%28720+600%29.jpg",
-                        width: 720,
-                        height: 600
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_04%28720+1061%29.jpg",
-                        width: 720,
-                        height: 1061
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_05%28720+906%29.jpg",
-                        width: 720,
-                        height: 906
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_06%28720+820%29.jpg",
-                        width: 720,
-                        height: 802
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_07%28720+1071%29.jpg",
-                        width: 720,
-                        height: 1071
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_08%28720+1204%29.jpg",
-                        width: 720,
-                        height: 1204
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_09%28720+720%29.jpg",
-                        width: 720,
-                        height: 720
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_10%28720+678%29.jpg",
-                        width: 720,
-                        height: 678
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_11%28720+1098%29.jpg",
-                        width: 720,
-                        height: 1098
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_12%28720+899%29.jpg",
-                        width: 720,
-                        height: 899
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_13%28720+1702%29.jpg",
-                        width: 720,
-                        height: 1702
-                    }
-                ]
-            },
-            {
-                id: "57e3a5a49f5160c9048b457c",
-                price: "",
-                name: "母婴房清洁",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/7%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
-                desc: [{content: "http://7oxep6.com2.z0.glb.clouddn.com/0e287e871c3831474536840941.jpg"}, {content: '母婴房清洁'}],
-                status: 1,
-                is_extra: 0,
-                order: 200,
-                type: "8",
-                type_str: "母婴房清洁",
-                extra: [
-                    {
-                        type: "整间日常清洁",
-                        price: "388"
-                    },
-                    {
-                        type: "整间深度清洁",
-                        price: "888"
-                    }
-                ],
-                action_user: "",
-                action_time: "",
-                action_log: "",
-                pics: [
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/7%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg",
-                        width: 750,
-                        height: 585
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_1%28730x522%29.jpg",
-                        width: 730,
-                        height: 522
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_2%28730x791%29.jpg",
-                        width: 730,
-                        height: 791
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_3%28730x823%29.jpg",
-                        width: 730,
-                        height: 823
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_4%28730x808%29.jpg",
-                        width: 730,
-                        height: 808
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_5%28730x1196%29.jpg",
-                        width: 730,
-                        height: 1196
-                    },
-                    {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_6%28730x1111%29.jpg",
-                        width: 730,
-                        height: 1111
-                    }
-                ]
-            },
-            {
-                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: "家电清洗"}],
-                status: 1,
-                is_extra: 0,
-                order: 0,
-                type: "9",
-                type_str: "租房清洁",
-                extra: [
-                    {
-                        type: "客厅清洁",
-                        price: "100"
-                    },
-                    {
-                        type: "厨房清洁",
-                        price: "150"
-                    },
-                    {
-                        type: "卧室清洁",
-                        price: "100"
-                    },
-                    {
-                        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
-                    },
-                    {
-                        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
-                    },
-                    {
-                        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
-                    },
-                    {
-                        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
-                    },
-                    {
-                        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
-                    },
-                    {
-                        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
-                    },
-                    {
-                        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",
-                        width: 720,
-                        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_08%28720x1213%29.jpg",
-                        width: 720,
-                        height: 1213
-                    },
-                    {
-                        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",
-                        width: 720,
-                        height: 657
-                    },
-                    {
-                        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",
-                        width: 720,
-                        height: 720
-                    },
-                    {
-                        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",
-                        width: 720,
-                        height: 1104
-                    },
-                    {
-                        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",
-                        width: 720,
-                        height: 951
-                    },
-                    {
-                        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",
-                        width: 720,
-                        height: 812
-                    },
-                    {
-                        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",
-                        width: 720,
-                        height: 850
-                    }
-                ]
-            },
-            {
-                id: "58324b7e9f5160a4048b5758",//test //583247cca84ea01d428b46a1 master//  58324b7e9f5160a4048b5758
-                price: "48",
-                name: "首单日常保洁2小时体验",//双11虹口区日常保洁特价体验//首单日常保洁2小时体验
-                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: "11",
-                type_str: "日常保洁2小时体验",
-                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/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_1%28720x1165%29.jpg",
-                        width: 720,
-                        height: 1165
-                    },
-                    {
-                        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: 1129
-                    },
-                    {
-                        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: 1127
-                    },
-                    {
-                        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: 1178
-                    },
-                    {
-                        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: 1246
-                    },
-                    {
-                        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: 520
-                    },
-                    {
-                        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: 644
-                    },
-                    {
-                        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: 644
-                    }
-                ]
-            },
-	          {
-		        id: "5835418aa84ea0a7748b4587",//5835418aa84ea0a7748b4587
-		        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: "家电清洗"}],
-		        status: 1,
-		        is_extra: 0,
-		        order: 0,
-		        type: "12",
-		        type_str: "长期订",
-		        extra: [
-			        {
-				        type: "2小时/人",
-				        price: "90"
-			        },
-			        {
-				        type: "3小时/人",
-				        price: "135"
-			        }
-		        ],
-		        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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",
-				        width: 720,
-				        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_08%28720x1213%29.jpg",
-				        width: 720,
-				        height: 1213
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 657
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 720
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 1104
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 951
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 812
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 850
-			        }
-		        ]
-	        },
-	          {
-		        id: "5835423fa84ea0ac7a8b4568",
-		        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: "家电清洗"}],
-		        status: 1,
-		        is_extra: 0,
-		        order: 0,
-		        type: "12",
-		        type_str: "长期订",
-		        extra: [
-			        {
-				        type: "3张(2小时/人)",
-				        price: "32"
-			        },
-			        {
-				        type: "3张(3小时/人)",
-				        price: "33"
-			        },
-			        {
-				        type: "6张(2小时/人)",
-				        price: "62"
-			        },
-			        {
-				        type: "6张(3小时/人)",
-				        price: "63"
-			        }
-		        ],
-		        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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
-			        },
-			        {
-				        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",
-				        width: 720,
-				        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_08%28720x1213%29.jpg",
-				        width: 720,
-				        height: 1213
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 657
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 720
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 1104
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 951
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 812
-			        },
-			        {
-				        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",
-				        width: 720,
-				        height: 850
-			        }
-		        ]
-	        }
-        ];
-        //列出所有的产品
-        Product.prototype.getListAll = function (userID, callback) {
-            var that = this;
-            api.getProductList({
-                user_id: userID,
-                // type: type
-            }, function (res) {
-                if (res.success) {
-                    that.productList = {};
-                    var petDic = {};
-                    var productDatas = res['data']['products'];
-                    var extraroducts = res['data']['extra_products'];
-                    // that.extraService = extraroducts;
+		/* 我新加的 */
+		/* this.allList = [
+		 {
+		 id: "57e0dffc9f5160dd048b4568",
+		 name: "日常清洁",
+		 imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_02.png',
+		 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_rc.jpg"}, {content: "日常清洁"}],
+		 status: 1,
+		 is_extra: 0,
+		 order: 0,
+		 type: "1",
+		 type_str: "日常清洁",
+		 extra: [
+		 {
+		 type: "一室一卫",
+		 price: "98"
+		 },
+		 {
+		 type: "两室一卫",
+		 price: "118"
+		 },
+		 {
+		 type: "两室两卫",
+		 price: "138"
+		 },
+		 {
+		 type: "三室两卫",
+		 price: "158"
+		 },
+		 {
+		 type: "四室三卫",
+		 price: "228"
+		 },
+		 {
+		 type: "200-250平米",
+		 price: "298"
+		 },
+		 {
+		 type: "200-300平米",
+		 price: "398"
+		 },
+		 {
+		 type: "三层别墅",
+		 price: "498"
+		 },
+		 {
+		 type: "四层别墅",
+		 price: "598"
+		 }
+		 ],
+		 action_user: "",
+		 action_time: "",
+		 action_log: "",
+		 pics: [
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/Advertising_02.png",
+		 width: 537,
+		 height: 537
+		 },
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/a_01.png",
+		 width: 720,
+		 height: 1165
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/ada69b8adb17b1475912214579.png",
+		 width: 720,
+		 height: 1129
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/rcqj_xqy_03.jpg",
+		 width: 720,
+		 height: 1127
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/03c6e0266e4661475977941220.png",
+		 width: 720,
+		 height: 1178
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/1e3638af93cab1475977951089.jpg",
+		 width: 720,
+		 height: 1246
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/cfd996a3783d11475977959884.png",
+		 width: 720,
+		 height: 520
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/d67ff4fcad4bc1475977977827.png",
+		 width: 720,
+		 height: 644
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/78ce92ec0d52d1475977966417.png",
+		 width: 720,
+		 height: 644
+		 }
+		 ]
+		 },
+		 {
+		 id: "57e0e0189f5160dc048b4568",
+		 name: "深度清洁",
+		 imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_01.png',
+		 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_sd.jpg"}, {content: "深度清洁"}],
+		 status: 1,
+		 is_extra: 0,
+		 order: 0,
+		 type: "2",
+		 type_str: "深度清洁",
+		 extra: [
+		 {
+		 type: "卧室清洁",
+		 price: "188"
+		 },
+		 {
+		 type: "客厅清洁",
+		 price: "288"
+		 },
+		 {
+		 type: "厨房清洁",
+		 price: "388"
+		 },
+		 {
+		 type: "卫生间清洁",
+		 price: "188"
+		 }
+		 ],
+		 action_user: "",
+		 action_time: "",
+		 action_log: "",
+		 pics: [
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/Advertising_01.png",
+		 width: 658,
+		 height: 663
+		 },
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/a_01.png",
+		 width: 720,
+		 height: 1165
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/e295c92da2e7c1475913803198.png",
+		 width: 720,
+		 height: 1129
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/363f18ed617211475913944488.jpg",
+		 width: 720,
+		 height: 1246
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/64a1375694e091475913947183.png",
+		 width: 720,
+		 height: 715
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/8cf32629eece91475913957779.png",
+		 width: 720,
+		 height: 674
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/0ef470cf13ea51475914131334.jpg",
+		 width: 720,
+		 height: 786
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/341746e8065381475978339748.jpg",
+		 width: 720,
+		 height: 832
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/beb99ec9850041475978342874.jpg",
+		 width: 720,
+		 height: 1178
+		 }
+		 ]
+		 },
+		 {
+		 id: "57e0e0369f5160b1048b456b",
+		 name: "除螨杀菌",
+		 imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_04.png',
+		 desc: [{content: 'http://odqeoyzxd.bkt.clouddn.com/image/image_etsj.jpg'}, {content: "除螨杀菌"}],
+		 status: 1,
+		 is_extra: 0,
+		 order: 0,
+		 type: "3",
+		 type_str: "除螨杀菌",
+		 extra: [
+		 {
+		 type: "儿童床",
+		 price: "80"
+		 },
+		 {
+		 type: "布艺窗帘",
+		 price: "100"
+		 },
+		 {
+		 type: "整床除螨",
+		 price: "180"
+		 },
+		 {
+		 type: "整套布艺沙发",
+		 price: "160"
+		 }
+		 ],
+		 action_user: "",
+		 action_time: "",
+		 action_log: "",
+		 pics: [
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/Advertising_04.png",
+		 width: 658,
+		 height: 663
+		 },
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/a_01.png",
+		 width: 720,
+		 height: 1129
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/5536a4677fb781475914511648.jpg",
+		 width: 720,
+		 height: 1697
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/58eb5a44603191475914516767.jpg",
+		 width: 720,
+		 height: 1246
+		 }
+		 ]
+		 },
+		 {
+		 id: "57e0e04e9f5160af048b456b",
+		 name: "家电清洗",
+		 imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_05.png',
+		 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
+		 status: 1,
+		 is_extra: 0,
+		 order: 0,
+		 type: "4",
+		 type_str: "家电清洗",
+		 extra: [
+		 {
+		 type: "微波炉",
+		 price: "60"
+		 },
+		 {
+		 type: "洗衣机",
+		 price: "100"
+		 },
+		 {
+		 type: "油烟机",
+		 price: "120"
+		 },
+		 {
+		 type: "挂式空调",
+		 price: "100"
+		 },
+		 {
+		 type: "立式空调",
+		 price: "130"
+		 },
+		 {
+		 type: "冰箱-单开门",
+		 price: "100"
+		 },
+		 {
+		 type: "冰箱-双开门",
+		 price: "130"
+		 }
+		 ],
+		 action_user: "",
+		 action_time: "",
+		 action_log: "",
+		 pics: [
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/Advertising_05.png",
+		 width: 537,
+		 height: 537
+		 },
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/a_01.png",
+		 width: 720,
+		 height: 1165
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/0f29fa9bf28161475979068565.jpg",
+		 width: 720,
+		 height: 844
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/205de28a664c21475979065361.png",
+		 width: 720,
+		 height: 1129
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/f17ecbfe231231475979073441.jpg",
+		 width: 720,
+		 height: 1204
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/30daa83d817761475979080897.jpg",
+		 width: 720,
+		 height: 1246
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/3ee87b41d9d241475979077357.png",
+		 width: 720,
+		 height: 1257
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/06e7de122aab21475979086760.png",
+		 width: 720,
+		 height: 647
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/2973a12ec9a0f1475979093617.jpg",
+		 width: 720,
+		 height: 786
+		 }
+		 ]
+		 },
+		 {
+		 id: "57e0e0879f5160b8048b4571",
+		 price: "8",
+		 name: "新居开荒-每平米",
+		 imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_03.png',
+		 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_kh.jpg"}, {content: '新居开荒'}],
+		 status: 1,
+		 is_extra: 0,
+		 order: 0,
+		 type: "5",
+		 type_str: "新居开荒",
+		 action_user: "",
+		 action_time: "",
+		 action_log: "",
+		 pics: [
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/Advertising_03.png",
+		 width: 658,
+		 height: 663
+		 },
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92-01.jpg",
+		 width: 720,
+		 height: 10637
+		 }
+		 ]
+		 }, {
+		 id: "57fb4a909f5160b2048b4a0e",
+		 price: "10",
+		 name: "擦玻璃-每平米",
+		 imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E5%A3%B9%E7%AE%A1%E5%AE%B6%E6%93%A6%E7%8E%BB%E7%92%83%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: "6",
+		 type_str: "擦玻璃",
+		 action_user: "",
+		 action_time: "",
+		 action_log: "",
+		 pics: [
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5.jpg",
+		 width: 720,
+		 height: 11906
+		 }
+		 ]
+		 },
+		 {
+		 id: "57e3a5a49f5160c9048b457c",
+		 price: "",
+		 name: "母婴房清洁",
+		 imgSrc: 'http://odulvej8l.bkt.clouddn.com/Advertising_06.png',
+		 desc: [{content: "http://7oxep6.com2.z0.glb.clouddn.com/0e287e871c3831474536840941.jpg"}, {content: '母婴房清洁'}],
+		 status: 1,
+		 is_extra: 0,
+		 order: 200,
+		 type: "7",
+		 type_str: "母婴房清洁",
+		 extra: [
+		 {
+		 type: "整间日常清洁",
+		 price: "388"
+		 },
+		 {
+		 type: "整间深度清洁",
+		 price: "888"
+		 }
+		 ],
+		 action_user: "",
+		 action_time: "",
+		 action_log: "",
+		 pics: [
+		 {
+		 url: "http://odulvej8l.bkt.clouddn.com/Advertising_06.png",
+		 width: 576,
+		 height: 484
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/2a28708adeba61475912920337.jpg",
+		 width: 730,
+		 height: 522
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/49b77d125873d1475913063652.jpg",
+		 width: 730,
+		 height: 791
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/48787438272821475913069079.jpg",
+		 width: 730,
+		 height: 823
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/5f027131794191475913084173.jpg",
+		 width: 730,
+		 height: 808
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/0eb339c6872641475913124202.jpg",
+		 width: 730,
+		 height: 1196
+		 },
+		 {
+		 url: "http://oduj3utzz.bkt.clouddn.com/1c48dcac293c31475913147997.jpg",
+		 width: 730,
+		 height: 1111
+		 }
+		 ]
+		 },
+		 {
+		 id: "58085f4b9f5160a9048b490e",
+		 name: "租房大扫除",
+		 imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E5%A3%B9%E7%AE%A1%E5%AE%B6%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E9%A6%96%E5%9B%BE.jpg',
+		 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
+		 status: 1,
+		 is_extra: 0,
+		 order: 0,
+		 type: "8",
+		 type_str: "租房大扫除",
+		 extra: [
+		 {
+		 type: "客厅清洁",
+		 price: "100"
+		 },
+		 {
+		 type: "厨房清洁",
+		 price: "150"
+		 },
+		 {
+		 type: "卧室清洁",
+		 price: "100"
+		 },
+		 {
+		 type: "卫生间清洁",
+		 price: "150"
+		 }
+		 ],
+		 action_user: "",
+		 action_time: "",
+		 action_log: "",
+		 pics: [
+		 {
+		 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.jpg",
+		 width: 720,
+		 height: 11906
+		 }
+		 ]
+		 }
+		 ];*/
+		/*图片压缩*/
+		this.allList = [
+			{
+				id: "57e0dffc9f5160dd048b4568",
+				name: "日常清洁",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE-%E6%94%B9.jpg',
+				desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_rc.jpg"}, {content: "日常清洁"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "1",
+				type_str: "日常清洁",
+				extra: [
+					{
+						type: "一室一卫",
+						price: "98"
+					},
+					{
+						type: "两室一卫",
+						price: "118"
+					},
+					{
+						type: "两室两卫",
+						price: "138"
+					},
+					{
+						type: "三室两卫",
+						price: "158"
+					},
+					{
+						type: "四室三卫",
+						price: "228"
+					},
+					{
+						type: "200-250平米",
+						price: "298"
+					},
+					{
+						type: "200-300平米",
+						price: "398"
+					},
+					{
+						type: "三层别墅",
+						price: "498"
+					},
+					{
+						type: "四层别墅",
+						price: "598"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_01%28720+609%29.jpg",
+						width: 720,
+						height: 609
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_02%28720+811%29.jpg",
+						width: 720,
+						height: 811
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_03%28720+456%29.jpg",
+						width: 720,
+						height: 456
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_04%28720+1219%29.jpg",
+						width: 720,
+						height: 1219
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_05%28720+855%29.jpg",
+						width: 720,
+						height: 855
+					}
+				]
+			},
+			{
+				id: "57e0e0189f5160dc048b4568",
+				name: "深度清洁",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
+				desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_sd.jpg"}, {content: "深度清洁"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "2",
+				type_str: "深度清洁",
+				extra: [
+					{
+						type: "卧室清洁",
+						price: "188"
+					},
+					{
+						type: "客厅清洁",
+						price: "288"
+					},
+					{
+						type: "厨房清洁",
+						price: "388"
+					},
+					{
+						type: "卫生间清洁",
+						price: "188"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_01%28720+1042%29.jpg",
+						width: 720,
+						height: 1042
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_02%28720+846%29.jpg",
+						width: 720,
+						height: 846
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_03%28720+887%29.jpg",
+						width: 720,
+						height: 887
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_04%28720+578%29.jpg",
+						width: 720,
+						height: 578
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_05%28720+726%29.jpg",
+						width: 720,
+						height: 726
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_06%28720+816%29.jpg",
+						width: 720,
+						height: 816
+					}
+				]
+			},
+			{
+				id: "57e0e0369f5160b1048b456b",
+				name: "除螨杀菌",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C%E9%A6%96%E5%9B%BE.jpg',
+				desc: [{content: 'http://odqeoyzxd.bkt.clouddn.com/image/image_etsj.jpg'}, {content: "除螨杀菌"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "3",
+				type_str: "除螨杀菌",
+				extra: [
+					{
+						type: "儿童床",
+						price: "80"
+					},
+					{
+						type: "布艺窗帘",
+						price: "100"
+					},
+					{
+						type: "整床除螨",
+						price: "180"
+					},
+					{
+						type: "整套布艺沙发",
+						price: "160"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C%E9%A6%96%E5%9B%BE.jpg",
+						width: 720,
+						height: 585
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_1%28720+1165%29.jpg",
+						width: 720,
+						height: 1165
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_2%28720+1697%29.jpg",
+						width: 720,
+						height: 1697
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_3%28720+1246%29.jpg",
+						width: 720,
+						height: 1246
+					}
+				]
+			},
+			{
+				id: "57e0e04e9f5160af048b456b",
+				name: "家电清洗",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/4%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97%E9%A6%96%E5%9B%BE.jpg',
+				desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "4",
+				type_str: "家电清洗",
+				extra: [
+					{
+						type: "微波炉",
+						price: "60"
+					},
+					{
+						type: "洗衣机",
+						price: "100"
+					},
+					{
+						type: "油烟机",
+						price: "120"
+					},
+					{
+						type: "挂式空调",
+						price: "100"
+					},
+					{
+						type: "立式空调",
+						price: "130"
+					},
+					{
+						type: "冰箱-单开门",
+						price: "100"
+					},
+					{
+						type: "冰箱-双开门",
+						price: "130"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/4%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97%E9%A6%96%E5%9B%BE.jpg",
+						width: 720,
+						height: 585
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_1%28720+1165%29.jpg",
+						width: 720,
+						height: 1165
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_2%28720+844%29.jpg",
+						width: 720,
+						height: 844
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_3%28720+1129%29.jpg",
+						width: 720,
+						height: 1129
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_4%28720+1204%29.jpg",
+						width: 720,
+						height: 1204
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_5%28720+1246%29.jpg",
+						width: 720,
+						height: 1246
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_6%28720+1257%29.jpg",
+						width: 720,
+						height: 1257
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_7%28720+674%29.jpg",
+						width: 720,
+						height: 647
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_8%28720+786%29.jpg",
+						width: 720,
+						height: 786
+					}
+				]
+			},
+			{
+				id: "57e0e0879f5160b8048b4571",
+				price: "8",
+				name: "新居开荒",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%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: "6",
+				type_str: "新居开荒",
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92%E9%A6%96%E5%9B%BE.jpg",
+						width: 750,
+						height: 585
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_01%28720x1209%29.jpg",
+						width: 720,
+						height: 1209
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_02%28720x1041%29.jpg",
+						width: 720,
+						height: 1041
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_03%28720x1264%29.jpg",
+						width: 720,
+						height: 1264
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_04%28720x1295%29.jpg",
+						width: 720,
+						height: 1295
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_05%28720x685%29.jpg",
+						width: 720,
+						height: 685
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_06%28720x717%29.jpg",
+						width: 720,
+						height: 717
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_07%28720x685%29.jpg",
+						width: 720,
+						height: 685
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_08%28720x1083%29.jpg",
+						width: 720,
+						height: 1083
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_09%28720x915%29.jpg",
+						width: 720,
+						height: 915
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_10%28720x785%29.jpg",
+						width: 720,
+						height: 785
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_11%28720x958%29.jpg",
+						width: 720,
+						height: 958
+					}
+				]
+			},
+			{
+				id: "57fb4a909f5160b2048b4a0e",
+				price: "10",
+				name: "擦玻璃",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E6%93%A6%E7%8E%BB%E7%92%83%E9%A6%96%E5%9B%BE%E6%94%B9.jpg',
+				desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_kh.jpg"}, {content: '擦玻璃'}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "10",
+				type_str: "擦玻璃",
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_01%28720+608%29.jpg",
+						width: 720,
+						height: 608
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_02%28720+802%29.jpg",
+						width: 720,
+						height: 802
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_04%28720+516%29.jpg",
+						width: 720,
+						height: 516
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_03%28720+666%29.jpg",
+						width: 720,
+						height: 666
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_06%28720+820%29.jpg",
+						width: 720,
+						height: 802
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_07%28720+1071%29.jpg",
+						width: 720,
+						height: 1071
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_05%28720+846%29.jpg",
+						width: 720,
+						height: 846
+					}
+				]
+			},
+			{
+				id: "57e3a5a49f5160c9048b457c",
+				price: "",
+				name: "母婴房清洁",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
+				desc: [{content: "http://7oxep6.com2.z0.glb.clouddn.com/0e287e871c3831474536840941.jpg"}, {content: '母婴房清洁'}],
+				status: 1,
+				is_extra: 0,
+				order: 200,
+				type: "8",
+				type_str: "母婴房清洁",
+				extra: [
+					{
+						type: "整间日常清洁",
+						price: "388"
+					},
+					{
+						type: "整间深度清洁",
+						price: "888"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg",
+						width: 750,
+						height: 585
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_1%28730x522%29.jpg",
+						width: 730,
+						height: 522
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_2%28730x791%29.jpg",
+						width: 730,
+						height: 791
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_3%28730x823%29.jpg",
+						width: 730,
+						height: 823
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_4%28730x808%29.jpg",
+						width: 730,
+						height: 808
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_5%28730x1196%29.jpg",
+						width: 730,
+						height: 1196
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_6%28730x1111%29.jpg",
+						width: 730,
+						height: 1111
+					}
+				]
+			},
+			{
+				id: "58085f4b9f5160a9048b490e",
+				name: "租房大扫除",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%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: "家电清洗"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "9",
+				type_str: "租房清洁",
+				extra: [
+					{
+						type: "客厅清洁",
+						price: "100"
+					},
+					{
+						type: "厨房清洁",
+						price: "150"
+					},
+					{
+						type: "卧室清洁",
+						price: "100"
+					},
+					{
+						type: "卫生间清洁",
+						price: "150"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128%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: 750,
+						height: 585
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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",
+						width: 720,
+						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_08%28720x1213%29.jpg",
+						width: 720,
+						height: 1213
+					},
+					{
+						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",
+						width: 720,
+						height: 657
+					},
+					{
+						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",
+						width: 720,
+						height: 720
+					},
+					{
+						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",
+						width: 720,
+						height: 1104
+					},
+					{
+						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",
+						width: 720,
+						height: 951
+					},
+					{
+						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",
+						width: 720,
+						height: 812
+					},
+					{
+						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",
+						width: 720,
+						height: 850
+					}
+				]
+			},
+			{
+				id: "58324b7e9f5160a4048b5758",//test //583247cca84ea01d428b46a1 master//  58324b7e9f5160a4048b5758
+				price: "48",
+				name: "首单日常保洁2小时体验",//双11虹口区日常保洁特价体验//首单日常保洁2小时体验
+				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: "11",
+				type_str: "日常保洁2小时体验",
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_01%28720+609%29.jpg",
+						width: 720,
+						height: 609
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_02%28720+811%29.jpg",
+						width: 720,
+						height: 811
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_03%28720+456%29.jpg",
+						width: 720,
+						height: 456
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_04%28720+1219%29.jpg",
+						width: 720,
+						height: 1219
+					},
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_05%28720+855%29.jpg",
+						width: 720,
+						height: 855
+					}
+				]
+			},
+			{
+				id: "5835418aa84ea0a7748b4587",//5835418aa84ea0a7748b4587
+				name: "小时工单次",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E9%95%BF%E6%9C%9F%E8%AE%A2%E9%A6%96%E5%9B%BE.jpg',
+				desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "12",
+				type_str: "长期订",
+				extra: [
+					{
+						type: "2小时/人",
+						price: "90"
+					},
+					{
+						type: "3小时/人",
+						price: "135"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128%E9%95%BF%E6%9C%9F%E8%AE%A2%E9%A6%96%E5%9B%BE.jpg",
+						width: 750,
+						height: 585
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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",
+						width: 720,
+						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_08%28720x1213%29.jpg",
+						width: 720,
+						height: 1213
+					},
+					{
+						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",
+						width: 720,
+						height: 657
+					},
+					{
+						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",
+						width: 720,
+						height: 720
+					},
+					{
+						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",
+						width: 720,
+						height: 1104
+					},
+					{
+						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",
+						width: 720,
+						height: 951
+					},
+					{
+						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",
+						width: 720,
+						height: 812
+					},
+					{
+						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",
+						width: 720,
+						height: 850
+					}
+				]
+			},
+			{
+				id: "5835423fa84ea0ac7a8b4568",
+				name: "小时工多次",
+				imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E9%95%BF%E6%9C%9F%E8%AE%A2%E9%A6%96%E5%9B%BE.jpg',
+				desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "12",
+				type_str: "长期订",
+				extra: [
+					{
+						type: "3张(2小时/人)",
+						price: "32"
+					},
+					{
+						type: "3张(3小时/人)",
+						price: "33"
+					},
+					{
+						type: "6张(2小时/人)",
+						price: "62"
+					},
+					{
+						type: "6张(3小时/人)",
+						price: "63"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: "",
+				pics: [
+					{
+						url: "http://odulvej8l.bkt.clouddn.com/1128%E9%95%BF%E6%9C%9F%E8%AE%A2%E9%A6%96%E5%9B%BE.jpg",
+						width: 750,
+						height: 585
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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
+					},
+					{
+						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",
+						width: 720,
+						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_08%28720x1213%29.jpg",
+						width: 720,
+						height: 1213
+					},
+					{
+						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",
+						width: 720,
+						height: 657
+					},
+					{
+						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",
+						width: 720,
+						height: 720
+					},
+					{
+						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",
+						width: 720,
+						height: 1104
+					},
+					{
+						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",
+						width: 720,
+						height: 951
+					},
+					{
+						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",
+						width: 720,
+						height: 812
+					},
+					{
+						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",
+						width: 720,
+						height: 850
+					}
+				]
+			}
+		];
+		//列出所有的产品
+		Product.prototype.getListAll = function (userID, callback) {
+			var that = this;
+			api.getProductList({
+				user_id: userID,
+				// type: type
+			}, function (res) {
+				if (res.success) {
+					that.productList = {};
+					var petDic = {};
+					var productDatas = res['data']['products'];
+					var extraroducts = res['data']['extra_products'];
+					// that.extraService = extraroducts;
 
-                    for (var i in that.productGroup) {
-                        that.productGroup[i] = [];
-                    }
+					for (var i in that.productGroup) {
+						that.productGroup[i] = [];
+					}
 
-                    for (var i in that.extraProductGroup) {
-                        that.extraProductGroup[i] = [];
-                    }
+					for (var i in that.extraProductGroup) {
+						that.extraProductGroup[i] = [];
+					}
 
-                    for (var i = 0, len = productDatas.length; i < len; i++) {
-                        var eachProduct = productDatas[i];
-                        that.productGroup[eachProduct['type']].push(eachProduct);
-                        var petIDs = [];
+					for (var i = 0, len = productDatas.length; i < len; i++) {
+						var eachProduct = productDatas[i];
+						that.productGroup[eachProduct['type']].push(eachProduct);
+						var petIDs = [];
 
 
-                        that.productDic[eachProduct.id] = {//产品中心
-                            petIDs: petIDs,//宠物ID
-                            maxWeight: eachProduct.max_weight,//产品最大
-                            minWeight: eachProduct.min_weight,//产品最小
-                            // price: parseFloat(eachProduct.price).toFixed(2)
-                            price: parseFloat(eachProduct.price)//解析产品价格
-                            // 价格不要加小数点后两位
-                        };
-                    }
+						that.productDic[eachProduct.id] = {//产品中心
+							petIDs: petIDs,//宠物ID
+							maxWeight: eachProduct.max_weight,//产品最大
+							minWeight: eachProduct.min_weight,//产品最小
+							// price: parseFloat(eachProduct.price).toFixed(2)
+							price: parseFloat(eachProduct.price)//解析产品价格
+							// 价格不要加小数点后两位
+						};
+					}
 
 
-                    // for (var petID in petDic) {
-                    //   that.productGroup[eachProduct['type']].push(petDic[petID]);
-                    // }
-                }
-                if (typeof (callback) == 'function') {
-                    callback(res);
-                }
-            });
-        }
-    };
+					// for (var petID in petDic) {
+					//   that.productGroup[eachProduct['type']].push(petDic[petID]);
+					// }
+				}
+				if (typeof (callback) == 'function') {
+					callback(res);
+				}
+			});
+		}
+	};
 
-    //列出所有的产品
-    Product.prototype.getListAll = function (userID) {
-        api.getProductList({
-            user_id: userID
-        });
-    };
+	//列出所有的产品
+	Product.prototype.getListAll = function (userID) {
+		api.getProductList({
+			user_id: userID
+		});
+	};
 
-    Product.prototype = new base();
+	Product.prototype = new base();
 
-    return new Product();
+	return new Product();
 });

+ 117 - 116
www/webapp/o2o/js/page/myCoupon.js

@@ -1,127 +1,128 @@
 define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, user, config, IScroll) {
-    function back(event) {
-        event.preventDefault();
-        $(document).trigger('spa:navigate', {
-            hash: '',
-            pushData: {
-                dontNeedReload: true
-            }
-        });
-    }
+	function back(event) {
+		event.preventDefault();
+		$(document).trigger('spa:navigate', {
+			hash: '',
+			pushData: {
+				dontNeedReload: true
+			}
+		});
+	}
 
-    function fixScroll(pageData) {
-        if (pageData.scroll) {
-            pageData.scroll.destroy();
-            pageData.scroll = null;
-        }
+	function fixScroll(pageData) {
+		if (pageData.scroll) {
+			pageData.scroll.destroy();
+			pageData.scroll = null;
+		}
 
-        setTimeout(function () {
-            pageData.scroll = new IScroll('#myCouponScroll');
-        }, 50);
-    }
+		setTimeout(function () {
+			pageData.scroll = new IScroll('#myCouponScroll');
+		}, 50);
+	}
 
-    return {
-        title: '壹管家上门服务',
-        body: '',
-        init: function (pageData, dtd) {
-            var $view = this;
-            var $doc = $(document);
+	return {
+		title: '壹管家上门服务',
+		body: '',
+		init: function (pageData, dtd) {
+			var $view = this;
+			var $doc = $(document);
 
-            // 返回
-            $view.on('swipeRight', function (event) {
-                //back.call(this, event);
-                history.go(-1);
-            });
+			// 返回
+			$view.on('swipeRight', function (event) {
+				//back.call(this, event);
+				history.go(-1);
+			});
 
-            $.newTouch('.back-button', function (event) {
-                //back.call(this, event);
-                history.go(-1);
-            }, $view);
+			$.newTouch('.back-button', function (event) {
+				//back.call(this, event);
+				history.go(-1);
+			}, $view);
 
-            $view.on('tapBackButton', function (event) {
-                //back.call(this, event);
-                history.go(-1);
-            });
+			$view.on('tapBackButton', function (event) {
+				//back.call(this, event);
+				history.go(-1);
+			});
 
-            // 兑换
-            $.newTouch('.btn-coupon', function (event) {
-                event.preventDefault();
-                var val = $('#coupon-code', $view).val();
-                if (val.length < 8) {
-                    $doc.trigger('spa:openpanel', ['simpleAlert', {
-                        message: '请输入有效的兑换码'
-                    }]);
-                    return;
-                } else {
-                    $(this).val('');
-                    user.exchangeCoupon(val, function (res) {
-                        $doc.trigger('spa:openloader');
-                        if (res.success) {
-                            user.getCouponList(user.id, function (result) {
-                                $doc.trigger('spa:closeloader');
-                                if (result.success) {
-                                    var exchangeTpl = template('myCoupon/exchange', {
-                                        coupons: user.coupons
-                                    });
-                                    $('.spa-page-body', $view).find('.coupon-items').html(exchangeTpl);
-                                    fixScroll(pageData);
-                                }
-                                $doc.trigger('spa:openpanel', ['simpleAlert', {
-                                    message: result.message
-                                }]);
-                            });
-                        } else {
-                            $doc.trigger('spa:closeloader');
-                            $doc.trigger('spa:openpanel', ['simpleAlert', {
-                                message: res.message
-                            }]);
-                        }
-                    })
-                }
-            }, $view);
+			// 兑换
+			$.newTouch('.btn-coupon', function (event) {
+				event.preventDefault();
+				var val = $('#coupon-code', $view).val();
+				if (val.length < 8) {
+					$doc.trigger('spa:openpanel', ['simpleAlert', {
+						message: '请输入有效的兑换码'
+					}]);
+					return;
+				} else {
+					$(this).val('');
+					user.exchangeCoupon(val, function (res) {
+						$doc.trigger('spa:openloader');
+						if (res.success) {
+							user.getCouponList(user.id, function (result) {
+								$doc.trigger('spa:closeloader');
+								if (result.success) {
+									var exchangeTpl = template('myCoupon/exchange', {
+										coupons: user.coupons
+									});
+									$('.spa-page-body', $view).find('.coupon-items').html(exchangeTpl);
+									fixScroll(pageData);
+								}
+								$doc.trigger('spa:openpanel', ['simpleAlert', {
+									message: result.message
+								}]);
+							});
+						} else {
+							$doc.trigger('spa:closeloader');
+							$doc.trigger('spa:openpanel', ['simpleAlert', {
+								message: res.message
+							}]);
+						}
+					})
+				}
+			}, $view);
 
-            dtd.resolve();
-        },
-        beforeopen: function (pageData, dtd) {
-            var $view = this;
-            var $doc = $(document);
-            $doc.trigger('spa:openloader');
-            user.checkLogin(function () {
-                user.getCouponList(function (res) {
-                    $doc.trigger('spa:closeloader');
-                    if (res.success) {
-                        var tpl = template('myCoupon/index', {
-                            showNavBar: !config.isWX && !config.isChubao,
-                            usable_coupons: user.usable_coupons,
-                            used_coupons: user.used_coupons,
-                            overtime_coupons: user.overtime_coupons
-                        });
-                        $('.spa-page-body', $view).html(tpl);
-                        fixScroll(pageData);
-                    } else {
-                        $doc.trigger('spa:openpanel', ['simpleAlert', {
-                            message: res.message
-                        }]);
-                    }
-                })
-            });
+			dtd.resolve();
+		},
+		beforeopen: function (pageData, dtd) {
+			var $view = this;
+			var $doc = $(document);
+			$doc.trigger('spa:openloader');
+			user.checkLogin(function () {
+				user.getCouponList(function (res) {
+					$doc.trigger('spa:closeloader');
+					if (res.success) {
+						console.log(res.data.useable_coupons);
+						var tpl = template('myCoupon/index', {
+							showNavBar: !config.isWX && !config.isChubao,
+							usable_coupons: user.usable_coupons,
+							used_coupons: user.used_coupons,
+							overtime_coupons: user.overtime_coupons
+						});
+						$('.spa-page-body', $view).html(tpl);
+						fixScroll(pageData);
+					} else {
+						$doc.trigger('spa:openpanel', ['simpleAlert', {
+							message: res.message
+						}]);
+					}
+				})
+			});
 
-            dtd.resolve();
-            if (config.isWX) {
-                wx.ready(function () {
-                    wx.onMenuShareTimeline({
-                        title: '家政服务,首选壹管家',
-                        link: 'http://www.yiguanjia.me/o2o/web/index',
-                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-                    });
-                    wx.onMenuShareAppMessage({
-                        title: '家政服务,首选壹管家',
-                        desc: '全程管家,精心每一个细节!',
-                        link: 'http://www.yiguanjia.me/o2o/web/index',
-                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-                    });
-                });
-            }
-        }
-    }
+			dtd.resolve();
+			if (config.isWX) {
+				wx.ready(function () {
+					wx.onMenuShareTimeline({
+						title: '家政服务,首选壹管家',
+						link: 'http://www.yiguanjia.me/o2o/web/index',
+						imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+					});
+					wx.onMenuShareAppMessage({
+						title: '家政服务,首选壹管家',
+						desc: '全程管家,精心每一个细节!',
+						link: 'http://www.yiguanjia.me/o2o/web/index',
+						imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+					});
+				});
+			}
+		}
+	}
 })

+ 11 - 24
www/webapp/o2o/tpl/activities/text.html

@@ -16,41 +16,28 @@
 						<div class="box-container box box-vertical" style="background: #fff">
 							<div style="position: relative;top: 0;width: 100%;background: #fff; padding: 0 10px">
 								<p style="position: absolute;background: #fff;">
-								<h3 style="text-align: center;">充值返现活动协议</h3>
+								<h3 style="text-align: center;margin-top: 10px;">充值返现活动协议</h3>
 								<h4>一、活动内容:</h4>
-								<h5>单笔充值1000元,可获得1088元余额+日本游抽奖一次;</h5>
+								<h5>单笔充值1000元,可获得1088元余额;</h5>
 								<h5> 单笔充值3000元,可获得3360元余额;</h5>
-								<h5> 单笔充值5000元,可获得5680元余额+日本游抽奖一次;
-								</h5>
-								<h5> 单笔充值10000元,可获得10880元余额+日本五天四夜游机票酒店一名;
-								</h5>
-								<h5>温馨提示:</h5>
-								<h5>1.壹管家抽奖相关细则:</h5>
-								<h5>a)充值1000元档的客户,可获88元折扣,并获得一次抽奖资格。抽选奖品为日本游1份。(每100个抽奖资格,配置奖品1组)</h5>
-								<h5>b)充值5000元档的客户,可获688元折扣,并活动一次抽奖资格。抽选奖品为日本游1份。(每100个抽奖资格,配置奖品2组)</h5>
-								<h5>c)充值10000元档的客户,直接送出日本游2份。(先到先得)</h5>
-								<h5>2.注,三种活动不叠加参与,活动A、活动B使用独立的奖池。</h5>
-								<h5>3.本次活动仅限个人用户参与,企业用户不在此活动范围。</h5>
-								<h4>二、活动时间</h4>
-								<h5>即日起至2016年11月20日</h5>
-								<h6>三、奖品兑换方式及说明</h6>
-								<p>2、壹管家不提供旅游相关服务,具体使用及相关售后问题请联系旅行社供应商</p>
-								<p>3、壹管家返活动的相关问题,您可咨询服务热线4009200901(周一至周五,9:00-18:00)</p>
-								<h4>四、余额构成</h4>
+								<h5> 单笔充值5000元,可获得5680元余额;</h5>
+								<h5>单笔充值10000元,可获得10880元余额;</h5>
+								<h4>二、余额构成</h4>
 								<h5>您实际支付的充值本金加上壹管家的返现金额会构成您的账户余额(人民币)。</h5>
-								<h4>、充值金额有效期</h4>
+								<h4>三、充值金额有效期</h4>
 								<h5>充值及返现金额有效期为自充值日起至用完即止。</h5>
-								<h4>、充值金额使用规则</h4>
+								<h4>四、充值金额使用规则</h4>
 								<h5>余额可用于支付壹管家所有家庭保洁和家电保洁服务,但不能用于支付服务中产生的其他第三方费用,也不支持提现、转移、转赠,退款。</h5>
-								<h4>、发票金额</h4>
+								<h4>五、发票金额</h4>
 								<h5>根据我们已收到的充值金额开具,充值赠送金额或其他并非您实际支付的费用不能开具发票。</h5>
-								<h4>、充返活动退款规则</h4>
+								<h4>六、充返活动退款规则</h4>
 								<h5>退款说明:在参与壹管家充返活动后的7天之内(≤7天,即参与活动当天为第一天),您可享受7天退款服务,当您申请退款服务,则视为您自动放弃“充值返现”活动权益,将不再享受充返折扣,具体退款规则如下:</h5>
 								<h5>1.充值余额:</h5>
 								<h5>a)若未产生服务费用,可退还当期实际充值金额,我们会在您申请退款服务之日起21个工作日内为您办理退款;</h5>
 								<h5>b)若已产生服务费用,可退款扣除您在下单服务中实际产生的用费后的实际剩余充值金额(实际剩余充值金额=实际充值金额-实际服务金额),我们会在您申请退款服务之日起21个工作日内为您办理退款;</h5>
 								<h5>
-									2.活动赠品服务(例:日本游抽奖活动);仅支持奖金兑换码在未发送并兑换使用的情况下享受退款服务,我们需要收回您在参与活动时得到的奖金号,并在您申请退款服务之日起21个工作日内,为您退还实际充值金额;抽奖兑换码及旅游奖金一经兑换使用,则无法享受退款服务。</h5>
+									2.仅支持奖金兑换码在未发送并兑换使用的情况下享受退款服务,我们需要收回您在参与活动时得到的奖金号,并在您申请退款服务之日起21个工作日内,为您退还实际充值金额;抽奖兑换码及旅游奖金一经兑换使用,则无法享受退款服务。</h5>
+								<h5>3.壹管家返活动的相关问题,您可咨询服务热线4009200901(周一至周五,9:00-18:00)</h5>
 								</p>
 								<div style="padding-bottom: 1%;width: 100%"></div>
 							</div>

+ 0 - 3
www/webapp/o2o/tpl/recharge/cell.html

@@ -17,9 +17,6 @@
     <button class="btn btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}" data-index="{{ i }}" style="background-color: rgba(146,118,3,1);color: rgb(233,233,216);border: 0;border-radius: 0px;">立即充值</button>
 </li>
 {{ /each }}-->
-
-
-
 {{ each recharges as recharge i }}
 <li class="media btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"
     data-index="{{ i }}">

+ 3 - 5
www/webapp/o2o/tpl/recharge/index.html

@@ -9,16 +9,14 @@
 <div class="content">
 	<div class="box-container box box-vertical">
 		<div id="rechargeScroll" class="scroll-container box-flex-1">
-			<img class="ad-hide" src="http://odulvej8l.bkt.clouddn.com/%E5%85%85%E5%80%BC%E5%8D%A1banner.jpg"
+			<img class="ad-hide" src="http://odulvej8l.bkt.clouddn.com/%E5%85%85%E5%80%BC%E5%8D%A1.jpg"
 			     style="width: 100%;">
 			<ul class="ad-hide list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px">
 				{{include './cell'}}
 			</ul>
 			<div class="ad-hide" style="text-align: center;"><span style="font-size: 0.6rem">点击立即充值,即表示您已经同意壹管家</span><span
-				style="font-size: 0.6rem;font-weight: 600;display: block;" ></span>
-				<span  style="font-size: 0.6rem;">《<span class="pay-agreement" style="text-decoration: underline;color: #0A246A">充返活动协议</span>》</span>
-				<span style="display: inline-block;font-size: 0.6rem;font-weight: 600; " class="pay-rule"><span
-					style="text-decoration: underline;color: #0A246A">活动规则</span></span>
+				style="font-size: 0.6rem;font-weight: 600;display: block;" >《<span class="pay-agreement" style="text-decoration: underline;color: #0A246A">充返活动协议</span>》</span>
+
 			</div>
 		</div>
 	</div>

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů