洪海涛 8 år sedan
förälder
incheckning
9e7b30ca34

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
www/webapp/o2o/dist/js/model/user.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 1
www/webapp/o2o/js/build/template.js


+ 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='';

+ 4 - 4
www/webapp/o2o/tpl/activities/day.html

@@ -12,14 +12,14 @@
 			<div class="box-container box box-vertical" style="background: #fff">
 				<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%801-%E7%AC%AC%E4%B8%80%E9%83%A8%E5%88%86.jpg" alt="">
 				<!--下单-->
-				<div style="position: relative;margin-top: -0.22rem;margin-bottom: -0.22rem;">
+				<span style="position: relative;margin-top: -0.22rem;margin-bottom: -0.22rem;">
 					<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%801.jpg" alt="">
-					<div style="    width: 32.7%;
+					<span style="    width: 32.7%;
     padding-bottom: 10.5%;
     position: absolute;
     left: 35.6%;
-    top: 0;" class="btn-appliances" data-product-type="9" ></div>
-				</div>
+    top: 0;" class="btn-appliances" data-product-type="9" ></span>
+				</span>
 				<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%803-%E7%AC%AC%E4%BA%8C%E9%83%A8%E5%88%86.jpg" alt="">
 				<!--优惠券-->
 				<div style="position: relative;margin-top: -0.22rem;margin-bottom: -0.22rem;">

+ 256 - 246
www/webapp/o2o/tpl/placeOrder/index.html

@@ -1,263 +1,273 @@
 {{ 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="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>
-                        </ul>
-                        <!-- 选择extra -->
-                        {{if extra}}
-                        <li class="o2o-singles-day" style="display: none;">
-                            <img src="http://odulvej8l.bkt.clouddn.com/11%E5%85%83banner.jpg" alt="双十一活动" style="width: 100%">
-                            <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/13内。</p>
-                            <p style="margin: 0 10px"><label style="font-weight:700;font-size: 14px;">5、</label>在未使用的情况下,可于2016/11/14后拨打400-806-5111,申请退款。</p>
-                        </li>
-                        <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 show-time-picker">
-                                <div class="link-label show-product-picker selected">
-                                    购买数量
-                                    <div class="service-count">
-                                        <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>
+	<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="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-img"></div>
+							</li>
+						</ul>
+						<!-- 选择extra -->
+						{{if extra}}
+						<li class="o2o-singles-day" style="display: none;">
+							<img src="http://odulvej8l.bkt.clouddn.com/11%E5%85%83banner.jpg" alt="双十一活动" style="width: 100%">
+							<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/13内。
+							</p>
+							<p style="margin: 0 10px"><label style="font-weight:700;font-size: 14px;">5、</label>在未使用的情况下,可于2016/11/14后拨打400-806-5111,申请退款。
+							</p>
+						</li>
+						<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 show-time-picker">
+								<div class="link-label show-product-picker selected">
+									购买数量
+									<div class="service-count">
+										<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>
-                                </a>
-                            </li>
-                            <!-- 不选宠物
-                            <li class="table-view-cell">
-                              {{if type == 7}}
-                              <div class="link-label show-product-picker selected">
-                                狗狗数量
-                                <div class="service-count">
-                                  <div class="btn btn-sub">-</div>
-                                  <span class="num">1</span>
-                                  <div class="btn btn-add">+</div>
-                                </div>
-                              </div>
-                              {{else if type == 6}}
-                              <div class="link-label show-product-picker selected">
-                                宠物
-                                <span class="table-view-cell-right-label pet-info">
-                                  {{ if petName == '' || petWeight == '' }}
-                                    选择宠物类型
-                                  {{ else }}
-                                    {{petName}} ({{petWeight}})
-                                  {{ /if }}
-                                </span>
-                              </div>
-                              {{else}}
-                              <a class="navigate-right show-product-picker">
-                                宠物
-                                <span class="table-view-cell-right-label pet-info">
-                                  {{if petName == '' || petWeight == ''}}
-                                    选择宠物类型
-                                  {{else}}
-                                    {{petName}} ({{petWeight}})
-                                  {{/if}}
-                                </span>
-                              </a>
-                              {{/if}}
-                            </li>
-                            -->
-                            <li class="table-view-cell">
-                                <a class="navigate-right show-time-picker"
-                                   style="display: flex; justify-content:space-between; align-items: center; padding-right: 2rem">
-                                    服务时间
+										<p class="order-address"></p>
+									</div>
+								</a>
+							</li>
+							<!-- 不选宠物
+							<li class="table-view-cell">
+								{{if type == 7}}
+								<div class="link-label show-product-picker selected">
+									狗狗数量
+									<div class="service-count">
+										<div class="btn btn-sub">-</div>
+										<span class="num">1</span>
+										<div class="btn btn-add">+</div>
+									</div>
+								</div>
+								{{else if type == 6}}
+								<div class="link-label show-product-picker selected">
+									宠物
+									<span class="table-view-cell-right-label pet-info">
+										{{ if petName == '' || petWeight == '' }}
+											选择宠物类型
+										{{ else }}
+											{{petName}} ({{petWeight}})
+										{{ /if }}
+									</span>
+								</div>
+								{{else}}
+								<a class="navigate-right show-product-picker">
+									宠物
+									<span class="table-view-cell-right-label pet-info">
+										{{if petName == '' || petWeight == ''}}
+											选择宠物类型
+										{{else}}
+											{{petName}} ({{petWeight}})
+										{{/if}}
+									</span>
+								</a>
+								{{/if}}
+							</li>
+							-->
+							<li class="table-view-cell">
+								<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>
-                        <!-- 附加服务
-                        <div class="extra-service-title">附加服务</div>
-                        <ul class="table-view extra-service-list">
-                          {{if extraServiceType == 11}}
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox checked" data-name="体外驱虫"> 体外驱虫 (40元)</a>
-                          </li>
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-name="体内驱虫"> 体内驱虫 (30元)</a>
-                          </li>
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-name="药浴"> 药浴 (40元)</a>
-                          </li>
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-name="一次性局部染色"> 一次性局部染色 (28元)</a>
-                          </li>
-                          {{else if extraServiceType == 12}}
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-name="体外驱虫"> 体外驱虫 (40元)</a>
-                          </li>
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-name="体内驱虫"> 体内驱虫 (30元)</a>
-                          </li>
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox checked" data-name="药浴"> 药浴 (40元)</a>
-                          </li>
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-name="一次性局部染色"> 一次性局部染色 (28元)</a>
-                          </li>
-                          {{else if extraServiceType == 13}}
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-name="体外驱虫"> 体外驱虫 (40元)</a>
-                          </li>
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-name="体内驱虫"> 体内驱虫 (30元)</a>
-                          </li>
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-name="药浴"> 药浴 (40元)</a>
-                          </li>
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox checked" data-name="一次性局部染色"> 一次性局部染色 (28元)</a>
-                          </li>
-                          {{/if}}
-                          {{ each extraService as extraServiceList i }}
-                          <li class="table-view-cell">
-                            <a class="navigate-right item-checkbox" data-select="0" data-id="{{extraServiceList.id}}" data-price="{{extraServiceList.price}}" data-name="{{extraServiceList.name}}" data-serviceType="{{extraServiceList.serviceType}}">
-                            {{extraServiceList.name}} ({{extraServiceList.price}}元)
-                            </a>
-                          </li>
-                          {{ /each }}
-                        </ul>
-                        -->
-                        <!-- 选择保洁师
-                        <ul class="table-view">
-                          <li class="table-view-cell">
-                            <a class="navigate-right show-beautician-picker">
-                              系统推荐保洁师
-                              <span class="table-view-cell-right-label booking-people">
-                                {{if beauticianName !== ''}}{{beauticianName}}{{else}}请选择{{/if}}
-                              </span>
-                            </a>
-                          </li>
-                        </ul>
-                        -->
-                        <!-- 优惠券 -->
-                        <ul class="table-view">
-                            <li class="show-coupon-picker 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">
-                                    优惠券
+								</a>
+							</li>
+						</ul>
+						<!-- 附加服务
+						<div class="extra-service-title">附加服务</div>
+						<ul class="table-view extra-service-list">
+							{{if extraServiceType == 11}}
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox checked" data-name="体外驱虫"> 体外驱虫 (40元)</a>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-name="体内驱虫"> 体内驱虫 (30元)</a>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-name="药浴"> 药浴 (40元)</a>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-name="一次性局部染色"> 一次性局部染色 (28元)</a>
+							</li>
+							{{else if extraServiceType == 12}}
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-name="体外驱虫"> 体外驱虫 (40元)</a>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-name="体内驱虫"> 体内驱虫 (30元)</a>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox checked" data-name="药浴"> 药浴 (40元)</a>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-name="一次性局部染色"> 一次性局部染色 (28元)</a>
+							</li>
+							{{else if extraServiceType == 13}}
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-name="体外驱虫"> 体外驱虫 (40元)</a>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-name="体内驱虫"> 体内驱虫 (30元)</a>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-name="药浴"> 药浴 (40元)</a>
+							</li>
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox checked" data-name="一次性局部染色"> 一次性局部染色 (28元)</a>
+							</li>
+							{{/if}}
+							{{ each extraService as extraServiceList i }}
+							<li class="table-view-cell">
+								<a class="navigate-right item-checkbox" data-select="0" data-id="{{extraServiceList.id}}" data-price="{{extraServiceList.price}}" data-name="{{extraServiceList.name}}" data-serviceType="{{extraServiceList.serviceType}}">
+								{{extraServiceList.name}} ({{extraServiceList.price}}元)
+								</a>
+							</li>
+							{{ /each }}
+						</ul>
+						-->
+						<!-- 选择保洁师
+						<ul class="table-view">
+							<li class="table-view-cell">
+								<a class="navigate-right show-beautician-picker">
+									系统推荐保洁师
+									<span class="table-view-cell-right-label booking-people">
+										{{if beauticianName !== ''}}{{beauticianName}}{{else}}请选择{{/if}}
+									</span>
+								</a>
+							</li>
+						</ul>
+						-->
+						<!-- 优惠券 -->
+						<ul class="table-view">
+							<li class="show-coupon-picker 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>
-                        <!-- 订单详情
-                        <ul class="table-view order-list">
-                          <li class="table-view-cell select-pet {{if petName == ''}}hide{{/if}}">
-                            <div class="link-label pet-type">{{petName}} ({{petWeight}})</div>
-                            <div class="link-label">
-                              <span class="service-name">{{productType}}</span>
-                              <span class="table-view-cell-right-label total-cost">¥ {{petPrice}}</span>
-                            </div>
-                          </li>
-                          <li class="table-view-cell calc-items hide">
-                            {{if extraServiceType == 11}}
-                            <div class="link-label select-extra-service" data-price="40">体外驱虫
-                              <span class="table-view-cell-right-label precedence-cost">¥ 40</span>
-                            </div>
-                            {{else if extraServiceType == 12}}
-                            <div class="link-label select-extra-service" data-price="40">药浴
-                              <span class="table-view-cell-right-label precedence-cost">¥ 40</span>
-                            </div>
-                            {{else if extraServiceType == 13}}
-                            <div class="link-label select-extra-service" data-price="28">一次性局部染色
-                              <span class="table-view-cell-right-label precedence-cost">¥ 28</span>
-                            </div>
-                            {{/if}}
-                            {{each extraService as extraServiceList i}}
-                              <div class="link-label select-extra-service" data-price="{{extraServiceList.price}}">{{extraServiceList.name}}
-                                <span class="table-view-cell-right-label precedence-cost">¥{{extraServiceList.price}}</span>
-                              </div>
-                            {{/each}}
-                          </li>
-                          <li class="table-view-cell select-precedence {{if !precedence}}hide{{/if}}">
-                            <div class="link-label select-precedence-label">加急
-                              <span class="table-view-cell-right-label precedence-cost">¥ {{precedence}}</span>
-                            </div>
-                          </li>
-                          <li class="table-view-cell select-coupon {{if !couponVal}}hide{{/if}}">
-                            <div class="link-label select-coupon-label">优惠券
-                              <span class="table-view-cell-right-label coupon-cost">
-                                - {{couponVal}}
-                              </span>
-                            </div>
-                          </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"/>
+								</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>
+						<!-- 订单详情
+						<ul class="table-view order-list">
+							<li class="table-view-cell select-pet {{if petName == ''}}hide{{/if}}">
+								<div class="link-label pet-type">{{petName}} ({{petWeight}})</div>
+								<div class="link-label">
+									<span class="service-name">{{productType}}</span>
+									<span class="table-view-cell-right-label total-cost">¥ {{petPrice}}</span>
+								</div>
+							</li>
+							<li class="table-view-cell calc-items hide">
+								{{if extraServiceType == 11}}
+								<div class="link-label select-extra-service" data-price="40">体外驱虫
+									<span class="table-view-cell-right-label precedence-cost">¥ 40</span>
+								</div>
+								{{else if extraServiceType == 12}}
+								<div class="link-label select-extra-service" data-price="40">药浴
+									<span class="table-view-cell-right-label precedence-cost">¥ 40</span>
+								</div>
+								{{else if extraServiceType == 13}}
+								<div class="link-label select-extra-service" data-price="28">一次性局部染色
+									<span class="table-view-cell-right-label precedence-cost">¥ 28</span>
+								</div>
+								{{/if}}
+								{{each extraService as extraServiceList i}}
+									<div class="link-label select-extra-service" data-price="{{extraServiceList.price}}">{{extraServiceList.name}}
+										<span class="table-view-cell-right-label precedence-cost">¥{{extraServiceList.price}}</span>
+									</div>
+								{{/each}}
+							</li>
+							<li class="table-view-cell select-precedence {{if !precedence}}hide{{/if}}">
+								<div class="link-label select-precedence-label">加急
+									<span class="table-view-cell-right-label precedence-cost">¥ {{precedence}}</span>
+								</div>
+							</li>
+							<li class="table-view-cell select-coupon {{if !couponVal}}hide{{/if}}">
+								<div class="link-label select-coupon-label">优惠券
+									<span class="table-view-cell-right-label coupon-cost">
+										- {{couponVal}}
+									</span>
+								</div>
+							</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 class="o2o-height" style="width: 100%;"></div>
-                    </div>
-                </div>
-            </div>
+							</div>
+						</div>
+						<!--高度补偿-->
+						<div class="o2o-height" style="width: 100%;"></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>
-            </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>
+			</div>
+		</div>
+	</div>
 </div>
 </div>

Vissa filer visades inte eftersom för många filer har ändrats