diff --git a/App.vue b/App.vue index 1f8c57f..e711b4f 100644 --- a/App.vue +++ b/App.vue @@ -12,8 +12,8 @@ console.log(token.secretKey,'App Launch') } else { uni.reLaunch({ - // url: '/pages/login/login' - url:'/pages/ylzList/detail/index' + url: '/pages/login/login' + // url:'/pages/mypage/mypage' }) console.log(token.secretKey,'App Launch2') } diff --git a/pages.json b/pages.json index 70b33b9..183b220 100644 --- a/pages.json +++ b/pages.json @@ -346,12 +346,6 @@ "selectedIconPath": "static/tabs/home2.png", "text": "首页" }, - { - "pagePath": "pages/addressBook/addressBook", - "iconPath": "/static/tabs/phone_icon@2x.png", - "selectedIconPath": "static/tabs/phone_icon@2x2.png", - "text": "通讯录" - }, { "pagePath": "pages/mypage/mypage", "iconPath": "/static/images/my2_icon@2x.png", diff --git a/pages/aqjc/index.vue b/pages/aqjc/index.vue index ecb702a..8c2dd5f 100644 --- a/pages/aqjc/index.vue +++ b/pages/aqjc/index.vue @@ -71,7 +71,7 @@ import moment from "moment" import drpOption from './jrxOptions'; import JcsjTable from "./jcsjTable" - const stm = moment().subtract(7, 'months').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"); + const stm = moment().subtract(1, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"); const etm = moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"); export default { diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index 65563db..ac1f51c 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -8,7 +8,7 @@
-
{{ userList.userName }}
+
{{ userList.nickName }}
{{ userList.dept.deptName || '' }}
@@ -26,7 +26,7 @@
-
+
- +
+ + 用户登录 + + - + - + - 记住用户名和密码 + 记住用户名和密码 - - @@ -37,176 +25,163 @@ - + \ No newline at end of file diff --git a/pages/modifyPassword/modifyPassword.vue b/pages/modifyPassword/modifyPassword.vue index 871fd29..2d87199 100644 --- a/pages/modifyPassword/modifyPassword.vue +++ b/pages/modifyPassword/modifyPassword.vue @@ -11,14 +11,14 @@
- + - - - - + +
@@ -34,10 +34,14 @@ export default { data() { return { + // formData: { + // oldSecretKey: '', + // newSecretKey: '', + // secondSecretKey: '', + // }, formData: { - oldSecretKey: '', - newSecretKey: '', - secondSecretKey: '', + oldPassword: '', + newPassword: '', }, } }, @@ -47,28 +51,33 @@ }, save(formData){ - let new_params = { - userId: '' , - oldSecretKey: '', - newSecretKey: '', - secondSecretKey: '', - } + // let new_params = { + // userId: '' , + // oldSecretKey: '', + // newSecretKey: '', + // secondSecretKey: '', + // } - new_params.oldSecretKey = CryptoJS.MD5(formData.oldSecretKey).toString() - new_params.newSecretKey = CryptoJS.MD5(formData.newSecretKey).toString() - new_params.secondSecretKey = CryptoJS.MD5(formData.secondSecretKey).toString() - new_params.userId = uni.getStorageSync('value').userId + // new_params.oldSecretKey = CryptoJS.MD5(formData.oldSecretKey).toString() + // new_params.newSecretKey = CryptoJS.MD5(formData.newSecretKey).toString() + // new_params.secondSecretKey = CryptoJS.MD5(formData.secondSecretKey).toString() + // new_params.userId = uni.getStorageSync('value').userId // console.log(formData) - uni.$http.post('/gunshiApp/xfflood/user/updateSecretKey',new_params).then(res=>{ + uni.$http.put(`/gunshiApp/xyt/system/user/profile/updatePwd?oldPassword=${formData.oldPassword}&newPassword=${formData.newPassword}`).then(res=>{ console.log(res); if (res.data.code === 200) { uni.showToast({ - title: res.data.description, + title: "修改成功，即将重新登录", icon:'none', duration: 2000 }) - setTimeout(uni.navigateBack(),2500) + setTimeout(() => { + uni.reLaunch({ + url: '/pages/login/login' + // url:'/pages/homeIndex/index' + }) + },2500) } else { uni.showToast({ title: res.data.description, diff --git a/pages/mypage/mypage.vue b/pages/mypage/mypage.vue index c810d64..d148949 100644 --- a/pages/mypage/mypage.vue +++ b/pages/mypage/mypage.vue @@ -10,8 +10,8 @@ >
-
{{this.userList.userName}}
-
{{this.userList.orgList[0].orgName}}
+
{{this.userList.nickName}}
+
{{this.userList.dept.deptName}}
@@ -31,7 +31,7 @@
-
+
版本号
@@ -45,16 +45,11 @@ + .userinfo { + border-radius: 5px; + display: flex; + flex-direction: row; + margin-top: 5vh; + margin-left: 2vw; + margin-bottom: 2vh; + align-items: center; + width: 95%; + height: 6vh; + background-color: #007afd; + + } + + .icon { + width: 6vw; + height: 6vh; + align-items: center; + line-height: 6vh; + } + + .Header { + display: flex; + flex-direction: row; + flex: 0.95; + justify-content: center; + color: white; + font-size: 20px; + } + + .info { + margin: 1vh; + + } + + .listContainer { + height: 6vh; + line-height: 8vh; + } + + .button { + margin-top: 60vh; + border-radius: 10px; + display: flex; + flex-direction: column-reverse; + width: 92%; + height: 6vh; + font-size: 20px; + color: white; + background-color: #007afd; + } + + .slot-image { + margin-top: 12px; + width: 40px; + height: 40px; + border-radius: 50%; + } + \ No newline at end of file diff --git a/pages/ylzList/index.vue b/pages/ylzList/index.vue index 71715ae..3d25602 100644 --- a/pages/ylzList/index.vue +++ b/pages/ylzList/index.vue @@ -34,16 +34,33 @@ h12:22, h24:35, }, - + ylzList:[] } }, methods:{ + + // 获取雨量站 + async getYlzData(){ + try { + const {data} = await uni.$http.post( + "/gunshiApp/xyt/stPptnRReal/list") + if(data.code == 200){ + this.ylzList = [...data.data]; + } + } catch (error) { + uni.$showMsg(); + } + }, toDetail(){ uni.navigateTo({ url:'/pages/ylzList/detail/index' }) }, - }} + }, + mounted() { + this.getYlzData(); + }, + }