소스 검색

rorder fix

Charlie 8 년 전
부모
커밋
8c740e398a
55개의 변경된 파일1909개의 추가작업 그리고 157개의 파일을 삭제
  1. 5 6
      www/protected/controllers/ROrderController.php
  2. 22 0
      www/protected/modules/o2o/models/BuyRechargeLog.php
  3. 68 65
      www/protected/modules/o2o/models/ROrder.php
  4. 7 1
      www/protected/modules/o2o/models/Recharge.php
  5. 0 5
      www/protected/views/rOrder/index.php
  6. 8 0
      www/webapp/o2o/js/build/.cache/activities/alert.js
  7. 11 0
      www/webapp/o2o/js/build/.cache/activities/cat.js
  8. 62 0
      www/webapp/o2o/js/build/.cache/address/detail/index.js
  9. 52 0
      www/webapp/o2o/js/build/.cache/address/list/cell.js
  10. 13 0
      www/webapp/o2o/js/build/.cache/address/list/index.js
  11. 41 0
      www/webapp/o2o/js/build/.cache/address/position/cell.js
  12. 2 0
      www/webapp/o2o/js/build/.cache/address/position/city.js
  13. 11 0
      www/webapp/o2o/js/build/.cache/address/position/index.js
  14. 6 0
      www/webapp/o2o/js/build/.cache/agreement/index.js
  15. 61 0
      www/webapp/o2o/js/build/.cache/beautician/comment.js
  16. 23 0
      www/webapp/o2o/js/build/.cache/beautician/detail.js
  17. 119 0
      www/webapp/o2o/js/build/.cache/beautician/index.js
  18. 11 0
      www/webapp/o2o/js/build/.cache/coming/index.js
  19. 18 0
      www/webapp/o2o/js/build/.cache/common/actionSheet.js
  20. 22 0
      www/webapp/o2o/js/build/.cache/common/alert.js
  21. 164 0
      www/webapp/o2o/js/build/.cache/common/dataPicker.js
  22. 26 0
      www/webapp/o2o/js/build/.cache/common/star.js
  23. 9 0
      www/webapp/o2o/js/build/.cache/desc/index.js
  24. 15 0
      www/webapp/o2o/js/build/.cache/hire/index.js
  25. 6 0
      www/webapp/o2o/js/build/.cache/home/index.js
  26. 60 0
      www/webapp/o2o/js/build/.cache/myCoupon/cell.js
  27. 47 0
      www/webapp/o2o/js/build/.cache/myCoupon/exchange.js
  28. 27 0
      www/webapp/o2o/js/build/.cache/myCoupon/index.js
  29. 159 0
      www/webapp/o2o/js/build/.cache/myOrder/detail.js
  30. 9 0
      www/webapp/o2o/js/build/.cache/myOrder/finish.js
  31. 21 0
      www/webapp/o2o/js/build/.cache/myOrder/index.js
  32. 126 0
      www/webapp/o2o/js/build/.cache/myOrder/list.js
  33. 43 0
      www/webapp/o2o/js/build/.cache/myOrder/refund.js
  34. 29 0
      www/webapp/o2o/js/build/.cache/pay/index.js
  35. 12 0
      www/webapp/o2o/js/build/.cache/picker/cell.js
  36. 31 0
      www/webapp/o2o/js/build/.cache/picker/coupon.js
  37. 25 0
      www/webapp/o2o/js/build/.cache/picker/index.js
  38. 11 0
      www/webapp/o2o/js/build/.cache/placeOrder/append.js
  39. 223 0
      www/webapp/o2o/js/build/.cache/placeOrder/index.js
  40. 23 0
      www/webapp/o2o/js/build/.cache/placeOrder/list.js
  41. 18 0
      www/webapp/o2o/js/build/.cache/placeOrder/list2.js
  42. 51 0
      www/webapp/o2o/js/build/.cache/product/index.js
  43. 21 0
      www/webapp/o2o/js/build/.cache/product/info.js
  44. 30 0
      www/webapp/o2o/js/build/.cache/product/option.js
  45. 26 0
      www/webapp/o2o/js/build/.cache/product/price.js
  46. 61 0
      www/webapp/o2o/js/build/.cache/product/reviewList.js
  47. 18 0
      www/webapp/o2o/js/build/.cache/review/post.js
  48. 2 2
      www/webapp/o2o/js/build/.cache/success/index.js
  49. 15 0
      www/webapp/o2o/js/build/.cache/success/refund.js
  50. 2 2
      www/webapp/o2o/js/build/template.js
  51. 29 56
      www/webapp/o2o/js/model/cart.js
  52. 1 1
      www/webapp/o2o/module/pay/index.html
  53. 0 14
      www/webapp/o2o/module/pay/newDeal.html
  54. 6 4
      www/webapp/o2o/tpl/package.json
  55. 1 1
      www/webapp/o2o/tpl/success/index.html

+ 5 - 6
www/protected/controllers/ROrderController.php

@@ -223,7 +223,6 @@ class ROrderController extends AdminController{
         // 获取用户信息,修改用户订单统计
         //     2015-11-16
         $user_id = $order->user;
-        $order->_id = $id;
         if (!empty($user_id)) {
             $user = RUser::get($user_id);
         } else {
@@ -271,8 +270,8 @@ class ROrderController extends AdminController{
                     );
 
                     if (!empty($order->append_orders)) {
-                        $counts = count($order->append_orders);
-                        $wechat_data['news']['articles'][0]['description'] .= "\n\n本订单包含" . $counts . "个追加订单,请注意查看。";
+                        $count = count($order->append_orders);
+                        $wechat_data['news']['articles'][0]['description'] .= "\n\n本订单包含" . $count . "个追加订单,请注意查看。";
                     }
                     $wechat->sendMessage($wechat_data);
                 }
@@ -345,8 +344,8 @@ class ROrderController extends AdminController{
         //$order->technician_name = $technician_name;
         $order->technicians = $technicians;
 
-       // var_dump($order->technicians);exit;
-        $arr_order = array('_id','cancel_time','refund_time','finish_time','status','booking_time','deal_time','remark', 'station', 'technicians');
+       //var_dump($order);exit;
+        $arr_order = array('cancel_time','refund_time','finish_time','status','booking_time','deal_time','remark', 'station', 'technicians');
         $success = $order->save(true,$arr_order);
 
         // 通知保洁师
@@ -580,7 +579,7 @@ class ROrderController extends AdminController{
         $rOrder->products     = $products;
         $rOrder->price        = intval($price);
         $rOrder->final_price  = intval($final_price);
-        //$rOrder->precedence   = intval($precedence);
+        $rOrder->precedence   = intval($precedence);
         $rOrder->counts      = $counts;
         $rOrder->coupons      = $coupons;
         $rOrder->user         = $user;

+ 22 - 0
www/protected/modules/o2o/models/BuyRechargeLog.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: PHP
+ * Date: 2016/9/26
+ * Time: 11:57
+ * 会员充值日志
+ */
+class BuyRechargeLog extends MongoAr
+{
+    public $_id;
+
+    public $user_id;//充值用户id
+
+    public $time;//充值时间
+
+    public $Denomination;//充值面额
+
+    public $type;//赠送类型 1 赠送优惠券  2 返现
+
+
+}

+ 68 - 65
www/protected/modules/o2o/models/ROrder.php

@@ -13,7 +13,7 @@ class ROrder extends MongoAr
     public $charge_id;//ping++的chargeId,charge_id即为支付单号
     public $pay_channel;//支付渠道
     public $channel;//订单来源渠道
-
+    public $precedence = 0;//加急 默认0
     public $booking_time; //用户预约的时间
     public $order_time;  //订单生成时间
     public $deal_time;  //订单处理时间
@@ -24,7 +24,7 @@ class ROrder extends MongoAr
     public $cancel_time;  //订单取消时间
     public $apply_refund_time;  //订单申请退款时间
     public $refund_time;  //订单退款时间
-
+    public $append_orders = array();
     public $products=array(); //订单包含的商品数组   数据库设计  支持多个产品在一个订单
 
     public $price;  //订单金额
@@ -334,7 +334,7 @@ class ROrder extends MongoAr
     protected function afterSave() {
         parent::afterSave();
 
-        $tech = TechInfo::get($this->technicians);
+
         // 生成保洁师提成并保存
         if ($this->status == 6 && !empty($this->technicians)) {
             // 订单时间检查
@@ -351,70 +351,73 @@ class ROrder extends MongoAr
 
             $order = $this->_id;
             $commisionObj = Commision::getByOrder($order);
-            
-            // 检查Cmmmision信息是否已录入
-            foreach ($this->technicians as $technician_id => $technician) {
-
-                if ($commisionObj == false) {
-                    // 普通订单生成提成并保存
-                    $commisionObj = new Commision();
-                    $commisionObj->time = empty($this->finish_time) ? $time : $this->finish_time;
-                    $commisionObj->booking_time = $this->booking_time;
-                    $commisionObj->user = $technician;
-                    $commisionObj->order = $this->_id;
-                    $commisionObj->commision = Commision::getCommision($this, Commision::MAIN, $tech->scheme);
-                    $commisionObj->type = Commision::MAIN;
-                    $commisionObj->insert();
-
-                    // 订单内附加订单生成提成并保存
-                    $appends = $this->append_orders;
-                    if (!empty($appends)) {
-                        $criteria = new EMongoCriteria();
-                        $criteria->_id('in', $appends);
-                        $appendOrders = AppendOrder::model()->findAll($criteria);
-                        foreach ($appendOrders as $key => $row) {
-                            if ($row->status != 1) {
-                                continue;
-                            }
-                            $commisionObj = new Commision();
-                            $commisionObj->time = empty($this->finish_time) ? $time : $this->finish_time;
-                            $commisionObj->booking_time = $this->booking_time;
-                            $commisionObj->user = $technician;
-                            $commisionObj->order = $row->_id;
-                            $commisionObj->commision = Commision::getCommision($row, Commision::APPEND, $tech->scheme);
-                            $commisionObj->type = Commision::APPEND;
-                            $commisionObj->insert();
-                        }
-                    }
-                }
 
+            // 检查Cmmmision信息是否已录入
+           foreach ($this->technicians as $key => $value) {
+               $technician_id = $value['technician_id'];
+               $technician = $value['technician_name'];
+               $tech = TechInfo::get($technician_id);
+               if ($commisionObj == false) {
+                   // 普通订单生成提成并保存
+                   $commisionObj = new Commision();
+                   $commisionObj->time = empty($this->finish_time) ? $time : $this->finish_time;
+                   $commisionObj->booking_time = $this->booking_time;
+                   $commisionObj->user = $technician;
+                   $commisionObj->order = $this->_id;
+                   $commisionObj->commision = Commision::getCommision($this, Commision::MAIN, $tech->scheme);
+                   $commisionObj->type = Commision::MAIN;
+                   $commisionObj->insert();
+
+                   // 订单内附加订单生成提成并保存
+                   $appends = $this->append_orders;
+                   if (!empty($appends)) {
+                       $criteria = new EMongoCriteria();
+                       $criteria->_id('in', $appends);
+                       $appendOrders = AppendOrder::model()->findAll($criteria);
+                       foreach ($appendOrders as $key => $row) {
+                           if ($row->status != 1) {
+                               continue;
+                           }
+                           $commisionObj = new Commision();
+                           $commisionObj->time = empty($this->finish_time) ? $time : $this->finish_time;
+                           $commisionObj->booking_time = $this->booking_time;
+                           $commisionObj->user = $technician;
+                           $commisionObj->order = $row->_id;
+                           $commisionObj->commision = Commision::getCommision($row, Commision::APPEND, $tech->scheme);
+                           $commisionObj->type = Commision::APPEND;
+                           $commisionObj->insert();
+                       }
+                   }
+               }
+
+
+               // 提示保洁师订单已完成
+               if ($tech && $tech->weixin_userid) {
+                   // 检查订单评价是否存在,若存在则不发送
+                   $comment = Comment::getByOrder($this->_id);
+                   if (!$comment) {
+                       $wechat = O2oApp::getWechatActive();
+                       $url_prefix = ENVIRONMENT == 'product' ? 'http:// api.yiguanjia.me' : 'http:// apitest.yiguanjia.me';
+                       $wechat_data = [
+                           'touser' => $tech->weixin_userid,
+                           'msgtype' => 'news',
+                           'agentid' => '24',
+                           'news' => [
+                               'articles' => [
+                                   [
+                                       'title' => '壹管家提示-订单已完成',
+                                       'description' => $tech->name . '你好!预定时间在' . date('m月d日H:i', $this->booking_time) . '的订单已完成,请点击查看订单情况。',
+                                       'url' => $url_prefix . '/index.php?r=o2o/myCommision/info&order=' . (string)$order . '&user=' . $technician . '&type=0',
+                                   ],
+                               ],
+                           ],
+                       ];
+                       $wechat->sendMessage($wechat_data);
+                   }
+               }
+           }
+       }
 
-                // 提示保洁师订单已完成
-                if ($tech && $tech->weixin_userid) {
-                    // 检查订单评价是否存在,若存在则不发送
-                    $comment = Comment::getByOrder($this->_id);
-                    if (!$comment) {
-                        $wechat = O2oApp::getWechatActive();
-                        $url_prefix = ENVIRONMENT == 'product' ? 'http:// api.yiguanjia.me' : 'http:// apitest.yiguanjia.me';
-                        $wechat_data = [
-                            'touser'  => $tech->weixin_userid,
-                            'msgtype' => 'news',
-                            'agentid' => '24',
-                            'news'    => [
-                                'articles' => [
-                                    [
-                                        'title' => '壹管家提示-订单已完成',
-                                        'description' => $tech->name.'你好!预定时间在'.date('m月d日H:i', $this->booking_time).'的订单已完成,请点击查看订单情况。',
-                                        'url' => $url_prefix.'/index.php?r=o2o/myCommision/info&order='.(string)$order.'&user='.$technician.'&type=0',
-                                    ],
-                                ],
-                            ],
-                        ];
-                        $wechat->sendMessage($wechat_data);
-                    }
-                }
-            }
-        }
     }
 
 }

+ 7 - 1
www/protected/modules/o2o/models/Recharge.php

@@ -9,11 +9,17 @@
 class Recharge extends MongoAr
 {
     public $_id;
+
     public $Denomination;//充值面额
-    public $time;
+
+    public $time;//充值时间
+
     public $presentation;//赠送方式  1 赠送优惠券  2 返现
+
     public $coupon = array();//赠送的优惠券
+
     public $cash_back;//返现
 
 
+
 }

+ 0 - 5
www/protected/views/rOrder/index.php

@@ -238,7 +238,6 @@
                                             </div>
                                             <input name="technician_name" style="width: 250px;" id="setTechnician_content"/>
                                             <input name="technician" type="hidden" id="technician_id" value="0" />
-
                                             <a class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="add_extra();return false;">添加保洁师</a><br/>
                                             </div>
                                     </div>
@@ -1534,12 +1533,8 @@ function add_extra(){
         $output +="<a href ='' onclick='delete_extra("+setTechnician_id+");return false;'>删除</a></div><br/>";
         $output +="<input type='hidden' id='extra_add_info_hidden_"+setTechnician_id+"' name='extra_add_info_"+setTechnician_id+"' value='"+setTechnician_content+"' /></div>";
         $('#setTechnician_content').val('');
-
-
         $("#extra_add_info").append($output);
-
     }
-
 }
 function reset_delete_extra(msg){
     $('#reset_extra_add_info_'+msg).remove();

+ 8 - 0
www/webapp/o2o/js/build/.cache/activities/alert.js

@@ -0,0 +1,8 @@
+/*TMODJS:{"version":1,"md5":"fa6d2f074295f8a0463d64668202d64d"}*/
+template('activities/alert',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$escape=$utils.$escape,content=$data.content,$out='';$out+='<div class="box-container box-center"> <div class="activity-body alert-body"> <img src="';
+$out+=$escape(content);
+$out+='" alt="" id="activity-content"> <div class="btn-close"></div> </div> </div> ';
+return new String($out);
+});

+ 11 - 0
www/webapp/o2o/js/build/.cache/activities/cat.js

@@ -0,0 +1,11 @@
+/*TMODJS:{"version":1,"md5":"76d3210a0445aa14b80a2899ecd61f2c"}*/
+template('activities/cat',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,src=$data.src,$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">下单送爪币 壕礼抽不停</h1> </header> ';
+}
+$out+=' <div id="activities-scroll" class="content"> <div class="scroller"> <div class="box-container"> <div class="box-container box box-vertical" style="background: #fff"> <img src="';
+$out+=$escape(src);
+$out+='" alt="" style="width:100%"> </div> </div> </div> </div> </div> ';
+return new String($out);
+});

+ 62 - 0
www/webapp/o2o/js/build/.cache/address/detail/index.js

@@ -0,0 +1,62 @@
+/*TMODJS:{"version":1,"md5":"6972fb6b9c57f3e8d08fc5fbaf688417"}*/
+template('address/detail/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,add=$data.add,$escape=$utils.$escape,address=$data.address,title=$data.title,$each=$utils.$each,value=$data.value,index=$data.index,$out='';if(showNavBar){
+$out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> ';
+if(!add){
+$out+=' <a class="right-button btn-delete" data-id="';
+$out+=$escape(address.address_id);
+$out+='">删除</a> ';
+}
+$out+=' <h1 class="title">';
+$out+=$escape(title);
+$out+='</h1> </header> ';
+}
+$out+=' <div class="content"> <div class="box-container box box-vertical"> <div id="addressDetailScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="page-content"> <form class="input-group"> <ul class="table-view"> ';
+if(!add){
+$out+=' <li> <input type="text" class="address-name" value="';
+$out+=$escape(address.name);
+$out+='" placeholder="怎么称呼您"> </li> <li> <input type="tel" placeholder="您的手机号" class="address-mobile" value="';
+$out+=$escape(address.mobile);
+$out+='"> </li> <li class="table-view-cell"> <a class="navigate-right select-poi test" ';
+if(address.address.poi){
+$out+='data-poi-name="';
+$out+=$escape(address.address.poi.name);
+$out+='" ';
+}
+$out+=' data-province="';
+$out+=$escape(address.address.province);
+$out+='" data-city="';
+$out+=$escape(address.address.city);
+$out+='" data-area="';
+$out+=$escape(address.address.area);
+$out+='" ';
+$each(address.position,function(value,index){
+$out+=' data-position-';
+$out+=$escape(index);
+$out+='="';
+$out+=$escape(value);
+$out+='" ';
+});
+$out+='> ';
+if(address.address.poi){
+$out+=$escape(address.address.poi.name);
+$out+=' ';
+}else{
+$out+='请定位您的小区或者街道';
+}
+$out+=' </a> </li> <li> <input type="text" placeholder="填写详细地址如15号楼1单元201室" class="address-detail" value="';
+$out+=$escape(address.address.detail);
+$out+='"> </li> ';
+}else{
+$out+=' <li> <input type="text" placeholder="怎么称呼您" class="address-name"> </li> <li> <input type="tel" placeholder="您的手机号" class="address-mobile"> </li> <li class="table-view-cell"> <a class="navigate-right select-poi">请定位您的小区或者街道</a> </li> <li> <input type="text" class="address-detail" placeholder="填写详细地址如15号楼1单元201室"> </li> ';
+}
+$out+=' </ul> </form> </div> </div> </div> <div class="btn-container prevent-scroll"> ';
+if(!add){
+$out+=' <a class="btn btn-main btn-block btn-save">更新</a> ';
+}else{
+$out+=' <a class="btn btn-main btn-block btn-save">保存</a> ';
+}
+$out+=' </div> </div> </div> ';
+return new String($out);
+});

+ 52 - 0
www/webapp/o2o/js/build/.cache/address/list/cell.js

@@ -0,0 +1,52 @@
+/*TMODJS:{"version":1,"md5":"4453437edc4feb7ceaa70d9b15cf75aa"}*/
+template('address/list/cell',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,addresses=$data.addresses,address=$data.address,i=$data.i,$escape=$utils.$escape,$out='';$each(addresses,function(address,i){
+$out+=' <li class="table-view-cell media"> <a class="address-item" data-id="';
+$out+=$escape(address.address_id);
+$out+='" data-index="';
+$out+=$escape(i);
+$out+='"> <div class="media-body"> <span class="username"> ';
+if(address ){
+$out+=' ';
+$out+=$escape(address.name);
+$out+=' ';
+}
+$out+=' </span> <span class="mobile"> ';
+if(address ){
+$out+=' ';
+$out+=$escape(address.mobile);
+$out+=' ';
+}
+$out+=' </span> <p class="detail"> ';
+if(address ){
+$out+=' ';
+if(address.address.poi ){
+$out+=' ';
+$out+=$escape(address.address.city);
+$out+=' ';
+$out+=$escape(address.address.area);
+$out+=' ';
+$out+=$escape(address.address.poi.name);
+$out+=' ';
+}else{
+$out+=' ';
+$out+=$escape(address.address.province);
+$out+=' ';
+$out+=$escape(address.address.city);
+$out+=' ';
+$out+=$escape(address.address.area);
+$out+=' ';
+$out+=$escape(address.address.detail);
+$out+=' ';
+}
+$out+=' ';
+}
+$out+=' </p> </div> </a> <button class="btn btn-edit" data-id="';
+$out+=$escape(address.address_id);
+$out+='" data-index="';
+$out+=$escape(i);
+$out+='">编辑</button> </li> ';
+});
+return new String($out);
+});

+ 13 - 0
www/webapp/o2o/js/build/.cache/address/list/index.js

@@ -0,0 +1,13 @@
+/*TMODJS:{"version":1,"md5":"d6d08bf1b4971d49dd8e4e57beeb2373"}*/
+template('address/list/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},$escape=$utils.$escape,addText=$data.addText,$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">选择地址</h1> </header> ';
+}
+$out+=' <div class="content" > <div class="box-container box box-vertical"> <div id="addressListScroll" class="scroll-container box-flex-1"> <div class="page-content"> <ul class="table-view list-content"> ';
+include('./cell');
+$out+=' </ul> </div> </div> <div class="btn-container prevent-scroll"> <a class="btn btn-main btn-block btn-add">';
+$out+=$escape(addText);
+$out+='</a> </div> </div> </div>';
+return new String($out);
+});

+ 41 - 0
www/webapp/o2o/js/build/.cache/address/position/cell.js

@@ -0,0 +1,41 @@
+/*TMODJS:{"version":1,"md5":"60f67e105953ef3cc2d1d9d21b089660"}*/
+template('address/position/cell',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,poiLists=$data.poiLists,poilist=$data.poilist,i=$data.i,$escape=$utils.$escape,$out='';$each(poiLists,function(poilist,i){
+$out+=' <li class="table-view-cell position-item" data-location-lat="';
+if(poilist.location){
+$out+=$escape(poilist.location.lat);
+}
+$out+='" data-location-lng="';
+if(poilist.location){
+$out+=$escape(poilist.location.lng);
+}
+$out+='" data-uid="';
+if(poilist.uid){
+$out+=$escape(poilist.uid);
+}
+$out+='" data-district="';
+if(poilist.district){
+$out+=$escape(poilist.district);
+}
+$out+='" data-city="';
+if(poilist.city){
+$out+=$escape(poilist.city);
+}
+$out+='"> <a class="set-poi">';
+if(poilist.name){
+$out+=$escape(poilist.name);
+}
+$out+='</a> <p> ';
+if(poilist.city){
+$out+=$escape(poilist.city);
+}
+$out+=' ';
+if(poilist.district){
+$out+=$escape(poilist.district);
+}
+$out+=' </p> </li> ';
+});
+$out+=' ';
+return new String($out);
+});

+ 2 - 0
www/webapp/o2o/js/build/.cache/address/position/city.js

@@ -0,0 +1,2 @@
+/*TMODJS:{"version":1,"md5":"91aa441752d50dbdcb55219e12e029ba"}*/
+template('address/position/city','');

+ 11 - 0
www/webapp/o2o/js/build/.cache/address/position/index.js

@@ -0,0 +1,11 @@
+/*TMODJS:{"version":1,"md5":"b586521e81694674964c2ecb01f935d0"}*/
+template('address/position/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},$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">定位地点</h1> </header> ';
+}
+$out+=' <div class="content"> <div class="box-container box box-vertical"> <div id="addressPositionScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="page-content"> <div class="table-view search-form"> <div class="search-city">上海</div> <input type="text" name="" id="search-text" placeholder="请搜索您的位置"> <button class="search-btn">搜索</button> </div> <ul class="table-view position-list"> ';
+include('./cell');
+$out+=' </ul> </div> </div> </div> </div> </div> ';
+return new String($out);
+});

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 6 - 0
www/webapp/o2o/js/build/.cache/agreement/index.js


+ 61 - 0
www/webapp/o2o/js/build/.cache/beautician/comment.js

@@ -0,0 +1,61 @@
+/*TMODJS:{"version":1,"md5":"b8237bcd80282df7c12342ca78e92084"}*/
+template('beautician/comment',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,comments=$data.comments,comment=$data.comment,i=$data.i,$escape=$utils.$escape,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},imgW=$data.imgW,pic=$data.pic,review=$data.review,$out='';$each(comments,function(comment,i){
+$out+=' <li class="table-view-cell"> <div> <div class="user-info-container"> <div class="user-info-btn" data-id="';
+$out+=$escape(comment.user.id);
+$out+='"> <img class="user-avatar" src="';
+$out+=$escape(comment.user.avatar);
+$out+='?imageView2/2/w/60/h/60"/> <span class="user-name">';
+$out+=$escape(comment.user.user_name);
+$out+='</span> </div> </div> <div class="box"> <div class="box-flex-1"> <span class="star-label">评分:</span> ';
+include('../common/star',comment);
+$out+=' </div> <div class="box-flex-1 review-time"> ';
+$out+=$escape(comment.time_str);
+$out+=' </div> </div> <div class="review-content"> ';
+$out+=$escape(comment.content);
+$out+=' </div> <div class="img-preview-list" ';
+if(comment.pics.length > 0){
+$out+='style="height:';
+$out+=$escape(imgW);
+$out+='px"';
+}
+$out+='> ';
+if(comment.pics.length > 0){
+$out+=' ';
+$each(comment.pics,function(pic,i){
+$out+=' ';
+if(i < 3){
+$out+=' <div class="width-percent-33"> <div class="img-preview" data-src="';
+$out+=$escape(pic.url);
+$out+='" style="width: ';
+$out+=$escape(imgW);
+$out+='px"> <img src="';
+$out+=$escape(pic.url);
+$out+='?imageView2/5/w/';
+$out+=$escape(imgW * 2);
+$out+='/h/';
+$out+=$escape(imgW * 2);
+$out+='" alt="" class="img-preview-item"> ';
+if(comment.pics.length > 3 && i == 2){
+$out+=' <span class="img-count">';
+$out+=$escape(comment.pics.length);
+$out+='</span> ';
+}
+$out+=' </div> </div> ';
+}
+$out+=' ';
+});
+$out+=' ';
+}
+$out+=' </div> ';
+if(comment.reply !== ''){
+$out+=' <div class="reply-content"> 保洁师回复:';
+$out+=$escape(review.reply);
+$out+=' </div> ';
+}
+$out+=' </div> </li> ';
+});
+$out+=' ';
+return new String($out);
+});

+ 23 - 0
www/webapp/o2o/js/build/.cache/beautician/detail.js

@@ -0,0 +1,23 @@
+/*TMODJS:{"version":1,"md5":"704964682a512ccf6c45e171b8bdfcab"}*/
+template('beautician/detail',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,recommend=$data.recommend,$escape=$utils.$escape,avatar=$data.avatar,name=$data.name,favor=$data.favor,desc=$data.desc,$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">保洁师详情</h1> </header> ';
+}
+$out+=' <div class="content beautician-detail-content"> <div class="box-container box box-vertical"> <div id="beauticianDetailScroll" class="scroll-container box-flex-1"> <div class="page-content"> ';
+if(recommend !== ''){
+$out+=' <p class="recommend">当前时间段,该保洁师已被预约,推荐时间段&nbsp; ';
+$out+=$escape(recommend);
+$out+='</p> ';
+}
+$out+=' <div class="tech-info"> <img src="';
+$out+=$escape(avatar);
+$out+='?imageView2/0/w/400/h/400" alt=""> <p class="name">';
+$out+=$escape(name);
+$out+='</p> <p class="favor">好评数: ';
+$out+=$escape(favor);
+$out+='</p> <p class="desc">';
+$out+=$escape(desc);
+$out+='</p> </div> <div id="tech-comment"> <div class="extra-service-title">用户评价<span></span></div> <ul class="table-view"></ul> <div class="btn-more-container box-center hide"> <a class="btn btn-block btn-more-review">加载更多</a> </div> </div> </div> </div> </div> </div> ';
+return new String($out);
+});

+ 119 - 0
www/webapp/o2o/js/build/.cache/beautician/index.js

@@ -0,0 +1,119 @@
+/*TMODJS:{"version":1,"md5":"eeed028678d5eabd302b4bb2a39307bf"}*/
+template('beautician/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,can=$data.can,match=$data.match,$each=$utils.$each,canMatchTech=$data.canMatchTech,$index=$data.$index,$escape=$utils.$escape,canSelectTech=$data.canSelectTech,$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">选择保洁师</h1> </header> ';
+}
+$out+=' <div class="content beautician-content"> <div class="box-container box box-vertical"> <div id="beauticianScroll" class="scroll-container box-flex-1"> <div class="page-content"> <ul class="table-view"> ';
+if(can.length == 0){
+$out+=' <li class="table-view-divider">该时间段暂无推荐保洁师,请选择其他时间段</li> ';
+if(match.length > 0){
+$out+=' ';
+$each(match,function(canMatchTech,$index){
+$out+=' <li class="table-view-cell"> <a class="select-item disabled" data-name="';
+$out+=$escape(canMatchTech.name);
+$out+='" data-id="';
+$out+=$escape(canMatchTech.id);
+$out+='" data-desc="';
+$out+=$escape(canMatchTech.desc);
+$out+='" data-favor="';
+$out+=$escape(canMatchTech.favourable_count);
+$out+='" data-avatar="';
+$out+=$escape(canMatchTech.avatar);
+$out+='" data-recommend="';
+$out+=$escape(canMatchTech.next_free_time);
+$out+='"> <div class="media-object pull-left"> <img src="';
+$out+=$escape(canMatchTech.avatar);
+$out+='?imageView2/0/w/84"> </div> <div class="media-body"> <p>';
+$out+=$escape(canMatchTech.name);
+if(canMatchTech.favourable_count){
+$out+='<span class="favor-count">好评数:';
+$out+=$escape(canMatchTech.favourable_count);
+$out+='次</span>';
+}
+$out+='</p> ';
+if(canMatchTech.next_free_time){
+$out+=' <p class="recommend-time">推荐时间段&nbsp;';
+$out+=$escape(canMatchTech.next_free_time);
+$out+='</p> ';
+}
+$out+=' </div> </a> </li> ';
+});
+$out+=' ';
+}
+$out+=' ';
+}else{
+$out+=' ';
+if(can.length > 0){
+$out+=' ';
+$each(can,function(canSelectTech,$index){
+$out+=' <li class="table-view-cell"> <a class="select-item" data-name="';
+$out+=$escape(canSelectTech.name);
+$out+='" data-id="';
+$out+=$escape(canSelectTech.id);
+$out+='" data-desc="';
+$out+=$escape(canSelectTech.desc);
+$out+='" data-favor="';
+$out+=$escape(canSelectTech.favourable_count);
+$out+='" data-avatar="';
+$out+=$escape(canSelectTech.avatar);
+$out+='" data-recommend=""> <div class="media-object pull-left"> <img class="" src="';
+$out+=$escape(canSelectTech.avatar);
+$out+='?imageView2/0/w/84/h/84"> </div> <div class="media-body"> <p>';
+$out+=$escape(canSelectTech.name);
+$out+=' ';
+if(canSelectTech.favourable_count){
+$out+='<span class="favor-count">好评数:';
+$out+=$escape(canSelectTech.favourable_count);
+$out+='次</span>';
+}
+$out+='</p> ';
+if(canSelectTech.next_free_time){
+$out+=' <p class="recommend-time">推荐时间段&nbsp;';
+$out+=$escape(canSelectTech.next_free_time);
+$out+='</p> ';
+}
+$out+=' </div> <button class="btn btn-positive btn-check">选我</button> </a> </li> ';
+});
+$out+=' ';
+}
+$out+=' ';
+if(match.length > 0){
+$out+=' <li class="table-view-divider">以下保洁师该时段已被预约,请选择其他空闲时间</li> ';
+$each(match,function(canMatchTech,$index){
+$out+=' <li class="table-view-cell"> <a class="select-item disabled" data-name="';
+$out+=$escape(canMatchTech.name);
+$out+='" data-id="';
+$out+=$escape(canMatchTech.id);
+$out+='" data-desc="';
+$out+=$escape(canMatchTech.desc);
+$out+='" data-favor="';
+$out+=$escape(canMatchTech.favourable_count);
+$out+='" data-avatar="';
+$out+=$escape(canMatchTech.avatar);
+$out+='" data-recommend="';
+$out+=$escape(canMatchTech.next_free_time);
+$out+='"> <div class="media-object pull-left"> <img src="';
+$out+=$escape(canMatchTech.avatar);
+$out+='?imageView2/0/w/84"> </div> <div class="media-body"> <p>';
+$out+=$escape(canMatchTech.name);
+if(canMatchTech.favourable_count){
+$out+='<span class="favor-count">好评次数:';
+$out+=$escape(canMatchTech.favourable_count);
+$out+='次</span>';
+}
+$out+='</p> ';
+if(canMatchTech.next_free_time){
+$out+=' <p class="recommend-time">推荐时间段&nbsp;';
+$out+=$escape(canMatchTech.next_free_time);
+$out+='</p> ';
+}
+$out+=' </div> </a> </li> ';
+});
+$out+=' ';
+}
+$out+=' ';
+}
+$out+=' </ul> </div> </div> <div class="prevent-scroll"> <div class="recommend"> <div class="btn btn-block btn-positive btn-recommend">系统推荐保洁师</div> </div> </div> </div> </div> ';
+return new String($out);
+});

+ 11 - 0
www/webapp/o2o/js/build/.cache/coming/index.js

@@ -0,0 +1,11 @@
+/*TMODJS:{"version":1,"md5":"503f6d88740f8e26bde5a9a12572cdec"}*/
+template('coming/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,prodcutTitle=$data.prodcutTitle,$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(prodcutTitle.name);
+$out+='</h1> </header> ';
+}
+$out+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical coming"> </div> </div> </div> </div>';
+return new String($out);
+});

+ 18 - 0
www/webapp/o2o/js/build/.cache/common/actionSheet.js

@@ -0,0 +1,18 @@
+/*TMODJS:{"version":1,"md5":"a18b6fbffc896f05e50d604b039a006b"}*/
+template('common/actionSheet',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$escape=$utils.$escape,message=$data.message,$each=$utils.$each,buttons=$data.buttons,button=$data.button,i=$data.i,$out='';$out+='<div class="box box-container box-align-end"> <div class="action-sheet-body"> <p class="action-sheet-message"> ';
+$out+=$escape(message);
+$out+=' </p> <div> ';
+$each(buttons,function(button,i){
+$out+=' <a href="javascript:;" class="btn btn-block btn-action-sheet ';
+$out+=$escape(button.class);
+$out+='" data-button-index="';
+$out+=$escape(i);
+$out+='">';
+$out+=$escape(button.text);
+$out+='</a> ';
+});
+$out+=' </div> </div> </div>';
+return new String($out);
+});

+ 22 - 0
www/webapp/o2o/js/build/.cache/common/alert.js

@@ -0,0 +1,22 @@
+/*TMODJS:{"version":1,"md5":"176d4dcb43e56afbde9efcca4fb5c3c4"}*/
+template('common/alert',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$escape=$utils.$escape,title=$data.title,message=$data.message,$string=$utils.$string,html=$data.html,$each=$utils.$each,buttons=$data.buttons,button=$data.button,i=$data.i,$out='';$out+='<div class="box-container box-center"> <div class="card alert-body"> <h4>';
+$out+=$escape(title);
+$out+='</h4> <p class="alert-message">';
+$out+=$escape(message);
+$out+='</p> <p class="alert-message">';
+$out+=$string(html);
+$out+='</p> <div class="box"> ';
+$each(buttons,function(button,i){
+$out+=' <div class="alert-btn-box box-flex-1"><button class="btn btn-block btn-alert ';
+$out+=$escape(button.class);
+$out+='" data-button-index=';
+$out+=$escape(i);
+$out+='>';
+$out+=$escape(button.text);
+$out+='</button></div> ';
+});
+$out+=' </div> </div> </div> ';
+return new String($out);
+});

+ 164 - 0
www/webapp/o2o/js/build/.cache/common/dataPicker.js

@@ -0,0 +1,164 @@
+/*TMODJS:{"version":1,"md5":"b8a14fd88375204a7456294a990c90f5"}*/
+template('common/dataPicker',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,columns=$data.columns,option=$data.option,i=$data.i,$escape=$utils.$escape,$out='';$out+='<div class="box box-container box-align-end"> <div class="picker-body"> <div class="picker-day-box">  <div class=" picker-day"> <ul class="row"> ';
+$each(columns.columnDay,function(option,i){
+$out+=' ';
+if(option.selected){
+$out+=' <li class="col-md-3 day ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='"> <span>';
+$out+=$escape(option.day);
+$out+='</span><br><small>';
+$out+=$escape(option.text);
+$out+='</small> </li> ';
+}else{
+$out+=' <li class="col-md-3 day ';
+if(i == 0 ){
+$out+=' on ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='"> <span>';
+$out+=$escape(option.day);
+$out+='</span><br><small>';
+$out+=$escape(option.text);
+$out+='</small> </li> ';
+}
+$out+=' ';
+});
+$out+=' </ul> </div>  </div> <div class="container picker-time"> <ul class="row"> ';
+$each(columns.columnTime,function(option,i){
+$out+=' ';
+if(option.num > option.now ){
+$out+=' <li class="col-md-3 j-book-time ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+=' ';
+if(option.num - option.now <= 4 || (option.now > 18 || option.now < 9 && option.num <= 12) ){
+$out+=' current ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='" data-time="';
+$out+=$escape(option.min);
+$out+='" data-now="';
+$out+=$escape(option.now);
+$out+='"> <a href="javascript:;" class="time"> <span class="num">';
+$out+=$escape(option.text);
+$out+='</span> <span class="disable">不可预约</span> <span class="able">预约</span> </a> </li> ';
+}
+$out+=' ';
+});
+$out+=' </ul> <ul class="row hide"> ';
+$each(columns.columnTime,function(option,i){
+$out+=' <li class="col-md-3 j-book-time ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+=' ';
+if(option.now >= 18 && option.num < 12 ){
+$out+=' current ';
+}else if(option.now >= 19 && option.num <= 12 ){
+$out+=' current ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='" data-time="';
+$out+=$escape(option.min);
+$out+='"> <a href="javascript:;" class="time"> <span class="num">';
+$out+=$escape(option.text);
+$out+='</span> <span class="disable">不可预约</span> <span class="able">预约</span> </a> </li> ';
+});
+$out+=' </ul> <ul class="row hide"> ';
+$each(columns.columnTime,function(option,i){
+$out+=' <li class="col-md-3 j-book-time ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='"> <a href="javascript:;" class="time"> <span class="num">';
+$out+=$escape(option.text);
+$out+='</span> <span class="disable">不可预约</span> <span class="able">预约</span> </a> </li> ';
+});
+$out+=' </ul> <ul class="row hide"> ';
+$each(columns.columnTime,function(option,i){
+$out+=' <li class="col-md-3 j-book-time ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='"> <a href="javascript:;" class="time"> <span class="num">';
+$out+=$escape(option.text);
+$out+='</span> <span class="disable">不可预约</span> <span class="able">预约</span> </a> </li> ';
+});
+$out+=' </ul> <ul class="row hide"> ';
+$each(columns.columnTime,function(option,i){
+$out+=' <li class="col-md-3 j-book-time ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='"> <a href="javascript:;" class="time"> <span class="num">';
+$out+=$escape(option.text);
+$out+='</span> <span class="disable">不可预约</span> <span class="able">预约</span> </a> </li> ';
+});
+$out+=' </ul> <ul class="row hide"> ';
+$each(columns.columnTime,function(option,i){
+$out+=' <li class="col-md-3 j-book-time ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='"> <a href="javascript:;" class="time"> <span class="num">';
+$out+=$escape(option.text);
+$out+='</span> <span class="disable">不可预约</span> <span class="able">预约</span> </a> </li> ';
+});
+$out+=' </ul> <ul class="row hide"> ';
+$each(columns.columnTime,function(option,i){
+$out+=' <li class="col-md-3 j-book-time ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='"> <a href="javascript:;" class="time"> <span class="num">';
+$out+=$escape(option.text);
+$out+='</span> <span class="disable">不可预约</span> <span class="able">预约</span> </a> </li> ';
+});
+$out+=' </ul> <ul class="row hide"> ';
+$each(columns.columnTime,function(option,i){
+$out+=' <li class="col-md-3 j-book-time ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='"> <a href="javascript:;" class="time"> <span class="num">';
+$out+=$escape(option.text);
+$out+='</span> <span class="disable">不可预约</span> <span class="able">预约</span> </a> </li> ';
+});
+$out+=' </ul> <ul class="row hide"> ';
+$each(columns.columnTime,function(option,i){
+$out+=' <li class="col-md-3 j-book-time ';
+if(option.selectIndex > -1 ){
+$out+=' on ';
+}
+$out+='" data-value="';
+$out+=$escape(option.value);
+$out+='"> <a href="javascript:;" class="time"> <span class="num">';
+$out+=$escape(option.text);
+$out+='</span> <span class="disable">不可预约</span> <span class="able">预约</span> </a> </li> ';
+});
+$out+=' </ul> </div> </div> </div> ';
+return new String($out);
+});

+ 26 - 0
www/webapp/o2o/js/build/.cache/common/star.js

@@ -0,0 +1,26 @@
+/*TMODJS:{"version":1,"md5":"a34a454314f28a3fc66f248c1d22ebb3"}*/
+template('common/star',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,score=$data.score,$out='';$out+='<div class="star-container"> <div class="box-container box"> <div class="star-item ';
+if(score >=1 ){
+$out+='enable';
+}
+$out+='"></div> <div class="star-item ';
+if(score >=2 ){
+$out+='enable';
+}
+$out+='"></div> <div class="star-item ';
+if(score >=3 ){
+$out+='enable';
+}
+$out+='"></div> <div class="star-item ';
+if(score >=4 ){
+$out+='enable';
+}
+$out+='"></div> <div class="star-item ';
+if(score >=5 ){
+$out+='enable';
+}
+$out+='"></div> </div> </div>';
+return new String($out);
+});

+ 9 - 0
www/webapp/o2o/js/build/.cache/desc/index.js

@@ -0,0 +1,9 @@
+/*TMODJS:{"version":1,"md5":"e8105a49b820da70e814caa66c2554a7"}*/
+template('desc/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$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">服务介绍</h1> </header> ';
+}
+$out+=' <div class="content" id="descScroll"> <div class="scroller"> <div> </div> </div>';
+return new String($out);
+});

+ 15 - 0
www/webapp/o2o/js/build/.cache/hire/index.js

@@ -0,0 +1,15 @@
+/*TMODJS:{"version":1,"md5":"b752c82a4aaa374ba9be18bb3a00b887"}*/
+template('hire/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$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">招贤纳士</h1> </header> ';
+}
+$out+=' <div class="content" id="placeOrderScroll"> <div class="top-content"> <p>招募上门宠物保洁师</p> </div> <div class="page-content"> <div class="logo-box"> <div class="logo"></div> <h2>壹管家宠物</h2> <h3>专业宠物服务平台</h3> </div> <div class="des"> <p>岗位职责</p> <p>资深保洁师:独立操作各种宠物造型的修剪工作。</p> <p>保洁师助理:独立完成宠物洗澡工作。</p> <br> <p class="bold">公司福利</p> <p class="bold">1.远高于传统美容店的底薪。</p> <p class="bold">2.全上海各区都有宿舍,就近安排住宿。</p> <p class="bold">3.完善的晋升机制,对业绩考评优秀的保洁师,公司将统一组织培训深造、考级。</p> <br> ';
+if(!showNavBar ){
+$out+=' <p class="bold">联系电话: <a href="tel:021-62109097">021-62109097</a> </p> ';
+}else{
+$out+=' <p class="bold">联系电话: <a class="service-telephone">021-62109097</a> </p> ';
+}
+$out+=' <br> </div> </div> </div> ';
+return new String($out);
+});

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 6 - 0
www/webapp/o2o/js/build/.cache/home/index.js


+ 60 - 0
www/webapp/o2o/js/build/.cache/myCoupon/cell.js

@@ -0,0 +1,60 @@
+/*TMODJS:{"version":1,"md5":"427777deea9a256cb5d3d1c14ba16125"}*/
+template('myCoupon/cell',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$escape=$utils.$escape,coupon=$data.coupon,isRemind=$data.isRemind,start_time_str=$data.start_time_str,end_time_str=$data.end_time_str,selected=$data.selected,$out='';$out+='<div class="box"> <div class="coupon-left"> <div class="coupon-value-box box-center"> <div> ¥<span class="coupon-value">';
+$out+=$escape(coupon.value);
+$out+='</span> </div> </div> </div> <div class="coupon-right box box-vertical"> <div class="box box-align-center box-flex-1"> <div class="coupon-name">';
+$out+=$escape(coupon.name);
+$out+='</div> </div> <div class="box box-align-center box-flex-1"> <div class="coupon-desc"> ';
+if(coupon.type == '0'){
+$out+=' <div>满';
+$out+=$escape(coupon.min_price);
+$out+='元可用 不含附加项目</div> ';
+}else{
+$out+=' <div>仅限';
+$out+=$escape(coupon.type_str);
+$out+=' 满';
+$out+=$escape(coupon.min_price);
+$out+='元可用</div> ';
+}
+$out+=' <div class="';
+if(isRemind){
+$out+='coupon-remind';
+}
+$out+='">有效期:';
+$out+=$escape(start_time_str);
+$out+='-';
+$out+=$escape(end_time_str);
+$out+='</div> ';
+if(coupon.workday_limit !== 0){
+$out+=' <span class="limit">';
+$out+=$escape(coupon.workday_limit_str);
+$out+='</span> ';
+if(coupon.time_limit_start && coupon.time_limit_end){
+$out+=' <span class="limit">';
+$out+=$escape(coupon.time_limit_start);
+$out+='点 - ';
+$out+=$escape(coupon.time_limit_end);
+$out+='点使用</span> ';
+}else{
+$out+=' 使用 ';
+}
+$out+=' ';
+}else{
+$out+=' ';
+if(coupon.time_limit_start && coupon.time_limit_end){
+$out+=' <span class="limit">仅限每日';
+$out+=$escape(coupon.time_limit_start);
+$out+='点 - ';
+$out+=$escape(coupon.time_limit_end);
+$out+='点使用</span> ';
+}
+$out+=' ';
+}
+$out+=' </div> </div> </div> ';
+if(selected){
+$out+=' <div class="box box-flex-1 box-pack-end box-align-center coupon-selected"> <span class="icon icon-check"></span> </div> ';
+}
+$out+=' </div> ';
+return new String($out);
+});

+ 47 - 0
www/webapp/o2o/js/build/.cache/myCoupon/exchange.js

@@ -0,0 +1,47 @@
+/*TMODJS:{"version":1,"md5":"e2d3b6e472ff83e107ea6c2399da8ad4"}*/
+template('myCoupon/exchange',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,coupons=$data.coupons,coupon=$data.coupon,i=$data.i,$escape=$utils.$escape,$out='';$out+='<p class="coupon-info">兑换码的获取请随时关注壹管家的优惠活动。</p> ';
+$each(coupons.useable_coupons,function(coupon,i){
+$out+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <div class="box"> <div class="coupon-left"> <div class="coupon-value-box box-center"> <div> ¥<span class="coupon-value">';
+$out+=$escape(coupon.coupon.value);
+$out+='</span> </div> </div> </div> <div class="coupon-right box box-vertical"> <div class="box box-align-center box-flex-1"> <div class="coupon-name">';
+$out+=$escape(coupon.coupon.name);
+$out+='</div> </div> <div class="box box-align-center box-flex-1"> <div class="coupon-desc"> <div>';
+$out+=$escape(coupon.coupon.type_str);
+$out+=' 满';
+$out+=$escape(coupon.coupon.min_price);
+$out+='元可用</div> <div>截止日期:';
+$out+=$escape(coupon.end_time_str);
+$out+='</div> </div> </div> </div> </div> </li> </ul> </div> ';
+});
+$out+=' ';
+$each(coupons.used_coupons,function(coupon,i){
+$out+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <div class="box"> <div class="coupon-left"> <div class="coupon-value-box box-center"> <div> ¥<span class="coupon-value">';
+$out+=$escape(coupon.coupon.value);
+$out+='</span> </div> </div> </div> <div class="coupon-right box box-vertical"> <div class="box box-align-center box-flex-1"> <div class="coupon-name">';
+$out+=$escape(coupon.coupon.name);
+$out+='</div> </div> <div class="box box-align-center box-flex-1"> <div class="coupon-desc"> <div>';
+$out+=$escape(coupon.coupon.type_str);
+$out+=' 满';
+$out+=$escape(coupon.coupon.min_price);
+$out+='元可用</div> <div>截止日期:';
+$out+=$escape(coupon.end_time_str);
+$out+='</div> </div> </div> </div> </div> </li> </ul> </div> ';
+});
+$out+=' ';
+$each(coupons.overtime_coupons,function(coupon,i){
+$out+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <div class="box"> <div class="coupon-left"> <div class="coupon-value-box box-center"> <div> ¥<span class="coupon-value">';
+$out+=$escape(coupon.coupon.value);
+$out+='</span> </div> </div> </div> <div class="coupon-right box box-vertical"> <div class="box box-align-center box-flex-1"> <div class="coupon-name">';
+$out+=$escape(coupon.coupon.name);
+$out+='</div> </div> <div class="box box-align-center box-flex-1"> <div class="coupon-desc"> <div>';
+$out+=$escape(coupon.coupon.type_str);
+$out+=' 满';
+$out+=$escape(coupon.coupon.min_price);
+$out+='元可用</div> <div>截止日期:';
+$out+=$escape(coupon.end_time_str);
+$out+='</div> </div> </div> </div> </div> </li> </ul> </div> ';
+});
+return new String($out);
+});

+ 27 - 0
www/webapp/o2o/js/build/.cache/myCoupon/index.js

@@ -0,0 +1,27 @@
+/*TMODJS:{"version":1,"md5":"fdf3a1a72645b96efa2d7b32f9a21055"}*/
+template('myCoupon/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$each=$utils.$each,coupons=$data.coupons,coupon=$data.coupon,i=$data.i,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},$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">我的优惠券</h1> </header> ';
+}
+$out+=' <div class="content" id="myCouponScroll"> <div class="scroller"> <div class="page-content"> <div class="coupon-form"> <div class="coupon-code-item"> <input type="tel" name="coupon-code" id="coupon-code" placeholder="请输入兑换码"> </div> <button class="btn-coupon">兑换</button> </div> <div class="coupon-items"> <p class="coupon-info">兑换码的获取请随时关注壹管家的优惠活动。</p> ';
+$each(coupons.useable_coupons,function(coupon,i){
+$out+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ';
+include('./cell',coupon);
+$out+=' </li> </ul> </div> ';
+});
+$out+=' ';
+$each(coupons.used_coupons,function(coupon,i){
+$out+=' <div class="card coupon-card used"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ';
+include('./cell',coupon);
+$out+=' </li> </ul> </div> ';
+});
+$out+=' ';
+$each(coupons.overtime_coupons,function(coupon,i){
+$out+=' <div class="card coupon-card disabled"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ';
+include('./cell',coupon);
+$out+=' </li> </ul> </div> ';
+});
+$out+=' </div> </div> </div> </div>';
+return new String($out);
+});

+ 159 - 0
www/webapp/o2o/js/build/.cache/myOrder/detail.js

@@ -0,0 +1,159 @@
+/*TMODJS:{"version":1,"md5":"ee04eb9ea5b50907b09f46199ba52367"}*/
+template('myOrder/detail',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,orderID=$data.orderID,order=$data.order,$each=$utils.$each,product=$data.product,i=$data.i,appendProduct=$data.appendProduct,appendOrder=$data.appendOrder,time=$data.time,$out='';if(showNavBar ){
+$out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <a class="right-button service-telephone"> <div></div> </a> <h1 class="title">订单详情</h1> </header> ';
+}
+$out+=' <div class="content box box-vertical"> <div id="myOrderDetailScroll';
+$out+=$escape(orderID);
+$out+='" class="box-flex-1 scroll-container"> <div class="scroller"> <div class="page-content list-content"> <ul class="table-view"> <li class="table-view-cell"> <div class="order-detail-item"> <span class="item-name">订单状态</span> <div class="item-detail">';
+$out+=$escape(order.status_str);
+$out+='</div> </div> <div class="order-detail-item"> <span class="item-name">订单编号</span> <div class="item-detail">';
+$out+=$escape(order.order_num);
+$out+='</div> </div> <div class="order-detail-item"> <span class="item-name">服务地点</span> <div class="item-detail"> ';
+$out+=$escape(order.address.city);
+$out+=$escape(order.address.area);
+$out+=$escape(order.address.poi.name);
+$out+=$escape(order.address.detail);
+$out+='</div> </div> <div class="order-detail-item"> <span class="item-name">联系电话</span> <div class="item-detail"><a href="javascript:;" class="j-phone">';
+$out+=$escape(order.address.mobile);
+$out+='</a></div> </div> <div class="order-detail-item"> <span class="item-name">预约时间</span> <div class="item-detail">';
+$out+=$escape(order.booking_time_str);
+$out+='</div> </div> <div class="order-detail-item"> <span class="item-name">下单时间</span> <div class="item-detail">';
+$out+=$escape(order.order_time_str);
+$out+='</div> </div> ';
+if(order.cancel_time){
+$out+=' <div class="order-detail-item"> <span class="item-name">取消时间</span> <div class="item-detail">';
+$out+=$escape(order.cancel_time_str);
+$out+='</div> </div> ';
+}
+$out+=' ';
+if(order.finish_time){
+$out+=' <div class="order-detail-item"> <span class="item-name">完成时间</span> <div class="item-detail">';
+$out+=$escape(order.finish_time_str);
+$out+='</div> </div> ';
+}
+$out+=' </li> <li class="table-view-divider"></li> ';
+if(order.status == 4 && order.technician_name){
+$out+=' <li class="table-view-cell"> <div class="order-label">';
+$out+=$escape(order.technician_name);
+$out+='已出发,电话:<a href="javascript:;" class="j-phone">';
+$out+=$escape(order.tech_info.mobile);
+$out+='</a></div> <div id="map-container-';
+$out+=$escape(orderID);
+$out+='" style="height: 200px;"> </div> </li> ';
+}
+$out+=' <li class="table-view-cell"> <div class="order-label"> <div class="label-name">订单明细</div> </div> </li> ';
+$each(order.products,function(product,i){
+$out+=' <li class="table-view-cell"> <div class="order-label"> <div class="label-name">';
+$out+=$escape(product.name);
+if(product.count > 1){
+$out+='<span class="service-count">x';
+$out+=$escape(product.count);
+$out+='</span>';
+}
+$out+='</div> <div class="label-value">';
+$out+=$escape(product.price);
+$out+='元</div> </div> </li> ';
+});
+$out+=' ';
+$each(order.append_orders,function(appendProduct,i){
+$out+=' <li class="table-view-cell"> <div class="order-label append-order"> <div class="label-name">';
+$out+=$escape(appendProduct.products_str);
+$out+='</div> <div class="label-value">';
+$out+=$escape(appendProduct.price);
+$out+='元</div> </div> </li> ';
+});
+$out+=' <li class="table-view-cell"> <div class="order-label"> <div class="label-name">总价</div> <div class="label-value">';
+$out+=$escape(order.sum_price);
+$out+='元</div> </div> </li> <li class="table-view-cell"> <div class="order-label"> <div class="label-name">订单状态</div> <div class="label-value">';
+$out+=$escape(order.status_str);
+$out+='</div> </div> </li> ';
+if(order.pay_channel !== ''){
+$out+=' <li class="table-view-cell"> <div class="order-label"> <div class="label-name">支付方式</div> <div class="label-value">';
+if(order.pay_channel == 'alipay'){
+$out+='支付宝';
+}else{
+$out+='微信';
+}
+$each(order.append_orders,function(appendOrder,i){
+$out+='+';
+if(appendOrder.pay_channel == 'alipay'){
+$out+='支付宝';
+}else{
+$out+='微信';
+}
+});
+$out+='</div> </div> </li> ';
+}
+$out+=' <li class="table-view-divider"></li> <li class="table-view-cell"> <div class="order-label order-comment"> <span class="order-comment-label">订单备注</span> ';
+if(order.memo !== ''){
+$out+='(';
+$out+=$escape(order.memo);
+$out+=')';
+}
+$out+=' </div> </li> </ul> <div class="order-label btn-group"> ';
+if(order.status == 0){
+$out+=' <div class="table-cell-accessory"> <a class="order-btn btn-default order-btn-cancel" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-order-name="';
+$out+=$escape(order.products[0].name);
+$out+='" data-order-price="';
+$out+=$escape(order.price);
+$out+='">取消订单</a> <a class="order-btn btn-warning order-btn-pay" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-order-name="';
+$out+=$escape(order.products[0].name);
+$out+='" data-order-price="';
+$out+=$escape(order.price);
+$out+='">立即支付</a> </div> ';
+}
+$out+=' ';
+if(order.status >= 1 && order.status <= 5){
+$out+=' <div class="table-cell-accessory"> ';
+if(order.booking_time > time && order.status == 1){
+$out+=' <a class="order-btn btn-default order-btn-refund ';
+if(order.booking_time - time <= 7200){
+$out+='btn-alert-info';
+}
+$out+='" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-type="';
+$out+=$escape(order.products[0].type);
+$out+='" data-index="';
+$out+=$escape(i);
+$out+='">申请退款</a> ';
+}
+$out+=' ';
+if(order.products[0].type !== '7' && order.products[0].type !== '6'){
+$out+=' <a class="order-btn btn-default order-btn-append" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-order-name="';
+$out+=$escape(order.products[0].pet_types[0].name);
+$out+='" data-order-price="';
+$out+=$escape(order.price);
+$out+='" data-type="';
+$out+=$escape(order.products[0].type);
+$out+='">追加服务</a> ';
+}
+$out+=' ';
+if(time > order.booking_time){
+$out+=' <a class="order-btn btn-warning order-btn-done" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-order-name="';
+$out+=$escape(order.products[0].name);
+$out+='" data-order-price="';
+$out+=$escape(order.price);
+$out+='">确认完成</a> ';
+}
+$out+=' </div> ';
+}
+$out+=' ';
+if(order.status == 6 && !order.have_comment){
+$out+=' <div class="table-cell-accessory"> <a class="order-btn order-btn-review btn-main" data-order-id="';
+$out+=$escape(order.id);
+$out+='">立即评价</a> </div> ';
+}
+$out+=' </div> </div> </div> </div> </div> ';
+return new String($out);
+});

+ 9 - 0
www/webapp/o2o/js/build/.cache/myOrder/finish.js

@@ -0,0 +1,9 @@
+/*TMODJS:{"version":1,"md5":"de16129c1b11784c254375478669bec8"}*/
+template('myOrder/finish',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$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">确认完成</h1> </header> ';
+}
+$out+=' <div class="content content-padding"> <div class="text-center"> <img src="http://wozhua-others.qiniudn.com/20160314-order-done.jpg?interlace/1" alt=""> </div> <div class="box"> <div class="box-flex-1"> <button class="btn btn-block btn-default back-button">我的预约</button> </div> <div class="box-flex-1"> <button class="btn btn-block btn-success to-order">立即评价</button> </div> </div> </div> ';
+return new String($out);
+});

+ 21 - 0
www/webapp/o2o/js/build/.cache/myOrder/index.js

@@ -0,0 +1,21 @@
+/*TMODJS:{"version":1,"md5":"75fac67c0580abbbdbf7481129bb6b3c"}*/
+template('myOrder/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,type=$data.type,$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">我的预约</h1> </header> ';
+}
+$out+=' <div class="content box box-vertical"> <div class="segmented-control order-type-control prevent-scroll"> <a class="control-item ';
+if(type == '1'){
+$out+='active';
+}
+$out+='" data-order-type="1">预约中</a> <a class="control-item ';
+if(type == '2'){
+$out+='active';
+}
+$out+='" data-order-type="3">已完成</a> <a class="control-item ';
+if(type == '3'){
+$out+='active';
+}
+$out+='" data-order-type="2">已取消</a> </div> <div id="myOrderScroll" class="box-flex-1 scroll-container"> <div class="scroller"> <div class="page-content list-content"> </div> <div class="btn-more-container box-center more-container hide"> <a class="btn btn-block btn-more-orders" data-type="1">加载更多</a> </div> </div> </div> </div> ';
+return new String($out);
+});

+ 126 - 0
www/webapp/o2o/js/build/.cache/myOrder/list.js

@@ -0,0 +1,126 @@
+/*TMODJS:{"version":1,"md5":"bfe00aa5452a768fae63c29390c9a197"}*/
+template('myOrder/list',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,orders=$data.orders,order=$data.order,i=$data.i,$escape=$utils.$escape,append_order=$data.append_order,time=$data.time,chubao=$data.chubao,$out='';$each(orders,function(order,i){
+$out+=' <ul class="table-view"> <li class="table-view-cell"> <span class="order-desc-title">预约时间</span> <span class="order-desc-more">';
+$out+=$escape(order.booking_time_str);
+$out+='</span> <span class="order-precedence-status">';
+if(order.precedence){
+$out+='(加急)';
+}
+$out+='</span> <div class="table-cell-accessory"> <span class="order-status ';
+if(order.status == 0){
+$out+='order-status-pay';
+}
+$out+='"> ';
+if(order.have_comment){
+$out+='已评价';
+}else{
+$out+=$escape(order.status_str);
+}
+$out+=' </span> </div> </li> <li class="table-view-cell btn-order-detail" data-order-id="';
+$out+=$escape(order.id);
+$out+='"> <div> <div class="order-desc-line order-number"> <span class="order-desc-title">编号</span><span class="order-desc-more">';
+$out+=$escape(order.order_num);
+$out+='</span> </div> <div class="order-desc-line order-service-name"> <span class="order-desc-title">服务</span><span class="order-desc-more">';
+$out+=$escape(order.products_str);
+if(order.products[0].count > 1){
+$out+='(';
+$out+=$escape(order.products[0].count);
+$out+='只) ';
+}
+$out+='</span> </div> ';
+if(order.append_orders){
+$out+=' ';
+$each(order.append_orders,function(append_order,i){
+$out+=' <div class="order-desc-line order-service-name order-append"> <span class="order-desc-title">追加</span><span class="order-desc-more">';
+$out+=$escape(append_order.products_str);
+$out+='</span> </div> ';
+});
+$out+=' ';
+}
+$out+=' <div class="order-desc-line order-service-name"> <span class="order-desc-title">价格</span> <span class="order-desc-more">';
+$out+=$escape(order.final_price.toFixed(2));
+$out+='元</span> ';
+if(order.append_orders){
+$out+=' ';
+$each(order.append_orders,function(append_order,i){
+$out+=' <span class="order-append-price">&nbsp; + ';
+$out+=$escape(append_order.price);
+$out+='元 </span> ';
+});
+$out+=' ';
+}
+$out+=' ';
+if(order.append_orders.length){
+$out+=' <span class="order-append-price">&nbsp;=&nbsp;';
+$out+=$escape(order.sum_price);
+$out+='元</span> ';
+}
+$out+=' </div> </div> </li> ';
+if(order.status == 0){
+$out+=' <li class="table-view-cell brn-group"> &nbsp; <div class="table-cell-accessory"> <a class="order-btn btn-default order-btn-cancel" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-order-name="';
+$out+=$escape(order.products[0].name);
+$out+='" data-order-price="';
+$out+=$escape(order.price);
+$out+='">取消订单</a> <a class="order-btn btn-warning order-btn-pay" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-order-name="';
+$out+=$escape(order.products[0].name);
+$out+='" data-order-price="';
+$out+=$escape(order.price);
+$out+='">立即支付</a> </div> </li> ';
+}
+$out+=' ';
+if(order.status >= 1 && order.status <= 5){
+$out+=' <li class="table-view-cell brn-group"> &nbsp; <div class="table-cell-accessory"> ';
+if(order.booking_time > time && order.status == 1){
+$out+=' <a class="order-btn btn-default order-btn-refund ';
+if(order.booking_time - time <= 7200){
+$out+='btn-alert-info';
+}
+$out+='" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-type="';
+$out+=$escape(order.products[0].type);
+$out+='" data-index="';
+$out+=$escape(i);
+$out+='">申请退款</a> ';
+}
+$out+=' ';
+if(!chubao && order.products[0].type !== '7' && order.products[0].type !== '6'){
+$out+=' <a class="order-btn btn-default order-btn-append" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-order-name="';
+$out+=$escape(order.products[0].pet_types[0].name);
+$out+='" data-order-price="';
+$out+=$escape(order.price);
+$out+='" data-type="';
+$out+=$escape(order.products[0].type);
+$out+='">追加服务</a> ';
+}
+$out+=' ';
+if(time > order.booking_time){
+$out+=' <a class="order-btn btn-warning order-btn-done" data-order-id="';
+$out+=$escape(order.id);
+$out+='" data-order-name="';
+$out+=$escape(order.products[0].name);
+$out+='" data-order-price="';
+$out+=$escape(order.price);
+$out+='">确认完成</a> ';
+}
+$out+=' </div> </li> ';
+}
+$out+=' ';
+if(order.status == 6 && !order.have_comment){
+$out+=' <li class="table-view-cell brn-group"> &nbsp; <div class="table-cell-accessory"> <a class="order-btn order-btn-review btn-main" data-order-id="';
+$out+=$escape(order.id);
+$out+='">立即评价</a> </div> </li> ';
+}
+$out+=' </ul> ';
+});
+$out+=' ';
+return new String($out);
+});

+ 43 - 0
www/webapp/o2o/js/build/.cache/myOrder/refund.js

@@ -0,0 +1,43 @@
+/*TMODJS:{"version":1,"md5":"1dbe626d0c66f194ba91101df7871a1a"}*/
+template('myOrder/refund',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,order=$data.order,$each=$utils.$each,append_order=$data.append_order,i=$data.i,$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">申请退款</h1> </header> ';
+}
+$out+=' <div class="content box box-vertical"> <div id="refundScroll" class="box-flex-1 scroll-container"> <div class="scroller"> <div class="page-content list-content"> <ul class="table-view"> <li class="table-view-cell"> <span class="order-desc-title">预约时间</span> <span class="order-desc-more">';
+$out+=$escape(order.booking_time_str);
+$out+='</span> <span class="order-precedence-status">';
+if(order.precedence ){
+$out+=' (加急) ';
+}
+$out+='</span> </li> <li class="table-view-cell"> <div> <div class="order-desc-line"> <span class="order-desc-title">编号</span><span class="order-desc-more">';
+$out+=$escape(order.order_num);
+$out+='</span> </div> <div class="order-desc-line order-service-name"> <span class="order-desc-title">服务</span><span class="order-desc-more">';
+$out+=$escape(order.products_str);
+$out+='</span> </div> ';
+if(order.append_orders){
+$out+=' ';
+$each(order.append_orders,function(append_order,i){
+$out+=' <div class="order-desc-line order-service-name"> <span class="order-desc-title">追加</span><span class="order-desc-more">';
+$out+=$escape(append_order.products_str);
+$out+='</span> </div> ';
+});
+$out+=' ';
+}
+$out+=' <div class="order-desc-line"> <span class="order-desc-title">价格</span> <span class="order-desc-more">';
+$out+=$escape(order.final_price.toFixed(2));
+$out+='元</span> ';
+if(order.append_orders){
+$out+=' ';
+$each(order.append_orders,function(append_order,i){
+$out+=' <span class="order-append-price">&nbsp; + ';
+$out+=$escape(append_order.price);
+$out+='元</span> ';
+});
+$out+=' ';
+}
+$out+=' </div> </div> </li> <li class="table-view-cell tip">退款将退至您的支付账户(3-10个工作日内到账)</li> </ul> <div class="btn-box"> <div class="btn btn-refund" data-order-id="';
+$out+=$escape(order.id);
+$out+='">申请退款</div> </div> </div> </div> </div> </div> ';
+return new String($out);
+});

+ 29 - 0
www/webapp/o2o/js/build/.cache/pay/index.js

@@ -0,0 +1,29 @@
+/*TMODJS:{"version":1,"md5":"4a676731cd0f79bb4495cdc3325c4920"}*/
+template('pay/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,orderType=$data.orderType,orderprice=$data.orderprice,chubao=$data.chubao,wxPub=$data.wxPub,showWX=$data.showWX,$out='';if(showNavBar ){
+$out+=' <header class="bar bar-nav"> <a class="cancel-button left-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">收银台</h1> </header> ';
+}
+$out+=' <div class="content"> <ul class="table-view "> <li class="table-view-cell order-info"> <a><span>订单类型:</span>';
+$out+=$escape(orderType);
+$out+='</a> <a><span>支付金额:</span>';
+$out+=$escape(orderprice);
+$out+='元</a> </li> </ul> ';
+if(chubao){
+$out+=' ';
+}else{
+$out+=' <div class="content-padded "> 支付方式 </div> ';
+if(wxPub){
+$out+=' <ul class="table-view"> <li class="table-view-cell"> <a href="javascript:void(0) " class="pay-option checked" data-value="wx_pub"> <i class="icon-weixin"></i> 微信支付 </a> </li> </ul> ';
+}else{
+$out+=' <ul class="table-view"> <li class="table-view-cell"> <a href="javascript:void(0)" class="pay-option checked" data-value="alipay"> <i class="icon-alipay"></i> 支付宝 </a> </li> ';
+if(showWX){
+$out+=' <li class="table-view-cell"> <a href="javascript:void(0)" class="pay-option" data-value="wx"> <i class="icon-weixin"></i> 微信支付 </a> </li> ';
+}
+$out+=' </ul> ';
+}
+$out+=' ';
+}
+$out+=' <div class="content-padded "> <a class="btn btn-main btn-block btn-pay" data-pay-channel="alipay">确认支付</a> </div> </div> ';
+return new String($out);
+});

+ 12 - 0
www/webapp/o2o/js/build/.cache/picker/cell.js

@@ -0,0 +1,12 @@
+/*TMODJS:{"version":1,"md5":"f03ad351b1e13bc9a79ae2253b0ba760"}*/
+template('picker/cell',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,options=$data.options,option=$data.option,i=$data.i,$escape=$utils.$escape,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},$out='';$each(options,function(option,i){
+$out+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option" data-value="';
+$out+=$escape(option.id);
+$out+='"> ';
+include('../myCoupon/cell',option);
+$out+=' </a> </li> </ul> </div> ';
+});
+return new String($out);
+});

+ 31 - 0
www/webapp/o2o/js/build/.cache/picker/coupon.js

@@ -0,0 +1,31 @@
+/*TMODJS:{"version":1,"md5":"a9611ac01c255d4fb3cfa730de1515c2"}*/
+template('picker/coupon',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,$each=$utils.$each,options=$data.options,option=$data.option,i=$data.i,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},unuseables=$data.unuseables,$out='';if(showNavBar ){
+$out+=' <header class="bar bar-nav"> <a href="javascript:void(0)" class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">';
+$out+=$escape(title);
+$out+='</h1> </header> ';
+}
+$out+=' <div class="content" id="pickerScroll"> <div class="scroller"> <div class="page-content"> <div class="coupon-form"> <div class="coupon-code-item"> <input type="tel" name="coupon-code" id="coupon-code" placeholder="请输入兑换码"> </div> <button class="btn-coupon">兑换</button> </div> <p class="coupon-info">兑换码的获取请随时关注壹管家的优惠活动。</p> <div class="card-list"> ';
+$each(options,function(option,i){
+$out+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option" data-value="';
+$out+=$escape(option.id);
+$out+='"> ';
+include('../myCoupon/cell',option);
+$out+=' </a> </li> </ul> </div> ';
+});
+$out+=' </div> ';
+if(unuseables.length > 0){
+$out+=' <div class="card-list"> <p class="coupon-line">当前时段不可用</p> ';
+$each(unuseables,function(option,i){
+$out+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option unable" data-value="';
+$out+=$escape(option.id);
+$out+='"> ';
+include('../myCoupon/cell',option);
+$out+=' </a> </li> </ul> </div> ';
+});
+$out+=' </div> ';
+}
+$out+=' <div class="card"> <ul class="table-view"> <li class="table-view-cell"> <a class="picker-option" data-value=""> 不使用优惠券 </a> </li> </ul> </div> </div> </div> </div>';
+return new String($out);
+});

+ 25 - 0
www/webapp/o2o/js/build/.cache/picker/index.js

@@ -0,0 +1,25 @@
+/*TMODJS:{"version":1,"md5":"8615c9e567c0d2678a7c8ba8740117de"}*/
+template('picker/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,$each=$utils.$each,options=$data.options,option=$data.option,i=$data.i,$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> ';
+}
+$out+=' <div class="content" id="pickerScroll"> <div class="scroller"> <div class="page-content"> <ul class="table-view"> ';
+$each(options,function(option,i){
+$out+=' <li class="table-view-cell"> <a class="picker-option" data-value="';
+$out+=$escape(option.value);
+$out+='"> ';
+$out+=$escape(option.text);
+$out+=' <span class="picker-option-more">';
+$out+=$escape(option.more);
+$out+='</span> ';
+if(option.selected ){
+$out+=' <span class="icon icon-check pull-right selected-option"></span> ';
+}
+$out+=' </a> </li> ';
+});
+$out+=' </ul> </div> </div> </div>';
+return new String($out);
+});

+ 11 - 0
www/webapp/o2o/js/build/.cache/placeOrder/append.js

@@ -0,0 +1,11 @@
+/*TMODJS:{"version":1,"md5":"3b8b430274158e7145f1fc3c2df88438"}*/
+template('placeOrder/append',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},$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">追加服务</h1> </header> ';
+}
+$out+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="appendOrderScroll" class="scroll-container box-flex-1"> <ul class="table-view extra-service-list"> ';
+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);
+});

+ 223 - 0
www/webapp/o2o/js/build/.cache/placeOrder/index.js

@@ -0,0 +1,223 @@
+/*TMODJS:{"version":1,"md5":"ac89df180063df5527015efaa684adff"}*/
+template('placeOrder/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,prodcutTitle=$data.prodcutTitle,productLists=$data.productLists,$each=$utils.$each,productList=$data.productList,$index=$data.$index,extraServiceType=$data.extraServiceType,address=$data.address,type=$data.type,petName=$data.petName,petWeight=$data.petWeight,bookingTimeStr=$data.bookingTimeStr,extraService=$data.extraService,extraServiceList=$data.extraServiceList,i=$data.i,env=$data.env,beauticianName=$data.beauticianName,showCoupon=$data.showCoupon,couponName=$data.couponName,productType=$data.productType,petPrice=$data.petPrice,precedence=$data.precedence,couponVal=$data.couponVal,pay=$data.pay,totalCost=$data.totalCost,extraServicePrice=$data.extraServicePrice,$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(prodcutTitle.name);
+$out+='</h1> </header> ';
+}
+$out+=' <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 ';
+$out+=$escape(prodcutTitle.className);
+$out+='"> <div class="product-name">';
+$out+=$escape(prodcutTitle.name);
+$out+='详情';
+if(!productLists){
+$out+='及评价';
+}
+$out+=' <span>&gt;&gt;&gt;</span></div> </a> </li> </ul>  ';
+if(productLists){
+$out+=' <div class="table-view main-service"> <p class="main-service-title">请选择服务</p> ';
+$each(productLists,function(productList,$index){
+$out+=' ';
+if(productList[0].suitable){
+$out+=' <div class="width-percent-50"> <div class="btn btn-main-service" data-type="';
+$out+=$escape(productList[0].type);
+$out+='" data-extra-type="';
+$out+=$escape(extraServiceType);
+$out+='">';
+$out+=$escape(productList[0].type_str);
+$out+='</div> </div> ';
+}
+$out+=' ';
+});
+$out+=' </div> <p class="main-service-tips">';
+$out+=$escape(prodcutTitle.name);
+$out+='为附加服务,须选择以上任意一项主服务,方可预约。</p> ';
+}
+$out+=' <ul class="table-view"> <li class="table-view-cell"> <a class="navigate-right select-address ';
+if(address){
+$out+='show-address';
+}
+$out+='"> 地址 <div class="table-view-cell-right-label media-body has-address"> <span class="order-username"> ';
+if(address ){
+$out+=' ';
+$out+=$escape(address.name);
+$out+=' ';
+}
+$out+=' </span> <span class="order-mobile"> ';
+if(address ){
+$out+=' ';
+$out+=$escape(address.mobile);
+$out+=' ';
+}else{
+$out+=' 添加服务地址 ';
+}
+$out+=' </span> <p class="order-address"> ';
+if(address ){
+$out+=' ';
+if(address.address.poi ){
+$out+=' ';
+$out+=$escape(address.address.city);
+$out+=' ';
+$out+=$escape(address.address.area);
+$out+=' ';
+$out+=$escape(address.address.poi.name);
+$out+=' ';
+}else{
+$out+=' ';
+$out+=$escape(address.address.province);
+$out+=' ';
+$out+=$escape(address.address.city);
+$out+=' ';
+$out+=$escape(address.address.area);
+$out+=' ';
+$out+=$escape(address.address.detail);
+$out+=' ';
+}
+$out+=' ';
+}
+$out+=' </p> </div> </a> </li> <li class="table-view-cell"> ';
+if(type == 7){
+$out+=' <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){
+$out+=' <div class="link-label show-product-picker selected"> 宠物 <span class="table-view-cell-right-label pet-info"> ';
+if(petName == '' || petWeight == '' ){
+$out+=' 选择宠物类型 ';
+}else{
+$out+=' ';
+$out+=$escape(petName);
+$out+=' (';
+$out+=$escape(petWeight);
+$out+=') ';
+}
+$out+=' </span> </div> ';
+}else{
+$out+=' <a class="navigate-right show-product-picker"> 宠物 <span class="table-view-cell-right-label pet-info"> ';
+if(petName == '' || petWeight == ''){
+$out+=' 选择宠物类型 ';
+}else{
+$out+=' ';
+$out+=$escape(petName);
+$out+=' (';
+$out+=$escape(petWeight);
+$out+=') ';
+}
+$out+=' </span> </a> ';
+}
+$out+=' </li> <li class="table-view-cell"> <a class="navigate-right show-time-picker"> 服务时间 <span class="table-view-cell-right-label booking-time"> ';
+if(bookingTimeStr == '' ){
+$out+='请选择';
+}else{
+$out+=' ';
+$out+=$escape(bookingTimeStr);
+$out+=' ';
+}
+$out+=' </span> </a> </li> <li class="table-view-cell memo"> <form class="input-group" id="order-form"> ';
+if(prodcutTitle.name == 'SPA'){
+$out+=' <input type="text" class="order-memo" id="order-memo" placeholder="浴盐、浴泥二选一,下单请备注"> ';
+}else{
+$out+=' <input type="text" class="order-memo" id="order-memo" placeholder="(备注)可填写附加要求"> ';
+}
+$out+=' </form> </li> </ul>  <div class="extra-service-title">附加服务</div> <ul class="table-view extra-service-list"> ';
+if(extraServiceType == 11){
+$out+=' <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){
+$out+=' <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){
+$out+=' <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> ';
+}
+$out+=' ';
+$each(extraService,function(extraServiceList,i){
+$out+=' <li class="table-view-cell"> <a class="navigate-right item-checkbox" data-select="0" data-id="';
+$out+=$escape(extraServiceList.id);
+$out+='" data-price="';
+$out+=$escape(extraServiceList.price);
+$out+='" data-name="';
+$out+=$escape(extraServiceList.name);
+$out+='" data-serviceType="';
+$out+=$escape(extraServiceList.serviceType);
+$out+='"> ';
+$out+=$escape(extraServiceList.name);
+$out+=' (';
+$out+=$escape(extraServiceList.price);
+$out+='元) </a> </li> ';
+});
+$out+=' </ul> ';
+if(env.test){
+$out+=' <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> ';
+}
+$out+='  <ul class="table-view"> <li class="table-view-cell ';
+if(!showCoupon ){
+$out+='disabled';
+}
+$out+='"> <a class="navigate-right show-coupon-picker">优惠券 <span class="table-view-cell-right-label coupon-selected-name"> ';
+if(couponName){
+$out+=' ';
+$out+=$escape(couponName);
+$out+=' ';
+}else{
+$out+=' ';
+}
+$out+=' </span> </a> </li> </ul>  <ul class="table-view order-list"> <li class="table-view-cell select-pet ';
+if(petName == ''){
+$out+='hide';
+}
+$out+='"> <div class="link-label pet-type">';
+$out+=$escape(petName);
+$out+=' (';
+$out+=$escape(petWeight);
+$out+=')</div> <div class="link-label"> <span class="service-name">';
+$out+=$escape(productType);
+$out+='</span> <span class="table-view-cell-right-label total-cost">¥ ';
+$out+=$escape(petPrice);
+$out+='</span> </div> </li> <li class="table-view-cell calc-items hide"> ';
+if(extraServiceType == 11){
+$out+=' <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){
+$out+=' <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){
+$out+=' <div class="link-label select-extra-service" data-price="28">一次性局部染色 <span class="table-view-cell-right-label precedence-cost">¥ 28</span> </div> ';
+}
+$out+=' ';
+$each(extraService,function(extraServiceList,i){
+$out+=' <div class="link-label select-extra-service" data-price="';
+$out+=$escape(extraServiceList.price);
+$out+='">';
+$out+=$escape(extraServiceList.name);
+$out+=' <span class="table-view-cell-right-label precedence-cost">¥';
+$out+=$escape(extraServiceList.price);
+$out+='</span> </div> ';
+});
+$out+=' </li> <li class="table-view-cell select-precedence ';
+if(!precedence){
+$out+='hide';
+}
+$out+='"> <div class="link-label select-precedence-label">加急 <span class="table-view-cell-right-label precedence-cost">¥ ';
+$out+=$escape(precedence);
+$out+='</span> </div> </li> <li class="table-view-cell select-coupon ';
+if(!couponVal){
+$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" data-pay="';
+$out+=$escape(pay);
+$out+='" data-costs="';
+$out+=$escape(totalCost);
+$out+='" data-precedence="';
+$out+=$escape(precedence);
+$out+='" data-coupon="';
+$out+=$escape(couponVal);
+$out+='" data-extra="';
+$out+=$escape(extraServicePrice);
+$out+='">¥ ';
+$out+=$escape(pay);
+$out+='</span> </div> <a class="btn btn-main btn-block btn-place">确认预约</a> </div> </div> </div> </div> </div> ';
+return new String($out);
+});

+ 23 - 0
www/webapp/o2o/js/build/.cache/placeOrder/list.js

@@ -0,0 +1,23 @@
+/*TMODJS:{"version":1,"md5":"fad3cba59cdee72106ced6c4aa2dbc0d"}*/
+template('placeOrder/list',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,extraService=$data.extraService,extraServiceList=$data.extraServiceList,i=$data.i,$escape=$utils.$escape,$out='';$each(extraService,function(extraServiceList,i){
+$out+=' <li class="table-view-cell"> <a class="navigate-right item-checkbox ';
+if(extraServiceList.seleted){
+$out+='checked';
+}
+$out+='" data-select="0" data-id="';
+$out+=$escape(extraServiceList.id);
+$out+='" data-price="';
+$out+=$escape(extraServiceList.price);
+$out+='" data-serviceType="';
+$out+=$escape(extraServiceList.serviceType);
+$out+='"> ';
+$out+=$escape(extraServiceList.name);
+$out+=' (';
+$out+=$escape(extraServiceList.price);
+$out+='元) </a> </li> ';
+});
+$out+=' ';
+return new String($out);
+});

+ 18 - 0
www/webapp/o2o/js/build/.cache/placeOrder/list2.js

@@ -0,0 +1,18 @@
+/*TMODJS:{"version":1,"md5":"874f60cb8f892bfae4a3fec3b8ec5ee8"}*/
+template('placeOrder/list2',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,extraService=$data.extraService,extraServiceList=$data.extraServiceList,i=$data.i,$escape=$utils.$escape,$out='';$each(extraService,function(extraServiceList,i){
+$out+=' <div class="link-label select-extra-service ';
+if(extraServiceList.seleted){
+$out+='on';
+}
+$out+='" data-price="';
+$out+=$escape(extraServiceList.price);
+$out+='">';
+$out+=$escape(extraServiceList.name);
+$out+=' <span class="table-view-cell-right-label precedence-cost">¥';
+$out+=$escape(extraServiceList.price);
+$out+='</span> </div> ';
+});
+return new String($out);
+});

+ 51 - 0
www/webapp/o2o/js/build/.cache/product/index.js

@@ -0,0 +1,51 @@
+/*TMODJS:{"version":1,"md5":"0566d114b5ed943bde93f154a1e989a3"}*/
+template('product/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,type=$data.type,commentCounts=$data.commentCounts,isShowVideo=$data.isShowVideo,productClassName=$data.productClassName,$each=$utils.$each,picLists=$data.picLists,picList=$data.picList,$index=$data.$index,tips=$data.tips,desc=$data.desc,note=$data.note,fromHome=$data.fromHome,$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> ';
+}
+$out+=' <div class="content"> <div class="control-bar box-center ';
+if(type > 10){
+$out+='hide';
+}
+$out+='"> <div class="segmented-control type-control prevent-scroll"> <a class="control-item active" data-type="1">详情</a> <a class="control-item" data-type="2">评价(';
+$out+=$escape(commentCounts);
+$out+=')</a> </div> </div> <div class="product-main-container" ';
+if(type > 10){
+$out+='style="top: 0"';
+}
+$out+='> <div class="box-container type-container" id="descContainer"> <div class="box-container box box-vertical"> <div id="productDescScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="pad-b-1"> ';
+if(isShowVideo){
+$out+=' <div class="video" style="margin-bottom: -8px;"> <iframe src="/webapp/static/introduce.html" id="iframe-service-introduce" frameborder="0" style="width: 100%"></iframe> </div> ';
+}
+$out+=' <div class="img-list ';
+$out+=$escape(productClassName.className);
+$out+='"> <div class="img-list-container"> ';
+$each(picLists.imglists,function(picList,$index){
+$out+=' <img src="';
+$out+=$escape(picLists.url);
+$out+='/';
+$out+=$escape(picList);
+$out+='" alt=""> ';
+});
+$out+=' </div> </div> <div class="notes"> <div class="group-title-container"> <div class="group-title">注意事项</div> </div> <ul class="group-detail hide"> <li> <ul> ';
+$each(tips.descs,function(desc,$index){
+$out+=' <li> <p>';
+$out+=$escape(desc);
+$out+='</p> </li> ';
+});
+$out+=' </ul> </li> ';
+$each(tips.notes,function(note,$index){
+$out+=' <li> <p>';
+$out+=$escape(note);
+$out+='</p> </li> ';
+});
+$out+=' </ul> </div> </div> </div> </div> ';
+if(fromHome){
+$out+=' <div class="btn-container prevent-scroll"> <a class="btn btn-main btn-block btn-next">立即下单</a> </div> ';
+}
+$out+=' </div> </div> <div class="box-container hide type-container" id="reviewContainer"> <div class="box-container box box-vertical"> <div id="productReviewScroll" class="scroll-container box-flex-1"> <div class="scroller"> <ul class="table-view list-content"> </ul> <div class="btn-more-container box-center hide"> <a class="btn btn-block btn-more-review">加载更多</a> </div> </div> </div> </div> </div> <div class="box-container hide type-container" id="consultationContainer"> <div class="box-container box box-vertical"> <div id="productConsultationScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="list-content"> </div> </div> </div> <div class="btn-container prevent-scroll"> <a class="btn btn-main btn-block btn-consult">提交</a> </div> </div> </div> </div> </div> ';
+return new String($out);
+});

+ 21 - 0
www/webapp/o2o/js/build/.cache/product/info.js

@@ -0,0 +1,21 @@
+/*TMODJS:{"version":1,"md5":"c16e81e8cee5a9e4c0d4e9ff9ee45099"}*/
+template('product/info',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$each=$utils.$each,tips=$data.tips,desc=$data.desc,$index=$data.$index,$escape=$utils.$escape,note=$data.note,$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">注意事项</h1> </header> ';
+}
+$out+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="productInfoScroll" class=" box-flex-1"> <div class="scroller"> <div> <div class="notes"> <ul class="group-detail"> <li> <ul> ';
+$each(tips.descs,function(desc,$index){
+$out+=' <li> <p>';
+$out+=$escape(desc);
+$out+='</p> </li> ';
+});
+$out+=' </ul> </li> ';
+$each(tips.notes,function(note,$index){
+$out+=' <li> <p>';
+$out+=$escape(note);
+$out+='</p> </li> ';
+});
+$out+=' </ul> </div> </div> </div> </div> </div> </div> </div> ';
+return new String($out);
+});

+ 30 - 0
www/webapp/o2o/js/build/.cache/product/option.js

@@ -0,0 +1,30 @@
+/*TMODJS:{"version":1,"md5":"208840ce60e137116adcb730200a1fde"}*/
+template('product/option',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,pets=$data.pets,pet=$data.pet,$index=$data.$index,$escape=$utils.$escape,$out='';$out+='<div class="box box-container box-align-end"> <div class="product-option-container"> ';
+$each(pets,function(pet,$index){
+$out+=' <div class="option-group" data-id="';
+$out+=$escape(pet.id);
+$out+='" data-weight="';
+$out+=$escape(pet.min_weight);
+$out+='-';
+$out+=$escape(pet.max_weight);
+$out+='kg" data-name="';
+$out+=$escape(pet.pet_types[0].name);
+$out+='" data-price="';
+$out+=$escape(pet.price);
+$out+='" data-weight-max="';
+$out+=$escape(pet.max_weight);
+$out+='" data-weight-min="';
+$out+=$escape(pet.min_weight);
+$out+='"> ';
+$out+=$escape(pet.pet_types[0].name);
+$out+=' (';
+$out+=$escape(pet.min_weight);
+$out+='-';
+$out+=$escape(pet.max_weight);
+$out+='kg) </div> ';
+});
+$out+=' <div class="btn-container"> <a class="btn btn-cancle btn-block btn-next">取消</a> </div> </div> </div> ';
+return new String($out);
+});

+ 26 - 0
www/webapp/o2o/js/build/.cache/product/price.js

@@ -0,0 +1,26 @@
+/*TMODJS:{"version":1,"md5":"a7b9139e6c0bbf12c1b2b9b0e6fcffc7"}*/
+template('product/price',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,petTypes=$data.petTypes,petType=$data.petType,$index=$data.$index,$escape=$utils.$escape,$out='';$out+='<tr> <th>类型</th> ';
+$each(petTypes,function(petType,$index){
+$out+=' <th colspan="" class="pet-type">';
+$out+=$escape(petType.pet_types[0].name);
+$out+='</th> ';
+});
+$out+=' </tr> <tr> <th>体重</th> ';
+$each(petTypes,function(petType,$index){
+$out+=' <td>';
+$out+=$escape(petType['min_weight']);
+$out+=' ~ ';
+$out+=$escape(petType['max_weight']);
+$out+='kg</td> ';
+});
+$out+=' </tr> <tr> <th>价格</th> ';
+$each(petTypes,function(petType,$index){
+$out+=' <td>';
+$out+=$escape(petType['price']);
+$out+='元</td> ';
+});
+$out+=' </tr>';
+return new String($out);
+});

+ 61 - 0
www/webapp/o2o/js/build/.cache/product/reviewList.js

@@ -0,0 +1,61 @@
+/*TMODJS:{"version":1,"md5":"9366c01d09aec4a13518fe909e4cef0b"}*/
+template('product/reviewList',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,reviews=$data.reviews,review=$data.review,i=$data.i,$escape=$utils.$escape,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},imgW=$data.imgW,pic=$data.pic,$out='';$each(reviews,function(review,i){
+$out+=' <li class="table-view-cell"> <div> <div class="user-info-container"> <div class="user-info-btn" data-id="';
+$out+=$escape(review.user.id);
+$out+='"> <img class="user-avatar" src="';
+$out+=$escape(review.user.avatar);
+$out+='?imageView2/2/w/60/h/60"/> <span class="user-name">';
+$out+=$escape(review.user.user_name);
+$out+='</span> </div> </div> <div class="box"> <div class="box-flex-1"> <span class="star-label">评分:</span> ';
+include('../common/star',review);
+$out+=' </div> <div class="box-flex-1 review-time"> ';
+$out+=$escape(review.time_str);
+$out+=' </div> </div> <div class="review-content"> ';
+$out+=$escape(review.content);
+$out+=' </div> <div class="img-preview-list" ';
+if(review.pics.length > 0){
+$out+='style="height:';
+$out+=$escape(imgW);
+$out+='px"';
+}
+$out+='> ';
+if(review.pics.length > 0){
+$out+=' ';
+$each(review.pics,function(pic,i){
+$out+=' ';
+if(i < 3){
+$out+=' <div class="width-percent-33"> <div class="img-preview" data-src="';
+$out+=$escape(pic.url);
+$out+='" style="width: ';
+$out+=$escape(imgW);
+$out+='px"> <img src="';
+$out+=$escape(pic.url);
+$out+='?imageView2/5/w/';
+$out+=$escape(imgW * 2);
+$out+='/h/';
+$out+=$escape(imgW * 2);
+$out+='" alt="" class="img-preview-item"> ';
+if(review.pics.length > 3 && i == 2){
+$out+=' <span class="img-count">';
+$out+=$escape(review.pics.length);
+$out+='</span> ';
+}
+$out+=' </div> </div> ';
+}
+$out+=' ';
+});
+$out+=' ';
+}
+$out+=' </div> ';
+if(review.reply !== ''){
+$out+=' <div class="reply-content"> 壹管家回复:';
+$out+=$escape(review.reply);
+$out+=' </div> ';
+}
+$out+=' </div> </li> ';
+});
+$out+=' ';
+return new String($out);
+});

+ 18 - 0
www/webapp/o2o/js/build/.cache/review/post.js

@@ -0,0 +1,18 @@
+/*TMODJS:{"version":1,"md5":"f12b4f633c74af626a78d20608eaea09"}*/
+template('review/post',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},showUpload=$data.showUpload,showInput=$data.showInput,$escape=$utils.$escape,cacheReview=$data.cacheReview,$out='';$out+='<div class="box box-container box-align-end"> <div class="review-container"> <div class="review-star-container"> <span>满意度评分:</span> ';
+include('../common/star');
+$out+=' </div> ';
+if(showUpload){
+$out+=' <div class="review-star-container review-img-content"> <div class="width-percent-25 img-upload"> <div class="img-upload-btn"> ';
+if(showInput){
+$out+=' <input type="file" name="" id="wx-upload" multiple="multiple" accept="image/gif, image/png, image/jpeg, image/x-png, image.jpg"> ';
+}
+$out+=' </div> </div> </div> ';
+}
+$out+=' <div class="review-content-container"> <textarea class="review-content enable-scroll" placeholder="亲,五星好评,立返3~10元随机代金券哦!">';
+$out+=$escape(cacheReview);
+$out+='</textarea> <p>评论内容至少10个字~</p> </div> <a class="btn btn-main btn-block btn-main btn-post disable">发表评价</a> </div> </div> ';
+return new String($out);
+});

+ 2 - 2
www/webapp/o2o/js/build/.cache/success/index.js

@@ -1,4 +1,4 @@
-/*TMODJS:{"version":3,"md5":"04c12c6a4c72e063ae60a8a4bdeb3dba"}*/
+/*TMODJS:{"version":4,"md5":"74bc9c6ef2591cfdf6c4a8b2bd0c4c8f"}*/
 template('success/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,WX=$data.WX,$out='';if(showNavBar ){
@@ -8,7 +8,7 @@ $out+=' ';
 if(!WX){
 $out+=' <div class="content content-padding"> <div class="box-center"> <p>订单支付成功,稍后会有壹管家工作人员联系你~</p> </div> <a class="btn btn-positive btn-block my-order">查看我的预约</a> </div> ';
 }else{
-$out+=' <div class="content content-padded"> <div class="padding-top-bottom"> <p> <svg version="1.1" id="icon-success" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve"> <circle fill="#87C34B" cx="15" cy="15" r="15"/> <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="12.791,18.624 6.604,12.437 4.571,14.469 10.758,20.656 12.791,22.689 14.824,20.656 25.828,9.652 23.795,7.619 "/> </svg> 支付完成,等待保洁师上门为您服务吧! </p> </div> <div class="border-top"> <p>服务:<span class="order-name">宠物洗澡(猫)</span></p> <p>时间:<span class="order-time">2015年7月10日 10:00</span></p> </div> <div class="border-top"> <p>实付: <span class="order-result">58元</span></p> </div> <div class="box-center btn-group"> <a class="btn btn-positive my-order">我的预约</a> <a class="btn btn-positive btn-home">继续购买</a> </div> </div> ';
+$out+=' <div class="content content-padded"> <div class="padding-top-bottom"> <p> <svg version="1.1" id="icon-success" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve"> <circle fill="#87C34B" cx="15" cy="15" r="15"/> <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="12.791,18.624 6.604,12.437 4.571,14.469 10.758,20.656 12.791,22.689 14.824,20.656 25.828,9.652 23.795,7.619 "/> </svg> 支付完成,等待保洁师上门为您服务吧! </p> </div> <div class="border-top"> <p>服务:<span class="order-name">家政服务</span></p> <p>时间:<span class="order-time">2015年7月10日 10:00</span></p> </div> <div class="border-top"> <p>实付: <span class="order-result">58元</span></p> </div> <div class="box-center btn-group"> <a class="btn btn-positive my-order">我的预约</a> <a class="btn btn-positive btn-home">继续购买</a> </div> </div> ';
 }
 return new String($out);
 });

+ 15 - 0
www/webapp/o2o/js/build/.cache/success/refund.js

@@ -0,0 +1,15 @@
+/*TMODJS:{"version":1,"md5":"cdad4c88bddf70c871e81ce259d9ee40"}*/
+template('success/refund',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$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">申请成功</h1> </header> ';
+}
+$out+=' <div class="content content-padding"> <div class="text-center"> <p class="title-msg text-danger">申请已提交成功</p> <p>预计在3-10工作日内到账</p> <p>如有疑问请拨打 ';
+if(showNavBar ){
+$out+=' <span class="service-telephone text-danger">400-032-8170</span> ';
+}else{
+$out+=' <a href="tel:400-032-8170">400-032-8170</a> ';
+}
+$out+=' </p> </div> <div class="btn-box"> <div class="btn btn-block back-button">返回首页</div> </div> </div> ';
+return new String($out);
+});

+ 2 - 2
www/webapp/o2o/js/build/template.js

@@ -41,6 +41,6 @@ a("product/info",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar)
 a("product/option",function(a){"use strict";var b=this,c=(b.$helpers,b.$each),d=a.pets,e=(a.pet,a.$index,b.$escape),f="";return f+='<div class="box box-container box-align-end"> <div class="product-option-container"> ',c(d,function(a){f+=' <div class="option-group" data-id="',f+=e(a.id),f+='" data-weight="',f+=e(a.min_weight),f+="-",f+=e(a.max_weight),f+='kg" data-name="',f+=e(a.pet_types[0].name),f+='" data-price="',f+=e(a.price),f+='" data-weight-max="',f+=e(a.max_weight),f+='" data-weight-min="',f+=e(a.min_weight),f+='"> ',f+=e(a.pet_types[0].name),f+=" (",f+=e(a.min_weight),f+="-",f+=e(a.max_weight),f+="kg) </div> "}),f+=' <div class="btn-container"> <a class="btn btn-cancle btn-block btn-next">\u53d6\u6d88</a> </div> </div> </div> ',new k(f)}),/*v:1*/
 a("product/price",function(a){"use strict";var b=this,c=(b.$helpers,b.$each),d=a.petTypes,e=(a.petType,a.$index,b.$escape),f="";return f+="<tr> <th>\u7c7b\u578b</th> ",c(d,function(a){f+=' <th colspan="" class="pet-type">',f+=e(a.pet_types[0].name),f+="</th> "}),f+=" </tr> <tr> <th>\u4f53\u91cd</th> ",c(d,function(a){f+=" <td>",f+=e(a.min_weight),f+=" ~ ",f+=e(a.max_weight),f+="kg</td> "}),f+=" </tr> <tr> <th>\u4ef7\u683c</th> ",c(d,function(a){f+=" <td>",f+=e(a.price),f+="\u5143</td> "}),f+=" </tr>",new k(f)}),/*v:1*/
 a("product/reviewList",function(a,b){"use strict";var c=this,d=(c.$helpers,c.$each),e=a.reviews,f=(a.review,a.i,c.$escape),g=function(d,e){e=e||a;var f=c.$include(d,e,b);return i+=f},h=a.imgW,i=(a.pic,"");return d(e,function(a){i+=' <li class="table-view-cell"> <div> <div class="user-info-container"> <div class="user-info-btn" data-id="',i+=f(a.user.id),i+='"> <img class="user-avatar" src="',i+=f(a.user.avatar),i+='?imageView2/2/w/60/h/60"/> <span class="user-name">',i+=f(a.user.user_name),i+='</span> </div> </div> <div class="box"> <div class="box-flex-1"> <span class="star-label">\u8bc4\u5206:</span> ',g("../common/star",a),i+=' </div> <div class="box-flex-1 review-time"> ',i+=f(a.time_str),i+=' </div> </div> <div class="review-content"> ',i+=f(a.content),i+=' </div> <div class="img-preview-list" ',a.pics.length>0&&(i+='style="height:',i+=f(h),i+='px"'),i+="> ",a.pics.length>0&&(i+=" ",d(a.pics,function(b,c){i+=" ",3>c&&(i+=' <div class="width-percent-33"> <div class="img-preview" data-src="',i+=f(b.url),i+='" style="width: ',i+=f(h),i+='px"> <img src="',i+=f(b.url),i+="?imageView2/5/w/",i+=f(2*h),i+="/h/",i+=f(2*h),i+='" alt="" class="img-preview-item"> ',a.pics.length>3&&2==c&&(i+=' <span class="img-count">',i+=f(a.pics.length),i+="</span> "),i+=" </div> </div> "),i+=" "}),i+=" "),i+=" </div> ",""!==a.reply&&(i+=' <div class="reply-content"> \u58f9\u7ba1\u5bb6\u56de\u590d\uff1a',i+=f(a.reply),i+=" </div> "),i+=" </div> </li> "}),i+=" ",new k(i)}),/*v:1*/
-a("review/post",function(a,b){"use strict";var c=this,d=(c.$helpers,function(d,e){e=e||a;var f=c.$include(d,e,b);return i+=f}),e=a.showUpload,f=a.showInput,g=c.$escape,h=a.cacheReview,i="";return i+='<div class="box box-container box-align-end"> <div class="review-container"> <div class="review-star-container"> <span>\u6ee1\u610f\u5ea6\u8bc4\u5206\uff1a</span> ',d("../common/star"),i+=" </div> ",e&&(i+=' <div class="review-star-container review-img-content"> <div class="width-percent-25 img-upload"> <div class="img-upload-btn"> ',f&&(i+=' <input type="file" name="" id="wx-upload" multiple="multiple" accept="image/gif, image/png, image/jpeg, image/x-png, image.jpg"> '),i+=" </div> </div> </div> "),i+=' <div class="review-content-container"> <textarea class="review-content enable-scroll" placeholder="\u4eb2\uff0c\u4e94\u661f\u597d\u8bc4\uff0c\u7acb\u8fd43~10\u5143\u968f\u673a\u4ee3\u91d1\u5238\u54e6\uff01">',i+=g(h),i+='</textarea> <p>\u8bc4\u8bba\u5185\u5bb9\u81f3\u5c1110\u4e2a\u5b57~</p> </div> <a class="btn btn-main btn-block btn-main btn-post disable">\u53d1\u8868\u8bc4\u4ef7</a> </div> </div> ',new k(i)}),/*v:3*/
-a("success/index",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d=a.WX,e="";return c&&(e+=' <header class="bar bar-nav"> <h1 class="title">\u652f\u4ed8\u6210\u529f</h1> </header> '),e+=" ",e+=d?' <div class="content content-padded"> <div class="padding-top-bottom"> <p> <svg version="1.1" id="icon-success" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve"> <circle fill="#87C34B" cx="15" cy="15" r="15"/> <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="12.791,18.624 6.604,12.437 4.571,14.469 10.758,20.656 12.791,22.689 14.824,20.656 25.828,9.652 23.795,7.619 "/> </svg> \u652f\u4ed8\u5b8c\u6210\uff0c\u7b49\u5f85\u4fdd\u6d01\u5e08\u4e0a\u95e8\u4e3a\u60a8\u670d\u52a1\u5427\uff01 </p> </div> <div class="border-top"> <p>\u670d\u52a1\uff1a<span class="order-name">\u5ba0\u7269\u6d17\u6fa1\uff08\u732b\uff09</span></p> <p>\u65f6\u95f4\uff1a<span class="order-time">2015\u5e747\u670810\u65e5 10:00</span></p> </div> <div class="border-top"> <p>\u5b9e\u4ed8\uff1a <span class="order-result">58\u5143</span></p> </div> <div class="box-center btn-group"> <a class="btn btn-positive my-order">\u6211\u7684\u9884\u7ea6</a> <a class="btn btn-positive btn-home">\u7ee7\u7eed\u8d2d\u4e70</a> </div> </div> ':' <div class="content content-padding"> <div class="box-center"> <p>\u8ba2\u5355\u652f\u4ed8\u6210\u529f\uff0c\u7a0d\u540e\u4f1a\u6709\u58f9\u7ba1\u5bb6\u5de5\u4f5c\u4eba\u5458\u8054\u7cfb\u4f60~</p> </div> <a class="btn btn-positive btn-block my-order">\u67e5\u770b\u6211\u7684\u9884\u7ea6</a> </div> ',new k(e)}),/*v:1*/
+a("review/post",function(a,b){"use strict";var c=this,d=(c.$helpers,function(d,e){e=e||a;var f=c.$include(d,e,b);return i+=f}),e=a.showUpload,f=a.showInput,g=c.$escape,h=a.cacheReview,i="";return i+='<div class="box box-container box-align-end"> <div class="review-container"> <div class="review-star-container"> <span>\u6ee1\u610f\u5ea6\u8bc4\u5206\uff1a</span> ',d("../common/star"),i+=" </div> ",e&&(i+=' <div class="review-star-container review-img-content"> <div class="width-percent-25 img-upload"> <div class="img-upload-btn"> ',f&&(i+=' <input type="file" name="" id="wx-upload" multiple="multiple" accept="image/gif, image/png, image/jpeg, image/x-png, image.jpg"> '),i+=" </div> </div> </div> "),i+=' <div class="review-content-container"> <textarea class="review-content enable-scroll" placeholder="\u4eb2\uff0c\u4e94\u661f\u597d\u8bc4\uff0c\u7acb\u8fd43~10\u5143\u968f\u673a\u4ee3\u91d1\u5238\u54e6\uff01">',i+=g(h),i+='</textarea> <p>\u8bc4\u8bba\u5185\u5bb9\u81f3\u5c1110\u4e2a\u5b57~</p> </div> <a class="btn btn-main btn-block btn-main btn-post disable">\u53d1\u8868\u8bc4\u4ef7</a> </div> </div> ',new k(i)}),/*v:4*/
+a("success/index",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d=a.WX,e="";return c&&(e+=' <header class="bar bar-nav"> <h1 class="title">\u652f\u4ed8\u6210\u529f</h1> </header> '),e+=" ",e+=d?' <div class="content content-padded"> <div class="padding-top-bottom"> <p> <svg version="1.1" id="icon-success" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve"> <circle fill="#87C34B" cx="15" cy="15" r="15"/> <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="12.791,18.624 6.604,12.437 4.571,14.469 10.758,20.656 12.791,22.689 14.824,20.656 25.828,9.652 23.795,7.619 "/> </svg> \u652f\u4ed8\u5b8c\u6210\uff0c\u7b49\u5f85\u4fdd\u6d01\u5e08\u4e0a\u95e8\u4e3a\u60a8\u670d\u52a1\u5427\uff01 </p> </div> <div class="border-top"> <p>\u670d\u52a1\uff1a<span class="order-name">\u5bb6\u653f\u670d\u52a1</span></p> <p>\u65f6\u95f4\uff1a<span class="order-time">2015\u5e747\u670810\u65e5 10:00</span></p> </div> <div class="border-top"> <p>\u5b9e\u4ed8\uff1a <span class="order-result">58\u5143</span></p> </div> <div class="box-center btn-group"> <a class="btn btn-positive my-order">\u6211\u7684\u9884\u7ea6</a> <a class="btn btn-positive btn-home">\u7ee7\u7eed\u8d2d\u4e70</a> </div> </div> ':' <div class="content content-padding"> <div class="box-center"> <p>\u8ba2\u5355\u652f\u4ed8\u6210\u529f\uff0c\u7a0d\u540e\u4f1a\u6709\u58f9\u7ba1\u5bb6\u5de5\u4f5c\u4eba\u5458\u8054\u7cfb\u4f60~</p> </div> <a class="btn btn-positive btn-block my-order">\u67e5\u770b\u6211\u7684\u9884\u7ea6</a> </div> ',new k(e)}),/*v:1*/
 a("success/refund",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d="";return c&&(d+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">\u7533\u8bf7\u6210\u529f</h1> </header> '),d+=' <div class="content content-padding"> <div class="text-center"> <p class="title-msg text-danger">\u7533\u8bf7\u5df2\u63d0\u4ea4\u6210\u529f</p> <p>\u9884\u8ba1\u57283-10\u5de5\u4f5c\u65e5\u5185\u5230\u8d26</p> <p>\u5982\u6709\u7591\u95ee\u8bf7\u62e8\u6253 ',d+=c?' <span class="service-telephone text-danger">400-032-8170</span> ':' <a href="tel:400-032-8170">400-032-8170</a> ',d+=' </p> </div> <div class="btn-box"> <div class="btn btn-block back-button">\u8fd4\u56de\u9996\u9875</div> </div> </div> ',new k(d)})}();

+ 29 - 56
www/webapp/o2o/js/model/cart.js

@@ -10,103 +10,76 @@ define(['base', '$', 'native', 'product'], function(base, $, native, product) {
 		this.storagePrefix = 'cart_';
 		this.products = this.getCache('products', null, {
 			1: {
-				petID: '',
 				productID: '',
-				petName: '',
-				petWeight: '',
-				petPrice: '',
+				price: '',
 				couponName: '',
 				couponId: '',
 				couponVal: '',
 				couponList: []
 			},
 			2: {
-				petID: '',
 				productID: '',
-				petName: '',
-				petWeight: '',
-				petPrice: '',
+				price: '',
 				couponName: '',
 				couponId: '',
 				couponVal: '',
 				couponList: []
 			},
 			3: {
-				petID: '',
 				productID: '',
-				petName: '',
-				petWeight: '',
-				petPrice: '',
+				price: '',
 				couponName: '',
 				couponId: '',
 				couponVal: '',
 				couponList: []
 			},
 			4: { // 洁牙
-				petID: '',
 				productID: '',
-				petName: '',
-				petWeight: '',
-				petPrice: '',
+				price: '',
 				couponName: '',
 				couponId: '',
 				couponVal: '',
 				couponList: []
 			},
 			5: { // spa
-				petID: '',
 				productID: '',
-				petName: '',
-				petWeight: '',
-				petPrice: '',
+				price: '',
 				couponName: '',
 				couponId: '',
 				couponVal: '',
 				couponList: []
 			},
       6: { // 训犬
-				petID: '',
-				productID: '',
-				petName: '',
-				petWeight: '',
-				petPrice: '',
-				couponName: '',
-				couponId: '',
-				couponVal: '',
-				couponList: []
+		  productID: '',
+		  price: '',
+		  couponName: '',
+		  couponId: '',
+		  couponVal: '',
+		  couponList: []
 			},
       7: { // 断尾
-				petID: '',
-				productID: '',
-				petName: '',
-				petWeight: '',
-				petPrice: '',
-				couponName: '',
-				couponId: '',
-				couponVal: '',
-				couponList: []
+		  productID: '',
+		  price: '',
+		  couponName: '',
+		  couponId: '',
+		  couponVal: '',
+		  couponList: []
 			},
       8: { // 碳酸浴
-				petID: '',
-				productID: '',
-				petName: '',
-				petWeight: '',
-				petPrice: '',
-				couponName: '',
-				couponId: '',
-				couponVal: '',
-				couponList: []
+		  productID: '',
+		  price: '',
+		  couponName: '',
+		  couponId: '',
+		  couponVal: '',
+		  couponList: []
 			},
       9: {
-				petID: '',
-				productID: '',
-				petName: '',
-				petWeight: '',
-				petPrice: '',
-				couponName: '',
-				couponId: '',
-				couponVal: '',
-				couponList: []
+		  productID: '',
+		  price: '',
+		  couponName: '',
+		  couponId: '',
+		  couponVal: '',
+		  couponList: []
 			}
 		});
 		this.petInfo = this.getCache('petInfo', null, {

+ 1 - 1
www/webapp/o2o/module/pay/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>壹管家宠物服务</title>
+  <title>壹管家上门服务</title>
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
   <meta name="apple-mobile-web-app-capable" content="yes">

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 14
www/webapp/o2o/module/pay/newDeal.html


+ 6 - 4
www/webapp/o2o/tpl/package.json

@@ -2,7 +2,7 @@
     "name": "template",
     "version": "1.0.0",
     "dependencies": {
-        "tmodjs": "~0.0.4"
+        "tmodjs": "1.0.3"
     },
     "tmodjs-config": {
         "output": "../js/build",
@@ -10,9 +10,11 @@
         "syntax": "simple",
         "helpers": null,
         "escape": true,
-        "engine": false,
-        "type": "templatejs",
+        "compress": true,
+        "type": "default",
+        "runtime": "template.js",
         "combo": true,
-        "minify": true
+        "minify": true,
+        "cache": true
     }
 }

+ 1 - 1
www/webapp/o2o/tpl/success/index.html

@@ -26,7 +26,7 @@
 		</p>
 	</div>
 	<div class="border-top">
-		<p>服务:<span class="order-name">宠物洗澡(猫)</span></p>
+		<p>服务:<span class="order-name">家政服务</span></p>
 		<p>时间:<span class="order-time">2015年7月10日 10:00</span></p>
 	</div>
 	<div class="border-top">

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.