From 7af68fee6ba82a0b06271fdc93178e1a76fa88f5 Mon Sep 17 00:00:00 2001 From: qianlile Date: Tue, 24 Aug 2021 18:32:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E5=86=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B94G=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=9A=84=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wechat/miniprogram/API/request.js | 2 - wechat/miniprogram/app.json | 3 +- wechat/miniprogram/icons/down.png | Bin 0 -> 3129 bytes wechat/miniprogram/icons/scand.png | Bin 0 -> 5027 bytes wechat/miniprogram/pages/add4G/index.js | 155 +++++--- wechat/miniprogram/pages/add4G/index.wxml | 64 +++- wechat/miniprogram/pages/add4G/index.wxss | 88 +++-- wechat/miniprogram/pages/index/index.js | 16 +- wechat/miniprogram/pages/login/index.js | 87 +++-- wechat/miniprogram/pages/login/index.wxml | 36 +- wechat/miniprogram/pages/login/index.wxss | 11 +- wechat/miniprogram/pages/register/index.js | 370 +++++++++++++++++++ wechat/miniprogram/pages/register/index.json | 8 + wechat/miniprogram/pages/register/index.wxml | 87 +++++ wechat/miniprogram/pages/register/index.wxss | 38 ++ wechat/project.private.config.json | 6 + 16 files changed, 844 insertions(+), 127 deletions(-) create mode 100644 wechat/miniprogram/icons/down.png create mode 100644 wechat/miniprogram/icons/scand.png create mode 100644 wechat/miniprogram/pages/register/index.js create mode 100644 wechat/miniprogram/pages/register/index.json create mode 100644 wechat/miniprogram/pages/register/index.wxml create mode 100644 wechat/miniprogram/pages/register/index.wxss diff --git a/wechat/miniprogram/API/request.js b/wechat/miniprogram/API/request.js index 0ef5c075..33282746 100644 --- a/wechat/miniprogram/API/request.js +++ b/wechat/miniprogram/API/request.js @@ -2,8 +2,6 @@ // const baseURL = 'http://106.38.203.210:81/prod-api'; const baseURL = 'http://106.12.9.213:80/prod-api'; - - const requestApi = ( url, params={} ) => { const token = wx.getStorageSync('token'); return new Promise((resolve,reject) => { diff --git a/wechat/miniprogram/app.json b/wechat/miniprogram/app.json index bf684ede..4d985814 100644 --- a/wechat/miniprogram/app.json +++ b/wechat/miniprogram/app.json @@ -10,7 +10,8 @@ "pages/add/index", "pages/4Gswitch/index", "pages/add4G/index", - "pages/addWiFi/index" + "pages/addWiFi/index", + "pages/register/index" ], "window": { "backgroundColor": "#F6F6F6", diff --git a/wechat/miniprogram/icons/down.png b/wechat/miniprogram/icons/down.png new file mode 100644 index 0000000000000000000000000000000000000000..844c52078b638e858a037f10f9bb3d23cbc37a50 GIT binary patch literal 3129 zcmeHK`#%%>7vC7>_B6Lp%0h}{50e#gnHj|zijr%VsT9invdJWyJTA$-(SwvQA(vr1 zvLY`oX_X;ex28Oy${9qlBJ~BAu#{|AbG(G zWzV;r{|Z=`ugk8{a`^@rU~h>8(0Y{E0D$=F1(ey9P`4#2A;HBF@ba_YZ*hBqL%xm+p+qMwFJj1fn|5ip zRG&huWv}Q-;eJ<(*SUzgtW)!aI%0ErY+yOpaE?0aJ7=`VW%SYmh`oCiULnCB9+^M^ z0#Bqp-U5M;YtI3omO-F^HRK^Q)W{S-np6Y;j{qZu`tO^600Y6Eg||wJRRLy!tYlpz zfTW;t$Y%j;3ORx(OyFmr#O_>(bVfcUjGj(n*^58ekO3{oA~ zV{(BhOlLUC$Zh?2tSLu3XSu&^<@4?AZmi>`iIlZ72M zPBSk1$c4{6;905|I0YO~Czd)CdizwyJd1{gEnZYv?^o>OVA=o%;B6M-MYXaS^ zKt2g#?Qel+e*lH+tk}1CpvA$ zaq*JTXl7BvX*}9y_?|BnBg)gl3rm%O`&C2cos>vQk9Et!dTnk?xcZ)uuPN#Az;$x1Oa zr*pAtU9FuzhAAgh@e(ewq{bHm7{o-4@8)08BIJ1&!uZsL`KtJ$H(s5);C%&K&kEV+ zv8NX(1+>V-)D0`2#myKgxUjC6S)$!yXwzP)esy!fo?>g1lJMrOz~8EB8_W&rUr);;rBaL59O} zP0$57O|yg6R}93a66-{aSd&kFY}6@QzN$K1H5V7WQcy>ad<7fu`G%JWK12fV)rXH3 zLi9U~gu5dz_-O8-yA$45;c}RRPt|s{eUEZhEDWR(xSxZNLSzSRImG^j^(mM7&Ew|g ze!ueSf4#DUlW*NEbxAE1rH0JqzRCMLsr(4Bs~!C{ntu? zwm6FCa>k_j1|GkH9aE$}XEMvBVy)l7Gv`P9ev{v3|FBzk!SRY2z&2jv~Jxsy-;k_vQGV8(eDg zr(*B5~FqhvBv%L<~}RSf~cdh zVd&Vlma%ci7#E?s=iHWEQ~*({BxdaN_ItmwOQR#iEQmk(+Qmku zp2mZqRu;AnFy_L3#IZgLhjPwT5O$}PI`BSBA-36beNNH;49~|i+%>95Ibxx2VJg+z zcT{#A-8mD2DUr81H z_UY{F;dQSmm8iuEEJWBt3&h4zoEVXQ;HiDwS5nr=Ho^=v-!O8D#`z{TYiXWrY$D*a zd_u5)&90WhTd5eAUnUthN3MQ5)~RbGKpWmx(c%7ZFBC&z(_$k&>NW7uVL-&cm=s7U+ncb}HN53$)56CK^AH3mSiJ=I|? z?GH3Al(S#G^DZWHOts82GDAPfh0BMA+nq1XE;LDvo0tD`V5(cbm}4A=k^q9G&9PZa zyQ+u_FLpGeQZwE&h?)&HVTNrg{5AxK>eyw}&XP470}y?^gh7VRtXt=Ts43)p!~D(b ztK*rsJuA$X`u2Zq%x-S=BU%AxfZ%-eNX}%7dyVJ**=qJj8zZH<)luKI9HBd$%$yI? z#&iY(*1skT_N*sr!K5BSrH?(&Q3sgWj3mwQzlTzJ6fnrAL+tH}MihW#^~m2h8vxRA zHA&ClQzr_f2P5+kTC~`)A`JwqNVU>$3qaZe_pZ6A0L;{oXAu|xDU+tmwB}bpf#-_& v4;@^`g;4;Y6z~*Fk59?|yYzn#-boY3gQ{~w*OYDfy8z&V#U&IC=|TDj_YjDe literal 0 HcmV?d00001 diff --git a/wechat/miniprogram/icons/scand.png b/wechat/miniprogram/icons/scand.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc3272b55cd452560dd9e9f6aa7bcb5cc61ffe7 GIT binary patch literal 5027 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 - + + 添加4G设备 - + + + * + IMEI： + + + + + + + + + * + 设备名称： + + + + + + + + 固件版本： + + {{ firmwareVersion }} + + + + * + 设备分类： + + + + + + + {{ item.categoryName }} + + + + + + + 备注： + + + + + + - + 提 交 - \ No newline at end of file diff --git a/wechat/miniprogram/pages/add4G/index.wxss b/wechat/miniprogram/pages/add4G/index.wxss index 3e3dd7ba..af8bf561 100644 --- a/wechat/miniprogram/pages/add4G/index.wxss +++ b/wechat/miniprogram/pages/add4G/index.wxss @@ -1,34 +1,74 @@ /* miniprogram/pages/add4G/index.wxss */ -.top{ - margin: 100rpx auto 30rpx; + .top{ + margin: 60rpx auto 0rpx; } .title{ font-size: 42rpx; text-align: center; - margin-bottom: 30rpx; -} -label{ - display:flex; - align-items:center; - padding:30rpx 0; - border-bottom:2rpx solid #bfbfbf; -} -.icon{ - width:40rpx; - height:40rpx; - display:flex; - align-items:center; - justify-content:center; -} -input{ - padding:15rpx 30rpx; - flex:1 -} -.account{ - width:80vw; - margin:0 auto; + margin-bottom: 45rpx; } .btn { margin: 60rpx auto; width: 50vw; +} + + +.biaodan{ + width: 90vw; + margin: 0 auto; + padding: 15rpx; +} +.item{ + display: flex; + align-items: center; + margin: 30rpx auto; +} +.name{ + width: 180rpx; + text-align: end; +} +.flag{ + display:inline-block; + color:red; + width:32rpx; + text-align: center; +} +.input{ + box-shadow: 0 0 3rpx 2rpx #bfbfbf; + flex: 1; + display: flex; + align-items: center; + position: relative; +} +.input>input{ + padding: 15rpx 30rpx; + flex: 1; +} + +.input>image{ + width: 60rpx; + height: 60rpx; + transition:transform 0.3s; +} +.input:hover{ + box-shadow: 0 0 3rpx 2rpx blue; +} +.select_box{ + position: absolute; + width: 100%; + top: 100%; + background-color: #ffffff; + box-shadow: 0 0 3rpx 2rpx #bfbfbf; + transition:height 0.3s; + box-sizing: border-box; + height: 0; + overflow-y: auto; + z-index: 99; +} +.select_item{ + padding: 15rpx 30rpx; + /* box-shadow: 0 0 3rpx 2rpx #bfbfbf; */ +} +.select_img_rotate{ + transform:rotate(180deg); } \ No newline at end of file diff --git a/wechat/miniprogram/pages/index/index.js b/wechat/miniprogram/pages/index/index.js index b8eb45db..18fa14fb 100644 --- a/wechat/miniprogram/pages/index/index.js +++ b/wechat/miniprogram/pages/index/index.js @@ -27,8 +27,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - // this.getProducts(); - // this.query(); // timer = setInterval(() => { this.getDevices(); // }, 2000); @@ -41,8 +39,18 @@ Page({ mask: true }) const res = await requestApi('/system/device/list',{ method:'GET' }); - console.log(res); + wx.hideLoading(); const result = JSON.parse(res.result); + if (result.code !== 200) { + wx.showToast({ + title: '请求失败', + icon:'error' + }); + return; + } + wx.showToast({ + title: '请求成功', + }); let onlineList = []; let unlineList = []; result.rows.forEach(v=>{ @@ -57,11 +65,9 @@ Page({ unlineList, DeviceList:result.rows }) - wx.hideLoading() }, - //获取天气 getWeather:async function(){ let that = this; diff --git a/wechat/miniprogram/pages/login/index.js b/wechat/miniprogram/pages/login/index.js index 115ca2cb..73672e50 100644 --- a/wechat/miniprogram/pages/login/index.js +++ b/wechat/miniprogram/pages/login/index.js @@ -22,46 +22,81 @@ Page({ }, //获取验证码图片和uuid - async getCaptchaImage(){ - const res = await loginApi('/captchaImage',{ method:'get' }); - const data = JSON.parse(res.result) - this.setData({ - img:data.img, - uuid:data.uuid + // async getCaptchaImage(){ + // const res = await loginApi('/captchaImage',{ method:'get' }); + // const data = JSON.parse(res.result) + // this.setData({ + // img:data.img, + // uuid:data.uuid + // }) + // }, + + //测试接口 + getCaptchaImage(){ + const that = this; + wx.request({ + url: 'http://localhost/dev-api/captchaImage', + success(res){ + that.setData({ + img:res.data.img, + uuid:res.data.uuid + }) + console.log(res); + } }) }, - //登录 async submit(){ - wx.showLoading({ - title: '正在登录', - }) - const res = await loginApi('/login',{ + // wx.showLoading({ + // title: '正在登录', + // }) + // const res = await loginApi('/login',{ + // method:'POST', + // body:{ + // code:this.data.value, + // uuid:this.data.uuid, + // password: this.data.password, + // username: this.data.username + // }, + // json:true + // }) + // wx.hideLoading(); + // if (res.result.code !== 200) { + // wx.showToast({ + // title: res.result.msg, + // icon:'error' + // }); + // this.getCaptchaImage(); + // return; + // } + // wx.setStorageSync('token', res.result.token); + // wx.switchTab({ + // url: '/pages/index/index', + // }) + + wx.request({ + url: 'http://localhost/dev-api/login', method:'POST', - body:{ + data:{ code:this.data.value, uuid:this.data.uuid, password: this.data.password, username: this.data.username }, - json:true - }) - wx.hideLoading(); - if (res.result.code !== 200) { - wx.showToast({ - title: res.result.msg, - icon:'error' - }); - this.getCaptchaImage(); - return; - } - wx.setStorageSync('token', res.result.token); - wx.switchTab({ - url: '/pages/index/index', + success(res){ + console.log(res); + wx.setStorageSync('token', res.data.token); + } }) }, + // + register(){ + wx.navigateTo({ + url: '/pages/register/index', + }) + }, inputUsername(e){ this.setData({ username:e.detail }); diff --git a/wechat/miniprogram/pages/login/index.wxml b/wechat/miniprogram/pages/login/index.wxml index 687e93a1..4cf962b4 100644 --- a/wechat/miniprogram/pages/login/index.wxml +++ b/wechat/miniprogram/pages/login/index.wxml @@ -25,23 +25,29 @@ /> - - + + + + + + - - - - - - 登录 + + + 登 录 + + + 注 册 + + diff --git a/wechat/miniprogram/pages/login/index.wxss b/wechat/miniprogram/pages/login/index.wxss index 1ad11756..e160c078 100644 --- a/wechat/miniprogram/pages/login/index.wxss +++ b/wechat/miniprogram/pages/login/index.wxss @@ -41,7 +41,12 @@ display: inline-block; height: 77rpx; } +.btns{ + width: 100%; + display: flex; + justify-content: space-around; + margin: 30rpx 0; +} .btn{ - margin: 45rpx auto; - width: 40vw; -} \ No newline at end of file + width: 30vw; +} diff --git a/wechat/miniprogram/pages/register/index.js b/wechat/miniprogram/pages/register/index.js new file mode 100644 index 00000000..4346526d --- /dev/null +++ b/wechat/miniprogram/pages/register/index.js @@ -0,0 +1,370 @@ +// miniprogram/pages/register/index.js +const registerOptions = { + "admin": false, + "avatar": "", + "createBy": "", + "createTime": "", + "delFlag": "", + "dept": { + "ancestors": "", + "children": [ + null + ], + "createBy": "", + "createTime": "", + "delFlag": "", + "deptId": 0, + "deptName": "", + "email": "", + "leader": "", + "orderNum": "", + "params": {}, + "parentId": 0, + "parentName": "", + "phone": "", + "remark": "", + "searchValue": "", + "status": "", + "updateBy": "", + "updateTime": "" + }, + "deptId": 0, + "email": "", + "loginDate": "", + "loginIp": "", + "nickName": "李四", + "params": {}, + "password": "", + "phonenumber": "", + "postIds": [ + 0 + ], + "remark": "", + "roleIds": [ + 2 + ], + "roles": [ + { + "admin": false, + "createBy": "", + "createTime": "", + "dataScope": "2", + "delFlag": "", + "deptCheckStrictly": true, + "deptIds": [ + 0 + ], + "flag": true, + "menuCheckStrictly": true, + "menuIds": [ + 0 + ], + "params": {}, + "remark": "", + "roleId": 2, + "roleKey": "common", + "roleName": "", + "roleSort": "2", + "searchValue": "", + "status": "", + "updateBy": "", + "updateTime": "" + } + ], + "salt": "", + "searchValue": "", + "sex": "", + "status": "", + "updateBy": "", + "updateTime": "", + "userId": 0, + "userName": "" +} + +const { loginApi } = require('../../API/request.js'); + + +Page({ + + /** + * 页面的初始数据 + */ + data: { + username:'', + password:'', + pwdAgain:'', + phonenumber:'', + email:'', + emailError:'', + radio:'0', + phoneError:'', + phoneValue:true, + emailValue:true, + nickName:'', + nickError:'', + nickValue:false, + nameValue:false, + nameError:'', + pwdValue:false, + pwdError:'', + pwdAgainValue:false, + pwdAgainError:'' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + wx.setNavigationBarTitle({ + title: '用户注册', + }) + }, + + + //测试接口，需修改 + async register(){ + if (!this.checkForm()) { + return; + }else{ + wx.showLoading({ + title: '正在注册', + }) + let registerParams = registerOptions; + registerParams.password = this.data.password; + registerParams.userName = this.data.username; + registerParams.nickName = this.data.nickName; + registerParams.sex = this.data.radio; + registerParams.phonenumber = this.data.phonenumber; + registerParams.email = this.data.email; + + wx.request({ + url: 'http://localhost/dev-api/system/user/register', + method:'POST', + data:registerParams, + timeout:10000, + success(res){ + wx.hideLoading(); + if (res.data.code === 200) { + wx.showToast({ + title: '注册成功', + icon:'success' + }) + setTimeout(() => { + wx.redirectTo({ + url: '/pages/login/index', + }) + }, 1000); + }else{ + wx.showToast({ + title: res.data.msg, + icon:'error' + }) + } + } + }) + } + + // const res = await loginApi('/system/user/register',{ + // method:'POST', + // body:registerParams, + // json:true + // }); + + // console.log(formatDate()); + }, + + //检查表单 + checkForm(){ + if (this.data.nickName === '') { + this.setData({ + nickError:'昵称不能为空!' + }) + } + if (this.data.username === '') { + this.setData({ + nameError:'账号不能为空!' + }) + } + if (this.data.password === '') { + this.setData({ + pwdError:'密码不能为空!' + }) + } + return (this.data.nickValue && this.data.nameValue && this.data.pwdValue && this.data.pwdAgainValue && this.data.phoneValue && this.data.emailValue) + }, + + + onChooseSex(e){ + this.setData({ + radio:e.detail + }) + }, + + // imputUsername(e){ + // this.setData({ + // username:e.detail + // }) + // }, + // imputPassword(e){ + // this.setData({ + // password:e.detail + // }) + // }, + endInputPwdAgain(e){ + if ((e.detail.value.trim()!=='') && (e.detail.value === this.data.password)) { + this.setData({ + pwdAgainValue:true, + pwdAgainError:'' + }) + }else{ + this.setData({ + pwdAgainValue:false, + pwdAgainError:'密码输入不一致' + }) + } + }, + + endInputNick(e){ + if (e.detail.value.trim() === '') { + this.setData({ + nickValue:false, + nickError:'昵称不能为空!' + }) + }else{ + this.setData({ + nickName:e.detail.value, + nickError:'', + nickValue:true + }) + } + }, + + endInputName(e){ + if (e.detail.value.trim() === '') { + this.setData({ + nameValue:false, + nameError:'账号不能为空!' + }) + }else{ + this.setData({ + username:e.detail.value, + nameError:'', + nameValue:true + }) + } + }, + + endInputPwd(e){ + if (e.detail.value.trim() === '') { + this.setData({ + pwdValue:false, + pwdError:'密码不能为空!' + }) + }else{ + this.setData({ + password:e.detail.value, + pwdError:'', + pwdValue:true + }) + } + }, + + endInputPhone(e){ + if (e.detail.value.trim() !== '') { + const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; + if(!reg.test(e.detail.value)){ + this.setData({ + phoneError:'请输入正确的手机号!', + phoneValue:false + }); + return; + }else{ + this.setData({ + phoneError:'', + phoneValue:true, + phonenumber:e.detail.value + }); + }; + }else{ + this.setData({ + phoneError:'', + phoneValue:true, + phonenumber:'' + }); + } + }, + + endInputEmail(e){ + if (e.detail.value.trim() !== '') { + const reg = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/; + if(!reg.test(e.detail.value)){ + this.setData({ + emailError:'邮箱不合规范!', + emailValue:false + }); + return; + }else{ + this.setData({ + emailError:'', + emailValue:true, + email:e.detail.value + }); + }; + }else{ + this.setData({ + emailError:'', + emailValue:true, + email:'' + }); + } + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/wechat/miniprogram/pages/register/index.json b/wechat/miniprogram/pages/register/index.json new file mode 100644 index 00000000..f9a4324a --- /dev/null +++ b/wechat/miniprogram/pages/register/index.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "van-field": "@vant/weapp/field/index", + "van-button": "@vant/weapp/button/index", + "van-radio": "@vant/weapp/radio/index", + "van-radio-group": "@vant/weapp/radio-group/index" + } +} \ No newline at end of file diff --git a/wechat/miniprogram/pages/register/index.wxml b/wechat/miniprogram/pages/register/index.wxml new file mode 100644 index 00000000..b22a6aa9 --- /dev/null +++ b/wechat/miniprogram/pages/register/index.wxml @@ -0,0 +1,87 @@ + + + + + 账号注册 + + + + + + + + + + + + + + + 性别 ： + + 男 + 女 + + + + + + + + + + 注 册 + + diff --git a/wechat/miniprogram/pages/register/index.wxss b/wechat/miniprogram/pages/register/index.wxss new file mode 100644 index 00000000..77f2e7cf --- /dev/null +++ b/wechat/miniprogram/pages/register/index.wxss @@ -0,0 +1,38 @@ +/* miniprogram/pages/register/index.wxss */ +.form{ + width: 80vw; + margin: 50rpx auto; + padding: 30rpx; + box-shadow: 0 0 5rpx 3rpx rgb(202, 202, 202); +} +.title{ + margin: 15rpx auto 30rpx; + font-size: 40rpx; + display: flex; + align-items: center; +} +.title>image{ + width: 60rpx; + height: 60rpx; + margin-right: 15rpx; +} +.input{ + margin: 15rpx 0; + /* box-shadow: 0 0 5rpx 5rpx #bfbfbf; */ + border-bottom: 1rpx solid #bfbfbf; +} +.btn{ + margin: 45rpx auto; + width: 40vw; +} +.checkbox{ + display: flex; + margin: 15rpx 0; + padding: 15rpx 0; +} +.check_title{ + /* font-size: 26rpx; */ + width: 120rpx; + padding: 0 30rpx; + color: rgba(0, 0, 0, .6); +} \ No newline at end of file diff --git a/wechat/project.private.config.json b/wechat/project.private.config.json index 66c83fc4..1314dbfd 100644 --- a/wechat/project.private.config.json +++ b/wechat/project.private.config.json @@ -69,6 +69,12 @@ { "name": "pages/add4G/index", "pathName": "pages/add4G/index", + "query": "", + "scene": null + }, + { + "name": "pages/register/index", + "pathName": "pages/register/index", "scene": null } ]