0

www/webapp/moonclub/dist/js/page/MyService.js

@@ -1 +1 @@
-define(["$","template","user","config","api"],function(e,t,n,r,i){function s(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function o(e){e.scroll&&(e.scroll.destroy(),e.scroll=null)}return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},r),r.on("tapBackButton",function(e){s.call(this,e)}),n.resolve()},beforeopen:function(s,o){var u=this,a=e(document);a.trigger("spa:openloader"),i.geteservation({user_id:n.id},function(e){console.log(e)}),i.geteservation({user_id:n.id},function(n){a.trigger("spa:closeloader");if(n.success){var i=[];n.data.length==0?(console.log("if"),showListBar=!1):showListBar=!0,console.log(showListBar);var o={showNavBar:!r.isWX&&!r.isChubao,list:n.data,timeArrea:i,showListBar:showListBar},f=t("MyService/index",o);e(".spa-page-body",u).html(f),setTimeout(function(){s.scroll=new IScroll("#myServiceScroll")},500)}else a.trigger("spa:openpanel",["simpleAlert",{message:n.message}])}),o.resolve(),r.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"})})}}});
+define(["$","template","user","config","api"],function(e,t,n,r,i){function s(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function o(e){e.scroll&&(e.scroll.destroy(),e.scroll=null)}return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},r),r.on("tapBackButton",function(e){s.call(this,e)}),n.resolve()},beforeopen:function(s,o){var u=this,a=e(document);a.trigger("spa:openloader"),i.geteservation({user_id:n.id},function(n){a.trigger("spa:closeloader");if(n.success){var i=[];n.data.length==0?showListBar=!1:showListBar=!0;var o={showNavBar:!r.isWX&&!r.isChubao,list:n.data,timeArrea:i,showListBar:showListBar},f=t("MyService/index",o);e(".spa-page-body",u).html(f),setTimeout(function(){s.scroll=new IScroll("#myServiceScroll")},500)}else a.trigger("spa:openpanel",["simpleAlert",{message:n.message}])}),o.resolve(),r.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"})})}}});

www/webapp/moonclub/dist/js/page/address/addressList.js

@@ -1 +1 @@
-define(["$","template","native","config","address","user","api","order"],function(e,t,n,r,i,s,o,u){function a(t,n){t.preventDefault(),e(document).trigger("spa:navigate",{hash:n})}var f={};return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e,t.pushData.backHash)},r),r.on("tapBackButton",function(e){a.call(this,e,t.pushData.backHash)}),r.on("swipeRight",function(e){a.call(this,e,t.pushData.backHash)}),e.newTouch(".address-item",function(n){var a=e(this).data("id"),f=e(this).data("index");o.checkAddress({address_id:a,user_id:s.id},function(n){n.success?(r.trigger("tapBackButton"),t.callback&&e.isFunction(t.callback.onSelect)&&t.callback.onSelect(i.list[f],n.data.station)):u.trigger("spa:openpanel",["simpleAlert",{message:n.message}])})},r),e.newTouch(".btn-add",function(e){console.log(f.callback),u.trigger("spa:navigate",{hash:"addressAdd",pushData:{needReload:!0},callback:f.callback})},r),e.newTouch(".btn-edit",function(t){var n=e(this),r=e(this).data("id"),i=e(this).data("index");u.trigger("spa:navigate",{hash:"addressDetail",pushData:{addressIndex:i,addressID:r,needReload:!0},callback:{onSelect:function(e){}}})},r),n.resolve()},beforeopen:function(n,o){var u=this,a=e(document),l=n.pushData;f.needReload=l.hasOwnProperty("needReload")?l.needReload:!1,f.callback=n.callback,i.getList({request_from:"weixin",user_id:s.id},function(n){if(n.success){var s=t("address/list/index",{showNavBar:!r.isWX&&!r.isChubao,addText:"添加地址",addresses:i.list});e(".spa-page-body",u).html(s),f.scroll&&(f.scroll.destroy(),f.scroll=null),setTimeout(function(){f.scroll=new IScroll("#addressListScroll")},10)}}),o.resolve()},afteropen:function(e,t){t.resolve()}}});
+define(["$","template","native","config","address","user","api","order"],function(e,t,n,r,i,s,o,u){function a(t,n){t.preventDefault(),e(document).trigger("spa:navigate",{hash:n})}var f={};return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e,t.pushData.backHash)},r),r.on("tapBackButton",function(e){a.call(this,e,t.pushData.backHash)}),r.on("swipeRight",function(e){a.call(this,e,t.pushData.backHash)}),e.newTouch(".address-item",function(n){var a=e(this).data("id"),f=e(this).data("index");o.checkAddress({address_id:a,user_id:s.id},function(n){n.success?(r.trigger("tapBackButton"),t.callback&&e.isFunction(t.callback.onSelect)&&t.callback.onSelect(i.list[f],n.data.station)):u.trigger("spa:openpanel",["simpleAlert",{message:n.message}])})},r),e.newTouch(".btn-add",function(e){u.trigger("spa:navigate",{hash:"addressAdd",pushData:{needReload:!0},callback:f.callback})},r),e.newTouch(".btn-edit",function(t){var n=e(this),r=e(this).data("id"),i=e(this).data("index");u.trigger("spa:navigate",{hash:"addressDetail",pushData:{addressIndex:i,addressID:r,needReload:!0},callback:{onSelect:function(e){}}})},r),n.resolve()},beforeopen:function(n,o){var u=this,a=e(document),l=n.pushData;f.needReload=l.hasOwnProperty("needReload")?l.needReload:!1,f.callback=n.callback,i.getList({request_from:"weixin",user_id:s.id},function(n){if(n.success){var s=t("address/list/index",{showNavBar:!r.isWX&&!r.isChubao,addText:"添加地址",addresses:i.list});e(".spa-page-body",u).html(s),f.scroll&&(f.scroll.destroy(),f.scroll=null),setTimeout(function(){f.scroll=new IScroll("#addressListScroll")},10)}}),o.resolve()},afteropen:function(e,t){t.resolve()}}});

www/webapp/moonclub/dist/js/page/modeifyStatus.js

@@ -1 +1 @@
-define(["$","template","native","config","user","api"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function l(t,n){e(".model-box").css("display","inline"),e(".model").css("bottom","0"),e(".model-title").html(t),e(".model-content").html(n);return}var u={},a=[],f={0:"未预约",1:"已预约",2:"已结束"};return{title:"雇员",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch("#submit",function(t){t.preventDefault();var n=parseInt(e(".user-auth").val());n===5?l("当前订单已经结束，不可修改状态","确定"):s.getModifyStatus({auth:u.auth,_id:a.id,status:n},function(e){e.success&&l("订单状态修改成功,请及时处理！","确定")})},r),e.newTouch(".model-content",function(t){var n=e(".model-title")[0].innerHTML;e(".model").css("bottom",""),e(".model-box").css("display","none"),i.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}})},r),n.resolve()},beforeopen:function(n,r){var i=this,s=e(document);u=n.pushData.authArr,a=n.pushData.listArr,console.log(a);var o={index:"",title:""};parseInt(a.status)===2?(o.index=5,o.title="暂无可选状态"):(o.index=parseInt(a.status)+1,o.title=f[parseInt(a.status)+1]),console.log(o),s.trigger("spa:openloader");if(s){s.trigger("spa:closeloader");var l=t("employe/modeifyStatus",{authArr:u,listArr:a,status:o});e(".spa-page-body",i).html(l)}r.resolve()},afteropen:function(e,t){t.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","native","config","user","api"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function l(t,n){e(".model-box").css("display","inline"),e(".model").css("bottom","0"),e(".model-title").html(t),e(".model-content").html(n);return}var u={},a=[],f=[];return{title:"雇员",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch("#submit",function(t){t.preventDefault();var n=parseInt(e(".user-auth").val());n===5?l("当前订单已经结束，不可修改状态","确定"):s.getModifyStatus({auth:u.auth,_id:a.id,status:n},function(e){e.success&&l("订单状态修改成功,请及时处理！","确定")})},r),e.newTouch(".model-content",function(t){var n=e(".model-title")[0].innerHTML;e(".model").css("bottom",""),e(".model-box").css("display","none"),i.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}})},r),n.resolve()},beforeopen:function(n,r){var i=this,o=e(document);u=n.pushData.authArr,a=n.pushData.listArr;var l={index:"",title:""};parseInt(a.status)===2?(l.index=5,l.title="暂无可选状态"):s.getServiceStatus({auth:u.auth},function(n){if(n.success){f=n.data,l.index=parseInt(a.status)+1,l.title=f[parseInt(a.status)+1],o.trigger("spa:openloader");if(o){o.trigger("spa:closeloader");var s=t("employe/modeifyStatus",{authArr:u,listArr:a,status:l});e(".spa-page-body",i).html(s)}r.resolve()}})},afteropen:function(e,t){t.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/moonclub/dist/js/page/serviceList.js

@@ -1 +1 @@
-define(["$","template","native","config","user","api"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function f(t,n){e(".model-box").css("display","inline"),e(".model").css("bottom","0"),e(".model-title").html(t),e(".model-content").html(n);return}var u={},a=[];return{title:"雇员",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch(".btn-status-edit",function(t){t.preventDefault();var n=this,r=e(n).attr("data-index");console.log(u),i.trigger("spa:navigate",{hash:"modeify-status",pushData:{needReload:!0,authArr:u,listArr:a[r]}})},r),e.newTouch(".model-content",function(t){e(".model-title")[0].innerHTML==="成功了棒棒哒∪０∪"&&(location.href="http://common.yiguanjia.me/index.php?r=moonclub/web/index"),e(".model").css("bottom",""),e(".model-box").css("display","none")},r),n.resolve()},beforeopen:function(n,r){var o=this,f=e(document);s.GetAuthinfo({},function(e){u.data=e.data}),s.getQueryPersonalInfo({user_id:i.id},function(n){n.success?(u.auth=n.data.auth,s.getTechInfoByUserId({user_id:i.id},function(n){if(n.success){a=n.data;for(var r=0;r<a.length;r++)a[r].posts_time=e.timetrans(parseInt(a[r].posts_time)),a[r].end_time=e.timetrans(parseInt(a[r].end_time));var i=t("employe/serviceList",{authArr:u,order_info:a});e(".spa-page-body",o).html(i)}})):f.trigger("spa:navigate",{hash:"employe",pushData:{needReload:!0}})}),r.resolve()},afteropen:function(e,t){t.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","native","config","user","api"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function f(t,n){e(".model-box").css("display","inline"),e(".model").css("bottom","0"),e(".model-title").html(t),e(".model-content").html(n);return}var u={},a=[];return{title:"雇员",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch(".btn-status-edit",function(t){t.preventDefault();var n=this,r=e(n).attr("data-index");i.trigger("spa:navigate",{hash:"modeify-status",pushData:{needReload:!0,authArr:u,listArr:a[r]}})},r),e.newTouch(".model-content",function(t){e(".model-title")[0].innerHTML==="成功了棒棒哒∪０∪"&&(location.href="http://common.yiguanjia.me/index.php?r=moonclub/web/index"),e(".model").css("bottom",""),e(".model-box").css("display","none")},r),n.resolve()},beforeopen:function(n,r){var o=this,f=e(document);s.GetAuthinfo({},function(e){u.data=e.data}),s.getQueryPersonalInfo({user_id:i.id},function(n){n.success?(u.auth=n.data.auth,s.getTechInfoByUserId({user_id:i.id},function(n){if(n.success){a=n.data;for(var r=0;r<a.length;r++)a[r].posts_time=e.timetrans(parseInt(a[r].posts_time)),a[r].end_time=e.timetrans(parseInt(a[r].end_time));var i=t("employe/serviceList",{authArr:u,order_info:a});e(".spa-page-body",o).html(i)}})):f.trigger("spa:navigate",{hash:"employe",pushData:{needReload:!0}})}),r.resolve()},afteropen:function(e,t){t.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/moonclub/js/api.js

@@ -549,6 +549,28 @@ define(['config', 'base'], function (config, base) {
     });
   };
 
+  // 预约状态值 moonclub/employe/ServiceStatus
+  API.prototype.getServiceStatus = function (data, callback) {
+    var that = this;
+    $.signAjax({
+      url: config.apiPath + '/index.php?r=moonclub/employe/ServiceStatus',
+      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.getModifyStatus = function (data, callback) {
     var that = this;

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 = '597ed29d47a7b2aceba34eec'; //5870c935a84ea0417e8b456f  597ed29d47a7b2aceba34eec
+		this.id = '586e13cea84ea0bb4c8b4591'; //586e13cea84ea0bb4c8b4591  597ed29d47a7b2aceba34eec
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';

www/webapp/moonclub/js/page/MyService.js

@@ -4,117 +4,96 @@
  * Date: 2017/1/5
  * Time: 14:24
  */
-define(['$', 'template', 'user', 'config',  'api'], function ($, template, user, config, api) {
-	function back(event) {
-		event.preventDefault();
-		$(document).trigger('spa:navigate', {
-			hash: '',
-			pushData: {
-				dontNeedReload: true
-			}
-		});
-	}
+define(['$', 'template', 'user', 'config', 'api'], function ($, template, user, config, api) {
+  function back(event) {
+    event.preventDefault();
+    $(document).trigger('spa:navigate', {
+      hash: '',
+      pushData: {
+        dontNeedReload: true
+      }
+    });
+  }
 
-	function fixScroll(pageData) {
-		if (pageData.scroll) {
-			pageData.scroll.destroy();
-			pageData.scroll = null;
-		}
+  function fixScroll(pageData) {
+    if (pageData.scroll) {
+      pageData.scroll.destroy();
+      pageData.scroll = null;
+    }
 
-		// setTimeout(function () {
-		// 	pageData.scroll = new IScroll('#myCouponScroll');
-		// }, 50);
-	}
+    // setTimeout(function () {
+    // 	pageData.scroll = new IScroll('#myCouponScroll');
+    // }, 50);
+  }
 
-	return {
-		title: '壹管家上门服务',
-		body: '',
-		init: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
+  return {
+    title: '壹管家上门服务',
+    body: '',
+    init: function (pageData, dtd) {
+      var $view = this;
+      var $doc = $(document);
 
-			// 返回
-			$view.on('swipeRight', function (event) {
-				back.call(this, event);
-			});
+      // 返回
+      $view.on('swipeRight', function (event) {
+        back.call(this, event);
+      });
 
-			$.newTouch('.back-button', function (event) {
-				back.call(this, event);
-			}, $view);
+      $.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) {
-			var $view = this;
-			var $doc = $(document);
-			$doc.trigger('spa:openloader');
-			api.geteservation({user_id: user.id}, function (res) {
-				console.log(res);
-			});
-			api.geteservation({user_id: user.id}, function (res) {
-				$doc.trigger('spa:closeloader');
-				if (res.success) {
-					/*function getLocalTime(nS) {
-					 return new Date(parseInt(nS) * 1000).toLocaleString().replace(/年|月/g, "-").replace(/日/g, " ");
-					 }*/
-					// console.log(getLocalTime(res.data[0].time));
-					var timeArrea = [];
-					/*for(var i=0;i<res.data.length;i++){
-					 res.data[i].time=getLocalTime(res.data[i].time);
-					 if(res.data[i].num==""){
-					 res.data[i].num="暂无预产期"
-					 }
-					 }*/
-					if (res.data.length==0) {
-						console.log("if");
-						showListBar=false;
-					} else {
-						showListBar=true;
-					}
+      $view.on('tapBackButton', function (event) {
+        back.call(this, event);
+      });
+      dtd.resolve();
+    },
+    beforeopen: function (pageData, dtd) {
+      var $view = this;
+      var $doc = $(document);
+      $doc.trigger('spa:openloader');
+      api.geteservation({user_id: user.id}, function (res) {
+        $doc.trigger('spa:closeloader');
+        if (res.success) {
+          var timeArrea = [];
+          if (res.data.length == 0) {
+            showListBar = false;
+          } else {
+            showListBar = true;
+          }
+          var tmpData = {
+            showNavBar: !config.isWX && !config.isChubao,
+            list: res.data,
+            timeArrea: timeArrea,
+            showListBar: showListBar
+          };
+          var tpl = template('MyService/index', tmpData);
+          $('.spa-page-body', $view).html(tpl);
+          setTimeout(function () {
+            pageData.scroll = new IScroll('#myServiceScroll');
+          }, 500);
+        } else {
+          $doc.trigger('spa:openpanel', ['simpleAlert', {
+            message: res.message
+          }]);
+        }
+      });
 
-					console.log(showListBar);
-					/*if(res.data){
-					 console.log("if");
-					 }else {
-					 console.log("else");
-					 }*/
-					var tmpData = {
-						showNavBar: !config.isWX && !config.isChubao,
-						list: res.data,
-						timeArrea: timeArrea,
-						showListBar:showListBar
-					};
-					var tpl = template('MyService/index', tmpData);
-					$('.spa-page-body', $view).html(tpl);
-					setTimeout(function () {
-						pageData.scroll = new IScroll('#myServiceScroll');
-					}, 500);
-				} else {
-					$doc.trigger('spa:openpanel', ['simpleAlert', {
-						message: res.message
-					}]);
-				}
-			});
-
-			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'
-					});
-				});
-			}
-		}
-	}
+      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'
+          });
+        });
+      }
+    }
+  }
 })

www/webapp/moonclub/js/page/Registered.js

@@ -184,7 +184,6 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
             model(res.message, '');
             return;
           }
-          console.log(res);
         });
       }
     }, $view);

www/webapp/moonclub/js/page/address/addressList.js

@@ -51,7 +51,6 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
 
 			// 新增地址
 			$.newTouch('.btn-add', function (event) {
-				console.log(cachePageData.callback);
 				$doc.trigger('spa:navigate', {
 					hash: 'addressAdd',
 					pushData: {

www/webapp/moonclub/js/page/employe.js

@@ -94,7 +94,6 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
         }
         // 地址
         var userAddress = $(".user-address").val();
-        console.log('地址:' + userAddress);
         if (userAddress === '') {
           model('请输入地址!', '确定');
           return;
@@ -166,8 +165,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
           auth: auth,
           desc: desc
         }, function (res) {
-          console.log(res)
-          if (res.success) {
+          if (res.message === "保存成功") {
             model('提交成功!', '确定')
           } else {
             model(res.message, '确定')

www/webapp/moonclub/js/page/modeifyStatus.js

@@ -12,11 +12,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
   var authArr = {}
   var listArr = []
-  var statusArr = {
-    0: '未预约',
-    1: '已预约',
-    2: '已结束'
-  }
+  var statusArr = []
 
   // 调用模态框
   function model(title, content) {
@@ -59,7 +55,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
             status: auth
           }, function (res) {
             if (res.success) {
-              model('订单状态修改成功,请及时处理！','确定')
+              model('订单状态修改成功,请及时处理！', '确定')
             }
           })
         }
@@ -84,7 +80,6 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
       var $doc = $(document);
       authArr = pageData.pushData.authArr
       listArr = pageData.pushData.listArr
-      console.log(listArr);
       var status = {
         index: '',
         title: ''
@@ -93,21 +88,28 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
         status.index = 5
         status.title = '暂无可选状态'
       } else {
-        status.index = parseInt(listArr.status) + 1
-        status.title = statusArr[parseInt(listArr.status) + 1]
-      }
-      console.log(status)
-      $doc.trigger('spa:openloader');
-      if ($doc) {
-        $doc.trigger('spa:closeloader');
-        var tpl = template('employe/modeifyStatus', {
-          authArr: authArr,
-          listArr: listArr,
-          status: status
-        });
-        $('.spa-page-body', $view).html(tpl);
+        // 获取状态值
+        api.getServiceStatus({
+          auth: authArr.auth
+        }, function (res) {
+          if (res.success) {
+            statusArr = res.data
+            status.index = parseInt(listArr.status) + 1
+            status.title = statusArr[parseInt(listArr.status) + 1]
+            $doc.trigger('spa:openloader');
+            if ($doc) {
+              $doc.trigger('spa:closeloader');
+              var tpl = template('employe/modeifyStatus', {
+                authArr: authArr,
+                listArr: listArr,
+                status: status
+              });
+              $('.spa-page-body', $view).html(tpl);
+            }
+            dtd.resolve();
+          }
+        })
       }
-      dtd.resolve();
     },
     afteropen: function (pageData, dtd) {
       dtd.resolve();

www/webapp/moonclub/js/page/serviceList.js

@@ -45,7 +45,6 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
         event.preventDefault();
         var that = this;
         var index = $(that).attr('data-index')
-        console.log(authArr)
         $doc.trigger('spa:navigate', {
           hash: 'modeify-status',
           pushData: {

www/webapp/moonclub/js/page/userInfo.js

@@ -15,7 +15,6 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
     });
   }
 
-  
 
   // mo tai kuang
   function model(title, content) {
@@ -63,145 +62,142 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
       }, $view);
       // 获取短信验证码
       $.newTouch('.createCode', function (event) {
+          event.preventDefault();
+          var mobile = $(".user-mobile").val();
+          var createCode1 = $('.createCode');
+          var inputCode = $(".input").val(); //取得输入的验证码并转化为大写
+          var s = 60, t;
+          if (viewShow === false) {
+            model('该操作过于频繁，请您60秒后，重新尝试！', '确定');
+            return;
+          } else if (!(/^1[34578]\d{9}$/.test(mobile)) || mobile == 0) {
+            model('请重新输入您的手机号码', '确定');
+            return;
+          } else if (inputCode.length <= 0) { //若输入的验证码长度为0
+            model('您输入的验证码有误，请重新输入!', '确定');
+            return;
+          } else if (inputCode.toUpperCase() != code) { //若输入的验证码与产生的验证码不一致时
+            //则弹出验证码输入错误
+            $('#checkCode').val($.createCode()); //刷新验证码
+            model('您输入的验证码有误，请重新输入!', '确定');
+            return;
+          } else if (viewShow) {
+            // 计算60秒插件
+            t = setInterval(function () {
+              viewShow = false
+              createCode1.val(s--);
+              if (s < 0) {
+                s = 60;
+                viewShow = true
+                createCode1.val("获取验证码");
+                $('#checkCode').val($.createCode()); //刷新验证码
+                clearTimeout(t);
+              }
+            }, 1000);
+            $('#checkCode').val($.createCode()); //刷新验证码
+            api.getCode({
+              mobile: mobile
+            }, function (res) {
+              if (res.success) {
+                smsCode = res.data.code
+                model('验证码已发送至您的手机，请注意查收!', '确定');
+                return;
+              } else {
+                model('该操作过于频繁，请您60秒后，重新尝试！', '确定');
+              }
+            })
+          }
+        }, $view
+      )
+
+      $.newTouch('.checkCodeBtn', function (event) {
         event.preventDefault();
+        $('.code').val($.createCode())
+      }, $view)
+
+      // 咨询
+      $.newTouch('#submit', function (event) {
+        // event.preventDefault();
+        $('.user-name', $view).blur();
+        $('.user-mobile', $view).blur();
+        $('.input', $view).blur();
+        $('.smsCode', $view).blur();
+        var name = $(".user-name").val();
         var mobile = $(".user-mobile").val();
-        var createCode1 = $('.createCode');
-        var inputCode = $(".input").val(); //取得输入的验证码并转化为大写
-        var s = 60, t;
-        if (viewShow === false) {
-          model('该操作过于频繁，请您60秒后，重新尝试！', '确定');
+        var num = $(".user-num").val();
+        var smsCodeInput = $(".smsCode").val();
+        smsCodeInput = parseInt(smsCodeInput)
+        if (name == null || name == undefined || name == '') {
+          model('请重新输入您的姓名!', '确定');
           return;
-        } else if (!(/^1[34578]\d{9}$/.test(mobile)) || mobile == 0) {
-          model('请重新输入您的手机号码', '确定');
+        } else if (num === undefined) {
+          model('请重新选择您的预产期!', '确定');
           return;
-        } else if (inputCode.length <= 0) { //若输入的验证码长度为0
-          model('您输入的验证码有误，请重新输入!', '确定');
+        } else if (!(/^1[34578]\d{9}$/.test(mobile)) || mobile == 0) {
+          model('请重新输入您的手机号码！', '确定');
           return;
-        } else if (inputCode.toUpperCase() != code) { //若输入的验证码与产生的验证码不一致时
-          //则弹出验证码输入错误
-          $('#checkCode').val($.createCode()); //刷新验证码
-          model('您输入的验证码有误，请重新输入!', '确定');
+        } else if (smsCode !== smsCodeInput) { // 判断验证码
+          model('请重新填写您的短信验证码！', '确定');
           return;
-        } else if (viewShow) {
-          // 计算60秒插件
-          t = setInterval(function () {
-            viewShow = false
-            createCode1.val(s--);
-            if (s < 0) {
-              s = 60;
-              viewShow = true
-              createCode1.val("获取验证码");
-              $('#checkCode').val($.createCode()); //刷新验证码
-              clearTimeout(t);
-            }
-          }, 1000);
-          $('#checkCode').val($.createCode()); //刷新验证码
-          api.getCode({
-            mobile: mobile
+        } else {
+          api.getReserveMonth({
+            user_id: user.id,
+            user_name: name,
+            homeType: 1,
+            num: num,
+            mobile: mobile,
           }, function (res) {
             if (res.success) {
-              smsCode = res.data.code
-              model('验证码已发送至您的手机，请注意查收!', '确定');
+              model(res.message, '确定');
               return;
             } else {
-              model('该操作过于频繁，请您60秒后，重新尝试！', '确定');
+              model(res.message, '确定');
+              return;
             }
-          })
+          });
         }
-      }, $view
-    )
-
-    $.newTouch('.checkCodeBtn', function (event) {
-      event.preventDefault();
-      $('.code').val($.createCode())
-    }, $view)
-
-    // 咨询
-    $.newTouch('#submit', function (event) {
-      // event.preventDefault();
-      $('.user-name', $view).blur();
-      $('.user-mobile', $view).blur();
-      $('.input', $view).blur();
-      $('.smsCode', $view).blur();
-      var name = $(".user-name").val();
-      var mobile = $(".user-mobile").val();
-      var num = $(".user-num").val();
-      var smsCodeInput = $(".smsCode").val();
-      smsCodeInput = parseInt(smsCodeInput)
-      // console.log(smsCode)
-      if (name == null || name == undefined || name == '') {
-        model('请重新输入您的姓名!', '确定');
-        return;
-      } else if (num === undefined) {
-        model('请重新选择您的预产期!', '确定');
-        return;
-      } else if (!(/^1[34578]\d{9}$/.test(mobile)) || mobile == 0) {
-        model('请重新输入您的手机号码！', '确定');
-        return;
-      } else if (smsCode !== smsCodeInput) { // 判断验证码
-        model('请重新填写您的短信验证码！', '确定');
-        return;
-      } else {
-        api.getReserveMonth({
-          user_id: user.id,
-          user_name: name,
-          homeType: 1,
-          num: num,
-          mobile: mobile,
-        }, function (res) {
-          if (res.success) {
-            model(res.message, '确定');
-            return;
-          } else {
-            model(res.message, '确定');
-            return;
-          }
-          // console.log(res);
-        });
-      }
-    }, $view);
-    // 模态框
-    $.newTouch('.model-content', function (event) {
-      // event.preventDefault();
-      if ($('.model-title')[0].innerHTML === '提交成功') {
-        location.href="http://common.yiguanjia.me/index.php?r=moonclub/web/index";
+      }, $view);
+      // 模态框
+      $.newTouch('.model-content', function (event) {
+        // event.preventDefault();
+        if ($('.model-title')[0].innerHTML === '提交成功') {
+          location.href = "http://common.yiguanjia.me/index.php?r=moonclub/web/index";
+        }
+        $('.model').css('height', '0');
+        $('.model-box').css('display', 'none');
+      }, $view)
+      dtd.resolve();
+    },
+    beforeopen: function (pageData, dtd) {
+      var $view = this;
+      var $doc = $(document);
+      $doc.trigger('spa:openloader');
+      if ($doc) {
+        $doc.trigger('spa:closeloader');
+        var tpl = template('userInfo/index');
+        $('.spa-page-body', $view).html(tpl);
+        $('#checkCode').val($.createCode())
+        setTimeout(function () {
+          pageData.scroll = new IScroll('#userInfoScroll');
+          var calendar = new LCalendar();
+          calendar.init({
+            'trigger': '#demo1', //标签id
+            'type': 'date', //date 调出日期选择 datetime 调出日期时间选择 time 调出时间选择 ym 调出年月选择,
+            'minDate': '1900-1-1', //最小日期
+            'maxDate': (new Date().getFullYear() + 10) + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() //最大日期
+          });
+        }, 700);
       }
-      $('.model').css('height', '0');
-      $('.model-box').css('display', 'none');
-    }, $view)
-    dtd.resolve();
-  },
-  beforeopen: function (pageData, dtd) {
-    var $view = this;
-    console.log(user.id)
-    var $doc = $(document);
-    $doc.trigger('spa:openloader');
-    if ($doc) {
-      $doc.trigger('spa:closeloader');
-      var tpl = template('userInfo/index');
-      $('.spa-page-body', $view).html(tpl);
-      $('#checkCode').val($.createCode())
-      setTimeout(function () {
-        pageData.scroll = new IScroll('#userInfoScroll');
-        var calendar = new LCalendar();
-        calendar.init({
-          'trigger': '#demo1', //标签id
-          'type': 'date', //date 调出日期选择 datetime 调出日期时间选择 time 调出时间选择 ym 调出年月选择,
-          'minDate': '1900-1-1', //最小日期
-          'maxDate': (new Date().getFullYear() + 10) + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() //最大日期
-        });
-      }, 700);
+      dtd.resolve();
+    }
+    ,
+    afteropen: function (pageData, dtd) {
+      dtd.resolve();
+    }
+    ,
+    beforeclose: function (pageData, dtd) {
+      dtd.resolve();
     }
-    dtd.resolve();
-  }
-  ,
-  afteropen: function (pageData, dtd) {
-    dtd.resolve();
-  }
-  ,
-  beforeclose: function (pageData, dtd) {
-    dtd.resolve();
   }
-}
 })
 ;

www/webapp/moonclub/tpl/employe/index.html

@@ -31,7 +31,7 @@
       <!-- 身份证号 -->
       <div class="form-group">
         <label>身份证:</label>
-        <input type="text"class="form-control card-id" placeholder="请输入您的身份证"/>
+        <input type="text" class="form-control card-id" placeholder="请输入您的身份证"/>
       </div>
       <!-- 地址 -->
       <div class="form-group">
@@ -42,13 +42,13 @@
       <div class="form-group">
         <label>手机号码:</label>
         <input type="text" name="mobile" class="form-control user-mobile"
-        placeholder="请输入您的手机号码"/>
+               placeholder="请输入您的手机号码"/>
       </div>
       <!-- 所属机构 -->
       <div class="form-group">
         <label>所属机构:</label>
         <input type="text" name="mobile" class="form-control user-mechanism"
-        placeholder="例如: 上海社会服务有限公司"/>
+               placeholder="例如: 上海社会服务有限公司"/>
       </div>
       <!-- 学历 -->
       <div class="form-group">
@@ -59,25 +59,25 @@
       <div class="form-group">
         <label>证书:</label>
         <input type="text" name="mobile" class="form-control user-certificate"
-        placeholder="例如: 暂无"/>
+               placeholder="例如: 暂无"/>
       </div>
       <!-- 工种 -->
       <div class="form-group">
         <label>工种:</label>
         <input type="text" name="mobile" class="form-control type-of-work"
-        placeholder="例如: 暂无"/>
+               placeholder="例如: 暂无"/>
       </div>
       <!-- 技能 -->
       <div class="form-group">
         <label>技能:</label>
         <input type="text" name="mobile" class="form-control user-skill"
-        placeholder="例如: 暂无"/>
+               placeholder="例如: 暂无"/>
       </div>
       <!-- 工作年限 -->
       <div class="form-group">
         <label>工作年限:</label>
         <input type="text" name="mobile" class="form-control user-work-year"
-        placeholder="例如: 3年"/>
+               placeholder="例如: 3年"/>
       </div>
       <!-- 角色 -->
       <div class="form-group">
@@ -95,9 +95,24 @@
         <textarea class="form-control user-desc" rows="3"></textarea>
       </div>
       <!-- 提交 -->
-      <div id="submit" class="btn-user-info btn btn-success col-xs-12" style="background: #2f004e;color:rgb(255,255,255);border: 0;padding: 4px 0;font-size: 22px;width: 100%;display: block;text-align: center;margin-bottom: 15px;" data-container="body" data-toggle="popover" data-placement="top" data-content=""> 提交 </div>
+      <div id="submit" class="btn-user-info btn btn-success col-xs-12"
+           style="background: #2f004e;color:rgb(255,255,255);border: 0;padding: 4px 0;font-size: 22px;width: 100%;display: block;text-align: center;margin-bottom: 15px;"
+           data-container="body" data-toggle="popover" data-placement="top" data-content=""> 提交
+      </div>
     </div>
   </div>
 </div>
 
+<!--模态框-->
+<div class="model" style="width: 100%;position: fixed;top: 0;left:0;background: rgba(0,0,0,0.4)">
+  <!--错误提示容器-->
+  <div class="model-box"
+       style="border-radius: 10px;min-height: 80px;display:none;width: 70%;background: #fff;margin: 0 auto;top:30%;left:15%;position: fixed;">
+    <div class="model-title"
+         style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';width: 100%;text-align: center;font-size: 1.1rem;margin-top: 5%;"></div>
+    <div class="model-content"
+         style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';margin: 0 auto;width: 80%;background: #2f004e;color:rgb(255, 255, 255);margin-bottom: 15px;font-size: 1.3rem;margin-top: 15px;text-align: center;padding: 5px 0 5px 0"></div>
+  </div>
+</div>
+