90

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

@@ -767,7 +767,9 @@ define(['base', '$', 'api'], function (base, $, api) {
         ]
       },
       {
-        id: "58085f4b9f5160a9048b490e",
+        // test:57e0e0709f5160aa048b456c
+        // master:58085f4b9f5160a9048b490e
+        id: "57e0e0709f5160aa048b456c",
         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: "家电清洗"}],
@@ -775,8 +777,8 @@ define(['base', '$', 'api'], function (base, $, api) {
         is_extra: 0,
         order: 0,
         price: "12",
-        type: "9",
-        type_str: "租房清洁",
+        type: "5",//test:5;master:9;
+        type_str: "民宿保洁",
         action_user: "",
         action_time: "",
         action_log: "",

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

@@ -749,8 +749,10 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
       /* 点击下订单 */
       $.newTouch('.btn-place', function (event) {
         event.preventDefault();
-        if(order.appendID==="布艺沙发"){
-          if(order.productCount<3){
+        console.log(order);
+        // 判断布艺沙发下单数量少于3套
+        if (order.appendID === "布艺沙发") {
+          if (order.productCount < 3) {
             $doc.trigger('spa:openpanel', ['simpleAlert', {
               message: '布衣沙发3套起购'
             }]);
@@ -760,31 +762,42 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
         if ($(this).hasClass('disable')) {
           return false;
         }
+        //擦玻璃数量少于10平米
         if (product.type_str == "擦玻璃" && order.productCount < 10) {
           $doc.trigger('spa:openpanel', ['simpleAlert', {
             message: '数量不少于10平米'
           }]);
           return;
         }
-
+        // 新居开慌的数量少于50平米
         if (product.type_str == "新居开荒" && order.productCount < 50) {
           $doc.trigger('spa:openpanel', ['simpleAlert', {
             message: '数量不少于50平米'
           }]);
           return;
         }
-        if (product.type_str == "租房大扫除" && order.productCount < 10) {
+        // 民宿保洁的数量少于10平米
+        if (product.type_str == "民宿保洁" && order.productCount < 10) {
           $doc.trigger('spa:openpanel', ['simpleAlert', {
             message: '数量不少于10平米'
           }]);
           return;
         }
+        //未选择服务
         if (product.extra && !order.appendID) {
           $doc.trigger('spa:openpanel', ['simpleAlert', {
             message: '请选择服务'
           }]);
           return;
         }
+        //未选择服务时间
+        if (order.bookingTime === "") {
+          $doc.trigger('spa:openpanel', ['simpleAlert', {
+            message: '请选择服务时间'
+          }]);
+          return;
+        }
+        // 地址为空
         if (!order.address) {
           $doc.trigger('spa:openpanel', ['simpleAlert', {
             message: '请选择地址'