Эх сурвалжийг харах

首页点击跳转到首页

jmx 8 жил өмнө
parent
commit
8852c7b89c

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/main.js


+ 1 - 1
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.balance=0,this.memo="",this.cost=0,this.price=0,this.bookingDate="",this.bookingTime="",this.bookingTimeStr="",this.address=this.getCache("address",null),this.productType="",this.productID="",this.productCount=1,this.price=0,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}],o=[];this.couponID!=""&&o.push(this.couponID),i.addOrder({products:JSON.stringify(s),memo:this.memo,precedence:"0",booking_time:this.bookingDate+" "+this.bookingTime+":00",address_id:this.address.address_id,coupons:JSON.stringify(o),station:this.stationID,type:this.productType,counts:"1",extra:JSON.stringify("[type:"+this.appendID+"]"),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.balance=0,this.memo="",this.cost=0,this.price=0,this.bookingDate="",this.bookingTime="",this.bookingTimeStr="",this.address=this.getCache("address",null),this.productType="",this.productID="",this.productCount=1,this.price=0,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}],o=[];this.couponID!=""&&o.push(this.couponID),i.addOrder({products:JSON.stringify(s),memo:this.memo,precedence:"0",booking_time:this.bookingDate+" "+this.bookingTime+":00",address_id:this.address.address_id,coupons:JSON.stringify(o),station:this.stationID,type:this.productType,counts:"1",extra:JSON.stringify([{type:this.appendID}]),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});

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/model/product.js


+ 1 - 1
www/webapp/o2o/dist/js/page/mine.js

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

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/page/placeOrder.js


+ 1 - 1
www/webapp/o2o/js/model/order.js

@@ -81,7 +81,7 @@ define(['base', '$', 'native', 'product', 'api'], function (base, $, native, pro
       station: this.stationID,
       type: this.productType,
       counts:'1',
-      extra:JSON.stringify("[type:"+this.appendID+"]"),
+      extra:JSON.stringify([{ type: this.appendID }]),
       tech_id: this.beautician.id,
       user_id: userID,
       order_channel: channel

+ 4 - 0
www/webapp/o2o/js/model/product.js

@@ -42,6 +42,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: '57e0dffc9f5160dd048b4568',
                 name: '日常清洁',
+                type: 1,
                 desc: [
                     {
                         "type": 1,
@@ -98,6 +99,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: '57e0e0189f5160dc048b4568',
                 name: '深度清洁',
+                type: 2,
                 desc: [
                     {
                         "type": 1,
@@ -134,6 +136,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: '57e0e0369f5160b1048b456b',
                 name: '除螨杀菌',
+                type: 3,
                 desc: [
                     {
                         "type": 1,
@@ -166,6 +169,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: '57eb9a369f5160cc048b4794',
                 name: '钟点工',
+                type: 4,
                 desc: [
                     {
                         "type": 1,

+ 6 - 6
www/webapp/o2o/js/page/mine.js

@@ -103,17 +103,17 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address'], func
             // 帮助中心
             $.newTouch('.btn-helper', function () {
                 event.preventDefault();
-                $doc.trigger('spa:navigate', {
-                    hash: 'help'
-                });
+                // $doc.trigger('spa:navigate', {
+                //     hash: 'help'
+                // });
             }, $view);
 
             // 关于
             $.newTouch('.btn-about', function () {
                 event.preventDefault();
-                $doc.trigger('spa:navigate', {
-                    hash: 'about'
-                });
+                // $doc.trigger('spa:navigate', {
+                //     hash: 'about'
+                // });
             }, $view);
 
             /* 定义按钮事件结束。*/

+ 1 - 1
www/webapp/o2o/js/page/placeOrder.js

@@ -282,7 +282,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                     $doc.trigger('spa:navigate', {
                         hash: 'addressList',
                         pushData: {
-                            backHash: 'mine'
+                            backHash: 'placeOrder'
                         },
                         callback: {
                             /* 在addressList页面挑选之后,回到这个页面时执行的回调。 */

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно