init

www/protected/modules/o2o/views/web/index.php

@@ -10,7 +10,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css">
     <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css">
-    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017052502">
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017052505">
     <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/swiper.css" rel="stylesheet">
     <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js"></script>
     <style>
@@ -76,7 +76,7 @@
       location.hash = '';
     }
     var debug = false;
-    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017052502';
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017052505';
     if (debug) {
       main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/js/main.js?v=' + (new Date()).getTime();
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';

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

@@ -774,26 +774,9 @@ define(['base', '$', 'api'], function (base, $, api) {
         status: 1,
         is_extra: 0,
         order: 0,
+        price: "12",
         type: "9",
         type_str: "租房清洁",
-        extra: [
-          {
-            type: "客厅清洁",
-            price: "100"
-          },
-          {
-            type: "厨房清洁",
-            price: "150"
-          },
-          {
-            type: "卧室清洁",
-            price: "100"
-          },
-          {
-            type: "卫生间清洁",
-            price: "150"
-          }
-        ],
         action_user: "",
         action_time: "",
         action_log: "",

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

@@ -749,7 +749,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
       /* 点击下订单 */
       $.newTouch('.btn-place', function (event) {
         event.preventDefault();
-        if(order.appendID="布艺沙发"){
+        if(order.appendID==="布艺沙发"){
           if(order.productCount<3){
             $doc.trigger('spa:openpanel', ['simpleAlert', {
               message: '布衣沙发3套起购'
@@ -773,21 +773,21 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
           }]);
           return;
         }
-        if (product.extra && !order.appendID) {
+        if (product.type_str == "租房大扫除" && order.productCount < 10) {
           $doc.trigger('spa:openpanel', ['simpleAlert', {
-            message: '请选择服务'
+            message: '数量不少于10平米'
           }]);
           return;
         }
-        if (!order.address) {
+        if (product.extra && !order.appendID) {
           $doc.trigger('spa:openpanel', ['simpleAlert', {
-            message: '请选择地址'
+            message: '请选择服务'
           }]);
           return;
         }
-        if (!order.bookingTimeStr && product.name !== "双11虹口区日常保洁特价体验") {
+        if (!order.address) {
           $doc.trigger('spa:openpanel', ['simpleAlert', {
-            message: '请选择上门时间'
+            message: '请选择地址'
           }]);
           return;
         }

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

@@ -1,40 +1,28 @@
 {{ if showNavBar }}
 <header class="bar bar-nav">
-	<a class="left-button back-button">
-		<div class="icon icon-left-nav"></div>
-	</a>
-	<h1 class="title">母婴房保洁</h1>
+  <a class="left-button back-button">
+    <div class="icon icon-left-nav"></div>
+  </a>
+  <h1 class="title">母婴房保洁</h1>
 </header>
 {{ /if }}
 
 <div class="content">
-	<div class="box-container">
-		<div class="box-container box box-vertical">
-			<div id="homeenterpriseScroll" class="scroll-container box-flex-1">
-				<div class="scroller">
-					<div class="home-stay-content">
-						<img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81.jpg"
-							style="width: 100%;display: block;"><img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_01.jpg"
-							style="width: 100%;display: block;">
-						<img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_02.jpg"
-							style="width: 100%;display: block;">
-						<img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_03.jpg"
-							style="width: 100%;display: block;">
-						<img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_04.jpg"
-							style="width: 100%;display: block;">
-						<img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_05.jpg"
-							style="width: 100%;display: block;">
-												<div style="padding-bottom:10%;"></div>
-					</div>
-				</div>
-				<div class="prevent-scroll">
-					<div class="btn-appliances" data-product-type="7" style="
+  <div class="box-container">
+    <div class="box-container box box-vertical">
+      <div id="homeenterpriseScroll" class="scroll-container box-flex-1">
+        <div class="scroller">
+          <div class="home-stay-content">
+            <img
+              src="http://odulvej8l.bkt.clouddn.com/2017525_mother_room_0.jpg"
+              style="width: 100%;display: block;"><img
+            src="http://odulvej8l.bkt.clouddn.com/2017525_mother_room.jpg"
+            style="width: 100%;display: block;">
+            <div style="padding-bottom:10%;"></div>
+          </div>
+        </div>
+        <div class="prevent-scroll">
+          <div class="btn-appliances" data-product-type="7" style="
 					        text-align: center;
     background: rgb(219,199,67);
     color: #fff;
@@ -44,37 +32,38 @@
     top: -2.85rem;
     border: 0px solid rgba(0,0,0,0.14);
     border-radius: 14px;
-    line-height: 2.5rem;" >预约服务</div>
-					<div class="box my-action">
-						<!--首页-->
-						<div class="width-percent-33">
-							<div class="title-container-square">
-								<a class="btn-home-action btn-action-my-order">
-									<div class="logo logo-my-order"></div>
-									<div class="name">首页</div>
-								</a>
-							</div>
-						</div>
-						<!--LOGO-->
-						<div class="width-percent-33">
-							<div class="title-container-square">
-								<a class="btn-home-action btn-action-logo" href="weixin://contacts/profile/honghaitzz">
-									<div class="logo logo-my-logo"></div>
-								</a>
-							</div>
-						</div>
-						<!--我的-->
-						<div class="width-percent-33">
-							<div class="title-container-square">
-								<a class="btn-home-action btn-action-coupon">
-									<div class="logo logo-coupon"></div>
-									<div class="name">我的</div>
-								</a>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+    line-height: 2.5rem;">预约服务
+          </div>
+          <div class="box my-action">
+            <!--首页-->
+            <div class="width-percent-33">
+              <div class="title-container-square">
+                <a class="btn-home-action btn-action-my-order">
+                  <div class="logo logo-my-order"></div>
+                  <div class="name">首页</div>
+                </a>
+              </div>
+            </div>
+            <!--LOGO-->
+            <div class="width-percent-33">
+              <div class="title-container-square">
+                <a class="btn-home-action btn-action-logo" href="weixin://contacts/profile/honghaitzz">
+                  <div class="logo logo-my-logo"></div>
+                </a>
+              </div>
+            </div>
+            <!--我的-->
+            <div class="width-percent-33">
+              <div class="title-container-square">
+                <a class="btn-home-action btn-action-coupon">
+                  <div class="logo logo-coupon"></div>
+                  <div class="name">我的</div>
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>