diff --git a/app-wx/config/params.php b/app-wx/config/params.php
index e2c6efe..4e1ee64 100644
--- a/app-wx/config/params.php
+++ b/app-wx/config/params.php
@@ -2,5 +2,5 @@
return [
'adminEmail' => 'admin@example.com',
'testLoginPhones' => ['13900139001'],
- 'VERSION' => 'v0.1.0 build 15', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数
+ 'VERSION' => 'v0.1.0 build 16', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数
];
diff --git a/app-wx/controllers/BaseController.php b/app-wx/controllers/BaseController.php
index cc26b6a..ab454cf 100644
--- a/app-wx/controllers/BaseController.php
+++ b/app-wx/controllers/BaseController.php
@@ -63,7 +63,7 @@ class BaseController extends AppController
private function getWxArray()
{
$wxArray = [
- 'name' => '汽车维修店系统',
+ 'name' => '',
'intro' => '汽车维修店系统',
'logo_path' => '',
'subscribe_title' => '汽车维修店系统',
diff --git a/app-wx/modules/order/controllers/DefaultController.php b/app-wx/modules/order/controllers/DefaultController.php
index 1ec03ea..8444dac 100644
--- a/app-wx/modules/order/controllers/DefaultController.php
+++ b/app-wx/modules/order/controllers/DefaultController.php
@@ -152,12 +152,11 @@ class DefaultController extends BaseController
/*
您好，${maintainer}已对您的车维修完成，点击http://gkauto.jiwork.com/site/t?o=${code}可以给本次服务评分。如有意见请拨打投诉热线:${tel}
* */
-
$smsVars = ['maintainer' => '', 'code' => '', 'tel' => ''];
$smsVars['tel'] = Yii::$app->params['SERVICE_PHONE'];
$smsVars['maintainer'] = $orderModel->maintainer_name;
- $smsVars['code'] = $orderModel->short_uuid;
+ $smsVars['code'] = $orderModel->short_uuid." "; //防止后面的文字和这个参数粘贴在一起
$phone = $orderModel->contact_mobile;
$sms = new SmsMessage();
return $sms->sendFinishInfo($phone, $smsVars);
diff --git a/app-wx/modules/user/views/default/index.php b/app-wx/modules/user/views/default/index.php
index 9eb9661..45550e4 100644
--- a/app-wx/modules/user/views/default/index.php
+++ b/app-wx/modules/user/views/default/index.php
@@ -28,7 +28,9 @@ if ($isGuest) {
render('pages/index-template', ['asset' => $asset])?>
render('pages/register-template', ['asset' => $asset])?>
render('pages/login-template', ['asset' => $asset])?>
-
+render('pages/about-template', ['asset' => $asset])?>
+render('pages/agreement-template', ['asset' => $asset])?>
+render('pages/regulation-template', ['asset' => $asset])?>
diff --git a/app-wx/modules/user/views/default/pages/agreement-template.php b/app-wx/modules/user/views/default/pages/agreement-template.php
new file mode 100644
index 0000000..a90e69d
--- /dev/null
+++ b/app-wx/modules/user/views/default/pages/agreement-template.php
@@ -0,0 +1,80 @@
+
+
+
+
\ No newline at end of file
diff --git a/app-wx/modules/user/views/default/pages/register-template.php b/app-wx/modules/user/views/default/pages/register-template.php
index 2b3addf..c4d3933 100644
--- a/app-wx/modules/user/views/default/pages/register-template.php
+++ b/app-wx/modules/user/views/default/pages/register-template.php
@@ -47,13 +47,8 @@ $baseUrl = Url::base(true);
#register .agreement-cls:visited{color:#FF8728;font-size:0.8rem;}
#register #agreement-wrapper{position: absolute;top: 0;bottom: 0;width: 100%;z-index: 2;padding:3rem 1rem;box-sizing: border-box;background: rgba(0,0,0,0.3);}
- #register #agreement-wrapper .agreement-wrapper-inner{width:100%;background: #fff;height:100%;position: relative}
- #register #agreement-wrapper .paragraph-cls{width:100%;padding:0.5rem 1rem;box-sizing: border-box;margin:0.25rem 0 ;}
-
- #register #agreement-wrapper .agree-btn{position: absolute;bottom:0;right:0;width:100%;color:#FF8728;background: #fff;padding:0.8rem 0.5rem;box-sizing: border-box;text-align: center}
-
- #register #agreement-wrapper h2{font-size: 0.9rem;font-weight: bol;color:#000}
- #register #agreement-wrapper p{line-height: 1.5rem;padding:0;margin: 0;color:#000}
+ #register #agreement-wrapper .agreement-list-div{width:100%;height:calc(100% - 50px);overflow-y: scroll}
+ #register #agreement-wrapper .agree-btn{display:block}
-
\ No newline at end of file
diff --git a/app-wx/modules/user/views/default/pages/regulation-template.php b/app-wx/modules/user/views/default/pages/regulation-template.php
new file mode 100644
index 0000000..9fe466b
--- /dev/null
+++ b/app-wx/modules/user/views/default/pages/regulation-template.php
@@ -0,0 +1,22 @@
+
+
+
diff --git a/app-wx/modules/user/views/default/pages/toolbar-template.php b/app-wx/modules/user/views/default/pages/toolbar-template.php
new file mode 100644
index 0000000..6baefe5
--- /dev/null
+++ b/app-wx/modules/user/views/default/pages/toolbar-template.php
@@ -0,0 +1,21 @@
+
+
+
diff --git a/web/dist/js/user-app.js b/web/dist/js/user-app.js
index c5fa925..7d8b4e5 100644
--- a/web/dist/js/user-app.js
+++ b/web/dist/js/user-app.js
@@ -1 +1 @@
-define("user-app",["mk7/app"],function(e){var t=Dom7,n=function(){var e=t(".ui-loading-block");0==e.length&&(t(".view-main").html(''),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var e=document.getElementById("loader-inner"),t=document.createElement("p");t.className="notice",e&&(t.innerHTML='加载速度太慢？试试重新加载',e.appendChild(t))},window.waitingTime))},r=!0;return e.name="user",e.routes={index:function(){return r=!1,n(),e.runController("index")},register:function(){return r=!1,n(),e.runController("register")},login:function(){return r=!1,n(),e.runController("login")},"*":function(){return e.runController("index")}},e}),define("user/index-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var e=(Dom7,Template7,new e);return e.run=function(){var e=this;e.setPageTitle("首页"),e.hideAllNonBaseMenuItem(window.$site),e.render()},e.bindEvents=function(){console.log("bindEvents")},e}),define("user/login-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var r=Dom7,e=(Template7,new e),o="/user/login/get-code",i="/user/login/login",c=!0,s=!0,a=null;return e.run=function(){var e=this;e.setPageTitle("登录"),e.codeDuration=60,!isGuest,e.render();const t=new Promise(function(e,t){setTimeout(function(){e("foo")},300)});t.then(function(e){console.log(e)}),console.log(t)},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.getCodeEvent(),e.gotoRegisterEvent(),e.loginEvent()},e.getCodeEvent=function(){var e=this;r("#login .get-code-cls").click(function(){var i=n.trim(r("#login .mobile").val());if(""==i)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(i))return n.toast({content:"手机号码不合格"}),!1;if(0==c)return!1;clearInterval(a),c=!1;var s=e.csrf({action:"login",mobile:i});n.httpGet(t.to(o),s,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),c=!0,!1;n.toast({content:t.message}),t.testCode&&r("#login .code").val(t.testCode);var o=t.codeDuration;e.codeDuration=o,a=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(r("#login .get-code-cls").html("获取验证码"),clearInterval(a),e.codeDuration=o,c=!0):r("#login .get-code-cls").html(''+e.codeDuration+"s后重新获取")},1e3)})})},e.loginEvent=function(){var e=this;r("#login .login-btn").click(function(o){var c=n.trim(r("#login .mobile").val()),a=n.trim(r("#login .code").val());if(""==c)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(c))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(0==s)return!1;s=!1;var l=e.csrf({mobile:c,code:a});n.httpPost(t.to(i),l,function(e){return s=!0,e.success?void(window.location.href=t.to("order/#index")):(n.toast({content:e.message,closeDelay:3e3}),!1)})})},e.gotoRegisterEvent=function(){r("#login .register-btn").click(function(e){window.location.href=t.to("user/#register")})},e}),define("user/register-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(e,t,n,r){var o=Dom7,i=Template7,e=new e,c="/user/login/register",s="/user/default/upload-file",a="/user/login/get-code",l=!0,u=!0,d=null,g=!1;return e.run=function(){var e=this;e.setPageTitle("注册"),e.codeDuration=60,!isGuest,e.render()},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.uploadEvent(),e.getCodeEvent(),e.registerEvent(),e.gotoLoginEvent(),e.checkAgreement()},e.uploadEvent=function(){o("#register .upload-input-cls").change(function(e){if(""!=o(this).val()&&null!=o(this).val()){var i=e.target,c=(i.files[0],o(this).attr("id")),a=o(this).parent();r.uploadFile({selector:"#"+c,url:t.to(s),processAppendTo:"#register",success:function(e,t){try{if(e.success){var r=e.tmpUrl;a.css("background-image","url("+e.tmpMinUrl+")"),a.attr("data",e.tmpFile),a.attr("data-url",r)}else n.toast({content:e.message,closeDelay:5e3})}catch(o){n.toast({content:"出错",closeDelay:5e3})}}})}})},e.getCodeEvent=function(){var e=this;o("#register .get-code-cls").click(function(){var r=n.trim(o("#register .mobile").val());if(""==r)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(r))return n.toast({content:"手机号码不合格"}),!1;if(0==l)return!1;clearInterval(d),l=!1;var i=e.csrf({action:"register",mobile:r});n.httpGet(t.to(a),i,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),l=!0,!1;n.toast({content:t.message}),t.testCode&&o("#register .code").val(t.testCode);var r=t.codeDuration;e.codeDuration=r,d=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(o("#register .get-code-cls").html("获取验证码"),clearInterval(d),e.codeDuration=r,l=!0):o("#register .get-code-cls").html(''+e.codeDuration+"s后重新获取")},1e3)})})},e.registerEvent=function(){var e=this;o("#register .register-btn").click(function(r){var i=n.trim(o("#register .name").val()),s=n.trim(o("#register .mobile").val()),a=n.trim(o("#register .code").val()),l=n.trim(o("#register .emergency_contact").val()),d=n.trim(o("#register .emergency_person").val()),g=n.trim(o("#register .address").val());if(""==i)return n.toast({content:"车厂名称必填"}),!1;if(""==s)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(s))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(""==d)return n.toast({content:"紧急联系人必填"}),!1;if(""==l)return n.toast({content:"紧急联系电话必填"}),!1;if(!n.isMobile(l)&&!n.isTelephone(l))return n.toast({content:"紧急联系电话不合格"}),!1;if(l==s)return n.toast({content:"紧急联系电话不能和注册手机一样"}),!1;if(""==g)return n.toast({content:"维修厂地址必填"}),!1;var v=o("#register .licensePic").attr("data");if(void 0===v||null==v)return n.toast({content:"请上传营业执照"}),!1;var m=o("#register .headPic").attr("data");if(void 0===m||null==m)return n.toast({content:"请上传维修厂门头照"}),!1;var f=o("#register .techChargePic").attr("data");if(void 0===f||null==f)return n.toast({content:"请上传维修技术负责人证书"}),!1;var h=o("#register .QAChargePic").attr("data");if(void 0===h||null==h)return n.toast({content:"请上传质检负责人证书"}),!1;if(!o("#register .check-agreement").hasClass("checked-active"))return n.toast({content:"请阅读同意《平台车管家服务条款》"}),!1;if(0==u)return!1;u=!1;var p=e.csrf({name:i,mobile:s,code:a,emergencyContact:l,emergencyPerson:d,address:g,licensePic:v,headPic:m,techChargePic:f,QAChargePic:h});n.httpPost(t.to(c),p,function(e){if(!e.success)return n.toast({content:e.message,closeDelay:3e3}),u=!0,!1;var r=3e3;n.toast({content:e.message,closeDelay:r}),setTimeout(function(){window.location.href=t.to("order/#index")},r)})})},e.gotoLoginEvent=function(){o("#register .login-btn").click(function(e){window.location.href=t.to("user/#login")})},e.checkAgreement=function(){var e=this;o("#register .check-agreement").click(function(t){return 0==g?(e.showAgreement(),!1):void(o(this).hasClass("checked-active")?o(this).removeClass("checked-active"):o(this).addClass("checked-active"))}),o("#register .agreement-cls").click(function(t){e.showAgreement()}),o("#register").on("click",".agree-btn",function(e){o("#agreement-wrapper").remove(),g=!0;var t=o("#register .check-agreement");t.hasClass("checked-active")||t.addClass("checked-active")})},e.showAgreement=function(){o("#agreement-wrapper").remove();var e=o("#register"),t=o("script#agreement-template"),n=i.compile(t.html()),r=n({});e.append(r)},e});
\ No newline at end of file
+define("user/about-controller",["mk7/controller"],function(e){var e=(Dom7,Template7,new e);return e.run=function(){var e=this;e.setPageTitle("关于我们"),e.loadPage()},e.bindEvents=function(){console.log("bindEvents")},e.loadPage=function(){var e=this;e.render()},e}),define("user-app",["mk7/app"],function(e){var t=Dom7,n=function(){var e=t(".ui-loading-block");0==e.length&&(t(".view-main").html(''),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var e=document.getElementById("loader-inner"),t=document.createElement("p");t.className="notice",e&&(t.innerHTML='加载速度太慢？试试重新加载',e.appendChild(t))},window.waitingTime))},r=!0;return e.name="user",e.routes={index:function(){return r=!1,n(),e.runController("index")},register:function(){return r=!1,n(),e.runController("register")},login:function(){return r=!1,n(),e.runController("login")},about:function(){return r=!1,n(),e.runController("about")},regulation:function(){return r=!1,n(),e.runController("regulation")},"*":function(){return e.runController("index")}},e}),define("user/index-controller",["mk7/controller","mk7/url"],function(e,t){var e=(Dom7,Template7,new e);return e.run=function(){var e=this;e.setPageTitle("首页"),window.location.replace(t.to("user#about"))},e.bindEvents=function(){console.log("bindEvents")},e}),define("user/login-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var r=Dom7,e=(Template7,new e),o="/user/login/get-code",i="/user/login/login",a=!0,c=!0,s=null;return e.run=function(){var e=this;e.setPageTitle("登录"),e.codeDuration=60,!isGuest,e.render()},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.getCodeEvent(),e.gotoRegisterEvent(),e.loginEvent()},e.getCodeEvent=function(){var e=this;r("#login .get-code-cls").click(function(){var i=n.trim(r("#login .mobile").val());if(""==i)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(i))return n.toast({content:"手机号码不合格"}),!1;if(0==a)return!1;clearInterval(s),a=!1;var c=e.csrf({action:"login",mobile:i});n.httpGet(t.to(o),c,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),a=!0,!1;n.toast({content:t.message}),t.testCode&&r("#login .code").val(t.testCode);var o=t.codeDuration;e.codeDuration=o,s=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(r("#login .get-code-cls").html("获取验证码"),clearInterval(s),e.codeDuration=o,a=!0):r("#login .get-code-cls").html(''+e.codeDuration+"s后重新获取")},1e3)})})},e.loginEvent=function(){var e=this;r("#login .login-btn").click(function(o){var a=n.trim(r("#login .mobile").val()),s=n.trim(r("#login .code").val());if(""==a)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(a))return n.toast({content:"手机号码不合格"}),!1;if(""==s)return n.toast({content:"验证码必填"}),!1;if(0==c)return!1;c=!1;var l=e.csrf({mobile:a,code:s});n.httpPost(t.to(i),l,function(e){return c=!0,e.success?void(window.location.href=t.to("order/#index")):(n.toast({content:e.message,closeDelay:3e3}),!1)})})},e.gotoRegisterEvent=function(){r("#login .register-btn").click(function(e){window.location.href=t.to("user/#register")})},e}),define("user/register-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(e,t,n,r){var o=Dom7,i=Template7,e=new e,a="/user/login/register",c="/user/default/upload-file",s="/user/login/get-code",l=!0,u=!0,d=null,g=!1;return e.run=function(){var e=this;e.setPageTitle("注册"),e.codeDuration=60,!isGuest,e.render()},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.uploadEvent(),e.getCodeEvent(),e.registerEvent(),e.gotoLoginEvent(),e.checkAgreement()},e.uploadEvent=function(){o("#register .upload-input-cls").change(function(e){if(""!=o(this).val()&&null!=o(this).val()){var i=e.target,a=(i.files[0],o(this).attr("id")),s=o(this).parent();r.uploadFile({selector:"#"+a,url:t.to(c),processAppendTo:"#register",success:function(e,t){try{if(e.success){var r=e.tmpUrl;s.css("background-image","url("+e.tmpMinUrl+")"),s.attr("data",e.tmpFile),s.attr("data-url",r)}else n.toast({content:e.message,closeDelay:5e3})}catch(o){n.toast({content:"出错",closeDelay:5e3})}}})}})},e.getCodeEvent=function(){var e=this;o("#register .get-code-cls").click(function(){var r=n.trim(o("#register .mobile").val());if(""==r)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(r))return n.toast({content:"手机号码不合格"}),!1;if(0==l)return!1;clearInterval(d),l=!1;var i=e.csrf({action:"register",mobile:r});n.httpGet(t.to(s),i,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),l=!0,!1;n.toast({content:t.message}),t.testCode&&o("#register .code").val(t.testCode);var r=t.codeDuration;e.codeDuration=r,d=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(o("#register .get-code-cls").html("获取验证码"),clearInterval(d),e.codeDuration=r,l=!0):o("#register .get-code-cls").html(''+e.codeDuration+"s后重新获取")},1e3)})})},e.registerEvent=function(){var e=this;o("#register .register-btn").click(function(r){var i=n.trim(o("#register .name").val()),c=n.trim(o("#register .mobile").val()),s=n.trim(o("#register .code").val()),l=n.trim(o("#register .emergency_contact").val()),d=n.trim(o("#register .emergency_person").val()),g=n.trim(o("#register .address").val());if(""==i)return n.toast({content:"车厂名称必填"}),!1;if(""==c)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(c))return n.toast({content:"手机号码不合格"}),!1;if(""==s)return n.toast({content:"验证码必填"}),!1;if(""==d)return n.toast({content:"紧急联系人必填"}),!1;if(""==l)return n.toast({content:"紧急联系电话必填"}),!1;if(!n.isMobile(l)&&!n.isTelephone(l))return n.toast({content:"紧急联系电话不合格"}),!1;if(l==c)return n.toast({content:"紧急联系电话不能和注册手机一样"}),!1;if(""==g)return n.toast({content:"维修厂地址必填"}),!1;var v=o("#register .licensePic").attr("data");if(void 0===v||null==v)return n.toast({content:"请上传营业执照"}),!1;var m=o("#register .headPic").attr("data");if(void 0===m||null==m)return n.toast({content:"请上传维修厂门头照"}),!1;var f=o("#register .techChargePic").attr("data");if(void 0===f||null==f)return n.toast({content:"请上传维修技术负责人证书"}),!1;var h=o("#register .QAChargePic").attr("data");if(void 0===h||null==h)return n.toast({content:"请上传质检负责人证书"}),!1;if(!o("#register .check-agreement").hasClass("checked-active"))return n.toast({content:"请阅读同意《平台车管家服务条款》"}),!1;if(0==u)return!1;u=!1;var p=e.csrf({name:i,mobile:c,code:s,emergencyContact:l,emergencyPerson:d,address:g,licensePic:v,headPic:m,techChargePic:f,QAChargePic:h});n.httpPost(t.to(a),p,function(e){if(!e.success)return n.toast({content:e.message,closeDelay:3e3}),u=!0,!1;var r=3e3;n.toast({content:e.message,closeDelay:r}),setTimeout(function(){window.location.href=t.to("order/#index")},r)})})},e.gotoLoginEvent=function(){o("#register .login-btn").click(function(e){window.location.href=t.to("user/#login")})},e.checkAgreement=function(){var e=this;o("#register .check-agreement").click(function(t){return 0==g?(e.showAgreement(),!1):void(o(this).hasClass("checked-active")?o(this).removeClass("checked-active"):o(this).addClass("checked-active"))}),o("#register .agreement-cls").click(function(t){e.showAgreement()}),o("#register").on("click",".agree-btn",function(e){o("#agreement-wrapper").remove(),g=!0;var t=o("#register .check-agreement");t.hasClass("checked-active")||t.addClass("checked-active")})},e.showAgreement=function(){o("#agreement-wrapper").remove();var e=o("#register"),t=o("script#agreement-template"),n=i.compile(t.html()),r=n({});e.append(r)},e}),define("user/regulation-controller",["mk7/controller"],function(e){var t=Dom7,n=Template7,e=new e;return e.run=function(){var e=this;e.setPageTitle("维修流程"),e.loadPage()},e.bindEvents=function(){console.log("bindEvents")},e.loadPage=function(){var e=this;e.render(),t("#agreement-wrapper").remove();var r=t("#regulation_content"),o=t("script#agreement-template"),i=n.compile(o.html()),a=i({});r.append(a)},e});
\ No newline at end of file
diff --git a/web/src/js/user/about-controller.js b/web/src/js/user/about-controller.js
new file mode 100644
index 0000000..4609647
--- /dev/null
+++ b/web/src/js/user/about-controller.js
@@ -0,0 +1,36 @@
+/**
+ * 关于我们
+ */
+define(
+ "user/about-controller",
+ [
+ 'mk7/controller',
+
+ ],
+
+ function(ctrl) {
+ var $$ = Dom7;
+ var t7 = Template7;
+ var ctrl = new ctrl();
+
+
+ ctrl.run = function () {
+ var me = this;
+ me.setPageTitle("关于我们");
+
+ me.loadPage()
+ }
+ ctrl.bindEvents = function () {
+ var me = this;
+ console.log("bindEvents");
+
+ }
+
+ ctrl.loadPage = function () {
+ var me = this;
+ me.render();
+ }
+
+ return ctrl;
+ }
+);
diff --git a/web/src/js/user/app.js b/web/src/js/user/app.js
index 016aeac..8ebd027 100644
--- a/web/src/js/user/app.js
+++ b/web/src/js/user/app.js
@@ -49,6 +49,16 @@ define(
_autoLoading();
return app.runController('login');
},
+ 'about': function () {
+ fromOutside = false;
+ _autoLoading();
+ return app.runController('about');
+ },
+ 'regulation': function () {
+ fromOutside = false;
+ _autoLoading();
+ return app.runController('regulation');
+ },
'*': function(){
return app.runController('index');
}
diff --git a/web/src/js/user/index-controller.js b/web/src/js/user/index-controller.js
index 3012d41..f22dd99 100644
--- a/web/src/js/user/index-controller.js
+++ b/web/src/js/user/index-controller.js
@@ -5,27 +5,23 @@ define(
"user/index-controller",
[
'mk7/controller',
- 'mk7/url',
- 'mk7/utils',
+ 'mk7/url'
+
],
- function(ctrl, url, utils) {
+ function(ctrl, url) {
var $$ = Dom7;
var t7 = Template7;
var ctrl = new ctrl();
- var pageurl = '/user/default/index-list';
-
ctrl.run = function () {
var me = this;
me.setPageTitle("首页");
- me.hideAllNonBaseMenuItem(window.$site);
-
- me.render();
-
-
+ //me.hideAllNonBaseMenuItem(window.$site);
+ window.location.replace(url.to('user#about'));
+ //me.render();
}
ctrl.bindEvents = function () {
var me = this;
diff --git a/web/src/js/user/regulation-controller.js b/web/src/js/user/regulation-controller.js
new file mode 100644
index 0000000..7323b45
--- /dev/null
+++ b/web/src/js/user/regulation-controller.js
@@ -0,0 +1,38 @@
+/**
+ * 维修流程协议
+ */
+define(
+ "user/regulation-controller",
+ [
+ 'mk7/controller'
+ ],
+
+ function(ctrl) {
+ var $$ = Dom7;
+ var t7 = Template7;
+ var ctrl = new ctrl();
+ ctrl.run = function () {
+ var me = this;
+ me.setPageTitle("维修流程");
+ me.loadPage()
+ }
+ ctrl.bindEvents = function () {
+ var me = this;
+ console.log("bindEvents");
+
+ }
+
+ ctrl.loadPage = function () {
+ var me = this;
+ me.render();
+ $$('#agreement-wrapper').remove();
+ var page = $$('#regulation_content');
+ var ele = $$('script#agreement-template');
+ var compiled = t7.compile(ele.html());
+ var doms = compiled({});
+ page.append(doms);
+ }
+
+ return ctrl;
+ }
+);
--
libgit2 0.21.0