Merge branch 'test' of https://git.oschina.net/yiguanjia/php into test

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

@@ -1,246 +1,246 @@
-{{ if showNavBar }}
-<header class="bar bar-nav">
-  <a class="left-button back-button">
-    <div class="icon icon-left-nav"></div>
-  </a>
-  <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">
-              <li id="product-pic-bg" class="table-view-cell">
-                <a class="navigate-right product-pic" style="background-image: url({{imgSrc}});">
-                  <div class="product-name">{{title}}详情及评价 <span>&gt;&gt;&gt;</span></div>
-                </a>
-              </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">
-                <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>
-              </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">
-                  服务时间
-                  <span class="table-view-cell-right-label booking-time">选择服务时间</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="table-view-cell {{if !showCoupon }}disabled{{/if}}">
-                <a class="navigate-right show-coupon-picker">优惠券
-                  <span class="table-view-cell-right-label coupon-selected-name">选择优惠券</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" />
-                <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: 14px">
-          账户余额
-          <span style="font-size: 14px; color: #ec5330; text-align: right; display: inline" >￥ {{balance}}</span>
-        </div>
-        <div style="font-size: 14px">
-          费用总计
-          <span class="order-cost" style="font-size: 14px; 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>
+{{ if showNavBar }}
+<header class="bar bar-nav">
+  <a class="left-button back-button">
+    <div class="icon icon-left-nav"></div>
+  </a>
+  <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">
+              <li id="product-pic-bg" class="table-view-cell">
+                <a class="navigate-right product-pic" style="background-image: url({{imgSrc}});">
+                  <div class="product-name">{{title}}详情及评价 <span>&gt;&gt;&gt;</span></div>
+                </a>
+              </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">
+                <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>
+              </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">
+                  服务时间
+                  <span class="table-view-cell-right-label booking-time">选择服务时间</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="table-view-cell {{if !showCoupon }}disabled{{/if}}">
+                <a class="navigate-right show-coupon-picker">优惠券
+                  <span class="table-view-cell-right-label coupon-selected-name">选择优惠券</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" />
+                <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: 14px">
+          账户余额
+          <span style="font-size: 14px; color: #ec5330; text-align: right; display: inline" >￥ {{balance}}</span>
+        </div>
+        <div style="font-size: 14px">
+          费用总计
+          <span class="order-cost" style="font-size: 14px; 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>