Ver Fonte

时间戳转化

seam há 8 anos atrás
pai
commit
23dc2b87ce

+ 101 - 89
www/webapp/common/js/jq_extend.js

@@ -3,96 +3,108 @@
  * author: wangyang
  * date: 2015-04-11
  */
-define(['config', 'native', 'zepto'], function(config, native, $) {
-	(function($) {
-		$.extend($, {
-			getScript: function(src, func) {
-				var script = document.createElement('script');
-				script.async = 'async';
-				script.src = src;
-				if (func) {
-				   script.onload = func;
-				}
-				document.getElementsByTagName('head')[0].appendChild(script);
-			},
-			//根据域名判断使用ajax还是jsonP
-			autoAjax: function(param) {
-				param['no_sign'] = 1;
-				if (location.host == 'yiguanjia.me') {
-					$.ajax(param);
-				} else {
-					// api接口增加版本号
-					param.data['version'] = config.o2oVersion;
-					var url = param.url;
-					if (url.indexOf('?') == -1) {
-						url += '?';
-					}
-					if (url.charAt(url.length - 1) != '?') {
-						url += '&';
-					}
-					url += 'callback=?';
-					if (!!param.data) {
-						if (url.charAt(url.length - 1) != '?') {
-							url += '';
-						}
-						url += '&' + $.param(param.data);
-					}
-					$.ajaxJSONP({
-						url: url,
-						success: (!!param.success) ? param.success : null,
-						error: (!!param.error) ? param.error : null
-					})
-				}
-			},
-			//带验证的ajax
-			signAjax: function(options) {
-				if (config.isIOS || config.isAndroid ) {
-					var params = options.data;
-					var sgf = options.success;
+define(['config', 'native', 'zepto'], function (config, native, $) {
+  (function ($) {
+    $.extend($, {
+      getScript: function (src, func) {
+        var script = document.createElement('script');
+        script.async = 'async';
+        script.src = src;
+        if (func) {
+          script.onload = func;
+        }
+        document.getElementsByTagName('head')[0].appendChild(script);
+      },
+      //根据域名判断使用ajax还是jsonP
+      autoAjax: function (param) {
+        param['no_sign'] = 1;
+        if (location.host == 'yiguanjia.me') {
+          $.ajax(param);
+        } else {
+          // api接口增加版本号
+          param.data['version'] = config.o2oVersion;
+          var url = param.url;
+          if (url.indexOf('?') == -1) {
+            url += '?';
+          }
+          if (url.charAt(url.length - 1) != '?') {
+            url += '&';
+          }
+          url += 'callback=?';
+          if (!!param.data) {
+            if (url.charAt(url.length - 1) != '?') {
+              url += '';
+            }
+            url += '&' + $.param(param.data);
+          }
+          $.ajaxJSONP({
+            url: url,
+            success: (!!param.success) ? param.success : null,
+            error: (!!param.error) ? param.error : null
+          })
+        }
+      },
+      //带验证的ajax
+      signAjax: function (options) {
+        if (config.isIOS || config.isAndroid) {
+          var params = options.data;
+          var sgf = options.success;
 
-					options.success = function(res) {
-						sgf(res);
-					}
+          options.success = function (res) {
+            sgf(res);
+          }
 
-					if (!!!params.time) {
-						params.time = new Date().getTime() / 1000;
-					}
-					sign_queue.push(options);
-					if (sign_queue.length == 1) {
-						native.getSign(sign_queue[0].data, sign_callback);
-					}
-				} else {
-					this.autoAjax(options);
-				}
-			},
-			//touch绑定事件的封装
-			newTouch: function(el, callback, parent_dom) {
-				var event = 'tap';
-				if (!((window.DocumentTouch && document instanceof DocumentTouch) || 'ontouchstart' in window)) {
-					event = 'click';
-				}
-				if (parent_dom !== undefined) {
-					$(parent_dom).on(event, el, function(ev) {
-						callback.call(this, ev);
-					});
-				} else {
-					$(el).on(event, function(ev) {
-						callback.call(this, ev);
-					});
-				}
-			}
-		})
-		//由于加密是异步的,递归调用队列
-		var sign_queue = [];
-		function sign_callback(res) {
-			var options = sign_queue.shift();
-			options.data = res.data;
-			$.autoAjax(options);
-			if (sign_queue.length > 0) {
-				native.getSign(sign_queue[0].data, sign_callback);
-			}
-		}
-	})($);
+          if (!!!params.time) {
+            params.time = new Date().getTime() / 1000;
+          }
+          sign_queue.push(options);
+          if (sign_queue.length == 1) {
+            native.getSign(sign_queue[0].data, sign_callback);
+          }
+        } else {
+          this.autoAjax(options);
+        }
+      },
+      //touch绑定事件的封装
+      newTouch: function (el, callback, parent_dom) {
+        var event = 'tap';
+        if (!((window.DocumentTouch && document instanceof DocumentTouch) || 'ontouchstart' in window)) {
+          event = 'click';
+        }
+        if (parent_dom !== undefined) {
+          $(parent_dom).on(event, el, function (ev) {
+            callback.call(this, ev);
+          });
+        } else {
+          $(el).on(event, function (ev) {
+            callback.call(this, ev);
+          });
+        }
+      },
+      // 时间戳转化
+      timetrans: function (date) {
+        let date = new Date(date * 1000);//如果date为13位不需要乘1000
+        let Y = date.getFullYear() + '-';
+        let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+        let D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';
+        let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+        let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+        let s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+        return Y + M + D + h + m + s;
+      }
+    })
+    //由于加密是异步的,递归调用队列
+    var sign_queue = [];
 
-	return $;
+    function sign_callback(res) {
+      var options = sign_queue.shift();
+      options.data = res.data;
+      $.autoAjax(options);
+      if (sign_queue.length > 0) {
+        native.getSign(sign_queue[0].data, sign_callback);
+      }
+    }
+  })($);
+
+  return $;
 })

+ 1 - 0
www/webapp/moonclub/build.js

@@ -14,6 +14,7 @@
 			'pagePicker',
 			'pageMyCoupon',
 			'pageMyOrder',
+			'pageMyOrderInfo',
 			'panelAlert',
 			'panelDataPicker',
 			'panelDataPicker',

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
www/webapp/moonclub/dist/js/api.js


+ 1 - 0
www/webapp/moonclub/dist/js/build.txt

@@ -22,6 +22,7 @@ page/home.js
 page/picker.js
 page/myCoupon.js
 page/MyOrder.js
+page/MyOrderInfo.js
 panel/alert.js
 panel/dataPicker.js
 model/cart.js

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
www/webapp/moonclub/dist/js/build/template.js


Diff do ficheiro suprimidas por serem muito extensas
+ 40 - 5
www/webapp/moonclub/dist/js/main.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
www/webapp/moonclub/dist/js/model/user.js


+ 77 - 58
www/webapp/moonclub/dist/js/page/MyOrder.js

@@ -1,66 +1,85 @@
-define(['$', 'template', 'user', 'config',  'api','product'], function ($, template, user, config,  api,product) {
-    function back(event) {
-        event.preventDefault();
-        $(document).trigger('spa:navigate', {
-            hash: '',
-            pushData: {
-                dontNeedReload: true
-            }
-        });
-    }
+define(['$', 'template', 'user', 'config', 'api', 'product'], function ($, template, user, config, api, product) {
+  function back(event) {
+    event.preventDefault();
+    $(document).trigger('spa:navigate', {
+      hash: '',
+      pushData: {
+        dontNeedReload: true
+      }
+    });
+  }
 
-    return {
-        title: '壹管家上门服务',
-        body: '',
-        init: function (pageData, dtd) {
-            let $view = this;
-            let $doc = $(document);
+  let order = {}; // 用户订单
+  let serviceInfo = []; // 服务信息
+// 时间戳转化
+  function timetrans(date) {
+    var date = new Date(date * 1000);//如果date为13位不需要乘1000
+    var Y = date.getFullYear() + '-';
+    var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+    var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';
+    var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+    var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+    var s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+    return Y + M + D + h + m + s;
+  }
 
-            // 返回
-            $view.on('swipeRight', function (event) {
-                back.call(this, event);
-            });
+  return {
+    title: '壹管家上门服务',
+    body: '',
+    init: function (pageData, dtd) {
+      let $view = this;
+      let $doc = $(document);
 
-            $.newTouch('.back-button', function (event) {
-                back.call(this, event);
-            }, $view);
+      // 返回
+      $view.on('swipeRight', function (event) {
+        back.call(this, event);
+      });
 
-            $view.on('tapBackButton', function (event) {
-                back.call(this, event);
-            });
-            dtd.resolve();
-        },
-        beforeopen: function (pageData, dtd) {
-            let $view = this;
-            let $doc = $(document);
-            $doc.trigger('spa:openloader');
-            if (!pageData.pushData.dontNeedReload) {
-                $doc.trigger('spa:closeloader');
-                let tmpData = {
-                    // showNavBar: !config.isWX && !config.isChubao,
-                    orderList:product.myOrderList
-                };
-                let tpl = template('MyOrder/index', tmpData);
+      $.newTouch('.back-button', function (event) {
+        back.call(this, event);
+      }, $view);
 
-                $('.spa-page-body', $view).html(tpl);
-
-            }
-            dtd.resolve();
-            if (config.isWX) {
-                wx.ready(function () {
-                    wx.onMenuShareTimeline({
-                        title: '家政服务,首选壹管家',
-                        link: 'http://www.yiguanjia.me/o2o/web/index',
-                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-                    });
-                    wx.onMenuShareAppMessage({
-                        title: '家政服务,首选壹管家',
-                        desc: '全程管家,精心每一个细节!',
-                        link: 'http://www.yiguanjia.me/o2o/web/index',
-                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-                    });
-                });
-            }
+      $view.on('tapBackButton', function (event) {
+        back.call(this, event);
+      });
+      dtd.resolve();
+    },
+    beforeopen: function (pageData, dtd) {
+      let $view = this;
+      let $doc = $(document);
+      api.getMyOrder({
+        user_id: user.id
+      }, function (res) {
+        order = res.data.xyh_orders;
+        //订单信息处理
+        let orders = {
+          order_time: timetrans(order[0].order_time),
+          pre_production_date: timetrans(order[0].pre_production_date),
+          production_date: timetrans(order[0].production_date),
         }
+        let tmpData = {
+          order: order[0], // 订单信息
+          orderTime: orders // 订单时间
+        };
+        let tpl = template('MyOrder/index', tmpData);
+        $('.spa-page-body', $view).html(tpl);
+      })
+      dtd.resolve();
+      if (config.isWX) {
+        wx.ready(function () {
+          wx.onMenuShareTimeline({
+            title: '家政服务,首选壹管家',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+          });
+          wx.onMenuShareAppMessage({
+            title: '家政服务,首选壹管家',
+            desc: '全程管家,精心每一个细节!',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+          });
+        });
+      }
     }
+  }
 })

+ 95 - 0
www/webapp/moonclub/dist/js/page/MyOrderInfo.js

@@ -0,0 +1,95 @@
+define(['$', 'template', 'user', 'config', 'api', 'product'], function ($, template, user, config, api, product) {
+  function back(event) {
+    event.preventDefault();
+    $(document).trigger('spa:navigate', {
+      hash: '',
+      pushData: {
+        dontNeedReload: true
+      }
+    });
+  }
+
+  let order = {}; // 用户订单
+  let serviceInfo = []; // 服务信息
+// // 时间戳转化
+//   function timetrans(date) {
+//     var date = new Date(date * 1000);//如果date为13位不需要乘1000
+//     var Y = date.getFullYear() + '-';
+//     var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+//     var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';
+//     var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+//     var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+//     var s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+//     return Y + M + D + h + m + s;
+//   }
+
+  return {
+    title: '壹管家上门服务',
+    body: '',
+    init: function (pageData, dtd) {
+      let $view = this;
+      let $doc = $(document);
+
+      // 返回
+      $view.on('swipeRight', function (event) {
+        back.call(this, event);
+      });
+
+      $.newTouch('.back-button', function (event) {
+        back.call(this, event);
+      }, $view);
+
+      $view.on('tapBackButton', function (event) {
+        back.call(this, event);
+      });
+      dtd.resolve();
+    },
+    beforeopen: function (pageData, dtd) {
+      let $view = this;
+      let $doc = $(document);
+      api.getMyOrder({
+        user_id: user.id
+      }, function (res) {
+        order = res.data.xyh_orders
+        serviceInfo = res.data.service_info
+        let object = [];
+        for(let i = 0;i<order.length;i++){
+          object[i]={
+            order: order[i],
+            serviceInfo: serviceInfo[i]
+          }
+        }
+        //订单信息处理
+        let orders = {
+          order_time: $.timetrans(order[0].order_time),
+          pre_production_date: $.timetrans(order[0].pre_production_date),
+          production_date: $.timetrans(order[0].production_date),
+        }
+        console.log(object)
+        let tmpData = {
+          order: order[0], // 订单信息
+          orderTime: orders, // 订单时间
+          serviceInfo: serviceInfo[0]
+        };
+        let tpl = template('MyOrder/MyOrderInfo', tmpData);
+        $('.spa-page-body', $view).html(tpl);
+      })
+      dtd.resolve();
+      if (config.isWX) {
+        wx.ready(function () {
+          wx.onMenuShareTimeline({
+            title: '家政服务,首选壹管家',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+          });
+          wx.onMenuShareAppMessage({
+            title: '家政服务,首选壹管家',
+            desc: '全程管家,精心每一个细节!',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+          });
+        });
+      }
+    }
+  }
+})

+ 22 - 0
www/webapp/moonclub/js/api.js

@@ -439,6 +439,28 @@ define(['config', 'base'], function (config, base) {
 		});
 	};
 
+  //获取我的订单
+  API.prototype.getMyOrder = function (data, callback) {
+    var that = this;
+    $.signAjax({
+      url: config.apiPath + '/index.php?r=moonclub/user/XOrderByUserId',
+      data: data,
+      dataType: 'JSON',
+      success: function (res) {
+        that.isLoading = false;
+        if (callback) {
+          callback(res);
+        }
+      },
+      error: function (res) {
+        that.isLoading = false;
+        if (callback) {
+          callback(apiErrorResult);
+        }
+      }
+    });
+  };
+
 	//获取我的订单列表
 	API.prototype.getMyOrderList = function (data, callback) {
 		var that = this;

Diff do ficheiro suprimidas por serem muito extensas
+ 2 - 2
www/webapp/moonclub/js/build/template.js


+ 15 - 2
www/webapp/moonclub/js/main.js

@@ -37,6 +37,7 @@ require.config({
     pageAdvisory: './page/advisory/advisory',
     pageMyService: './page/MyService',
     pageMyOrder: './page/MyOrder',
+    pageMyOrderInfo: './page/MyOrderInfo',
     pageMonth: './page/month',
     pageUserInfo: './page/userInfo',
     pageRegistered: './page/Registered',
@@ -113,7 +114,19 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
       })
     }
   };
-  //
+  // 订单详情
+  var pageMyOrderInfo = {
+    route: 'MyOrderInfo',
+    classname: 'MyOrderInfo',
+    animate: 'pushInLeft',
+    view: function () {
+      var $page = this;
+      requirejs(['pageMyOrderInfo'], function (viewData) {
+        $doc.trigger('spa:initpage', [$page, viewData])
+      })
+    }
+  };
+
   var pageMonth = {
     route: 'month',
     classname: 'month',
@@ -217,7 +230,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
   };
 
 
-  $doc.trigger('spa:route', [pageHome, pageMyService, pageMyOrder, pageMonth, pageUserInfo, pageRegistered, pageEmploye, pageDesc, pagePicker, pageMyCoupon, pageComing, pageAdvisory]);
+  $doc.trigger('spa:route', [pageHome, pageMyService, pageMyOrder, pageMyOrderInfo, pageMonth, pageUserInfo, pageRegistered, pageEmploye, pageDesc, pagePicker, pageMyCoupon, pageComing, pageAdvisory]);
 
   var panelAlert = {
     id: 'simpleAlert',

+ 1 - 1
www/webapp/moonclub/js/model/user.js

@@ -9,7 +9,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		// localStorage.getItem('xyhwxUserID')
 		User.instance = this;
 		this.storagePrefix = 'user_';
-		this.id = '5870c935a84ea0417e8b456f'; //5870c935a84ea0417e8b456f
+		this.id = '597ed29d47a7b2aceba34eec'; //597ed29d47a7b2aceba34eec
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';

+ 77 - 58
www/webapp/moonclub/js/page/MyOrder.js

@@ -1,66 +1,85 @@
-define(['$', 'template', 'user', 'config',  'api','product'], function ($, template, user, config,  api,product) {
-    function back(event) {
-        event.preventDefault();
-        $(document).trigger('spa:navigate', {
-            hash: '',
-            pushData: {
-                dontNeedReload: true
-            }
-        });
-    }
+define(['$', 'template', 'user', 'config', 'api', 'product'], function ($, template, user, config, api, product) {
+  function back(event) {
+    event.preventDefault();
+    $(document).trigger('spa:navigate', {
+      hash: '',
+      pushData: {
+        dontNeedReload: true
+      }
+    });
+  }
 
-    return {
-        title: '壹管家上门服务',
-        body: '',
-        init: function (pageData, dtd) {
-            let $view = this;
-            let $doc = $(document);
+  let order = {}; // 用户订单
+  let serviceInfo = []; // 服务信息
+// 时间戳转化
+  function timetrans(date) {
+    var date = new Date(date * 1000);//如果date为13位不需要乘1000
+    var Y = date.getFullYear() + '-';
+    var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+    var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';
+    var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+    var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+    var s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+    return Y + M + D + h + m + s;
+  }
 
-            // 返回
-            $view.on('swipeRight', function (event) {
-                back.call(this, event);
-            });
+  return {
+    title: '壹管家上门服务',
+    body: '',
+    init: function (pageData, dtd) {
+      let $view = this;
+      let $doc = $(document);
 
-            $.newTouch('.back-button', function (event) {
-                back.call(this, event);
-            }, $view);
+      // 返回
+      $view.on('swipeRight', function (event) {
+        back.call(this, event);
+      });
 
-            $view.on('tapBackButton', function (event) {
-                back.call(this, event);
-            });
-            dtd.resolve();
-        },
-        beforeopen: function (pageData, dtd) {
-            let $view = this;
-            let $doc = $(document);
-            $doc.trigger('spa:openloader');
-            if (!pageData.pushData.dontNeedReload) {
-                $doc.trigger('spa:closeloader');
-                let tmpData = {
-                    // showNavBar: !config.isWX && !config.isChubao,
-                    orderList:product.myOrderList
-                };
-                let tpl = template('MyOrder/index', tmpData);
+      $.newTouch('.back-button', function (event) {
+        back.call(this, event);
+      }, $view);
 
-                $('.spa-page-body', $view).html(tpl);
-
-            }
-            dtd.resolve();
-            if (config.isWX) {
-                wx.ready(function () {
-                    wx.onMenuShareTimeline({
-                        title: '家政服务,首选壹管家',
-                        link: 'http://www.yiguanjia.me/o2o/web/index',
-                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-                    });
-                    wx.onMenuShareAppMessage({
-                        title: '家政服务,首选壹管家',
-                        desc: '全程管家,精心每一个细节!',
-                        link: 'http://www.yiguanjia.me/o2o/web/index',
-                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-                    });
-                });
-            }
+      $view.on('tapBackButton', function (event) {
+        back.call(this, event);
+      });
+      dtd.resolve();
+    },
+    beforeopen: function (pageData, dtd) {
+      let $view = this;
+      let $doc = $(document);
+      api.getMyOrder({
+        user_id: user.id
+      }, function (res) {
+        order = res.data.xyh_orders;
+        //订单信息处理
+        let orders = {
+          order_time: timetrans(order[0].order_time),
+          pre_production_date: timetrans(order[0].pre_production_date),
+          production_date: timetrans(order[0].production_date),
         }
+        let tmpData = {
+          order: order[0], // 订单信息
+          orderTime: orders // 订单时间
+        };
+        let tpl = template('MyOrder/index', tmpData);
+        $('.spa-page-body', $view).html(tpl);
+      })
+      dtd.resolve();
+      if (config.isWX) {
+        wx.ready(function () {
+          wx.onMenuShareTimeline({
+            title: '家政服务,首选壹管家',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+          });
+          wx.onMenuShareAppMessage({
+            title: '家政服务,首选壹管家',
+            desc: '全程管家,精心每一个细节!',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+          });
+        });
+      }
     }
+  }
 })

+ 95 - 0
www/webapp/moonclub/js/page/MyOrderInfo.js

@@ -0,0 +1,95 @@
+define(['$', 'template', 'user', 'config', 'api', 'product'], function ($, template, user, config, api, product) {
+  function back(event) {
+    event.preventDefault();
+    $(document).trigger('spa:navigate', {
+      hash: '',
+      pushData: {
+        dontNeedReload: true
+      }
+    });
+  }
+
+  let order = {}; // 用户订单
+  let serviceInfo = []; // 服务信息
+// // 时间戳转化
+//   function timetrans(date) {
+//     var date = new Date(date * 1000);//如果date为13位不需要乘1000
+//     var Y = date.getFullYear() + '-';
+//     var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+//     var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';
+//     var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+//     var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+//     var s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+//     return Y + M + D + h + m + s;
+//   }
+
+  return {
+    title: '壹管家上门服务',
+    body: '',
+    init: function (pageData, dtd) {
+      let $view = this;
+      let $doc = $(document);
+
+      // 返回
+      $view.on('swipeRight', function (event) {
+        back.call(this, event);
+      });
+
+      $.newTouch('.back-button', function (event) {
+        back.call(this, event);
+      }, $view);
+
+      $view.on('tapBackButton', function (event) {
+        back.call(this, event);
+      });
+      dtd.resolve();
+    },
+    beforeopen: function (pageData, dtd) {
+      let $view = this;
+      let $doc = $(document);
+      api.getMyOrder({
+        user_id: user.id
+      }, function (res) {
+        order = res.data.xyh_orders
+        serviceInfo = res.data.service_info
+        let object = [];
+        for(let i = 0;i<order.length;i++){
+          object[i]={
+            order: order[i],
+            serviceInfo: serviceInfo[i]
+          }
+        }
+        //订单信息处理
+        let orders = {
+          order_time: $.timetrans(order[0].order_time),
+          pre_production_date: $.timetrans(order[0].pre_production_date),
+          production_date: $.timetrans(order[0].production_date),
+        }
+        console.log(object)
+        let tmpData = {
+          order: order[0], // 订单信息
+          orderTime: orders, // 订单时间
+          serviceInfo: serviceInfo[0]
+        };
+        let tpl = template('MyOrder/MyOrderInfo', tmpData);
+        $('.spa-page-body', $view).html(tpl);
+      })
+      dtd.resolve();
+      if (config.isWX) {
+        wx.ready(function () {
+          wx.onMenuShareTimeline({
+            title: '家政服务,首选壹管家',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+          });
+          wx.onMenuShareAppMessage({
+            title: '家政服务,首选壹管家',
+            desc: '全程管家,精心每一个细节!',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+          });
+        });
+      }
+    }
+  }
+})

+ 81 - 0
www/webapp/moonclub/tpl/MyOrder/MyOrderInfo.html

@@ -0,0 +1,81 @@
+<div class="content" id="MyOrderScroll" style="background: #fff;">
+  <div class="page-content">
+    <div>订单编号:{{order.order_num}}</div>
+    <div>下单时间:{{orderTime.order_time}}</div>
+    <div>预产期:{{orderTime.pre_production_date}}</div>
+    <div>生产日期:{{orderTime.production_date}}</div>
+    <div>已购套餐:{{order.package_name}}</div>
+    <div>签约人:{{order.sign_name}}</div>
+    <div>婴儿性别:{{if order.baby_sex === '0'}}女{{else if order.baby_sex === '1'}}男{{else}}其他{{/if}}</div>
+    <div>服务地址:{{order.address}}</div>
+    <div>
+      <!--中医-->
+      {{if serviceInfo.docters.length !== 0}}
+      <div>中医编号:{{serviceInfo.docters[0].num}}</div>
+      <div>中医姓名:{{serviceInfo.docters[0].user_name}}</div>
+      <div>
+        <h4>状态</h4>
+        {{serviceInfo.docters[0].status_str}}
+      </div>
+      {{/if}}
+
+      <!--营养餐-->
+      营养餐
+      {{if serviceInfo.nutritiousMeals.length !==0}}
+      <div>中医编号:{{serviceInfo.nutritiousMeals[0].num}}</div>
+      <div>中医姓名:{{serviceInfo.nutritiousMeals[0].user_name}}</div>
+      <div>
+        <h4>状态</h4>
+        {{serviceInfo.nutritiousMeals[0].status_str}}
+      </div>
+      {{/if}}
+      <!--保洁服务信息-->
+      保洁服务信息
+      {{if serviceInfo.techs.length !==0}}
+      <div>中医编号:{{serviceInfo.techs[0].num}}</div>
+      <div>中医姓名:{{serviceInfo.techs[0].user_name}}</div>
+      <div>
+        <h4>状态</h4>
+        {{serviceInfo.techs[0].status_str}}
+      </div>
+      {{/if}}
+      <!--辅料配送-->
+      辅料配送
+      {{if serviceInfo.techs.length !==0}}
+      <div>中医编号:{{serviceInfo.techs[0].num}}</div>
+      <div>中医姓名:{{serviceInfo.techs[0].user_name}}</div>
+      <div>
+        <h4>状态</h4>
+        {{serviceInfo.techs[0].status_str}}
+      </div>
+      {{/if}}
+      <!--月嫂服务-->
+      辅料配送
+      {{if serviceInfo.techs.length !==0}}
+      <div>中医编号:{{serviceInfo.techs[0].num}}</div>
+      <div>中医姓名:{{serviceInfo.techs[0].user_name}}</div>
+      <div>
+        <h4>状态</h4>
+        {{serviceInfo.techs[0].status_str}}
+      </div>
+      {{/if}}
+      <!--催乳服务-->
+      <!--送菜服务-->
+    </div>
+    {{ each orderList as order index }}
+    <div data-extra-type="{{index}}" style="padding: 3%;border-bottom: 1px solid rgba(0, 0, 0, 0.1);">
+      <!--服务-->
+      <div style="margin: 1% 0">{{order.name}}</div>
+      <!--进度-->
+      <div style="padding: 1% 0">{{if order.state == 100}}已完成{{else}}进行中{{/if}}</div>
+      <div
+        style="width: 100%;position: relative;height: 5px;border-radius: 5px;border:1px solid rgba(0,0,0,0.42);margin: 1% 0;">
+        <div
+          style="width: {{order.state}}%;position: absolute;height: 3px;border-radius: 5px;background-color:{{if order.state==100}}#ea11b8{{else}}#d49cc7{{/if}};"></div>
+      </div>
+    </div>
+    {{ /each }}
+    <div style="width: 90%;margin: 30px auto;color: #d3d3d3;font-size: 2rem;text-align: center;">
+    </div>
+  </div>
+</div>

+ 13 - 14
www/webapp/moonclub/tpl/MyOrder/index.html

@@ -1,17 +1,16 @@
 <div class="content" id="MyOrderScroll" style="background: #fff;">
-    <div class="page-content">
-        {{ each orderList as order index }}
-        <div data-extra-type="{{index}}" style="padding: 3%;border-bottom: 1px solid rgba(0, 0, 0, 0.1);">
-            <!--服务-->
-            <div style="margin: 1% 0">{{order.name}}</div>
-            <!--进度-->
-            <div style="padding: 1% 0">{{if order.state == 100}}已完成{{else}}进行中{{/if}}</div>
-            <div style="width: 100%;position: relative;height: 5px;border-radius: 5px;border:1px solid rgba(0,0,0,0.42);margin: 1% 0;">
-                <div style="width: {{order.state}}%;position: absolute;height: 3px;border-radius: 5px;background-color:{{if order.state==100}}#ea11b8{{else}}#d49cc7{{/if}};"></div>
-            </div>
-        </div>
-        {{ /each }}
-        <div style="width: 90%;margin: 30px auto;color: #d3d3d3;font-size: 2rem;text-align: center;">
-        </div>
+  <div class="page-content">
+    <div>订单编号:{{order.order_num}}</div>
+    <div>下单时间:{{orderTime.order_time}}</div>
+    <div>预产期:{{orderTime.pre_production_date}}</div>
+    <div>生产日期:{{orderTime.production_date}}</div>
+    <div>已购套餐:{{order.package_name}}</div>
+    <div>签约人:{{order.sign_name}}</div>
+    <div>婴儿性别:{{if order.baby_sex === '0'}}女{{else if order.baby_sex === '1'}}男{{else}}其他{{/if}}</div>
+    <div>服务地址:{{order.address}}</div>
+    <div>
     </div>
+    <div style="width: 90%;margin: 30px auto;color: #d3d3d3;font-size: 2rem;text-align: center;">
+    </div>
+  </div>
 </div>

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff