我的订单 显示价格pay_price

www/webapp/o2o/dist/js/page/mine.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-define(["$","template","IScroll","user","native","config","address"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"我的",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(t){t.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{backHash:"mine"},callback:{onSelect:function(t,n){var r="";t.address.poi?r=t.address.city+t.address.area+t.address.poi.name+t.address.detail:r=t.address.province+t.address.city+t.address.area+t.address.detail,e("#default-address",i).text(r)}}})},i),e.newTouch(".btn-recharge",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,u){var a=this,f=e(document);if(i.pushData&&i.pushData.needReset){var l="",c=o.defaultAddress;c.address.poi?l=c.address.city+c.address.area+c.address.poi.name+c.address.detail:l=c.address.province+c.address.city+c.address.area+c.address.detail;var h=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance,defaultAddress:l});e(".spa-page-body",a).html(h),setTimeout(function(){i.scroll=new n("#mineScroll")},500)}u.resolve()},beforeclose:function(e,t){t.resolve()}}});
-=======
-define(["$","template","IScroll","user","native","config"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"我的",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},i),i.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{needReload:!0}})},i),e.newTouch(".btn-recharge",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document),f=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance});e(".spa-page-body",u).html(f),setTimeout(function(){i.scroll=new n("#mineScroll")},500),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
->>>>>>> test
+define(["$","template","IScroll","user","native","config","address"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"我的",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(t){t.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{backHash:"mine"},callback:{onSelect:function(t,n){var r="";t.address.poi?r=t.address.city+t.address.area+t.address.poi.name+t.address.detail:r=t.address.province+t.address.city+t.address.area+t.address.detail,e("#default-address",i).text(r)}}})},i),e.newTouch(".btn-recharge",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,u){var a=this,f=e(document);if(i.pushData&&i.pushData.needReset){var l="",c=o.defaultAddress;c.address.poi?l=c.address.city+c.address.area+c.address.poi.name+c.address.detail:l=c.address.province+c.address.city+c.address.area+c.address.detail;var h=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance,defaultAddress:l});e(".spa-page-body",a).html(h),setTimeout(function(){i.scroll=new n("#mineScroll")},500)}u.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -284,7 +284,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                                 order.set('stationID', station, true);
 
                                 var addressStr = '';
-                                console.log(order.address.address.poi);
                                 if (order.address.address.poi) {
                                     addressStr = order.address.address.city + order.address.address.area + order.address.address.poi.name + order.address.address.detail
                                 } else {

www/webapp/o2o/tpl/myOrder/detail.html

@@ -68,26 +68,22 @@
               <div class="label-name">订单明细</div>
             </div>
           </li>
-          {{each order.products as product i}}
+          {{each order.products as data i}}
           <li class="table-view-cell">
             <div class="order-label">
-              <div class="label-name">{{product.name}}{{if product.count > 1}}<span class="service-count">x{{product.count}}</span>{{/if}}</div>
-              <div class="label-value">{{product.price}}元</div>
-            </div>
-          </li>
-          {{/each}}
-          {{each order.append_orders as appendProduct i}}
-          <li class="table-view-cell">
-            <div class="order-label append-order">
-              <div class="label-name">{{appendProduct.products_str}}</div>
-              <div class="label-value">{{appendProduct.price}}元</div>
+              <div class="label-name">{{data.product.name}}<span class="service-count">x{{data.product.count}}</span></div>
+              {{if data.product.price != ''}}
+              <div class="label-value">{{data.product.price}}元</div>
+              {{else}}
+              <div class="label-value">{{data.extra.price}}元</div>
+              {{/if}}
             </div>
           </li>
           {{/each}}
           <li class="table-view-cell">
             <div class="order-label">
               <div class="label-name">总价</div>
-              <div class="label-value">{{order.sum_price}}元</div>
+              <div class="label-value">{{order.pay_price}}元</div>
             </div>
           </li>
           <li class="table-view-cell">
@@ -124,9 +120,6 @@
                 {{if order.booking_time > time && order.status == 1}}
                 <a class="order-btn btn-default order-btn-refund {{if order.booking_time - time <= 7200}}btn-alert-info{{/if}}" data-order-id="{{order.id}}" data-type="{{order.products[0].type}}" data-index="{{i}}">申请退款</a>
                 {{/if}}
-                {{if order.products[0].type !== '7' && order.products[0].type !== '6'}}
-                <a class="order-btn btn-default order-btn-append" data-order-id="{{order.id}}" data-order-name="{{order.products[0].pet_types[0].name}}" data-order-price="{{order.price}}"  data-type="{{order.products[0].type}}">追加服务</a>
-                {{/if}}
                 {{if time > order.booking_time}}
                 <a class="order-btn btn-warning order-btn-done" data-order-id="{{order.id}}" data-order-name="{{order.products[0].name}}" data-order-price="{{order.price}}">确认完成</a>
                 {{/if}}

www/webapp/o2o/tpl/myOrder/list.html

@@ -28,12 +28,7 @@
             {{/if}}
             <div class="order-desc-line order-service-name">
                 <span class="order-desc-title">价格</span>
-                <span class="order-desc-more">{{order.final_price.toFixed(2)}}元</span>
-                {{if order.append_orders}}
-                {{each order.append_orders as append_order i}}
-                <span class="order-append-price">&nbsp; + {{append_order.price}}元 </span>
-                {{/each}}
-                {{/if}}
+                <span class="order-desc-more">{{order.pay_price.toFixed(2)}}元</span>
             </div>
         </div>
     </li>