merge

www/webapp/common/js/config.js

@@ -20,9 +20,9 @@ define(function (require) {
     test = false;
   }
   if (test) {
-    apiPath = 'http:// apitest.yiguanjia.me';
+    apiPath = 'http://apitest.yiguanjia.me';
   } else {
-    apiPath = 'http:// api.yiguanjia.me';
+    apiPath = 'http://api.yiguanjia.me';
   }
 
   var ua = navigator.userAgent.toLowerCase();

www/webapp/o2o/dist/js/build/.cache/activities/alert.js

@@ -1 +1,12 @@
-template("activities/alert",function(e,t){var n=this,r=n.$helpers,i=n.$escape,s=e.content,o="";return o+='<div class="box-container box-center"> <div class="activity-body alert-body"> <img src="',o+=i(s),o+='" alt="" id="activity-content"> <div class="btn-close"></div> </div> </div> ',new String(o)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"df6770fa479c81a29208bf6c4eefd8a5"}*/
+=======
+/*TMODJS:{"version":1,"md5":"fa6d2f074295f8a0463d64668202d64d"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/activities/cat.js

@@ -1 +1 @@
-template("activities/cat",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=n.$escape,o=e.src,u="";return i&&(u+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">下单送爪币 壕礼抽不停</h1> </header> '),u+=' <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="',u+=s(o),u+='" alt="" style="width:100%"> </div> </div> </div> </div> </div> ',new String(u)});
+template("activities/cat",function(e,t){"use strict";var n=this,r=n.$helpers,i=e.showNavBar,s=n.$escape,o=e.src,u="";return i&&(u+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">下单送爪币 壕礼抽不停</h1> </header> '),u+=' <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="',u+=s(o),u+='" alt="" style="width:100%"> </div> </div> </div> </div> </div> ',new String(u)});

www/webapp/o2o/dist/js/build/.cache/address/list/cell.js

@@ -1 +1,56 @@
-template("address/list/cell",function(e,t){var n=this,r=n.$helpers,i=n.$each,s=e.addresses,o=e.address,u=e.i,a=n.$escape,f="";return i(s,function(e,t){f+=' <li class="table-view-cell media"> <a class="address-item" data-id="',f+=a(e.address_id),f+='" data-index="',f+=a(t),f+='"> <div class="media-body"> <span class="username"> ',e&&(f+=" ",f+=a(e.name),f+=" "),f+=' </span> <span class="mobile"> ',e&&(f+=" ",f+=a(e.mobile),f+=" "),f+=' </span> <p class="detail"> ',e&&(f+=" ",e.address.poi?(f+=" ",f+=a(e.address.city),f+=" ",f+=a(e.address.area),f+=" ",f+=a(e.address.poi.name),f+=" "):(f+=" ",f+=a(e.address.province),f+=" ",f+=a(e.address.city),f+=" ",f+=a(e.address.area),f+=" ",f+=a(e.address.detail),f+=" "),f+=" "),f+=' </p> </div> </a> <button class="btn btn-edit" data-id="',f+=a(e.address_id),f+='" data-index="',f+=a(t),f+='">编辑</button> </li> '}),new String(f)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"25a8bdac1e7ce6fb3a1615b8bfc92131"}*/
+=======
+/*TMODJS:{"version":1,"md5":"4453437edc4feb7ceaa70d9b15cf75aa"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/address/list/index.js

@@ -1 +1,17 @@
-template("address/list/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=function(r,i){i=i||e;var s=n.$include(r,i,t);return a+=s,a},o=n.$escape,u=e.addText,a="";return i&&(a+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">选择地址</h1> </header> '),a+=' <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"> ',s("./cell"),a+=' </ul> </div> </div> <div class="btn-container prevent-scroll"> <a class="btn btn-main btn-block btn-add">',a+=o(u),a+="</a> </div> </div> </div>",new String(a)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"ff9e117ec45f200938ac46d0507cd21b"}*/
+=======
+/*TMODJS:{"version":1,"md5":"d6d08bf1b4971d49dd8e4e57beeb2373"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/address/position/cell.js

@@ -1 +1,45 @@
-template("address/position/cell",function(e,t){var n=this,r=n.$helpers,i=n.$each,s=e.poiLists,o=e.poilist,u=e.i,a=n.$escape,f="";return i(s,function(e,t){f+=' <li class="table-view-cell position-item" data-location-lat="',e.location&&(f+=a(e.location.lat)),f+='" data-location-lng="',e.location&&(f+=a(e.location.lng)),f+='" data-uid="',e.uid&&(f+=a(e.uid)),f+='" data-district="',e.district&&(f+=a(e.district)),f+='" data-city="',e.city&&(f+=a(e.city)),f+='"> <a class="set-poi">',e.name&&(f+=a(e.name)),f+="</a> <p> ",e.city&&(f+=a(e.city)),f+=" ",e.district&&(f+=a(e.district)),f+=" </p> </li> "}),f+=" ",new String(f)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"fe3f821a45b156433d82719cf9339263"}*/
+=======
+/*TMODJS:{"version":1,"md5":"60f67e105953ef3cc2d1d9d21b089660"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/address/position/index.js

@@ -1 +1,15 @@
-template("address/position/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=function(r,i){i=i||e;var s=n.$include(r,i,t);return o+=s,o},o="";return i&&(o+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">定位地点</h1> </header> '),o+=' <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"> ',s("./cell"),o+=" </ul> </div> </div> </div> </div> </div> ",new String(o)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"7b81ec4ef813576b3de24273e18b1792"}*/
+=======
+/*TMODJS:{"version":1,"md5":"b586521e81694674964c2ecb01f935d0"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/beautician/comment.js

@@ -1 +1,65 @@
-template("beautician/comment",function(e,t){var n=this,r=n.$helpers,i=n.$each,s=e.comments,o=e.comment,u=e.i,a=n.$escape,f=function(r,i){i=i||e;var s=n.$include(r,i,t);return p+=s,p},l=e.imgW,c=e.pic,h=e.review,p="";return i(s,function(e,t){p+=' <li class="table-view-cell"> <div> <div class="user-info-container"> <div class="user-info-btn" data-id="',p+=a(e.user.id),p+='"> <img class="user-avatar" src="',p+=a(e.user.avatar),p+='?imageView2/2/w/60/h/60"/> <span class="user-name">',p+=a(e.user.user_name),p+='</span> </div> </div> <div class="box"> <div class="box-flex-1"> <span class="star-label">评分:</span> ',f("../common/star",e),p+=' </div> <div class="box-flex-1 review-time"> ',p+=a(e.time_str),p+=' </div> </div> <div class="review-content"> ',p+=a(e.content),p+=' </div> <div class="img-preview-list" ',e.pics.length>0&&(p+='style="height:',p+=a(l),p+='px"'),p+="> ",e.pics.length>0&&(p+=" ",i(e.pics,function(t,n){p+=" ",n<3&&(p+=' <div class="width-percent-33"> <div class="img-preview" data-src="',p+=a(t.url),p+='" style="width: ',p+=a(l),p+='px"> <img src="',p+=a(t.url),p+="?imageView2/5/w/",p+=a(l*2),p+="/h/",p+=a(l*2),p+='" alt="" class="img-preview-item"> ',e.pics.length>3&&n==2&&(p+=' <span class="img-count">',p+=a(e.pics.length),p+="</span> "),p+=" </div> </div> "),p+=" "}),p+=" "),p+=" </div> ",e.reply!==""&&(p+=' <div class="reply-content"> 保洁师回复：',p+=a(h.reply),p+=" </div> "),p+=" </div> </li> "}),p+=" ",new String(p)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"e3447c1ac978c88d4eca60876cf9d3ce"}*/
+=======
+/*TMODJS:{"version":1,"md5":"b8237bcd80282df7c12342ca78e92084"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/beautician/detail.js

@@ -1 +1,27 @@
-template("beautician/detail",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=e.recommend,o=n.$escape,u=e.avatar,a=e.name,f=e.favor,l=e.desc,c="";return i&&(c+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">保洁师详情</h1> </header> '),c+=' <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"> ',s!==""&&(c+=' <p class="recommend">当前时间段，该保洁师已被预约，推荐时间段&nbsp; ',c+=o(s),c+="</p> "),c+=' <div class="tech-info"> <img src="',c+=o(u),c+='?imageView2/0/w/400/h/400" alt=""> <p class="name">',c+=o(a),c+='</p> <p class="favor">好评数: ',c+=o(f),c+='</p> <p class="desc">',c+=o(l),c+='</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> ',new String(c)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"b3b637eea9323e19277ac2a351f49e08"}*/
+=======
+/*TMODJS:{"version":1,"md5":"704964682a512ccf6c45e171b8bdfcab"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/coming/index.js

@@ -1 +1,15 @@
-template("coming/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=n.$escape,o=e.prodcutTitle,u="";return i&&(u+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">',u+=s(o.name),u+="</h1> </header> "),u+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical coming"> </div> </div> </div> </div>',new String(u)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"b1e683cdefbefbda98a4cf27df3c4274"}*/
+=======
+/*TMODJS:{"version":1,"md5":"503f6d88740f8e26bde5a9a12572cdec"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/common/actionSheet.js

@@ -1 +1,22 @@
-template("common/actionSheet",function(e,t){var n=this,r=n.$helpers,i=n.$escape,s=e.message,o=n.$each,u=e.buttons,a=e.button,f=e.i,l="";return l+='<div class="box box-container box-align-end"> <div class="action-sheet-body"> <p class="action-sheet-message"> ',l+=i(s),l+=" </p> <div> ",o(u,function(e,t){l+=' <a href="javascript:;" class="btn btn-block btn-action-sheet ',l+=i(e.class),l+='" data-button-index="',l+=i(t),l+='">',l+=i(e.text),l+="</a> "}),l+=" </div> </div> </div>",new String(l)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"673fa8e1e4181dee6a78fbf603579cab"}*/
+=======
+/*TMODJS:{"version":1,"md5":"a18b6fbffc896f05e50d604b039a006b"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/common/alert.js

@@ -1 +1,26 @@
-template("common/alert",function(e,t){var n=this,r=n.$helpers,i=n.$escape,s=e.title,o=e.message,u=n.$string,a=e.html,f=n.$each,l=e.buttons,c=e.button,h=e.i,p="";return p+='<div class="box-container box-center"> <div class="card alert-body"> <h4>',p+=i(s),p+='</h4> <p class="alert-message">',p+=i(o),p+='</p> <p class="alert-message">',p+=u(a),p+='</p> <div class="box"> ',f(l,function(e,t){p+=' <div class="alert-btn-box box-flex-1"><button class="btn btn-block btn-alert ',p+=i(e.class),p+='" data-button-index=',p+=i(t),p+=">",p+=i(e.text),p+="</button></div> "}),p+=" </div> </div> </div> ",new String(p)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"8cb323d67d9f751395775417c3e7e730"}*/
+=======
+/*TMODJS:{"version":1,"md5":"176d4dcb43e56afbde9efcca4fb5c3c4"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/common/star.js

@@ -1 +1,30 @@
-template("common/star",function(e,t){var n=this,r=n.$helpers,i=e.score,s="";return s+='<div class="star-container"> <div class="box-container box"> <div class="star-item ',i>=1&&(s+="enable"),s+='"></div> <div class="star-item ',i>=2&&(s+="enable"),s+='"></div> <div class="star-item ',i>=3&&(s+="enable"),s+='"></div> <div class="star-item ',i>=4&&(s+="enable"),s+='"></div> <div class="star-item ',i>=5&&(s+="enable"),s+='"></div> </div> </div>',new String(s)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"55955b7fc8682f4ff43b6ed937251014"}*/
+=======
+/*TMODJS:{"version":1,"md5":"a34a454314f28a3fc66f248c1d22ebb3"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/desc/index.js

@@ -1 +1,13 @@
-template("desc/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s="";return i&&(s+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">服务介绍</h1> </header> '),s+=' <div class="content" id="descScroll"> <div class="scroller"> <div> </div> </div>',new String(s)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"de05f78b850ed1952cb00411d62e13f0"}*/
+=======
+/*TMODJS:{"version":1,"md5":"e8105a49b820da70e814caa66c2554a7"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/hire/index.js

@@ -1 +1,19 @@
-template("hire/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s="";return i&&(s+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">招贤纳士</h1> </header> '),s+=' <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> ',i?s+=' <p class="bold">联系电话: <a class="service-telephone">021-62109097</a> </p> ':s+=' <p class="bold">联系电话: <a href="tel:021-62109097">021-62109097</a> </p> ',s+=" <br> </div> </div> </div> ",new String(s)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"f4e248a8eebfc64680574f2147dfe683"}*/
+=======
+/*TMODJS:{"version":1,"md5":"b752c82a4aaa374ba9be18bb3a00b887"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/myCoupon/cell.js

@@ -1 +1,64 @@
-template("myCoupon/cell",function(e,t){var n=this,r=n.$helpers,i=n.$escape,s=e.coupon,o=e.isRemind,u=e.start_time_str,a=e.end_time_str,f=e.selected,l="";return l+='<div class="box"> <div class="coupon-left"> <div class="coupon-value-box box-center"> <div> ￥<span class="coupon-value">',l+=i(s.value),l+='</span> </div> </div> </div> <div class="coupon-right box box-vertical"> <div class="box box-align-center box-flex-1"> <div class="coupon-name">',l+=i(s.name),l+='</div> </div> <div class="box box-align-center box-flex-1"> <div class="coupon-desc"> ',s.type=="0"?(l+=" <div>满",l+=i(s.min_price),l+="元可用 不含附加项目</div> "):(l+=" <div>仅限",l+=i(s.type_str),l+=" 满",l+=i(s.min_price),l+="元可用</div> "),l+=' <div class="',o&&(l+="coupon-remind"),l+='">有效期：',l+=i(u),l+="-",l+=i(a),l+="</div> ",s.workday_limit!==0?(l+=' <span class="limit">',l+=i(s.workday_limit_str),l+="</span> ",s.time_limit_start&&s.time_limit_end?(l+=' <span class="limit">',l+=i(s.time_limit_start),l+="点 - ",l+=i(s.time_limit_end),l+="点使用</span> "):l+=" 使用 ",l+=" "):(l+=" ",s.time_limit_start&&s.time_limit_end&&(l+=' <span class="limit">仅限每日',l+=i(s.time_limit_start),l+="点 - ",l+=i(s.time_limit_end),l+="点使用</span> "),l+=" "),l+=" </div> </div> </div> ",f&&(l+=' <div class="box box-flex-1 box-pack-end box-align-center coupon-selected"> <span class="icon icon-check"></span> </div> '),l+=" </div> ",new String(l)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"feddb177181971893781a3cba730217d"}*/
+=======
+/*TMODJS:{"version":1,"md5":"427777deea9a256cb5d3d1c14ba16125"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/myCoupon/index.js

@@ -1 +1,31 @@
-template("myCoupon/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=n.$each,o=e.coupons,u=e.coupon,a=e.i,f=function(r,i){i=i||e;var s=n.$include(r,i,t);return l+=s,l},l="";return i&&(l+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">我的优惠券</h1> </header> '),l+=' <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> ',s(o.useable_coupons,function(e,t){l+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ',f("./cell",e),l+=" </li> </ul> </div> "}),l+=" ",s(o.used_coupons,function(e,t){l+=' <div class="card coupon-card used"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ',f("./cell",e),l+=" </li> </ul> </div> "}),l+=" ",s(o.overtime_coupons,function(e,t){l+=' <div class="card coupon-card disabled"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> ',f("./cell",e),l+=" </li> </ul> </div> "}),l+=" </div> </div> </div> </div>",new String(l)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"c16fc00268250fa8ab6a991dbf53035c"}*/
+=======
+/*TMODJS:{"version":1,"md5":"fdf3a1a72645b96efa2d7b32f9a21055"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/myOrder/finish.js

@@ -1 +1,13 @@
-template("myOrder/finish",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s="";return i&&(s+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">确认完成</h1> </header> '),s+=' <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> ',new String(s)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"58cd441ca29084c5c047940b9ca28d93"}*/
+=======
+/*TMODJS:{"version":1,"md5":"de16129c1b11784c254375478669bec8"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/myOrder/index.js

@@ -1 +1,25 @@
-template("myOrder/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=e.type,o="";return i&&(o+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">我的预约</h1> </header> '),o+=' <div class="content box box-vertical"> <div class="segmented-control order-type-control prevent-scroll"> <a class="control-item ',s=="1"&&(o+="active"),o+='" data-order-type="1">预约中</a> <a class="control-item ',s=="2"&&(o+="active"),o+='" data-order-type="3">已完成</a> <a class="control-item ',s=="3"&&(o+="active"),o+='" 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> ',new String(o)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"96618b497a3bfa91e29c3b7a604c2fbf"}*/
+=======
+/*TMODJS:{"version":1,"md5":"75fac67c0580abbbdbf7481129bb6b3c"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/myOrder/refund.js

@@ -1 +1,47 @@
-template("myOrder/refund",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=n.$escape,o=e.order,u=n.$each,a=e.append_order,f=e.i,l="";return i&&(l+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">申请退款</h1> </header> '),l+=' <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">',l+=s(o.booking_time_str),l+='</span> <span class="order-precedence-status">',o.precedence&&(l+=" (加急) "),l+='</span> </li> <li class="table-view-cell"> <div> <div class="order-desc-line"> <span class="order-desc-title">编号</span><span class="order-desc-more">',l+=s(o.order_num),l+='</span> </div> <div class="order-desc-line order-service-name"> <span class="order-desc-title">服务</span><span class="order-desc-more">',l+=s(o.products_str),l+="</span> </div> ",o.append_orders&&(l+=" ",u(o.append_orders,function(e,t){l+=' <div class="order-desc-line order-service-name"> <span class="order-desc-title">追加</span><span class="order-desc-more">',l+=s(e.products_str),l+="</span> </div> "}),l+=" "),l+=' <div class="order-desc-line"> <span class="order-desc-title">价格</span> <span class="order-desc-more">',l+=s(o.final_price.toFixed(2)),l+="元</span> ",o.append_orders&&(l+=" ",u(o.append_orders,function(e,t){l+=' <span class="order-append-price">&nbsp; + ',l+=s(e.price),l+="元</span> "}),l+=" "),l+=' </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="',l+=s(o.id),l+='">申请退款</div> </div> </div> </div> </div> </div> ',new String(l)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"dd678e3e40739eb81f9b156ae4b6b1b3"}*/
+=======
+/*TMODJS:{"version":1,"md5":"1dbe626d0c66f194ba91101df7871a1a"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/pay/index.js

@@ -1 +1,33 @@
-template("pay/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=n.$escape,o=e.orderType,u=e.orderprice,a=e.chubao,f=e.wxPub,l=e.showWX,c="";return i&&(c+=' <header class="bar bar-nav"> <a class="cancel-button left-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">收银台</h1> </header> '),c+=' <div class="content"> <ul class="table-view "> <li class="table-view-cell order-info"> <a><span>订单类型：</span>',c+=s(o),c+="</a> <a><span>支付金额：</span>",c+=s(u),c+="元</a> </li> </ul> ",a?c+=" ":(c+=' <div class="content-padded "> 支付方式 </div> ',f?c+=' <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> ':(c+=' <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> ',l&&(c+=' <li class="table-view-cell"> <a href="javascript:void(0)" class="pay-option" data-value="wx"> <i class="icon-weixin"></i> 微信支付 </a> </li> '),c+=" </ul> "),c+=" "),c+=' <div class="content-padded "> <a class="btn btn-main btn-block btn-pay" data-pay-channel="alipay">确认支付</a> </div> </div> ',new String(c)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"01d729b7119a08a39069f51222fde6eb"}*/
+=======
+/*TMODJS:{"version":1,"md5":"4a676731cd0f79bb4495cdc3325c4920"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/picker/cell.js

@@ -1 +1,16 @@
-template("picker/cell",function(e,t){var n=this,r=n.$helpers,i=n.$each,s=e.options,o=e.option,u=e.i,a=n.$escape,f=function(r,i){i=i||e;var s=n.$include(r,i,t);return l+=s,l},l="";return i(s,function(e,t){l+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option" data-value="',l+=a(e.id),l+='"> ',f("../myCoupon/cell",e),l+=" </a> </li> </ul> </div> "}),new String(l)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"1427ddb2d46c5e9dc896c40ef8c88504"}*/
+=======
+/*TMODJS:{"version":1,"md5":"f03ad351b1e13bc9a79ae2253b0ba760"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/picker/coupon.js

@@ -1 +1,35 @@
-template("picker/coupon",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=n.$escape,o=e.title,u=n.$each,a=e.options,f=e.option,l=e.i,c=function(r,i){i=i||e;var s=n.$include(r,i,t);return p+=s,p},h=e.unuseables,p="";return i&&(p+=' <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">',p+=s(o),p+="</h1> </header> "),p+=' <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"> ',u(a,function(e,t){p+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option" data-value="',p+=s(e.id),p+='"> ',c("../myCoupon/cell",e),p+=" </a> </li> </ul> </div> "}),p+=" </div> ",h.length>0&&(p+=' <div class="card-list"> <p class="coupon-line">当前时段不可用</p> ',u(h,function(e,t){p+=' <div class="card coupon-card"> <ul class="table-view"> <li class="table-view-cell coupon-cell"> <a class="picker-option unable" data-value="',p+=s(e.id),p+='"> ',c("../myCoupon/cell",e),p+=" </a> </li> </ul> </div> "}),p+=" </div> "),p+=' <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>',new String(p)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"c4dfa363a00cc7007e6f730931f5880a"}*/
+=======
+/*TMODJS:{"version":1,"md5":"a9611ac01c255d4fb3cfa730de1515c2"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/picker/index.js

@@ -1 +1,29 @@
-template("picker/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=n.$escape,o=e.title,u=n.$each,a=e.options,f=e.option,l=e.i,c="";return i&&(c+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">',c+=s(o),c+="</h1> </header> "),c+=' <div class="content" id="pickerScroll"> <div class="scroller"> <div class="page-content"> <ul class="table-view"> ',u(a,function(e,t){c+=' <li class="table-view-cell"> <a class="picker-option" data-value="',c+=s(e.value),c+='"> ',c+=s(e.text),c+=' <span class="picker-option-more">',c+=s(e.more),c+="</span> ",e.selected&&(c+=' <span class="icon icon-check pull-right selected-option"></span> '),c+=" </a> </li> "}),c+=" </ul> </div> </div> </div>",new String(c)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"1d2c020b4ff75eae3208d26c55a92f31"}*/
+=======
+/*TMODJS:{"version":1,"md5":"8615c9e567c0d2678a7c8ba8740117de"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/placeOrder/append.js

@@ -1 +1,15 @@
-template("placeOrder/append",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=function(r,i){i=i||e;var s=n.$include(r,i,t);return o+=s,o},o="";return i&&(o+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">追加服务</h1> </header> '),o+=' <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"> ',s("./list"),o+=' </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> ',new String(o)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"ea4ec6f10274fda9669cf32d5181a1a0"}*/
+=======
+/*TMODJS:{"version":1,"md5":"3b8b430274158e7145f1fc3c2df88438"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/placeOrder/list.js

@@ -1 +1,27 @@
-template("placeOrder/list",function(e,t){var n=this,r=n.$helpers,i=n.$each,s=e.extraService,o=e.extraServiceList,u=e.i,a=n.$escape,f="";return i(s,function(e,t){f+=' <li class="table-view-cell"> <a class="navigate-right item-checkbox ',e.seleted&&(f+="checked"),f+='" data-select="0" data-id="',f+=a(e.id),f+='" data-price="',f+=a(e.price),f+='" data-serviceType="',f+=a(e.serviceType),f+='"> ',f+=a(e.name),f+=" （",f+=a(e.price),f+="元） </a> </li> "}),f+=" ",new String(f)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"32a7f825c6f63cc883fa047a1325cec1"}*/
+=======
+/*TMODJS:{"version":1,"md5":"fad3cba59cdee72106ced6c4aa2dbc0d"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/placeOrder/list2.js

@@ -1 +1,22 @@
-template("placeOrder/list2",function(e,t){var n=this,r=n.$helpers,i=n.$each,s=e.extraService,o=e.extraServiceList,u=e.i,a=n.$escape,f="";return i(s,function(e,t){f+=' <div class="link-label select-extra-service ',e.seleted&&(f+="on"),f+='" data-price="',f+=a(e.price),f+='">',f+=a(e.name),f+=' <span class="table-view-cell-right-label precedence-cost">¥',f+=a(e.price),f+="</span> </div> "}),new String(f)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"95df7f3ff7f7605b5677f40ca6f8243b"}*/
+=======
+/*TMODJS:{"version":1,"md5":"874f60cb8f892bfae4a3fec3b8ec5ee8"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/product/info.js

@@ -1 +1,25 @@
-template("product/info",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=n.$each,o=e.tips,u=e.desc,a=e.$index,f=n.$escape,l=e.note,c="";return i&&(c+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">注意事项</h1> </header> '),c+=' <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> ',s(o.descs,function(e,t){c+=" <li> <p>",c+=f(e),c+="</p> </li> "}),c+=" </ul> </li> ",s(o.notes,function(e,t){c+=" <li> <p>",c+=f(e),c+="</p> </li> "}),c+=" </ul> </div> </div> </div> </div> </div> </div> </div> ",new String(c)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"7ae3a0422cf2c18b5b3674f1c46086df"}*/
+=======
+/*TMODJS:{"version":1,"md5":"c16e81e8cee5a9e4c0d4e9ff9ee45099"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/product/option.js

@@ -1 +1,34 @@
-template("product/option",function(e,t){var n=this,r=n.$helpers,i=n.$each,s=e.pets,o=e.pet,u=e.$index,a=n.$escape,f="";return f+='<div class="box box-container box-align-end"> <div class="product-option-container"> ',i(s,function(e,t){f+=' <div class="option-group" data-id="',f+=a(e.id),f+='" data-weight="',f+=a(e.min_weight),f+="-",f+=a(e.max_weight),f+='kg" data-name="',f+=a(e.pet_types[0].name),f+='" data-price="',f+=a(e.price),f+='" data-weight-max="',f+=a(e.max_weight),f+='" data-weight-min="',f+=a(e.min_weight),f+='"> ',f+=a(e.pet_types[0].name),f+=" (",f+=a(e.min_weight),f+="-",f+=a(e.max_weight),f+="kg) </div> "}),f+=' <div class="btn-container"> <a class="btn btn-cancle btn-block btn-next">取消</a> </div> </div> </div> ',new String(f)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"bdc70055f3f8920d1f0c02aa5234fdf3"}*/
+=======
+/*TMODJS:{"version":1,"md5":"208840ce60e137116adcb730200a1fde"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/product/price.js

@@ -1 +1,30 @@
-template("product/price",function(e,t){var n=this,r=n.$helpers,i=n.$each,s=e.petTypes,o=e.petType,u=e.$index,a=n.$escape,f="";return f+="<tr> <th>类型</th> ",i(s,function(e,t){f+=' <th colspan="" class="pet-type">',f+=a(e.pet_types[0].name),f+="</th> "}),f+=" </tr> <tr> <th>体重</th> ",i(s,function(e,t){f+=" <td>",f+=a(e.min_weight),f+=" ~ ",f+=a(e.max_weight),f+="kg</td> "}),f+=" </tr> <tr> <th>价格</th> ",i(s,function(e,t){f+=" <td>",f+=a(e.price),f+="元</td> "}),f+=" </tr>",new String(f)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"545f59458b9a9e725eda9235d4e141f5"}*/
+=======
+/*TMODJS:{"version":1,"md5":"a7b9139e6c0bbf12c1b2b9b0e6fcffc7"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/product/reviewList.js

@@ -1 +1,65 @@
-template("product/reviewList",function(e,t){var n=this,r=n.$helpers,i=n.$each,s=e.reviews,o=e.review,u=e.i,a=n.$escape,f=function(r,i){i=i||e;var s=n.$include(r,i,t);return h+=s,h},l=e.imgW,c=e.pic,h="";return i(s,function(e,t){h+=' <li class="table-view-cell"> <div> <div class="user-info-container"> <div class="user-info-btn" data-id="',h+=a(e.user.id),h+='"> <img class="user-avatar" src="',h+=a(e.user.avatar),h+='?imageView2/2/w/60/h/60"/> <span class="user-name">',h+=a(e.user.user_name),h+='</span> </div> </div> <div class="box"> <div class="box-flex-1"> <span class="star-label">评分:</span> ',f("../common/star",e),h+=' </div> <div class="box-flex-1 review-time"> ',h+=a(e.time_str),h+=' </div> </div> <div class="review-content"> ',h+=a(e.content),h+=' </div> <div class="img-preview-list" ',e.pics.length>0&&(h+='style="height:',h+=a(l),h+='px"'),h+="> ",e.pics.length>0&&(h+=" ",i(e.pics,function(t,n){h+=" ",n<3&&(h+=' <div class="width-percent-33"> <div class="img-preview" data-src="',h+=a(t.url),h+='" style="width: ',h+=a(l),h+='px"> <img src="',h+=a(t.url),h+="?imageView2/5/w/",h+=a(l*2),h+="/h/",h+=a(l*2),h+='" alt="" class="img-preview-item"> ',e.pics.length>3&&n==2&&(h+=' <span class="img-count">',h+=a(e.pics.length),h+="</span> "),h+=" </div> </div> "),h+=" "}),h+=" "),h+=" </div> ",e.reply!==""&&(h+=' <div class="reply-content"> 壹管家回复：',h+=a(e.reply),h+=" </div> "),h+=" </div> </li> "}),h+=" ",new String(h)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"20b3a51b2131a7b486570502c10ac776"}*/
+=======
+/*TMODJS:{"version":1,"md5":"9366c01d09aec4a13518fe909e4cef0b"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/review/post.js

@@ -1 +1,22 @@
-template("review/post",function(e,t){var n=this,r=n.$helpers,i=function(r,i){i=i||e;var s=n.$include(r,i,t);return f+=s,f},s=e.showUpload,o=e.showInput,u=n.$escape,a=e.cacheReview,f="";return f+='<div class="box box-container box-align-end"> <div class="review-container"> <div class="review-star-container"> <span>满意度评分：</span> ',i("../common/star"),f+=" </div> ",s&&(f+=' <div class="review-star-container review-img-content"> <div class="width-percent-25 img-upload"> <div class="img-upload-btn"> ',o&&(f+=' <input type="file" name="" id="wx-upload" multiple="multiple" accept="image/gif, image/png, image/jpeg, image/x-png, image.jpg"> '),f+=" </div> </div> </div> "),f+=' <div class="review-content-container"> <textarea class="review-content enable-scroll" placeholder="亲，五星好评，立返3~10元随机代金券哦！">',f+=u(a),f+='</textarea> <p>评论内容至少10个字~</p> </div> <a class="btn btn-main btn-block btn-main btn-post disable">发表评价</a> </div> </div> ',new String(f)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"9a5ec05adfa0776c55c0f4908a966f9f"}*/
+=======
+/*TMODJS:{"version":1,"md5":"f12b4f633c74af626a78d20608eaea09"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/build/.cache/success/index.js

@@ -1 +1 @@
-template("success/index",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s=e.WX,o="";return i&&(o+=' <header class="bar bar-nav"> <h1 class="title">支付成功</h1> </header> '),o+=" ",s?o+=' <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> ':o+=' <div class="content content-padding"> <div class="box-center"> <p>订单支付成功，稍后会有壹管家工作人员联系你~</p> </div> <a class="btn btn-positive btn-block my-order">查看我的预约</a> </div> ',new String(o)});
+template("success/index",function(e,t){"use strict";var n=this,r=n.$helpers,i=e.showNavBar,s=e.WX,o="";return i&&(o+=' <header class="bar bar-nav"> <h1 class="title">支付成功</h1> </header> '),o+=" ",s?o+=' <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> ':o+=' <div class="content content-padding"> <div class="box-center"> <p>订单支付成功，稍后会有壹管家工作人员联系你~</p> </div> <a class="btn btn-positive btn-block my-order">查看我的预约</a> </div> ',new String(o)});

www/webapp/o2o/dist/js/build/.cache/success/refund.js

@@ -1 +1,19 @@
-template("success/refund",function(e,t){var n=this,r=n.$helpers,i=e.showNavBar,s="";return i&&(s+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">申请成功</h1> </header> '),s+=' <div class="content content-padding"> <div class="text-center"> <p class="title-msg text-danger">申请已提交成功</p> <p>预计在3-10工作日内到账</p> <p>如有疑问请拨打 ',i?s+=' <span class="service-telephone text-danger">400-032-8170</span> ':s+=' <a href="tel:400-032-8170">400-032-8170</a> ',s+=' </p> </div> <div class="btn-box"> <div class="btn btn-block back-button">返回首页</div> </div> </div> ',new String(s)});
+<<<<<<< HEAD
+/*TMODJS:{"version":1,"md5":"6ff6b98c70d811feb65f173e85e11603"}*/
+=======
+/*TMODJS:{"version":1,"md5":"cdad4c88bddf70c871e81ce259d9ee40"}*/
+>>>>>>> 6a8dc40e5b73c0033f48ec6511d8934fb74e8c42
+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);
+});

www/webapp/o2o/dist/js/model/order.js

@@ -1 +1 @@
-define(["base","$","native","product","api"],function(e,t,n,r,i){var s=function(){if(typeof s.instance=="object")return s.instance;s.instance=this,this.storagePrefix="order_",this.memo="",this.cost=0,this.bookingDate="",this.bookingTime="",this.bookingTimeStr="",this.address=this.getCache("address",null),this.productType="",this.productID="",this.productCount=1,this.petID="",this.petName="",this.petWeight="",this.petPrice="",this.couponID="",this.stationID=this.getCache("stationID",null,""),this.cacheReview=this.getCache("cacheReview",null,""),this.precedence="",this.extraService=[],this.extraServiceType=[],this.serviceName="",this.servicePrice="",this.appendID="",this.beautician={name:"请选择",id:""}};return s.prototype=new e,s.prototype.reset=function(){this.couponID="",this.bookingTime="",this.bookingTimeStr="",this.bookingDate="",this.productType="",this.productID="",this.petID="",this.extraService=[],this.serviceName="",this.servicePrice="",this.productCount=1,this.precedence="",this.extraServiceType=[],this.beautician={name:"",id:""}},s.prototype.addOrder=function(e,t,n){var r=this,s=[{product_id:this.productID,count:this.productCount}];for(var o=0;o<r.extraService.length;o++)r.extraService[o]&&r.extraService[o].product_id&&s.push(r.extraService[o]);var u=[];r.extraServiceType.forEach(function(e,t){e!==100&&u.push(e)});var a=[];this.couponID!=""&&a.push(this.couponID),i.addOrder({products:JSON.stringify(s),memo:this.memo,precedence:this.precedence,booking_time:this.bookingDate+" "+this.bookingTime+":00",address_id:this.address.address_id,coupons:JSON.stringify(a),station:this.stationID,type:this.productType,tech_id:this.beautician.id,user_id:e,order_channel:t},function(e){e.success&&(r.id=e.data.id),typeof n=="function"&&n(e)})},s.prototype.appendOrder=function(e,t,n,r){var s=this;i.appendOrder({order_id:e,products:n,user_id:t},function(e){e.success&&(s.appendID=e.data.id),typeof r=="function"&&r(e)})},new s});
+define(["base","$","native","product","api"],function(e,t,n,r,i){var s=function(){if(typeof s.instance=="object")return s.instance;s.instance=this,this.storagePrefix="order_",this.memo="",this.cost=0,this.bookingDate="",this.bookingTime="",this.bookingTimeStr="",this.address=this.getCache("address",null),this.productType="",this.productID="",this.productCount=1,this.price="",this.couponID="",this.stationID=this.getCache("stationID",null,""),this.cacheReview=this.getCache("cacheReview",null,""),this.precedence="",this.extraService=[],this.extraServiceType=[],this.serviceName="",this.servicePrice="",this.appendID="",this.beautician={name:"请选择",id:""}};return s.prototype=new e,s.prototype.reset=function(){this.couponID="",this.bookingTime="",this.bookingTimeStr="",this.bookingDate="",this.productType="",this.productID="",this.extraService=[],this.serviceName="",this.servicePrice="",this.productCount=1,this.precedence="",this.extraServiceType=[],this.beautician={name:"",id:""}},s.prototype.addOrder=function(e,t,n){var r=this,s=[{product_id:this.productID,count:this.productCount}];for(var o=0;o<r.extraService.length;o++)r.extraService[o]&&r.extraService[o].product_id&&s.push(r.extraService[o]);var u=[];r.extraServiceType.forEach(function(e,t){e!==100&&u.push(e)});var a=[];this.couponID!=""&&a.push(this.couponID),i.addOrder({products:JSON.stringify(s),memo:this.memo,precedence:this.precedence,booking_time:this.bookingDate+" "+this.bookingTime+":00",address_id:this.address.address_id,coupons:JSON.stringify(a),station:this.stationID,type:this.productType,counts:this.counts,extra:this.extra,tech_id:this.beautician.id,user_id:e,order_channel:t},function(e){e.success&&(r.id=e.data.id),typeof n=="function"&&n(e)})},s.prototype.appendOrder=function(e,t,n,r){var s=this;i.appendOrder({order_id:e,products:n,user_id:t},function(e){e.success&&(s.appendID=e.data.id),typeof r=="function"&&r(e)})},new s});

www/webapp/o2o/js/build/.cache/home/index.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/*TMODJS:{"version":10,"md5":"f360d9ee09ca9d54f420e9a6512efbef"}*/
-=======
-/*TMODJS:{"version":8,"md5":"b68c8016ad34d705e596a272499fc364"}*/
->>>>>>> 1706258625cf17960ad83b6da113babc21dc9074
+/*TMODJS:{"version":11,"md5":"03caf20c1d83bb2c4019554e74576185"}*/
 template('home/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$out='';if(showNavBar ){

www/webapp/o2o/js/model/cart.js

@@ -1,7 +1,6 @@
 /**
  * 购物车模型，目前服务有多种类型，所以通过增加一个购物车对象来缓存用户所选的服务
  */
-<<<<<<< HEAD
 define(['base', '$', 'native', 'product'], function (base, $, native, product) {
     var Cart = function () {
         if (typeof Cart.instance === 'object') {
@@ -118,95 +117,6 @@ define(['base', '$', 'native', 'product'], function (base, $, native, product) {
             petPrice: ''
         });
     };
-=======
-define(['base', '$', 'native', 'product'], function(base, $, native, product) {
-	var Cart = function() {
-		if (typeof Cart.instance === 'object') {
-			return Cart.instance;
-		}
-		Cart.instance = this;
-		this.storagePrefix = 'cart_';
-		this.products = this.getCache('products', null, {
-			1: {
-				productID: '',
-				price: '',
-				couponName: '',
-				couponId: '',
-				couponVal: '',
-				couponList: []
-			},
-			2: {
-				productID: '',
-				price: '',
-				couponName: '',
-				couponId: '',
-				couponVal: '',
-				couponList: []
-			},
-			3: {
-				productID: '',
-				price: '',
-				couponName: '',
-				couponId: '',
-				couponVal: '',
-				couponList: []
-			},
-			4: { // 洁牙
-				productID: '',
-				price: '',
-				couponName: '',
-				couponId: '',
-				couponVal: '',
-				couponList: []
-			},
-			5: { // spa
-				productID: '',
-				price: '',
-				couponName: '',
-				couponId: '',
-				couponVal: '',
-				couponList: []
-			},
-      6: { // 训犬
-		  productID: '',
-		  price: '',
-		  couponName: '',
-		  couponId: '',
-		  couponVal: '',
-		  couponList: []
-			},
-      7: { // 断尾
-		  productID: '',
-		  price: '',
-		  couponName: '',
-		  couponId: '',
-		  couponVal: '',
-		  couponList: []
-			},
-      8: { // 碳酸浴
-		  productID: '',
-		  price: '',
-		  couponName: '',
-		  couponId: '',
-		  couponVal: '',
-		  couponList: []
-			},
-      9: {
-		  productID: '',
-		  price: '',
-		  couponName: '',
-		  couponId: '',
-		  couponVal: '',
-		  couponList: []
-			}
-		});
-		this.petInfo = this.getCache('petInfo', null, {
-			id: '',
-			productID: '',
-			price: ''
-		});
-	};
->>>>>>> 1706258625cf17960ad83b6da113babc21dc9074
 
     Cart.prototype = new base();
 

www/webapp/o2o/js/model/order.js

@@ -2,43 +2,6 @@
  * 订单模型
  */
 define(['base', '$', 'native', 'product', 'api'], function (base, $, native, product, api) {
-<<<<<<< HEAD
-    var Order = function () {
-        if (typeof Order.instance === 'object') {
-            return Order.instance;
-        }
-        Order.instance = this;
-        this.storagePrefix = 'order_';//存储前缀
-        this.memo = '';//备注
-        this.cost = 0;//费用
-        this.bookingDate = '';//预订日期
-        this.bookingTime = '';//预订时间
-        this.bookingTimeStr = '';//预约的时间序列
-        this.address = this.getCache('address', null);//地址
-        this.productType = '';//产品类型
-        this.productID = '';//产品ID
-        this.productCount = 1;//产品数量
-        this.petID = '';//宠物ID-
-        this.petName = '';//宠物名字-
-        this.petWeight = '';//宠物重量-
-        this.petPrice = '';//宠物价格-
-        this.couponID = '';//优惠券ID-
-        this.stationID = this.getCache('stationID', null, '');//服务站点ID
-        this.cacheReview = this.getCache('cacheReview', null, '');//缓存的评论
-        this.precedence = ''; // 是否加急
-        this.extraService = [];//额外的服务
-        this.extraServiceType = [];//额外的服务类型
-        // this.bath = '';     // 药浴
-        // this.desinsectization = ''; // 驱虫
-        // this.barbering = ''; // 剃毛
-        this.serviceName = '';//服务类型
-        this.servicePrice = '';//服务价格
-        this.appendID = '';//追加ID
-        this.beautician = { // 保洁师
-            name: '请选择',
-            id: ''
-        };
-=======
   var Order = function () {
     if (typeof Order.instance === 'object') {
       return Order.instance;
@@ -68,32 +31,10 @@ define(['base', '$', 'native', 'product', 'api'], function (base, $, native, pro
     this.beautician = { // 保洁师
       name: '请选择',
       id: ''
->>>>>>> 1706258625cf17960ad83b6da113babc21dc9074
     };
-
+  };
     Order.prototype = new base();
 
-<<<<<<< HEAD
-    //重置 所有数据
-    Order.prototype.reset = function () {
-        this.couponID = '';
-        this.bookingTime = '';
-        this.bookingTimeStr = '';
-        this.bookingDate = '';
-        this.productType = '';
-        this.productID = '';
-        this.petID = '';
-        this.extraService = [];
-        this.serviceName = '';
-        this.servicePrice = '';
-        this.productCount = 1;
-        this.precedence = '';
-        this.extraServiceType = [];
-        this.beautician = {
-            name: '',
-            id: ''
-        };
-=======
   Order.prototype.reset = function () {
     this.couponID = '';
     this.bookingTime = '';
@@ -110,8 +51,8 @@ define(['base', '$', 'native', 'product', 'api'], function (base, $, native, pro
     this.beautician = {
       name: '',
       id: ''
->>>>>>> 1706258625cf17960ad83b6da113babc21dc9074
     };
+  };
 
     //添加顺序
     //channel-渠道
@@ -142,29 +83,6 @@ define(['base', '$', 'native', 'product', 'api'], function (base, $, native, pro
             coupons.push(this.couponID);
         }
 
-<<<<<<< HEAD
-        api.addOrder({//添加顺序
-            products: JSON.stringify(productParam),//产品参数
-            memo: this.memo,//备忘录
-            precedence: this.precedence,
-            booking_time: this.bookingDate + ' ' + this.bookingTime + ':00',//预订时间
-            address_id: this.address.address_id,//地址
-            coupons: JSON.stringify(coupons),//优惠券
-            station: this.stationID,//站
-            type: this.productType,//产品类型
-            tech_id: this.beautician.id,//美容师
-            user_id: userID,
-            order_channel: channel
-        }, function (res) {
-            if (res.success) {
-                that.id = res.data.id;
-            }
-            if (typeof (callback) == 'function') {
-                callback(res);
-            }
-        })
-    };
-=======
     api.addOrder({
       products: JSON.stringify(productParam),
       memo: this.memo,
@@ -188,7 +106,6 @@ define(['base', '$', 'native', 'product', 'api'], function (base, $, native, pro
       }
     })
   };
->>>>>>> 1706258625cf17960ad83b6da113babc21dc9074
 
     // 追加订单
     Order.prototype.appendOrder = function (orderID, userID, products, callback) {