添加企业服务

www/protected/modules/common/views/activity/SinglesDay.php

@@ -86,12 +86,14 @@
 <!--      </div>-->
       <!--按钮-->
       <div class="form-group">
-        <button class="btn btn-success col-xs-12"
+        <button
+          style="background: rgb(42,36,0);color:rgb(178,143,0);border: 0"
+          class="btn btn-success col-xs-12"
                 data-container="body"
                 data-toggle="popover"
                 data-placement="top"
                 data-content="{{btnContent}}">
-          预约服务
+          提交
         </button>
       </div>
     </div>
@@ -136,7 +138,7 @@
     <div class="model-title"
          style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';width: 100%;text-align: center;font-size: 2.2rem;margin-top: 5%;"></div>
     <div class="model-content"
-         style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';margin: 0 auto;width: 80%;background: #007aff;font-size: 1.3rem;margin-top: 30px;color: #fff;text-align: center;padding: 5px 0 5px 0"></div>
+         style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';margin: 0 auto;width: 80%;background: rgb(42,36,0);color:rgb(178,143,0);font-size: 1.3rem;margin-top: 30px;text-align: center;padding: 5px 0 5px 0"></div>
   </div>
 </div>
 </body>
@@ -153,6 +155,7 @@
 
     /*表单提交进行判断*/
     $('button').on('click', function () {
+
         /*姓名是否为空*/
         if ($scope.username == undefined) {
           model('请重填', '确认您的姓名');
@@ -163,6 +166,11 @@
           model('请重填', '手机号码有误');
           return false;
         }
+        /*性别*/
+        if ($scope.sex == undefined) {
+          model('请重新选择', '确认');
+          return false;
+        }
         /*验证服务范围内*/
 //        if ($scope.Area != 6) {
 //          model('抱歉', '您所在区域不再服务范围之内');
@@ -170,10 +178,10 @@
 //        }
 
         /*验证地址*/
-        if ($('input[name="address"]').val().length < 7) {
-          model('地址错误', '确认您的的地址');
-          return false;
-        }
+//        if ($('input[name="address"]').val().length < 7) {
+//          model('地址错误', '确认您的的地址');
+//          return false;
+//        }
         /*model*/
         function model(title, content) {
           $('.model-box').css('display', 'inline');

www/webapp/o2o/build.js

@@ -17,6 +17,7 @@
 			'pageMine',
 			'pageSecondary',
 			'pageHomestay',
+			'pageHomeenterprise',
 			'pageProduct',
 			'pagePlaceOrder',
 			'pagePicker',

www/webapp/o2o/css/main.css

@@ -8,6 +8,7 @@
 @import url("./mine.css");
 @import url("./secondary.css");
 @import url("./homestay.css");
+@import url("./homeenterprise.css");
 @import url("./desc.css");
 @import url("./agreement.css");
 @import url("./review.css");

www/webapp/o2o/dist/js/build.txt

@@ -28,6 +28,7 @@ model/review.js
 page/mine.js
 page/secondary.js
 page/homestay.js
+page/homeenterprise.js
 model/cart.js
 page/product.js
 page/placeOrder.js

www/webapp/o2o/dist/js/page/homeenterprise.js

@@ -0,0 +1 @@
+;

www/webapp/o2o/js/main.js

@@ -33,6 +33,7 @@ require.config({
 		pageRecharge: './page/rechargee',
 		pageHelp: './page/help',
 		pageHomestay: './page/homestay',
+		pageHomeenterprise: './page/homeenterprise',
 		pageAbout: './page/about',
 		pageProduct: './page/product',
 		pageProductInfo: './page/productInfo',
@@ -162,6 +163,18 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 			})
 		}
 	};
+	//企业服务homeEnterprise
+	var pageHomeenterprise = {
+		route: 'homeenterprise',
+		classname: 'homeenterprise',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageHomeenterprise'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
 	//商品提示信息
 	var pageProductInfo = {
 		route: 'product-info/:type',
@@ -495,7 +508,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 		}
 	};
 
-	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay, pageHomeenterprise,pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
 
 	var panelAlert = {
 		id: 'simpleAlert',

www/webapp/o2o/js/page/home.js

@@ -49,10 +49,10 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			}, $view);
 			//加载弹框
 			setTimeout(function () {
-				// $('.swiper-container').height($('.swiper-container img').height());
+				$('.swiper-container').height($('.swiper-container img').height());
 				$('.pagination').css('bottom', '0.15rem');
 			}, 200);
-			setTimeout(function () {
+			/*setTimeout(function () {
 				$doc.trigger('spa:openpanel', ['simpleAlert', {
 					message: '您已获得双十一大礼包',
 					// title: '系统通知',
@@ -60,7 +60,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 					buttons: [{text: '查看', class: 'btn-o2o-home btn-o2o-home-2'}, {text: '关闭', class: 'btn-o2o-home'}]
 				}]);
 
-			}, 1000);
+			}, 1000);*/
 			$.newTouch('.btn-o2o-home', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {

www/webapp/o2o/js/page/homeenterprise.js

@@ -0,0 +1,3 @@
+/**
+ * Created by Jinguo on 2016/11/8.
+ */

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

@@ -58,8 +58,12 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 		setTimeout(function () {
 			pageData.scroll = new IScroll('#placeOrderScroll');
 			if (product.name == "活动产品") {
-				console.log("正常");
+				// console.log($('.o2o-singles-day p').height());
+				// $('.o2o-height').height($('.o2o-singles-day p').height()*6);
+				$('.o2o-height').css('padding-bottom','100%')
 				$('.show-time-picker').css('display', 'none');
+				$('.o2o-singles-day').css('display','list-item');
+				$('.o2o-product-html').css('height','1000px');
 			}
 		}, 50);
 	}

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

@@ -12,13 +12,21 @@
         <div class="box-container box box-vertical">
             <div id="placeOrderScroll" class="scroll-container box-flex-1">
                 <div class="scroller">
-                    <div class="">
+                    <div class="o2o-product-html">
                         <ul class="table-view product-pic-o2o">
                             <li id="product-pic-bg">
                                 <img src="{{imgSrc}}" style="width: 100%;" alt="">
                                 <!--<div class="product-name">{{title}}详情及评价 <span id="hot">&gt;&gt;&gt;</span></div>-->
                                 <div class="product-img"></div>
                             </li>
+                            <li class="o2o-singles-day" style="display: none;">
+                                <h4 style="padding: 0 0 0 10px">本次活动明细</h4>
+                                <p style="margin: 0 10px"><label style="font-weight:700;font-size: 14px;">1、</label>11元活动产品仅于2016/11/11-2016/11/13在线销售，每日销售111份，共计333份。</p>
+                                <p style="margin: 0 10px"><label style="font-weight:700;font-size: 14px;">2、</label>本产品为日常保洁服务，不包含擦玻璃、家电清洁、大扫除等深层服务内容</p>
+                                <p style="margin: 0 10px"><label style="font-weight:700;font-size: 14px;">3、</label>每个微信号限购买1次，每个地址限使用1次，限虹口区地址的民用住宅使用，不限房型。</p>
+                                <p style="margin: 0 10px"><label style="font-weight:700;font-size: 14px;">4、</label>购买产品后，请于2016/11/11-2016/11/24之间拨打400-806-5111，预约服务时间，服务时间为2016/11/14-2016/12/23内。</p>
+                                <p style="margin: 0 10px"><label style="font-weight:700;font-size: 14px;">5、</label>在未使用的情况下，可于2016/11/14后拨打400-806-5111，申请退款。</p>
+                            </li>
                         </ul>
                         <!-- 选择extra -->
                         {{if extra}}
@@ -239,9 +247,12 @@
                 </span>
                             </div>
                         </div>
+                        <!--高度补偿-->
+                        <div class="o2o-height" style="width: 100%;padding-bottom:15% "></div>
                     </div>
                 </div>
             </div>
+
             <div class="result-item btn-container prevent-scroll" style="padding-left: 15px; display: flex; justify-content: space-between; align-items: center">
                 <!--<div style="font-size: 0.8rem">账户余额<span class="order-cost" style="font-size: 0.8rem; color: #ec5330; text-align: right; display: inline">￥ {{balance}}</span></div>-->
                 <div style="font-size: 0.8rem">费用总计：<span class="order-cost" style="font-size: 0.8rem; color: #ec5330; text-align: right; display: inline">￥ 0</span></div><a class="btn btn-main btn-block btn-place">确认预约</a>

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

@@ -25,7 +25,7 @@
 
                                     <div class="extra-service-name">日常清洁</div>
                                 </li>
-                                <li class="Long-term-set btn-product" data-product-type="9">
+                                <li class="Long-term-set">
                                     <!--<img src="http://oduj3utzz.bkt.clouddn.com/Home_btn_clean%20%287%29.png"  width="50px" height="50px">-->
                                     <img src="http://odulvej8l.bkt.clouddn.com/%E9%95%BF%E6%9C%9F%E5%AE%9Aicon-01-01-01.png">