Merge branch 'developerA' of http://git.caimei365.com/chao/caimei-caimei365-www into developerA

src/main/resources/static/css/product/qualityauthorize.css

@@ -8,6 +8,7 @@ ul{margin:0;padding:0;list-style-type:none}
 .params{border-collapse:unset;border:0;width:100%}
 .product-params .params tr td{border:0}
 .product-params .params tr td:nth-child(2n-1){color:#999999}
+.float-zplm{display: none;visibility: hidden;}
 @media screen and (min-width:768px){body{background-color:#F8F8F8}
 .inner{width:1184px;margin:0 auto}
 .container-header{width:100%;height:auto}

src/main/resources/static/js/account/forget.js

@@ -19,23 +19,24 @@ var registerPage = new Vue({
         imageCode:'',
         phonePwd: {
             mobileOrEmail :'',
-            activateCode : '',
-            passWord : '',
-            confirmPwd : '',
+            smsCode : '',
+            password : '',
+            passwordConfirm : '',
             status:1
         },
         emailPwd: {
             mobileOrEmail :'',
             activateCode : '',
-            passWord : '',
-            confirmPwd : '',
+            smsCode : '',
+            password:'',
+            passwordConfirm : '',
             status:2
         },
         rule:{
             name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
             phone: '^\\d{6,12}$',
             code: '^\\d{6}$',
-            emailCode: '^\\d{4}$',
+            emailCode: '^\\d{6}$',
             license: '^[a-zA-Z0-9_]{18}$',
             email: '^(([^<>()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^<>()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$',
             password: "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$"
@@ -50,14 +51,14 @@ var registerPage = new Vue({
             var pass = verifyForm();
             if (_self.loginLoading) { return false; }
             if (!pass) {return false;}
-            if(_self.phonePwd.confirmPwd!=_self.phonePwd.passWord){
+            if(_self.phonePwd.passwordConfirm!=_self.phonePwd.password){
                 CAIMEI.dialog('两次密码输入不一致',false,function () {});
                 return;
             }
             _self.loginLoading = true;
             UserApi.FindCompanyPwd(_self.phonePwd,function (response) {
                 if(response.code === 0){
-                    CAIMEI.Alert('成功找回密码！','去登录',true,function () {
+                    CAIMEI.Alert('密码修改成功~','去登录',true,function () {
                         _self.loginLoading = false;
                         window.location.href = '/login.html';
                     });
@@ -72,14 +73,14 @@ var registerPage = new Vue({
             var pass = verifyForm();
             if (_self.loginLoading) { return false; }
             if (!pass) {return false;}
-            if(_self.emailPwd.confirmPwd!=_self.emailPwd.passWord){
+            if(_self.emailPwd.passwordConfirm!=_self.emailPwd.password){
                 CAIMEI.dialog('两次密码输入不一致',false,function () {});
                 return;
             }
             _self.loginLoading = true;
             UserApi.FindCompanyPwd(_self.emailPwd,function (response) {
                 if(response.code === 0){
-                    CAIMEI.Alert('成功找回密码！','去登录',true,function () {
+                    CAIMEI.Alert('密码修改成功~','去登录',true,function () {
                         _self.loginLoading = false;
                         window.location.href = '/login.html';
                     });
@@ -109,7 +110,7 @@ var registerPage = new Vue({
                 })
             });
         },
-        getMobileCodeFn:function(){//机构注册获取注册短信验证码
+        getMobileCodeFn:function(){//获取短信验证码
             var _self = this;
             var params = {
                     mobile:_self.phonePwd.mobileOrEmail,

src/main/resources/static/js/common/serviceapi/user.service.js

@@ -34,6 +34,14 @@ var UserApi = {
                     callback(res)
                 });
         },
+        /*
+        * @params
+        * isCheckCaptcha        是否检查图片验证码，0:检查，1:不检查
+        * imgCode               图片验证码
+        * activateCodeType      1:找回密码,2:注册机构,3:供应商注册,4:更换联系人手机号-旧手机验证码,5:更换联系人手机号-新手机验证码
+        * platformType          0:www，1:crm/h5，2:小程序
+        * token                 图片token
+        * */
         getRegisterMobileCode: function (params, callback) {//机构注册获取短信验证码
             Http.AjaxService({ url:'/user/sms/code', type:'get', data:params, json:false, isHost:true})
                 .then(function(res){
@@ -53,7 +61,7 @@ var UserApi = {
             });
         },
         FindCompanyPwd : function(params,callback) {//用户找回密码
-            Http.AjaxService({ url:'/user/findCompanyPwd', type:'post', data:params, json:false})
+            Http.AjaxService({ url:'/user/update/password', type:'post', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res);
             });

src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -94,13 +94,7 @@ var PublicApi = {
             });
         },
         getEmailSMScode : function (params,callback) { //获取邮箱短信验证码
-            Http.AjaxService({ url:'/user/mailbox', type:'get', data:params, json:true})
-            .then(function(res){
-                callback(res);
-            });
-        },
-        getClubMobileCode : function (params,callback) { //获取手机短信验证码
-            Http.AjaxService({ url:'/club/modifyPhoneNumber', type:'get', data:params, json:true})
+            Http.AjaxService({ url:'/user/mail/code', type:'get', data:params, json:true, isHost:true})
             .then(function(res){
                 callback(res);
             });
@@ -152,7 +146,7 @@ var PublicApi = {
             });
         },
         clubChangeMobile:function(params,callback){//更换手机号
-            Http.AjaxService({ url:'/club/changeMobile', type:'post', data:params, json:false})
+            Http.AjaxService({ url:'/user/update/mobile', type:'post', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res);
             });

src/main/resources/static/js/supplier-center/setting/password.js

@@ -20,23 +20,23 @@ var passwordPage = new Vue({
         imageCode:'',
         phonePwd: {
             mobileOrEmail :'',
-            activateCode : '',
-            passWord : '',
-            confirmPwd : '',
+            smsCode : '',
+            password : '',
+            passwordConfirm : '',
             status:1
         },
         emailPwd: {
             mobileOrEmail :'',
-            activateCode : '',
-            passWord : '',
-            confirmPwd : '',
+            smsCode : '',
+            password : '',
+            passwordConfirm : '',
             status:2
         },
         rule:{
             name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
             phone: '^\\d{6,12}$',
             code: '^\\d{6}$',
-            emailCode: '^\\d{4}$',
+            emailCode: '^\\d{6}$',
             license: '^[a-zA-Z0-9_]{18}$',
             email: '^(([^<>()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^<>()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$',
             password: "^[^\\u4e00-\\u9fa5]{8,16}$"
@@ -51,14 +51,14 @@ var passwordPage = new Vue({
             var pass = verifyForm();
             if (_self.loginLoading) { return false; }
             if (!pass) {return false;}
-            if(_self.phonePwd.confirmPwd!=_self.phonePwd.passWord){
+            if(_self.phonePwd.passwordConfirm!=_self.phonePwd.password){
                 CAIMEI.dialog('两次密码输入不一致',false,function () {});
                 return;
             }
             _self.loginLoading = true;
             UserApi.FindCompanyPwd(_self.phonePwd,function (response) {
                 if(response.code === 0){
-                    CAIMEI.dialog('重置密码成功！',true,function () {
+                    CAIMEI.dialog('密码修改成功~',true,function () {
                         _self.loginLoading = false;
                         CAIMEI.Storage.clear();
                         window.location.href = '/login.html';
@@ -74,14 +74,14 @@ var passwordPage = new Vue({
             var pass = verifyForm();
             if (_self.loginLoading) { return false; }
             if (!pass) {return false;}
-            if(_self.emailPwd.confirmPwd!=_self.emailPwd.passWord){
+            if(_self.emailPwd.passwordConfirm!=_self.emailPwd.password){
                 CAIMEI.dialog('两次密码输入不一致',false,function () {});
                 return;
             }
             _self.loginLoading = true;
             UserApi.FindCompanyPwd(_self.emailPwd,function (response) {
                 if(response.code === 0){
-                    CAIMEI.dialog('重置密码成功！',true,function () {
+                    CAIMEI.dialog('密码修改成功~',true,function () {
                         _self.loginLoading = false;
                         CAIMEI.Storage.clear();
                         window.location.href = '/login.html';
@@ -112,7 +112,7 @@ var passwordPage = new Vue({
                 })
             });
         },
-        getMobileCodeFn:function(){//机构注册获取注册短信验证码
+        getMobileCodeFn:function(){//获取短信验证码
             var _self = this;
             var params = {
                     mobile:_self.phonePwd.mobileOrEmail,
@@ -121,7 +121,7 @@ var passwordPage = new Vue({
                     token:_self.codeImageToken,
                     activateCodeType:1,
                     platformType:0
-                };
+            };
             _self.isMobileDisabled = true;
             UserApi.getRegisterMobileCode(params,function (response) {
                 if(response.code == 0){

src/main/resources/static/js/supplier-center/setting/phone.js

@@ -12,11 +12,11 @@ var phonePage = new Vue({
         isMobileDisabled: false,	//手机验证码按钮控制
         isNewMobileDisabled: false,	//手机验证码按钮控制
         form:{
-            contractMobile2:'', //新联系人手机号
-            contractMobile:'',  //旧联系人手机号
-            mobileCode:'',      //原手机号验证码
-            newMobileCode:'',   //新手机号手机验证码
-            userID:0
+            mobile:'',  //旧联系人手机号
+            newMobile:'', //新联系人手机号
+            smsCode:'',      //原手机号验证码
+            newSmsCode:'',   //新手机号手机验证码
+            userId:0
         },
         rule:{
             phone: '^\\d{6,12}$',
@@ -35,7 +35,7 @@ var phonePage = new Vue({
             _self.loginLoading = true;
             PublicApi.clubChangeMobile(_self.form,function (response) {
                 if(response.code === 0){
-                    CAIMEI.dialog('修改成功',true,function () {
+                    CAIMEI.dialog('修改成功~',true,function () {
                         _self.loginLoading = false;
                         CAIMEI.Storage.clear();
                         window.location.href = '/login.html';
@@ -48,8 +48,14 @@ var phonePage = new Vue({
         },
         getMobileCodeFn:function(){//获取旧手机号验证码
             var _self = this;
+            var params = {
+                    mobile:_self.form.mobile,
+                    isCheckCaptcha:1,
+                    activateCodeType:4,
+                    platformType:0
+                };
             _self.isMobileDisabled = true;
-            PublicApi.getClubMobileCode({ mobile : _self.form.contractMobile2 },function(response){
+            UserApi.getRegisterMobileCode(params,function(response){
                 if(response.code == 0){
                     CAIMEI.dialog('验证短信已发送',false,function () {});
                     var TIME_COUNT = 60;
@@ -76,8 +82,14 @@ var phonePage = new Vue({
         },
         getNewMobileCodeFn:function(){//获取新手机号短信验证码
             var _self = this;
+            var params = {
+                    mobile:_self.form.newMobile,
+                    isCheckCaptcha:1,
+                    activateCodeType:5,
+                    platformType:0
+                };
             _self.isNewMobileDisabled = true;
-            PublicApi.getClubMobileCode({ mobile : _self.form.contractMobile },function(response){
+            UserApi.getRegisterMobileCode(params,function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('验证短信已发送',false,function () {});
                         var TIME_COUNT = 60;
@@ -113,8 +125,8 @@ var phonePage = new Vue({
     mounted: function () {
         var _self = this;
         if(globalUserData){
-            _self.form.contractMobile2 = globalUserData.phone;
-            _self.form.userID = globalUserData.userId;
+            _self.form.mobile = globalUserData.phone;
+            _self.form.userId = globalUserData.userId;
         }
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(3).addClass("on").find('.con').show().find('a').eq(1).addClass("on");

src/main/resources/static/js/user-center/setting/password.js

@@ -20,23 +20,23 @@ var passwordPage = new Vue({
         imageCode:'',
         phonePwd: {
             mobileOrEmail :'',
-            activateCode : '',
-            passWord : '',
-            confirmPwd : '',
+            smsCode : '',
+            password : '',
+            passwordConfirm : '',
             status:1
         },
         emailPwd: {
             mobileOrEmail :'',
-            activateCode : '',
-            passWord : '',
-            confirmPwd : '',
+            smsCode : '',
+            password : '',
+            passwordConfirm : '',
             status:2
         },
         rule:{
             name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
             phone: '^\\d{6,12}$',
             code: '^\\d{6}$',
-            emailCode: '^\\d{4}$',
+            emailCode: '^\\d{6}$',
             license: '^[a-zA-Z0-9_]{18}$',
             email: '^(([^<>()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^<>()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$',
             password: "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$"
@@ -51,14 +51,14 @@ var passwordPage = new Vue({
             var pass = verifyForm();
             if (_self.loginLoading) { return false; }
             if (!pass) {return false;}
-            if(_self.phonePwd.confirmPwd!=_self.phonePwd.passWord){
+            if(_self.phonePwd.passwordConfirm!=_self.phonePwd.password){
                 CAIMEI.dialog('两次密码输入不一致',false,function () {});
                 return;
             }
             _self.loginLoading = true;
             UserApi.FindCompanyPwd(_self.phonePwd,function (response) {
                 if(response.code === 0){
-                    CAIMEI.dialog('重置密码成功！',true,function () {
+                    CAIMEI.dialog('密码修改成功~',true,function () {
                         _self.loginLoading = false;
                         CAIMEI.Storage.clear();
                         window.location.href = '/login.html';
@@ -74,14 +74,14 @@ var passwordPage = new Vue({
             var pass = verifyForm();
             if (_self.loginLoading) { return false; }
             if (!pass) {return false;}
-            if(_self.emailPwd.confirmPwd!=_self.emailPwd.passWord){
+            if(_self.emailPwd.passwordConfirm!=_self.emailPwd.password){
                 CAIMEI.dialog('两次密码输入不一致',false,function () {});
                 return;
             }
             _self.loginLoading = true;
             UserApi.FindCompanyPwd(_self.emailPwd,function (response) {
                 if(response.code === 0){
-                    CAIMEI.dialog('重置密码成功！',true,function () {
+                    CAIMEI.dialog('密码修改成功~',true,function () {
                         _self.loginLoading = false;
                         CAIMEI.Storage.clear();
                         window.location.href = '/login.html';
@@ -112,7 +112,7 @@ var passwordPage = new Vue({
                 })
             });
         },
-        getMobileCodeFn:function(){//机构注册获取注册短信验证码
+        getMobileCodeFn:function(){//获取短信验证码
             var _self = this;
             var params = {
                     mobile:_self.phonePwd.mobileOrEmail,
@@ -120,7 +120,7 @@ var passwordPage = new Vue({
                     isCheckCaptcha:0,
                     token:_self.codeImageToken,
                     activateCodeType:1,
-                    platformType:2
+                    platformType:0
                 };
             _self.isMobileDisabled = true;
             UserApi.getRegisterMobileCode(params,function (response) {

src/main/resources/static/js/user-center/setting/phone.js

@@ -12,11 +12,11 @@ var phonePage = new Vue({
         isMobileDisabled: false,	//手机验证码按钮控制
         isNewMobileDisabled: false,	//手机验证码按钮控制
         form:{
-            contractMobile2:'', //新联系人手机号
-            contractMobile:'',  //旧联系人手机号
-            mobileCode:'',      //原手机号验证码
-            newMobileCode:'',   //新手机号手机验证码
-            userID:0
+            mobile:'',  //旧联系人手机号
+            newMobile:'', //新联系人手机号
+            smsCode:'',      //原手机号验证码
+            newSmsCode:'',   //新手机号手机验证码
+            userId:0
         },
         rule:{
             phone: '^\\d{6,12}$',
@@ -35,7 +35,7 @@ var phonePage = new Vue({
             _self.loginLoading = true;
             PublicApi.clubChangeMobile(_self.form,function (response) {
                 if(response.code === 0){
-                    CAIMEI.dialog('修改成功',true,function () {
+                    CAIMEI.dialog('修改成功~',true,function () {
                         _self.loginLoading = false;
                         CAIMEI.Storage.clear();
                         window.location.href = '/login.html';
@@ -48,8 +48,14 @@ var phonePage = new Vue({
         },
         getMobileCodeFn:function(){//获取旧手机号验证码
             var _self = this;
+            var params = {
+                    mobile:_self.form.mobile,
+                    isCheckCaptcha:1,
+                    activateCodeType:4,
+                    platformType:0
+                };
             _self.isMobileDisabled = true;
-            PublicApi.getClubMobileCode({ mobile : _self.form.contractMobile2 },function(response){
+            UserApi.getRegisterMobileCode(params,function(response){
                 if(response.code == 0){
                     CAIMEI.dialog('验证短信已发送',false,function () {});
                     var TIME_COUNT = 60;
@@ -77,11 +83,15 @@ var phonePage = new Vue({
         getNewMobileCodeFn:function(){//获取新手机号短信验证码
             var _self = this;
             var pass = verifyCheack('.massageBtn');
-            if (!pass) {
-                return false;
-            }
+            if (!pass) { return false; }
+            var params = {
+                    mobile:_self.form.newMobile,
+                    isCheckCaptcha:1,
+                    activateCodeType:5,
+                    platformType:0
+                };
             _self.isNewMobileDisabled = true;
-            PublicApi.getClubMobileCode({ mobile : _self.form.contractMobile },function(response){
+            UserApi.getRegisterMobileCode(params,function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('验证短信已发送',false,function () {});
                         var TIME_COUNT = 60;
@@ -117,8 +127,8 @@ var phonePage = new Vue({
     mounted: function () {
         var _self = this;
         if(globalUserData){
-            _self.form.contractMobile2 = globalUserData.phone;
-            _self.form.userID = globalUserData.userId;
+            _self.form.mobile = globalUserData.phone;
+            _self.form.userId = globalUserData.userId;
         }
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(2).addClass("on").find('.con').show().find('a').eq(1).addClass("on");

src/main/resources/templates/account/forget.html

@@ -31,21 +31,21 @@
                     </div>
                     <div class="formLine code">
                         <p><em>*</em>短信验证码：</p>
-                        <input type="text" v-model.trim="phonePwd.activateCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
+                        <input type="text" v-model.trim="phonePwd.smsCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入有效短信验证码"></span>
                         <a class="getCode" href="javascript:void(0);" @click="getMobileImage" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>新密码：</p>
-                        <input type="password" v-model.trim="phonePwd.passWord" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                        <input type="password" v-model.trim="phonePwd.password" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                         <i class="icon showPwd" @click="showPassword($event)"></i>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>确认密码：</p>
-                        <input type="password" v-model.trim="phonePwd.confirmPwd" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                        <input type="password" v-model.trim="phonePwd.passwordConfirm" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                         <i class="icon showPwd" @click="showPassword($event)"></i>
@@ -65,21 +65,21 @@
                     </div>
                     <div class="formLine code">
                         <p><em>*</em>邮箱验证码：</p>
-                        <input type="text" v-model.trim="emailPwd.activateCode" autocomplete="off" placeholder="请输入邮箱验证码" :rule="rule.emailCode"  maxlength="6" @blur="blurHandle($event)" needverify>
+                        <input type="text" v-model.trim="emailPwd.smsCode" autocomplete="off" placeholder="请输入邮箱验证码" :rule="rule.emailCode"  maxlength="6" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入有效邮箱验证码"></span>
                         <a class="getCode" href="javascript:void(0);" @click="getEmailCodeFn" :class="[isEmailDisabled  ? 'disabled' : '']">{{ emailCodeText }}</a>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>登录密码：</p>
-                        <input type="password" v-model.trim="emailPwd.passWord" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                        <input type="password" v-model.trim="emailPwd.password" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                         <i class="icon showPwd" @click="showPassword($event)"></i>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>确认密码：</p>
-                        <input type="password" v-model.trim="emailPwd.confirmPwd" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                        <input type="password" v-model.trim="emailPwd.passwordConfirm" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                         <i class="icon showPwd" @click="showPassword($event)"></i>

src/main/resources/templates/supplier-center/setting/password.html

@@ -38,21 +38,21 @@
                             </div>
                             <div class="formLine code">
                                 <p><em>*</em>短信验证码：</p>
-                                <input type="text" v-model.trim="phonePwd.activateCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
+                                <input type="text" v-model.trim="phonePwd.smsCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入有效短信验证码"></span>
                                 <a class="getCode" href="javascript:void(0);" @click="getMobileImage" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>新密码：</p>
-                                <input type="password" v-model.trim="phonePwd.passWord" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                                <input type="password" v-model.trim="phonePwd.password" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                                 <i class="icon mIcon showPwd" @click="showPassword($event)"></i>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>确认密码：</p>
-                                <input type="password" v-model.trim="phonePwd.confirmPwd" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                                <input type="password" v-model.trim="phonePwd.passwordConfirm" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                                 <i class="icon mIcon showPwd" @click="showPassword($event)"></i>
@@ -72,21 +72,21 @@
                             </div>
                             <div class="formLine code">
                                 <p><em>*</em>邮箱验证码：</p>
-                                <input type="text" v-model.trim="emailPwd.activateCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.emailCode"  maxlength="6" @blur="blurHandle($event)" needverify>
+                                <input type="text" v-model.trim="emailPwd.smsCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.emailCode"  maxlength="6" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入有效短信验证码"></span>
                                 <a class="getCode" href="javascript:void(0);" @click="getEmailCodeFn" :class="[isEmailDisabled  ? 'disabled' : '']">{{ emailCodeText }}</a>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>登录密码：</p>
-                                <input type="password" v-model.trim="emailPwd.passWord" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                                <input type="password" v-model.trim="emailPwd.password" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                                 <i class="icon showPwd" @click="showPassword($event)"></i>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>确认密码：</p>
-                                <input type="password" v-model.trim="emailPwd.confirmPwd" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                                <input type="password" v-model.trim="emailPwd.passwordConfirm" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                                 <i class="icon showPwd" @click="showPassword($event)"></i>

src/main/resources/templates/supplier-center/setting/phone.html

@@ -27,24 +27,24 @@
                     <div class="header-p">本操作更换的是公司联系人的手机号，不是运营人员的手机号！</div>
                 </div>
                 <div class="container clear">
-                    <div class="title"><span>*</span>原手机号：{{form.contractMobile2.substring(0,3)}}***{{form.contractMobile2.substring(7,11)}}</div>
+                    <div class="title"><span>*</span>原手机号：{{ form.mobile }}</div>
                     <form>
                         <div class="formLine code">
                             <p><em>*</em>原手机号验证码：</p>
-                            <input type="text" v-model.trim="form.mobileCode" autocomplete="off" placeholder="请输入原手机号验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
+                            <input type="text" v-model.trim="form.smsCode" autocomplete="off" placeholder="请输入原手机号验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
                             <i class="checked icon mIcon"></i>
                             <span class="errTips icon mIcon" tips="请输入原手机号验证码"></span>
                             <a class="getCode" href="javascript:void(0);" @click="getMobileCodeFn" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
                         </div>
                         <div class="formLine" >
                             <p><em>*</em>新手机号：</p>
-                            <input  class="massageBtn"  type="text" v-model.trim="form.contractMobile" placeholder="请输入新手机号码" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
+                            <input  class="massageBtn"  type="text" v-model.trim="form.newMobile" placeholder="请输入新手机号码" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
                             <i class="checked icon mIcon"></i>
                             <span class="errTips icon mIcon" tips="请输入新手机号码"></span>
                         </div>
                         <div class="formLine code">
                             <p><em>*</em>新手机号验证码：</p>
-                            <input type="text" v-model.trim="form.newMobileCode" autocomplete="off" placeholder="请输入新手机号验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
+                            <input type="text" v-model.trim="form.newSmsCode" autocomplete="off" placeholder="请输入新手机号验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
                             <i class="checked icon mIcon"></i>
                             <span class="errTips icon mIcon" tips="请输入新手机号验证码"></span>
                             <a class="getCode" href="javascript:void(0);" @click="getNewMobileCodeFn" :class="[isNewMobileDisabled  ? 'disabled' : '']">{{ newMobileCodeText }}</a>
@@ -62,6 +62,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/setting/phone.js(v=${version})}"></script>
 </body>

src/main/resources/templates/user-center/order/detail.html

@@ -225,7 +225,7 @@
                                 <a class="btn primary" href="javascript: void(0);" v-if="!orderInfo.payButton && ['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
                                 <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(orderInfo.status)!=-1" @click="hanldCancelOrderFn()">取消订单</a>
                                 <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(orderInfo.status)!=-1"  @click="hanldConfirmOrderFn()">确认订单</a>
-                                <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(orderInfo.status)!=-1" @click="hanldDeleteOrderFn()">删除订单</a>
+<!--                                <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(orderInfo.status)!=-1" @click="hanldDeleteOrderFn()">删除订单</a>-->
                                 <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(orderInfo.status)!=-1 && orderInfo.secondHandOrderFlag!=1" @click="hanldQueryExpressFn()">查看物流</a>
                                 <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(orderInfo.status)!=-1" @click="hanldReceivingOrderFn()">确认收货</a>
                                 <div class="shopinfo" v-if="['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1">

src/main/resources/templates/user-center/order/list.html

@@ -104,7 +104,7 @@
                                     <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.orderID)">订单详情</a>
                                     <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.orderID)">取消订单</a>
                                     <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(order.status)!=-1"  @click="hanldConfirmOrderFn(order.orderID)">确认订单</a>
-                                    <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(order.status)!=-1" @click="hanldDeleteOrderFn(order.orderID)">删除订单</a>
+<!--                                    <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(order.status)!=-1" @click="hanldDeleteOrderFn(order.orderID)">删除订单</a>-->
                                     <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldQueryExpressFn(order.orderID)">查看物流</a>
                                     <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldReceivingOrderFn(order.orderID)">确认收货</a>
                                 </div>

src/main/resources/templates/user-center/setting/password.html

@@ -38,21 +38,21 @@
                             </div>
                             <div class="formLine code">
                                 <p><em>*</em>短信验证码：</p>
-                                <input type="text" v-model.trim="phonePwd.activateCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
+                                <input type="text" v-model.trim="phonePwd.smsCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入有效短信验证码"></span>
                                 <a class="getCode" href="javascript:void(0);" @click="getMobileImage" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>新密码：</p>
-                                <input type="password" v-model.trim="phonePwd.passWord" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                                <input type="password" v-model.trim="phonePwd.password" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                                 <i class="icon showPwd" @click="showPassword($event)"></i>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>确认密码：</p>
-                                <input type="password" v-model.trim="phonePwd.confirmPwd" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                                <input type="password" v-model.trim="phonePwd.passwordConfirm" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                                 <i class="icon showPwd" @click="showPassword($event)"></i>
@@ -72,21 +72,21 @@
                             </div>
                             <div class="formLine code">
                                 <p><em>*</em>邮箱验证码：</p>
-                                <input type="text" v-model.trim="emailPwd.activateCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.emailCode"  maxlength="6" @blur="blurHandle($event)" needverify>
+                                <input type="text" v-model.trim="emailPwd.smsCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.emailCode"  maxlength="6" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入有效短信验证码"></span>
                                 <a class="getCode" href="javascript:void(0);" @click="getEmailCodeFn" :class="[isEmailDisabled  ? 'disabled' : '']">{{ emailCodeText }}</a>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>新密码：</p>
-                                <input type="password" v-model.trim="emailPwd.passWord" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                                <input type="password" v-model.trim="emailPwd.password" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                                 <i class="icon showPwd" @click="showPassword($event)"></i>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>确认密码：</p>
-                                <input type="password" v-model.trim="emailPwd.confirmPwd" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
+                                <input type="password" v-model.trim="emailPwd.passwordConfirm" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                                 <i class="icon showPwd" @click="showPassword($event)"></i>

src/main/resources/templates/user-center/setting/phone.html

@@ -27,24 +27,24 @@
                     <div class="header-p">本操作更换的是机构联系人的手机号，不是运营人员的手机号！</div>
                 </div>
                 <div class="container clear">
-                    <div class="title"><span>*</span>原手机号:{{form.contractMobile2}}</div>
+                    <div class="title"><span>*</span>原手机号:{{form.mobile}}</div>
                     <form>
                         <div class="formLine code">
                             <p><em>*</em>原手机号验证码：</p>
-                            <input type="text" v-model.trim="form.mobileCode" autocomplete="off" placeholder="请输入原手机号验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
+                            <input type="text" v-model.trim="form.smsCode" autocomplete="off" placeholder="请输入原手机号验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
                             <i class="checked icon mIcon"></i>
                             <span class="errTips icon mIcon" tips="请输入原手机号验证码"></span>
                             <a class="getCode" href="javascript:void(0);" @click="getMobileCodeFn" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
                         </div>
                         <div class="formLine" >
                             <p><em>*</em>新手机号：</p>
-                            <input  class="massageBtn"  type="text" v-model.trim="form.contractMobile" placeholder="请输入新手机号码" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
+                            <input  class="massageBtn"  type="text" v-model.trim="form.newMobile" placeholder="请输入新手机号码" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
                             <i class="checked icon mIcon"></i>
                             <span class="errTips icon mIcon" tips="请输入新手机号码"></span>
                         </div>
                         <div class="formLine code">
                             <p><em>*</em>新手机号验证码：</p>
-                            <input type="text" v-model.trim="form.newMobileCode" autocomplete="off" placeholder="请输入新手机号验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
+                            <input type="text" v-model.trim="form.newSmsCode" autocomplete="off" placeholder="请输入新手机号验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
                             <i class="checked icon mIcon"></i>
                             <span class="errTips icon mIcon" tips="请输入新手机号验证码"></span>
                             <a class="getCode" href="javascript:void(0);" @click="getNewMobileCodeFn" :class="[isNewMobileDisabled  ? 'disabled' : '']">{{ newMobileCodeText }}</a>