洪海涛 il y a 8 ans
Parent
commit
8e1e2f91ab

+ 2 - 0
www/webapp/o2o/css/common.css

@@ -152,6 +152,7 @@ ul, li {
 
 .page-content {
 	padding: 15px 0;
+	background: #efeff4;
 }
 
 /* picker */
@@ -225,6 +226,7 @@ ul, li {
 
 .coupon-items {
 	background: #efeff4;
+	margin-bottom: 13%;
 }
 
 .coupon-info {

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/css/main.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/js/model/product.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/js/model/user.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/js/page/myCoupon.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/js/page/placeOrder.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1
www/webapp/o2o/dist/js/page/rechargee.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/js/build/template.js


+ 11 - 11
www/webapp/o2o/js/model/product.js

@@ -489,7 +489,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 			{
 				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',
+				// 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,
@@ -568,7 +568,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 			{
 				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',
+				// 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,
@@ -632,7 +632,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 			{
 				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',
+				// 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,
@@ -686,7 +686,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 			{
 				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',
+				// 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,
@@ -778,7 +778,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 				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',
+				// 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,
@@ -855,7 +855,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 				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',
+				// 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,
@@ -907,7 +907,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 				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',
+				// 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,
@@ -968,7 +968,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 			{
 				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',
+				// 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,
@@ -1073,7 +1073,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 				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',
+				// 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,
@@ -1114,7 +1114,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 			{
 				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',
+				// 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,
@@ -1210,7 +1210,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 			{
 				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',
+				// 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,

+ 1 - 1
www/webapp/o2o/js/model/user.js

@@ -8,7 +8,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		}
 		User.instance = this;
 		this.storagePrefix = 'user_';
-		this.id = ''; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
+		this.id = '57e38f1b9f5160ac048b457d'; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';

+ 30 - 0
www/webapp/o2o/js/page/myCoupon.js

@@ -42,6 +42,34 @@ define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, us
 				//back.call(this, event);
 				history.go(-1);
 			});
+// im
+			$.newTouch('.btn-action-logo', function (event) {
+				event.preventDefault();
+				window.location.href = '/index.php?r=o2o/advisory/im';
+			}, $view);
+			/*首页*/
+			$.newTouch('.btn-action-my-order', function () {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: '',
+					pushData: {
+						needReset: true
+					}
+				});
+			}, $view);
+			/*个人中心*/
+			$.newTouch('.btn-action-coupon', function (event) {
+				event.preventDefault();
+				user.checkLogin(function () {
+					$doc.trigger('spa:navigate', {
+						hash: 'mine',
+						pushData: {
+							needReset: true
+						}
+					});
+				});
+			}, $view);
+
 
 			// 兑换
 			$.newTouch('.btn-coupon', function (event) {
@@ -80,6 +108,8 @@ define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, us
 				}
 			}, $view);
 
+
+
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {

+ 8 - 0
www/webapp/o2o/js/page/placeOrder.js

@@ -55,6 +55,12 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 			if (product.name == "首单日常保洁2小时体验") {
 				$('.selected').css('display', 'none');
 			}
+			if(product.name=="擦玻璃"){
+				$('.orderNum').text("请选择玻璃的平方数");
+			}
+			if(product.name=="新居开荒"){
+				$('.orderNum').text("请选择开荒的平方数");
+			}
 			/*隐藏手势*/
 			$('.product-img').css('display', 'none');
 		}, 100);
@@ -885,6 +891,8 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 		beforeopen: function (pageData, dtd) {
 			/*地址- setInterval-setTimeout*/
 			setTimeout(function () {
+				/*隐藏广告位*/
+				$('.product-pic-o2o').css('display', 'none');
 				/*当用户没有地址时*/
 				var defaultAddress = address.defaultAddress;
 				if (typeof(defaultAddress.address) == "undefined") {

+ 21 - 4
www/webapp/o2o/js/page/rechargee.js

@@ -11,6 +11,18 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 		});
 	}
 
+
+	function fixScroll(pageData) {
+		if (pageData.scroll) {
+			pageData.scroll.destroy();
+			pageData.scroll = null;
+		}
+
+		setTimeout(function () {
+			pageData.scroll = new IScroll('#myCouponScroll');
+		}, 50);
+	}
+
 	return {
 		title: '充值规则',
 		body: '',
@@ -88,6 +100,10 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
+			/*设置底部功能区*/
+			setTimeout(function () {
+				$('.coupon-items').css("margin-bottom", "15%");
+			}, 500);
 			/*获取上一页跳转的路由名称*/
 			var pushData = pageData.pushData;
 			backHash = pushData.backHash ? pushData.backHash : '';
@@ -107,17 +123,18 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 							recharges: res.data
 						});
 						$('.spa-page-body', $view).html(tpl);
+						fixScroll(pageData);
 						//var value = $(this).attr('data-value');
 						var value = $('.btn-add-recharge').attr('data-index');
 						for (var i = value; i < 2; i++) {
 						}
 						/*设置返现协议居中*/
 						setTimeout(function () {
-							var rechargeRule=$(".rechargeRule");
-							var window=$("#rechargeScroll").width();
+							var rechargeRule = $(".rechargeRule");
+							var window = $("#rechargeScroll").width();
 							console.log(window);
-							rechargeRule.css("left",(window-rechargeRule.width())/2);
-						},10);
+							rechargeRule.css("left", (window - rechargeRule.width()) / 2);
+						}, 10);
 						setTimeout(function () {
 							pageData.scroll = new IScroll('#rechargeScroll');
 						}, 500);

+ 10 - 10
www/webapp/o2o/tpl/homeenterprise/index.html

@@ -22,16 +22,16 @@
 				</div>
 				<div class="prevent-scroll">
 					<div class="o2o-btn-homestay" style="
-					    text-align: center;
-              background: rgb(219,199,67);
-              color: #fff;
-              position: absolute;
-              right: 0;
-              width: 25%;
-              top: -1.65rem;
-              border: 0px solid rgba(0,0,0,0.14);
-              border-radius: 14px;
-              line-height: 1.5rem;">点击咨询
+					        text-align: center;
+                  background: rgb(219,199,67);
+                  color: #fff;
+                  position: absolute;
+                  right: 0;
+                  width: 25%;
+                  top: -2.65rem;
+                  border: 0px solid rgba(0,0,0,0.14);
+                  border-radius: 14px;
+                  line-height: 2.5rem;">点击咨询
 					</div>
 					<div class="box my-action">
 						<!--首页-->

+ 10 - 10
www/webapp/o2o/tpl/homestay/index.html

@@ -22,16 +22,16 @@
 				</div>
 				<div class="prevent-scroll">
 					<div class="o2o-btn-homestay" style="
-					    text-align: center;
-              background: rgb(219,199,67);
-              color: #fff;
-              position: absolute;
-              right: 0;
-              width: 25%;
-              top: -1.65rem;
-              border: 0px solid rgba(0,0,0,0.14);
-              border-radius: 14px;
-              line-height: 1.5rem;">点击咨询
+					        text-align: center;
+                  background: rgb(219,199,67);
+                  color: #fff;
+                  position: absolute;
+                  right: 0;
+                  width: 25%;
+                  top: -2.65rem;
+                  border: 0px solid rgba(0,0,0,0.14);
+                  border-radius: 14px;
+                  line-height: 2.5rem;">点击咨询
 					</div>
 					<div class="box my-action">
 						<!--首页-->

+ 30 - 0
www/webapp/o2o/tpl/myCoupon/index.html

@@ -48,4 +48,34 @@
       </div>
     </div>
   </div>
+	<div class="prevent-scroll">
+		<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">
+						<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>

+ 102 - 102
www/webapp/o2o/tpl/placeOrder/index.html

@@ -1,115 +1,115 @@
 {{ if showNavBar }}
 <header class="bar bar-nav">
-    <a class="left-button back-button">
-        <div class="icon icon-left-nav"></div>
-    </a>
+	<a class="left-button back-button">
+		<div class="icon icon-left-nav"></div>
+	</a>
 
-    <h1 class="title">{{title}}</h1>
+	<h1 class="title">{{title}}</h1>
 </header>
 {{ /if }}
 <div class="content">
-    <div class="box-container">
-        <div class="box-container box box-vertical">
-            <div id="placeOrderScroll" class="scroll-container box-flex-1">
-                <div class="scroller">
-                    <div class="">
-                        <ul class="table-view product-pic-o2o">
-                            <li id="product-pic-bg">
-                                <img class="lazy product-pic-o2o" src="{{imgSrc}}" style="width: 100%;" alt="">
-                                <div class="product-img"></div>
-                            </li>
-                        </ul>
-                        <!-- 选择extra -->
-                        {{if extra}}
-                        <div class="table-view main-service">
-                            <p class="main-service-title">请选择</p>
-                            {{each extra as e}}
-                            <div class="width-percent-50">
-                                <div class="btn btn-main-service" data-extra-type="{{e.type}}"
-                                     data-extra-price="{{e.price}}">{{e.type}}
-                                </div>
-                            </div>
-                            {{/each}}
-                        </div>
-                        {{/if}}
-                        <ul class="table-view">
-                            <!-- 选择数量 -->
-                            <li class="table-view-cell selected table-link-label">
-                                <div class="link-label selected">
-                                    购买数量
-                                    <div class="service-count o2o-singles-day">
-                                        <div class="btn btn-sub">-</div>
-                                        <!--<span class="num">1</span>-->
-                                        <input type="text" class="input-num"
-                                               style="text-align: center;padding: 0;width: 24px;height: 24px;border-radius:0;"
-                                               maxlength="3" value="1"/>
-                                        <div class="btn btn-add">+</div>
-                                    </div>
-                                </div>
-                            </li>
-                            <li class="table-view-cell">
-                                <a class="navigate-right select-address"
-                                   style="display: flex; justify-content:space-between; align-items: center; padding-right: 2rem">
-                                    地址
-                                    <div class="table-view-cell-right-label media-body has-address"
-                                         style="display: block; position: static;">
-                                        <span class="order-username"></span>
-                                        <span class="order-mobile"></span>
-                                        <p class="order-address"></p>
+	<div class="box-container">
+		<div class="box-container box box-vertical">
+			<div id="placeOrderScroll" class="scroll-container box-flex-1">
+				<div class="scroller">
+					<div class="">
+						<ul class="table-view product-pic-o2o">
+							<li id="product-pic-bg">
+								<img class="lazy product-pic-o2o" src="{{imgSrc}}" style="width: 100%;" alt="">
+								<div class="product-img"></div>
+							</li>
+						</ul>
+						<!-- 选择extra -->
+						{{if extra}}
+						<div class="table-view main-service">
+							<p class="main-service-title">请选择</p>
+							{{each extra as e}}
+							<div class="width-percent-50">
+								<div class="btn btn-main-service" data-extra-type="{{e.type}}"
+								     data-extra-price="{{e.price}}">{{e.type}}
+								</div>
+							</div>
+							{{/each}}
+						</div>
+						{{/if}}
+						<ul class="table-view">
+							<!-- 选择数量 -->
+							<li class="table-view-cell selected table-link-label">
+								<div class="link-label selected">
+									<span class="orderNum">购买数量</span>
+									<div class="service-count o2o-singles-day">
+										<div class="btn btn-sub">-</div>
+										<!--<span class="num">1</span>-->
+										<input type="text" class="input-num"
+										       style="text-align: center;padding: 0;width: 24px;height: 24px;border-radius:0;"
+										       maxlength="3" value="1"/>
+										<div class="btn btn-add">+</div>
+									</div>
+								</div>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right select-address"
+								   style="display: flex; justify-content:space-between; align-items: center; padding-right: 2rem">
+									地址
+									<div class="table-view-cell-right-label media-body has-address"
+									     style="display: block; position: static;">
+										<span class="order-username"></span>
+										<span class="order-mobile"></span>
+										<p class="order-address"></p>
 
-                                    </div>
+									</div>
 
-                                </a>
-                            </li>
-                            <li class="table-view-cell table-link-label">
-                                <a class="navigate-right show-time-picker"
-                                   style="display: flex; justify-content:space-between; align-items: center; padding-right: 2rem">
-                                    服务时间
-                                    <span class="table-view-cell-right-label booking-time"
-                                          style="display: block; position: static; text-align: right">选择服务时间</span>
-                                </a>
-                            </li>
+								</a>
+							</li>
+							<li class="table-view-cell table-link-label">
+								<a class="navigate-right show-time-picker"
+								   style="display: flex; justify-content:space-between; align-items: center; padding-right: 2rem">
+									服务时间
+									<span class="table-view-cell-right-label booking-time"
+									      style="display: block; position: static; text-align: right">选择服务时间</span>
+								</a>
+							</li>
 
-                        </ul>
-                        <!-- 优惠券 -->
-                        <ul class="table-view">
-                            <li class="table-view-cell {{if !showCoupon }}disabled{{/if}}">
-                                <a class="navigate-right show-coupon-picker"
-                                   style="display: flex; justify-content:space-between; align-items: center; padding-right: 2rem">
-                                    优惠券
-                                    <span class="table-view-cell-right-label coupon-selected-name"
-                                          style="display: block; position: static; text-align: right">选择优惠券</span>
-                                </a>
-                            </li>
-                            <li class="table-view-cell memo">
-                                <form class="input-group" id="order-form">
-                                    <input type="text" class="order-memo" id="order-memo" placeholder="(备注)可填写附加要求">
-                                </form>
-                            </li>
-                        </ul>
-                        <!-- 用户协议 -->
-                        <div class="box bottom-box">
-                            <div class="agreement-box">
-                                <div class="agreement-touch-area">
-                                </div>
-                                <input type="checkbox" class="agreement-checkbox" checked="checked"/>
-                <span>
+						</ul>
+						<!-- 优惠券 -->
+						<ul class="table-view">
+							<li class="table-view-cell {{if !showCoupon }}disabled{{/if}}">
+								<a class="navigate-right show-coupon-picker"
+								   style="display: flex; justify-content:space-between; align-items: center; padding-right: 2rem">
+									优惠券
+									<span class="table-view-cell-right-label coupon-selected-name"
+									      style="display: block; position: static; text-align: right">选择优惠券</span>
+								</a>
+							</li>
+							<li class="table-view-cell memo">
+								<form class="input-group" id="order-form">
+									<input type="text" class="order-memo" id="order-memo" placeholder="(备注)可填写附加要求">
+								</form>
+							</li>
+						</ul>
+						<!-- 用户协议 -->
+						<div class="box bottom-box">
+							<div class="agreement-box">
+								<div class="agreement-touch-area">
+								</div>
+								<input type="checkbox" class="agreement-checkbox" checked="checked"/>
+								<span>
                   同意<a class="agreement">壹管家用户服务协议</a>
                 </span>
-                            </div>
-                        </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" style="margin-bottom: 0;">确认预约</a>
-            </div>
-        </div>
-    </div>
+							</div>
+						</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" style="margin-bottom: 0;">确认预约</a>
+			</div>
+		</div>
+	</div>
 </div>
 </div>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff