订单部分页面与css修改

www/webapp/o2o/css/common.css

@@ -14,9 +14,9 @@ html {
     font-size: 13px;
     color: #999;
     white-space: nowrap;
-    margin-left: 3%;
     overflow: hidden;
-    width: 57%;
+    right: 13%;
+    text-align: right;
 }
 
 .bar-nav {

www/webapp/o2o/css/placeOrder.css

@@ -280,6 +280,7 @@
   font-size: 0.8rem;
   padding-left: 8px;
   color: #333;
+    margin-bottom: 0;
 }
 .main-service-tips {
   font-size: 0.7rem;
@@ -317,7 +318,7 @@
 .main-service .width-percent-50 {
   display: inline-block;
   width: 50%;
-  padding: 4px 8px;
+  padding: 2px 8px;
 }
 .main-service .btn {
   width: 100%;

www/webapp/o2o/css/ratchetOverloading.css

@@ -28,4 +28,8 @@
 
 #beauticianScroll .table-view-cell .select-item .btn-positive {
     padding: 12px 14px 12px;
+}
+
+.table-view .table-view-cell{
+    background-size: 90% 1px;
 }

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

@@ -502,7 +502,8 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                 if (order.productCount >= 999) return;
                 if (order.price == 0) {
                     $doc.trigger('spa:openpanel', ['simpleAlert', {
-                        message: '请选择extra'
+                        //message: '请选择extra'
+                        message: '请选择服务'
                     }]);
                     return;
                 }

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

@@ -62,7 +62,7 @@
                             </ul>
                         </div>
                         <!--<div style="width: 100%; height: 80px"></div>-->
-                        <!--<div style="width: 100%;padding-bottom: 15%"></div>-->
+                        <div style="width: 100%;padding-bottom: 10%"></div>
                     </div>
                 </div>
             </div>

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

@@ -94,11 +94,6 @@
                   <span class="table-view-cell-right-label booking-time">选择服务时间</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="extra-service-title">附加服务</div>
@@ -171,6 +166,11 @@
                   <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">