增加balance

www/webapp/o2o/css/placeOrder.css

@@ -75,6 +75,7 @@
   font-weight: 700;
   font-size: 18px;
 }
+
 .spa-page-place-order .order-cost {
   font-size: 16px;
   color: #ec5330;
@@ -173,6 +174,7 @@
   background: #fff;
   border-top: 1px solid #eee;
 }
+
 .spa-page-place-order .result-item .cost {
   text-align: right;
   line-height: 48px;

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

@@ -1459,10 +1459,10 @@ $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:28*/
+});/*v:35*/
 template('placeOrder/index',function($data,$filename
 /**/) {
-'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,showExtra=$data.showExtra,$each=$utils.$each,extra=$data.extra,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,$out='';if(showNavBar ){
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,showExtra=$data.showExtra,$each=$utils.$each,extra=$data.extra,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 ){
 $out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">';
 $out+=$escape(title);
 $out+='</h1> </header> ';
@@ -1533,13 +1533,13 @@ $out+=' （';
 $out+=$escape(extraServiceList.price);
 $out+='元） </a> </li> ';
 });
-$out+=' </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"> ';
+$out+=' </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 !== ''){
 $out+=$escape(beauticianName);
 }else{
 $out+='请选择';
 }
-$out+=' </span> </a> </li> </ul>  <ul class="table-view"> <li class="table-view-cell ';
+$out+=' </span> </a> </li> </ul> -->  <ul class="table-view"> <li class="table-view-cell ';
 if(!showCoupon ){
 $out+='disabled';
 }
@@ -1585,7 +1585,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"> <div class="cost"> 总计 <span class="order-cost" >￥ 0</span> </div> <a class="btn btn-main btn-block btn-place">确认预约</a> </div> </div> </div> </div> </div> ';
+$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="display: flex; justify-content: space-between; align-items: center"> <div style="padding-left: 15px; text-align: left; line-height: 48px;"> 账户余额 <span style="font-size: 16px; color: #ec5330; text-align: right;" >￥ ';
+$out+=$escape(balance);
+$out+='</span> </div> <div class="cost"> 费用总计 <span class="order-cost" >￥ 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/js/model/order.js

@@ -8,6 +8,7 @@ define(['base', '$', 'native', 'product', 'api'], function (base, $, native, pro
     }
     Order.instance = this;
     this.storagePrefix = 'order_';
+    this.balance = 0;
     this.memo = '';
     this.cost = 0;
     this.bookingDate = '';

www/webapp/o2o/js/model/user.js

@@ -12,6 +12,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function(ba
     this.lastID = this.getCache('lastID', null, '');
     this.name = '';
     this.mobile = '';
+    this.balance = 0;
     this.info = {};
     this.orders = {
       1: {

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

@@ -381,7 +381,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                 pageData.scroll.refresh();
             }, $view); */
 
-            /* 点击选择保洁师 */
+            /* 点击选择保洁师
             $.newTouch('.show-beautician-picker', function (event) {
                 // 如果订单的地址数据为空
                 if (!order.address || !order.address.address_id) {
@@ -427,7 +427,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                         });
                     }
                 );
-            }, $view);
+            }, $view);  */
 
             /* 点击选择宠物相关
             $.newTouch('.show-product-picker', function () {
@@ -743,6 +743,8 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 
                 /* 向服务器下订单 */
                 $doc.trigger('spa:openloader');
+                order.balance = user.balance;
+                console.log(user);
                 order.addOrder(user.id, payChannel, function (res) {
                     $doc.trigger('spa:closeloader');
                     if (res.success) {
@@ -814,7 +816,9 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                     /* extra选择项 */
                     extra: product.extra,
                     /* 如果用户有优惠券，则显示优惠券的选择栏 */
-                    showCoupon: user.orderCoupons.length
+                    showCoupon: user.orderCoupons.length,
+                    /* 账户余额 */
+                    balance: user.balance
                 };
                 /* 渲染页面 */
                 var tpl = template('placeOrder/index', tmpData);

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

@@ -141,6 +141,7 @@
               {{ /each }}
             </ul>
             -->
+            <!-- 选择保洁师
             <ul class="table-view">
               <li class="table-view-cell">
                 <a class="navigate-right show-beautician-picker">
@@ -151,6 +152,7 @@
                 </a>
               </li>
             </ul>
+            -->
             <!-- 优惠券 -->
             <ul class="table-view">
               <li class="table-view-cell {{if !showCoupon }}disabled{{/if}}">
@@ -216,9 +218,13 @@
           </div>
         </div>
       </div>
-      <div class="result-item btn-container prevent-scroll">
+      <div class="result-item btn-container prevent-scroll" style="display: flex; justify-content: space-between; align-items: center">
+        <div style="padding-left: 15px; text-align: left; line-height: 48px;">
+          账户余额
+          <span style="font-size: 16px; color: #ec5330; text-align: right;" >￥ {{balance}}</span>
+        </div>
         <div class="cost">
-          总计
+          费用总计
           <span class="order-cost" >￥ 0</span>
         </div>
         <a class="btn btn-main btn-block btn-place">确认预约</a>