diff --git a/components/tf-verify-img/img/tf-arrows.png b/components/tf-verify-img/img/tf-arrows.png new file mode 100644 index 0000000..f10c1a7 Binary files /dev/null and b/components/tf-verify-img/img/tf-arrows.png differ diff --git a/components/tf-verify-img/img/tf-close.png b/components/tf-verify-img/img/tf-close.png new file mode 100644 index 0000000..f31a385 Binary files /dev/null and b/components/tf-verify-img/img/tf-close.png differ diff --git a/components/tf-verify-img/tf-verify-img.vue b/components/tf-verify-img/tf-verify-img.vue new file mode 100644 index 0000000..834a2e3 --- /dev/null +++ b/components/tf-verify-img/tf-verify-img.vue @@ -0,0 +1,259 @@ + + + + + diff --git a/components/tfVerify/tfVerify.vue b/components/tfVerify/tfVerify.vue new file mode 100644 index 0000000..7293991 --- /dev/null +++ b/components/tfVerify/tfVerify.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/main.js b/main.js index 91cb010..ba01f6f 100644 --- a/main.js +++ b/main.js @@ -7,9 +7,12 @@ Vue.config.productionTip = false // 挂载 全局变量 Vue.prototype.devCode = "2aaecd0b124df819eda75e639a1f91fd"; // Vue.prototype.serverUrl = "https://pqmcc.com:8040/shiningCloud"; -Vue.prototype.serverUrl = "http://112.4.156.196:8040/shiningCloud"; -// Vue.prototype.serverUrl = "http://www.pqmcc.com:8040/shiningCloud"; +// Vue.prototype.serverUrl = "http://112.4.156.196:8040/shiningCloud"; +Vue.prototype.serverUrl = "http://www.pqmcc.com:8040/shiningCloud"; +// Vue.prototype.serverUrl = "http://192.168.1.125:8889/shiningCloud"; + Vue.prototype.key = "f81804778c89c779"; +Vue.prototype.authTokenId = ""; Vue.prototype.getCid=function(){ var that = this // #ifdef APP-PLUS @@ -58,16 +61,36 @@ Vue.prototype.createMessage=function(title,payload,content){ } Vue.prototype.cid = function(){ var that= this; + // return '088GgLnToXTWf6XUpi8N7Z47PcqaKmONlF0ChR7F4gjdSLRIyTnTruoYfLxGK3Oy' var cidAES = uni.getStorageSync('cidAES'); - // var cid = uni.getStorageSync('cid'); + if(!(cidAES!=null&&cidAES!='null'&&cidAES!=''&&cidAES!=undefined)){ setTimeout(function() { return that.cid(); }, 500); }else{ - return cidAES; + return cidAES; } } +Vue.prototype.authToken = function(){ + var that= this; + console.log(123,that.cid()) + uni.request({ + url: that.serverUrl + '/user/authToken', + method: 'POST', + data: { + devCode:that.cid(), + }, + header: { + 'content-type': 'application/x-www-form-urlencoded' + }, + sslVerify: false, + success: (res) => { + that.authTokenId=res.data.data + }, + + }); +} Vue.prototype.judgeLogin = function(){ var that= this; if((!uni.getStorageSync('userInfo').userId)||(!uni.getStorageSync('userInfo').phone)){ diff --git a/manifest.json b/manifest.json index 8254624..7b9d7dd 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "灿能云", - "appid" : "__UNI__903A5B1", + "appid" : "__UNI__9894FCF", "description" : "", "versionName" : "1.2.1", "versionCode" : 121, @@ -68,9 +68,8 @@ "push" : { "unipush" : {} }, - "speech" : { - "ifly" : {} - }, + "speech" : {}, + // "ifly" : {} "ad" : {} }, "icons" : { diff --git a/package.json b/package.json new file mode 100644 index 0000000..5858d6a --- /dev/null +++ b/package.json @@ -0,0 +1,17 @@ +{ + "id": "tf-verify-img", + "name": "高性能多端拼图滑动验证", + "version": "1.0.3", + "description": "一款高性能的多端拼图滑动验证组件(希望各位大佬们抽出宝贵的时间留下您的评论,感激不尽)", + "keywords": [ + "拼图", + "滑动验证" + ], + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ] + }, + "displayName": "高性能多端拼图滑动验证" +} \ No newline at end of file diff --git a/pages.json b/pages.json index 3f9d311..7752dcb 100644 --- a/pages.json +++ b/pages.json @@ -184,6 +184,13 @@ ,{ "path" : "pages/terminalStatusAll/terminalStatusAll", "style" : {} + }, + { + "path" : "components/tfVerify/tfVerify", + "style" : + { + "navigationBarTitleText" : "" + } } ], "tabBar": { diff --git a/pages/companyIntroduce/companyIntroduce.vue b/pages/companyIntroduce/companyIntroduce.vue index 3d35146..1a55b7a 100644 --- a/pages/companyIntroduce/companyIntroduce.vue +++ b/pages/companyIntroduce/companyIntroduce.vue @@ -1,7 +1,7 @@ diff --git a/pages/fastLoginVercode/fastLoginVercode.vue b/pages/fastLoginVercode/fastLoginVercode.vue index 1742010..5301702 100644 --- a/pages/fastLoginVercode/fastLoginVercode.vue +++ b/pages/fastLoginVercode/fastLoginVercode.vue @@ -27,12 +27,18 @@ 下一步 + + diff --git a/pages/forgetPassword/forgetPassword.vue b/pages/forgetPassword/forgetPassword.vue index b665fe5..60b23fa 100644 --- a/pages/forgetPassword/forgetPassword.vue +++ b/pages/forgetPassword/forgetPassword.vue @@ -19,12 +19,16 @@ 下一步 + + diff --git a/pages/forgetPasswordVercode/forgetPasswordVercode.vue b/pages/forgetPasswordVercode/forgetPasswordVercode.vue index 64ef34c..015142a 100644 --- a/pages/forgetPasswordVercode/forgetPasswordVercode.vue +++ b/pages/forgetPasswordVercode/forgetPasswordVercode.vue @@ -67,16 +67,19 @@ that.nextFlag=0 } }, - sendVercodeAgain(){ + async sendVercodeAgain(){ var that = this; that.sendAgainFlag=1 + await that.authToken(); + setTimeout(() => { uni.request({ url: that.serverUrl+'/user/authCode', method:'POST', data: { phone:that.phoneNumTrue, devCode:that.cid(), - type:3 + type:3, + authToken: that.authTokenId }, header: { 'content-type': 'application/x-www-form-urlencoded' @@ -122,6 +125,7 @@ that.second=60; that.sendAgainFlag=0 },61000) + }, 500); }, reset(){ this.vercode=''; diff --git a/pages/login/login.vue b/pages/login/login.vue index a900517..16ba084 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -8,22 +8,41 @@ - + +86 - + - + - - - + + + - + @@ -34,179 +53,184 @@ - - + + - - 记住密码 - + 记住密码 - - - - - diff --git a/pages/modifyPassword/modifyPassword.vue b/pages/modifyPassword/modifyPassword.vue index 50aa516..a9d20ea 100644 --- a/pages/modifyPassword/modifyPassword.vue +++ b/pages/modifyPassword/modifyPassword.vue @@ -67,16 +67,19 @@ that.nextFlag=0 } }, - sendVercodeAgain(){ + async sendVercodeAgain(){ var that = this; that.sendAgainFlag=1 + await that.authToken(); + setTimeout(() => { uni.request({ url: that.serverUrl+'/user/authCode', method:'POST', data: { phone:that.phoneNumTrue, devCode:that.cid(), - type:2 + type:2, + authToken: that.authTokenId }, header: { 'content-type': 'application/x-www-form-urlencoded' @@ -122,6 +125,7 @@ that.second=60; that.sendAgainFlag=0 },61000) + }, 500); }, reset(){ this.vercode=''; diff --git a/pages/modifyPasswordSetpassword/modifyPasswordSetpassword.vue b/pages/modifyPasswordSetpassword/modifyPasswordSetpassword.vue index 67486f7..5215b3f 100644 --- a/pages/modifyPasswordSetpassword/modifyPasswordSetpassword.vue +++ b/pages/modifyPasswordSetpassword/modifyPasswordSetpassword.vue @@ -73,7 +73,7 @@ disabledFlag:false, doneFlag:0, sendAgain:'发送验证码', - sendAgainFlag:0, + sendAgainFlag:1, resetFlag:0, vercode:'', second:60, @@ -115,6 +115,11 @@ that.seeFlag=0; that.password=''; } + if( that.password.length>0 && that.again.length>0 ){ + that.sendAgainFlag=0 + }else{ + that.sendAgainFlag=1 + } }, setAgain(e){ var that = this; @@ -130,6 +135,11 @@ that.seeAgainFlag=0; that.again=''; } + if( that.password.length>0 && that.again.length>0 ){ + that.sendAgainFlag=0 + }else{ + that.sendAgainFlag=1 + } }, see(flag){ this.passwordFlag=flag; @@ -137,19 +147,22 @@ seeAgain(flag){ this.againFlag=flag; }, - sendVercodeAgain(){ + async sendVercodeAgain(){ var that = this; if(that.second!=60){ return; } that.sendAgainFlag=1 + await that.authToken(); + setTimeout(() => { uni.request({ url: that.serverUrl+'/user/authCode', method:'POST', data: { phone:that.phoneNum, devCode:that.cid(), - type:2 + type:2, + authToken: that.authTokenId }, header: { 'content-type': 'application/x-www-form-urlencoded' @@ -193,6 +206,7 @@ }); } }); + }, 500); }, complete(){ var that = this; diff --git a/pages/modifyUserPhoneNum/modifyUserPhoneNum.vue b/pages/modifyUserPhoneNum/modifyUserPhoneNum.vue index 278938a..4a7b77e 100644 --- a/pages/modifyUserPhoneNum/modifyUserPhoneNum.vue +++ b/pages/modifyUserPhoneNum/modifyUserPhoneNum.vue @@ -68,20 +68,25 @@ that.nextFlag=0 } }, - sendVercodeAgain(){ + async sendVercodeAgain(){ var that = this; if(that.second!=60){ return; } that.sendAgainFlag=1 if(that.judgeLogin()){ + await that.authToken(); + setTimeout(() => { + + uni.request({ url: that.serverUrl+'/user/authCode', method:'POST', data: { phone:uni.getStorageSync('userInfo').phone, devCode:that.cid(), - type:5 + type:5, + authToken: that.authTokenId }, header: { 'content-type': 'application/x-www-form-urlencoded' @@ -125,6 +130,7 @@ }); } }); + }, 500); } }, reset(){ diff --git a/pages/modifyUserPhoneNumSetPhoneNum/modifyUserPhoneNumSetPhoneNum.vue b/pages/modifyUserPhoneNumSetPhoneNum/modifyUserPhoneNumSetPhoneNum.vue index 3edd404..2df87cf 100644 --- a/pages/modifyUserPhoneNumSetPhoneNum/modifyUserPhoneNumSetPhoneNum.vue +++ b/pages/modifyUserPhoneNumSetPhoneNum/modifyUserPhoneNumSetPhoneNum.vue @@ -1,275 +1,296 @@ diff --git a/pages/privacyAgreement/privacyAgreement.vue b/pages/privacyAgreement/privacyAgreement.vue index 6f557be..3b4da87 100644 --- a/pages/privacyAgreement/privacyAgreement.vue +++ b/pages/privacyAgreement/privacyAgreement.vue @@ -1,7 +1,7 @@ diff --git a/pages/setNewPassword/setNewPassword.vue b/pages/setNewPassword/setNewPassword.vue index 0cbffeb..eb83104 100644 --- a/pages/setNewPassword/setNewPassword.vue +++ b/pages/setNewPassword/setNewPassword.vue @@ -50,12 +50,18 @@ 完成 + + diff --git a/pages/systemIntroduce/systemIntroduce.vue b/pages/systemIntroduce/systemIntroduce.vue index 439a9c2..cab53b8 100644 --- a/pages/systemIntroduce/systemIntroduce.vue +++ b/pages/systemIntroduce/systemIntroduce.vue @@ -1,7 +1,7 @@ diff --git a/pages/userAgreement/userAgreement.vue b/pages/userAgreement/userAgreement.vue index 8f2b5af..5f9e8df 100644 --- a/pages/userAgreement/userAgreement.vue +++ b/pages/userAgreement/userAgreement.vue @@ -1,7 +1,7 @@ diff --git a/pages/vercode/vercode.vue b/pages/vercode/vercode.vue index 4f0188d..786f2eb 100644 --- a/pages/vercode/vercode.vue +++ b/pages/vercode/vercode.vue @@ -115,15 +115,18 @@ }); } }, - getVerCode(e){ + async getVerCode(e){ var that = this; + await that.authToken(); + setTimeout(() => { uni.request({ url: that.serverUrl+'/user/authCode', method:'POST', data: { phone:that.phoneNum, devCode:that.cid(), - type:0 + type:0, + authToken: that.authTokenId }, header: { 'content-type': 'application/x-www-form-urlencoded' @@ -157,6 +160,7 @@ }); } }); + }, 500); this.readSecond(); }, readSecond(){ diff --git a/static/pic/BG0.jpeg b/static/pic/BG0.jpeg new file mode 100644 index 0000000..e8e2f18 Binary files /dev/null and b/static/pic/BG0.jpeg differ diff --git a/static/pic/BG1.jpeg b/static/pic/BG1.jpeg new file mode 100644 index 0000000..de8bde5 Binary files /dev/null and b/static/pic/BG1.jpeg differ diff --git a/static/pic/BG2.jpg b/static/pic/BG2.jpg new file mode 100644 index 0000000..56dc6e3 Binary files /dev/null and b/static/pic/BG2.jpg differ diff --git a/static/pic/BG3.jpg b/static/pic/BG3.jpg new file mode 100644 index 0000000..2dd71fb Binary files /dev/null and b/static/pic/BG3.jpg differ diff --git a/static/pic/BG4.jpg b/static/pic/BG4.jpg new file mode 100644 index 0000000..37f8b43 Binary files /dev/null and b/static/pic/BG4.jpg differ diff --git a/static/pic/aboutUs.png的替身 b/static/pic/aboutUs.png的替身 deleted file mode 100644 index 05ff88a..0000000 Binary files a/static/pic/aboutUs.png的替身 and /dev/null differ diff --git a/static/pic/aboutUs的副本.png b/static/pic/aboutUs的副本.png deleted file mode 100644 index 9639a73..0000000 Binary files a/static/pic/aboutUs的副本.png and /dev/null differ diff --git a/static/verify/0.jpeg b/static/verify/0.jpeg new file mode 100644 index 0000000..e8e2f18 Binary files /dev/null and b/static/verify/0.jpeg differ diff --git a/static/verify/1.jpeg b/static/verify/1.jpeg new file mode 100644 index 0000000..de8bde5 Binary files /dev/null and b/static/verify/1.jpeg differ