订单样式颜色改动

www/webapp/o2o/css/placeOrder.css

@@ -184,7 +184,7 @@
 .spa-page-place-order .booking-time,
 .spa-page-place-order .coupon-selected-name {
     /*color: #8bc34e;*/
-    color: rgb(178,143,1);
+    color: rgba(146,118,3,1);
 }
 
 .spa-page-place-order .total-cost {
@@ -258,7 +258,7 @@
     color: #fff;
     height: 1.4rem;
     /*background: rgba(139, 195, 74, 0.80);*/
-    background: rgb(178,143,1);
+    background: rgba(146,118,3,1);
 }
 
 .spa-page-place-order .product-name span {
@@ -408,8 +408,8 @@
 .spa-page-place-order .service-count .btn {
     /*color: #8bc34a;
     border-color: #8bc34a;*/
-    color: rgb(178,143,1);
-    border-color: rgb(178,143,1);
+    color: rgba(146,118,3,1);
+    border-color: rgba(146,118,3,1);
     background: #fff;
     padding: 0;
     font-size: 20px;

www/webapp/o2o/css/product.css

@@ -19,12 +19,12 @@
   width: 50%;
  /* border-color: #8bc34a;
   color: #8bc34a;*/
-   border-color: rgb(178,143,1);
-  color: rgb(178,143,1);
+   border-color: rgba(146,118,3,1);
+  color: rgba(146,118,3,1);
 }
 .spa-page-product .type-control .control-item.active {
   /*background: #8bc34a;*/
-  background: rgb(178,143,1);
+  background: rgba(146,118,3,1);
   color: #fff;
 }
 .spa-page-product .product-main-container {

www/webapp/o2o/css/refund.css

@@ -42,7 +42,7 @@
   font-size: 0;
 }
 .btn-main {
-  background-color: rgb(178,143,1)!important;
+  background-color: rgba(146,118,3,1)!important;
 }
 .spa-page-refund .order-btn {
   display: inline-block;

www/webapp/o2o/js/build/template.js

@@ -1434,7 +1434,7 @@ $out+=' <div class="content"> <div class="box-container"> <div class="box-contai
 include('./list');
 $out+=' </ul> </div> <div class="result-item btn-container prevent-scroll"> <div class="cost"> 总计 <span class="order-cost" data-pay="0">￥ 0</span> </div> <a class="btn btn-main btn-block btn-place">确认预约</a> </div> </div> </div> </div> ';
 return new String($out);
-});/*v:61*/
+});/*v:63*/
 template('placeOrder/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,imgSrc=$data.imgSrc,extra=$data.extra,$each=$utils.$each,e=$data.e,$index=$data.$index,type=$data.type,petName=$data.petName,petWeight=$data.petWeight,extraServiceType=$data.extraServiceType,extraService=$data.extraService,extraServiceList=$data.extraServiceList,i=$data.i,beauticianName=$data.beauticianName,showCoupon=$data.showCoupon,productType=$data.productType,petPrice=$data.petPrice,precedence=$data.precedence,couponVal=$data.couponVal,balance=$data.balance,$out='';if(showNavBar ){
@@ -1564,9 +1564,9 @@ $out+='hide';
 }
 $out+='"> <div class="link-label select-coupon-label">优惠券 <span class="table-view-cell-right-label coupon-cost"> - ';
 $out+=$escape(couponVal);
-$out+=' </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: 0.8rem"> 账户余额 <span style="font-size: 0.8rem; color: #ec5330; text-align: right; display: inline">￥ ';
+$out+=' </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: 0.8rem">账户余额<span class="order-cost" style="font-size: 0.8rem; color: #ec5330; text-align: right; display: inline">￥ ';
 $out+=$escape(balance);
-$out+='</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="background-color: rgb(178,143,1)">确认预约</a> </div> </div> </div> </div> </div> ';
+$out+='</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> ';
 return new String($out);
 });/*v:1*/
 template('placeOrder/list',function($data,$filename

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

@@ -243,18 +243,9 @@
                     </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 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="background-color: rgb(178,143,1)">确认预约</a>
+            <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>