修改登录密码的页面

pages.json

@@ -40,6 +40,14 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/updatePassword/updatePassword",
+			"style" :
+			{
+				"navigationStyle": "custom",
+				"enablePullDownRefresh" : false
+			}
 		}
 	],
 

pages/index/index.rpx.css

@@ -1,433 +1,491 @@
-.page{
-    background-image:url('https://wine.gzzzyd.com/tech/static/index/bgImg.png');
-    background-repeat:no-repeat;
-    background-size:100% ;
-    background-color: #f7f7f7;
-    padding: 0 32rpx;
-}
-.tuni{
-    height: 160rpx;
-    border-radius: 24rpx;
-    background: #ffffff;
-    margin-top: 34rpx;
-    background: linear-gradient(180deg, #FFFFFF 0%, #FFFCED 100%);
-}
-.profile{
-    width: 112rpx;
-    height: 112rpx;
-    border-radius: 80rpx;
-    border: 2rpx solid #FFFFFF;
-    box-sizing: border-box;
-    margin-left: 32rpx;
-    margin-top: 24rpx;
-}
-.tuniMsg{
-    width: 165rpx;
-    height: 160rpx;
-    margin-left: 16rpx;
-}
-.name{
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #333333;
-    margin-top: 30rpx;
-    line-height: 52rpx;
-}
-.biaoqian{
-    background: #FFF6CE;
-    border-radius: 8rpx;
-    border: 2rpx solid #FFE05C;
-    padding: 6rpx 18rpx;
-    font-size: 20rpx;
-    font-weight: 400;
-    color: #333333;
-}
-.tuni-right{
-    width: 365rpx;
-
-}
-
-.imgs{
-    width: 622rpx;
-    /*height: 624rpx;*/
-    margin-top: 16rpx;
-    border-radius: 15rpx;
-}
-.mmImgView{
-    float: left;
-    width: 308rpx;
-    height: 310rpx;
-    border-radius: 15rpx;
-    overflow: hidden;
-}
-.floatRight{
-    float:right;
-}
-.marginTop{
-    margin-top: 6rpx;
-}
-.mmImg{
-    width: 308rpx;
-    height: 310rpx;
-    border-radius: 8rpx;
-}
-.like{
-    width: 622rpx;
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #333333;
-    line-height: 40rpx;
-    margin-top: 16rpx;
-}
-.serviceMsg{
-    width: 686rpx;
-    background: #FFFFFF;
-    border-radius: 24rpx;
-    margin-top: 84rpx;
-    position: relative;
-    margin-bottom: 60rpx;
-    padding-bottom: 38rpx;
-}
-
-.dakaIcon{
-    height: 40rpx;
-    margin-top: 46rpx;
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #93D21A;
-    line-height: 36rpx;
-}
-.dakaText{
-    margin-top: 10rpx;
-    font-size: 20rpx;
-    font-weight: 400;
-    color: #333333;
-}
-.buttons{
-    margin-top: 16rpx;
-}
-.buttonItem{
-    width: 164rpx;
-    height: 80rpx;
-    background: #FFE05C;
-    border-radius: 40rpx;
-    border: 4rpx solid #FFFFFF;
-    text-align: center;
-    font-size: 24rpx;
-    font-weight: 600;
-    color: #333333;
-    line-height: 80rpx;
-}
-
-.serviceProfile{
-    width: 160rpx;
-    height: 160rpx;
-    border-radius: 80rpx;
-    border: 2px solid #ffffff;
-    box-sizing: border-box;
-}
-.serviceInfo{
-    width: 622rpx;
-    position: absolute;
-    left: 32rpx;
-    top: -60rpx;
-}
-.serviceInfo-rigth{
-    width: 465rpx;
-    padding-bottom: 20rpx;
-}
-.servicename{
-    height: 52rpx;
-    font-size: 36rpx;
-    font-weight: 600;
-    color: #333333;
-   padding: 0 20rpx;
-    line-height: 64rpx;
-    margin-bottom: 20rpx;
-}
-.tag{
-    width: 140rpx;
-    height: 64rpx;
-    background: #FFF6CE;
-    border-radius: 32rpx;
-    line-height: 64rpx;
-}
-.tag text{
-    margin-right: 10rpx;
-}
-.hint{
-     width: 24rpx;
-     height: 24rpx;
-     border-radius: 12rpx;
-     text-align: center;
-     background:   #FFAF36;
-     color: red;
-     font-size: 18rpx;
-     margin-left: 20rpx;
-     margin-top: 32rpx;
-     line-height: 24rpx;
- }
-.hintCentent{
-    font-size: 32rpx;
-    font-weight: 500;
-    color: #FFFFFF;
-    line-height: 88rpx;
-    margin-left: 20rpx;
-}
-.hintView{
-    width: 622rpx;
-    height: 88rpx;
-    background: linear-gradient(180deg, #FF5C5C 0%, #E63A3A 100%);
-    border-radius: 44rpx;
-    border: 2rpx solid #FFFFFF;
-}
-
-
-.leftBord{
-    border-left: 2px solid #DDDDDD;
-    padding-left: 30rpx;
-    margin-left: 30rpx;
-}
-.dataNull{
-    width: 280rpx;
-    height: 280rpx;
-    margin-top: 100rpx;
-}
-.dataNullText{
-    font-size: 24rpx;
-    font-weight: 400;
-    color: #999999;
-    margin-top: 24rpx;
-}
-.addService{
-    width: 750rpx;
-    background: #FFFFFF;
-    padding: 24rpx 0;
-    border-radius: 24rpx 24rpx 0rpx 0rpx;
-}
-.popupTitle{
-    height: 44rpx;
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #333333;
-    line-height: 44rpx;
-    margin-left: 34rpx;
-}
-.scrollY{
-    height: 504rpx;
-    margin-top: 34rpx;
-    margin-bottom: 24rpx;
-}
-
-.scrollY1{
-    height: 870rpx;
-    margin-bottom: 24rpx;
-}
-.serviceItems{
-    width: 684rpx;
-    margin-top: 20rpx;
-}
-.serviceItem{
-    width: 210rpx;
-    height: 100rpx;
-    background: #FAFAFA;
-    border-radius: 16rpx;
-    text-align: center;
-    font-size: 28rpx;
-    font-weight: 500;
-    color: #111111;
-    line-height: 100rpx;
-    float: left;
-}
-.marginTop24{
-    margin-top: 24rpx;
-}
-.marginLeft16{
-    margin-left: 16rpx;
-}
-.marginLeft28{
-    margin-left: 28rpx;
-}
-.serviceTeach{
-    width: 148rpx;
-    height: 206rpx;
-    float: left;
-    position: relative;
-}
-.serviceTeachImg{
-    width: 148rpx;
-    height: 148rpx;
-    border-radius: 74rpx;
-}
-.serviceTeachName{
-    width: 148rpx;
-    height: 40rpx;
-    font-size: 24rpx;
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    color: #666666;
-    line-height: 40rpx;
-    text-align: center;
-    margin-top: 16rpx;
-}
-.vImage{
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 32rpx;
-    height: 32rpx;
-}
-
-.serviceName{
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #111111;
-    margin-left: 24rpx;
-    padding-top: 24rpx;
-}
-.servicePrice{
-    margin-top: 16rpx;
-    margin-left: 24rpx;
-}
-.servicePriceKey{
-    height: 40rpx;
-    font-size: 24rpx;
-    font-weight: 400;
-    color: #999999;
-    line-height: 40rpx;
+.page {
+	/* background-image:url('https://wine.gzzzyd.com/tech/static/index/bgImg.png'); */
+	background-image: url('https://jje.admin.xinyuekj.com.cn/tech/static/index/bgImg.png');
+	background-repeat: no-repeat;
+	background-size: 100%;
+	background-color: #f7f7f7;
+	padding: 0 32rpx;
 }
+
+.tuni {
+	height: 160rpx;
+	border-radius: 24rpx;
+	background: #ffffff;
+	margin-top: 34rpx;
+	background: linear-gradient(180deg, #FFFFFF 0%, #FFFCED 100%);
+}
+
+.profile {
+	width: 112rpx;
+	height: 112rpx;
+	border-radius: 80rpx;
+	border: 2rpx solid #FFFFFF;
+	box-sizing: border-box;
+	margin-left: 32rpx;
+	margin-top: 24rpx;
+}
+
+.tuniMsg {
+	width: 165rpx;
+	height: 160rpx;
+	margin-left: 16rpx;
+}
+
+.name {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #333333;
+	margin-top: 30rpx;
+	line-height: 52rpx;
+}
+
+.biaoqian {
+	background: #FFF6CE;
+	border-radius: 8rpx;
+	border: 2rpx solid #FFE05C;
+	padding: 6rpx 18rpx;
+	font-size: 20rpx;
+	font-weight: 400;
+	color: #333333;
+}
+
+.tuni-right {
+	width: 365rpx;
+
+}
+
+.imgs {
+	width: 622rpx;
+	/*height: 624rpx;*/
+	margin-top: 16rpx;
+	border-radius: 15rpx;
+}
+
+.mmImgView {
+	float: left;
+	width: 308rpx;
+	height: 310rpx;
+	border-radius: 15rpx;
+	overflow: hidden;
+}
+
+.floatRight {
+	float: right;
+}
+
+.marginTop {
+	margin-top: 6rpx;
+}
+
+.mmImg {
+	width: 308rpx;
+	height: 310rpx;
+	border-radius: 8rpx;
+}
+
+.like {
+	width: 622rpx;
+	font-size: 28rpx;
+	font-weight: 400;
+	color: #333333;
+	line-height: 40rpx;
+	margin-top: 16rpx;
+}
+
+.serviceMsg {
+	width: 686rpx;
+	background: #FFFFFF;
+	border-radius: 24rpx;
+	margin-top: 84rpx;
+	position: relative;
+	margin-bottom: 60rpx;
+	padding-bottom: 38rpx;
+}
+
+.dakaIcon {
+	height: 40rpx;
+	margin-top: 46rpx;
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #93D21A;
+	line-height: 36rpx;
+}
+
+.dakaText {
+	margin-top: 10rpx;
+	font-size: 20rpx;
+	font-weight: 400;
+	color: #333333;
+}
+
+.buttons {
+	margin-top: 16rpx;
+}
+
+.buttonItem {
+	width: 164rpx;
+	height: 80rpx;
+	background: #FFE05C;
+	border-radius: 40rpx;
+	border: 4rpx solid #FFFFFF;
+	text-align: center;
+	font-size: 24rpx;
+	font-weight: 600;
+	color: #333333;
+	line-height: 80rpx;
+}
+
+.serviceProfile {
+	width: 160rpx;
+	height: 160rpx;
+	border-radius: 80rpx;
+	border: 2px solid #ffffff;
+	box-sizing: border-box;
+}
+
+.serviceInfo {
+	width: 622rpx;
+	position: absolute;
+	left: 32rpx;
+	top: -60rpx;
+}
+
+.serviceInfo-rigth {
+	width: 465rpx;
+	padding-bottom: 20rpx;
+}
+
+.servicename {
+	height: 52rpx;
+	font-size: 36rpx;
+	font-weight: 600;
+	color: #333333;
+	padding: 0 20rpx;
+	line-height: 64rpx;
+	margin-bottom: 20rpx;
+}
+
+.tag {
+	width: 140rpx;
+	height: 64rpx;
+	background: #FFF6CE;
+	border-radius: 32rpx;
+	line-height: 64rpx;
+}
+
+.tag text {
+	margin-right: 10rpx;
+}
+
+.hint {
+	width: 24rpx;
+	height: 24rpx;
+	border-radius: 12rpx;
+	text-align: center;
+	background: #FFAF36;
+	color: red;
+	font-size: 18rpx;
+	margin-left: 20rpx;
+	margin-top: 32rpx;
+	line-height: 24rpx;
+}
+
+.hintCentent {
+	font-size: 32rpx;
+	font-weight: 500;
+	color: #FFFFFF;
+	line-height: 88rpx;
+	margin-left: 20rpx;
+}
+
+.hintView {
+	width: 622rpx;
+	height: 88rpx;
+	background: linear-gradient(180deg, #FF5C5C 0%, #E63A3A 100%);
+	border-radius: 44rpx;
+	border: 2rpx solid #FFFFFF;
+}
+
+
+.leftBord {
+	border-left: 2px solid #DDDDDD;
+	padding-left: 30rpx;
+	margin-left: 30rpx;
+}
+
+.dataNull {
+	width: 280rpx;
+	height: 280rpx;
+	margin-top: 100rpx;
+}
+
+.dataNullText {
+	font-size: 24rpx;
+	font-weight: 400;
+	color: #999999;
+	margin-top: 24rpx;
+}
+
+.addService {
+	width: 750rpx;
+	background: #FFFFFF;
+	padding: 24rpx 0;
+	border-radius: 24rpx 24rpx 0rpx 0rpx;
+}
+
+.popupTitle {
+	height: 44rpx;
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #333333;
+	line-height: 44rpx;
+	margin-left: 34rpx;
+}
+
+.scrollY {
+	height: 504rpx;
+	margin-top: 34rpx;
+	margin-bottom: 24rpx;
+}
+
+.scrollY1 {
+	height: 870rpx;
+	margin-bottom: 24rpx;
+}
+
+.serviceItems {
+	width: 684rpx;
+	margin-top: 20rpx;
+}
+
+.serviceItem {
+	width: 210rpx;
+	height: 100rpx;
+	background: #FAFAFA;
+	border-radius: 16rpx;
+	text-align: center;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #111111;
+	line-height: 100rpx;
+	float: left;
+}
+
+.marginTop24 {
+	margin-top: 24rpx;
+}
+
+.marginLeft16 {
+	margin-left: 16rpx;
+}
+
+.marginLeft28 {
+	margin-left: 28rpx;
+}
+
+.serviceTeach {
+	width: 148rpx;
+	height: 206rpx;
+	float: left;
+	position: relative;
+}
+
+.serviceTeachImg {
+	width: 148rpx;
+	height: 148rpx;
+	border-radius: 74rpx;
+}
+
+.serviceTeachName {
+	width: 148rpx;
+	height: 40rpx;
+	font-size: 24rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	color: #666666;
+	line-height: 40rpx;
+	text-align: center;
+	margin-top: 16rpx;
+}
+
+.vImage {
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 32rpx;
+	height: 32rpx;
+}
+
+.serviceName {
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #111111;
+	margin-left: 24rpx;
+	padding-top: 24rpx;
+}
+
+.servicePrice {
+	margin-top: 16rpx;
+	margin-left: 24rpx;
+}
+
+.servicePriceKey {
+	height: 40rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: #999999;
+	line-height: 40rpx;
+}
+
 .servicePricePrice {
-    height: 40rpx;
-    font-size: 24rpx;
-    font-weight: 400;
-    color: #ED569F;
-    line-height: 40rpx;
-}
-.cancelButton{
-    width: 332rpx;
-    height: 80rpx;
-    background: #F5F5F5;
-    border-radius: 54rpx;
-    text-align: center;
-    line-height: 80rpx;
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #666666;
-}
-.confirmButton{
-    width: 332rpx;
-    height: 80rpx;
-    background: #FFE05C;
-    border-radius: 54rpx;
-    text-align: center;
-    line-height: 80rpx;
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #333333;
-}
-
-.teachItem{
-    width: 686rpx;
-    height: 228rpx;
-    background: #FAFAFA;
-    border-radius: 16rpx;
-    position: relative;
-    margin-left: 32rpx;
-    margin-top: 24rpx;
-}
-.teachItem:first-child{
-    margin-top: 0rpx;
-}
-.teachImage{
-    width: 180rpx;
-    height: 180rpx;
-    border-radius: 8rpx;
-    margin-top: 24rpx;
-    margin-left: 24rpx;
-}
-.teachMsg{
-    margin-left: 24rpx;
-}
-.techName{
-    height: 48rpx;
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #111111;
-    line-height: 48rpx;
-    margin-top: 62rpx;
-}
-.teachTag{
-
-    height: 44rpx;
-    font-size: 20rpx;
-    font-weight: 400;
-    color: #333333;
-    line-height: 44rpx;
-
-    padding: 0 24rpx;
-    margin-left: 16rpx;
-    margin-top: 62rpx;
-    background: #FFF6CE;
-    border-radius: 8rpx;
-    border: 2rpx solid #FFE05C;
-}
-.declaration{
-    height: 40rpx;
-    font-size: 24rpx;
-    font-weight: 400;
-    color: #999999;
-    line-height: 40rpx;
-    margin-top: 16rpx;
-}
-.vBackGround{
-    background: rgba(255,224,92,0.1);
-    border: 4rpx solid #FFE05C;
-    box-sizing: border-box;
-}
-.objectItem{
-    width: 686rpx;
-    height: 160rpx;
-    background: #FAFAFA;
-    border-radius: 16rpx;
-    margin-left: 32rpx;
-    position: relative;
-    margin-top: 24rpx;
-}
-.objectItem:first-child{
-    margin-top: 0rpx;
-}
-.objectImage{
-    width: 108rpx;
-    height: 108rpx;
-    border-radius: 56rpx;
-    border: 2rpx solid #FFFFFF;
-    margin-top: 24rpx;
-    margin-left: 24rpx;
-}
-.objectName{
-    height: 160rpx;
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #111111;
-    line-height: 160rpx;
-    margin-left: 24rpx;
-}
-.reminderView{
-    width: 600rpx;
-    background: #FFFFFF;
-    border-radius: 15rpx;
-    padding: 20rpx 10rpx;
-}
-.reminderTitle{
-    text-align: center;
-    height: 50rpx;
-    line-height: 50rpx;
-}
-.textareaView{
-    height: 280rpx;
-    padding: 10rpx 0;
-}
-.textarea{
-    border: 1px solid #F7F7F7;
-    padding: 10rpx;
+	height: 40rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: #ED569F;
+	line-height: 40rpx;
+}
+
+.cancelButton {
+	width: 332rpx;
+	height: 80rpx;
+	background: #F5F5F5;
+	border-radius: 54rpx;
+	text-align: center;
+	line-height: 80rpx;
+	font-size: 28rpx;
+	font-weight: 400;
+	color: #666666;
+}
+
+.confirmButton {
+	width: 332rpx;
+	height: 80rpx;
+	background: #FFE05C;
+	border-radius: 54rpx;
+	text-align: center;
+	line-height: 80rpx;
+	font-size: 28rpx;
+	font-weight: 400;
+	color: #333333;
 }
+
+.teachItem {
+	width: 686rpx;
+	height: 228rpx;
+	background: #FAFAFA;
+	border-radius: 16rpx;
+	position: relative;
+	margin-left: 32rpx;
+	margin-top: 24rpx;
+}
+
+.teachItem:first-child {
+	margin-top: 0rpx;
+}
+
+.teachImage {
+	width: 180rpx;
+	height: 180rpx;
+	border-radius: 8rpx;
+	margin-top: 24rpx;
+	margin-left: 24rpx;
+}
+
+.teachMsg {
+	margin-left: 24rpx;
+}
+
+.techName {
+	height: 48rpx;
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #111111;
+	line-height: 48rpx;
+	margin-top: 62rpx;
+}
+
+.teachTag {
+
+	height: 44rpx;
+	font-size: 20rpx;
+	font-weight: 400;
+	color: #333333;
+	line-height: 44rpx;
+
+	padding: 0 24rpx;
+	margin-left: 16rpx;
+	margin-top: 62rpx;
+	background: #FFF6CE;
+	border-radius: 8rpx;
+	border: 2rpx solid #FFE05C;
+}
+
+.declaration {
+	height: 40rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: #999999;
+	line-height: 40rpx;
+	margin-top: 16rpx;
+}
+
+.vBackGround {
+	background: rgba(255, 224, 92, 0.1);
+	border: 4rpx solid #FFE05C;
+	box-sizing: border-box;
+}
+
+.objectItem {
+	width: 686rpx;
+	height: 160rpx;
+	background: #FAFAFA;
+	border-radius: 16rpx;
+	margin-left: 32rpx;
+	position: relative;
+	margin-top: 24rpx;
+}
+
+.objectItem:first-child {
+	margin-top: 0rpx;
+}
+
+.objectImage {
+	width: 108rpx;
+	height: 108rpx;
+	border-radius: 56rpx;
+	border: 2rpx solid #FFFFFF;
+	margin-top: 24rpx;
+	margin-left: 24rpx;
+}
+
+.objectName {
+	height: 160rpx;
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #111111;
+	line-height: 160rpx;
+	margin-left: 24rpx;
+}
+
+.reminderView {
+	width: 600rpx;
+	background: #FFFFFF;
+	border-radius: 15rpx;
+	padding: 20rpx 10rpx;
+}
+
+.reminderTitle {
+	text-align: center;
+	height: 50rpx;
+	line-height: 50rpx;
+}
+
+.textareaView {
+	height: 280rpx;
+	padding: 10rpx 0;
+}
+
+.textarea {
+	border: 1px solid #F7F7F7;
+	padding: 10rpx;
+}

pages/index/index.vue

@@ -469,7 +469,6 @@
 				this.$api.user.getUserInfo().then(res => {
 					this.userInfo = res.data.data
 					this.getImgUrlByOssId(this.userInfo.avatar)
-					uni.setStorageSync('userInfo', this.userInfo )
 					if (this.userInfo.signIn){
 						this.currServiceInfo()
 					}
@@ -478,6 +477,7 @@
 			 getImgUrlByOssId(ossId){
 				this.$api.service.getImgUrlByOssId({ossId:ossId}).then(res=>{
 					this.$set(this.userInfo,'avatarUrl', res.data.data[0].url.replace(/^http:/, "https:"))
+					uni.setStorageSync('userInfo', this.userInfo )
 				})
 			},
 

pages/login/login.vue

@@ -17,13 +17,13 @@
 			<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm">
 				<view class="formItem">
 					<u-form-item label="账号" prop="username" borderBottom ref="item1">
-						<u--input v-model="form.username" border="none"></u--input>
+						<u--input v-model="form.username" placeholder="请输入账号" border="none"></u--input>
 					</u-form-item>
 				</view>
 
 				<view class="formItem">
 					<u-form-item label="密码" prop="password" borderBottom ref="item1">
-						<u--input v-model="form.password" border="none" type="password"></u--input>
+						<u--input v-model="form.password" placeholder="请输入密码" border="none" type="password"></u--input>
 					</u-form-item>
 				</view>
 

pages/my/index.rpx.css

@@ -1,94 +1,107 @@
-.page{
-    background-image:url('https://wine.gzzzyd.com/tech/static/my/bg1.png');
-    background-repeat:no-repeat;
-    background-size:100% 30%;
-    background-color: #f7f7f7;
-    padding: 0 32rpx;
-}
-.useInfo{
-    width: 686rpx;
-    height: 152rpx;
-    margin-top: 32rpx;
+.page {
+	background-image: url('https://jje.admin.xinyuekj.com.cn/tech/static/my/bg1.png');
+	background-repeat: no-repeat;
+	background-size: 100% 30%;
+	background-color: #f7f7f7;
+	padding: 0 32rpx;
 }
 
-.profileView{
-    width: 152rpx;
-    height: 152rpx;
-    border-radius: 76rpx;
+.useInfo {
+	width: 686rpx;
+	height: 152rpx;
+	margin-top: 32rpx;
 }
-.profile{
-    width: 152rpx;
-    height: 152rpx;
-    border-radius: 76rpx;
-    border: 2px solid #ffffff;
-    box-sizing: border-box;
+
+.profileView {
+	width: 152rpx;
+	height: 152rpx;
+	border-radius: 76rpx;
 }
-.usermsg{
-    width: 500rpx;
-    height: 152rpx;
-    margin-left: 24rpx;
+
+.profile {
+	width: 152rpx;
+	height: 152rpx;
+	border-radius: 76rpx;
+	border: 2px solid #ffffff;
+	box-sizing: border-box;
 }
-.name{
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #333333;
-    margin-top: 24rpx;
+
+.usermsg {
+	width: 500rpx;
+	height: 152rpx;
+	margin-left: 24rpx;
 }
-.other{
-    font-size: 24rpx;
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    color: #333333;
-    margin-top: 16rpx;
+
+.name {
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #333333;
+	margin-top: 24rpx;
 }
-.statistics{
-    width: 686rpx;
-    height: 320rpx;
-    background: #FFFFFF;
-    box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(255,224,92,0.05);
-    border-radius: 24rpx;
-    margin-top: 40rpx;
+
+.other {
+	font-size: 24rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	color: #333333;
+	margin-top: 16rpx;
 }
-.statisticsTitle{
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #333333;
-    margin-left: 32rpx;
-    margin-top: 20rpx;
+
+.statistics {
+	width: 686rpx;
+	height: 320rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(255, 224, 92, 0.05);
+	border-radius: 24rpx;
+	margin-top: 40rpx;
 }
-.statisticsItem{
-    width: 33%;
-    height: 160rpx;
-    margin-top: 40rpx;
+
+.statisticsTitle {
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #333333;
+	margin-left: 32rpx;
+	margin-top: 20rpx;
 }
-.statisticsItemBorder{
-    border-left: 4rpx solid #EEEEEE;
+
+.statisticsItem {
+	width: 33%;
+	height: 160rpx;
+	margin-top: 40rpx;
 }
-.tuoke{
-    width: 686rpx;
-    height: 308rpx;
-    background: #FFFFFF;
-    box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(255,224,92,0.05);
-    background: linear-gradient(180deg, #FFFCED 0%, #FFFFFF 100%);
-    border-radius: 24rpx;
-    margin-top: 24rpx;
-    padding: 1rpx 0;
+
+.statisticsItemBorder {
+	border-left: 4rpx solid #EEEEEE;
 }
-.statisticsKey{
-    font-size: 24rpx;
-    font-weight: 400;
-    color: #999999;
-    line-height: 60rpx;
+
+.tuoke {
+	width: 686rpx;
+	height: 308rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(255, 224, 92, 0.05);
+	background: linear-gradient(180deg, #FFFCED 0%, #FFFFFF 100%);
+	border-radius: 24rpx;
+	margin-top: 24rpx;
+	padding: 1rpx 0;
 }
-.statisticsValue{
-    font-size: 36rpx;
-    font-weight: bold;
-    color: #333333;
+
+.statisticsKey {
+	font-size: 24rpx;
+	font-weight: 400;
+	color: #999999;
+	line-height: 60rpx;
 }
-.list{
-    width: 638rpx;
-    background: #FFFFFF;
-    border-radius: 24rpx;
-    padding: 20rpx 24rpx;
-    margin-top: 40rpx;
+
+.statisticsValue {
+	font-size: 36rpx;
+	font-weight: bold;
+	color: #333333;
 }
+
+.list {
+	width: 638rpx;
+	background: #FFFFFF;
+	border-radius: 24rpx;
+	padding: 20rpx 24rpx;
+	margin-top: 40rpx;
+}

pages/my/my.vue

@@ -132,13 +132,13 @@
 				this.$api.user.getUserInfo().then(res=>{
 					this.userInfo = res.data.data
 					this.getImgUrlByOssId(this.userInfo.avatar)
-					uni.setStorageSync('userInfo', this.userInfo )
 				})
 			},
 
 			getImgUrlByOssId(ossId){
 				this.$api.service.getImgUrlByOssId({ossId:ossId}).then(res=>{
 					this.$set(this.userInfo,'avatarUrl', res.data.data[0].url.replace(/^http:/, "https:"))
+					uni.setStorageSync('userInfo', this.userInfo )
 				})
 			},
 

pages/updatePassword/index.rpx.css

@@ -0,0 +1,14 @@
+.page{
+    height: 100vh;
+    background: #F9F9F9;
+    padding: 0 32rpx;
+}
+
+.updatePasswordButton{
+    text-align: center;
+    background: #4cd964;
+    line-height: 80rpx;
+    border-radius: 10rpx;
+    color: #FFFFFF;
+    margin-top: 100rpx;
+}

pages/updatePassword/updatePassword.vue

@@ -0,0 +1,81 @@
+<template>
+	<view class="page">
+		<uni-nav-bar  :fixed="true" background-color="#FFE05C" :border="false" :statusBar="true"  left-icon="left" title="修改登录密码" @clickLeft="back" />
+		<view :style="{'marginTop':'10rpx'}">
+			<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm">
+
+				<u-form-item :labelWidth="80" label="手机号：" prop="phone" ref="item1">
+					<u--input v-model="form.phone"  placeholder="请输入手机号"></u--input>
+				</u-form-item>
+
+				<u-form-item :labelWidth="80" label="原密码：" prop="oldPassword" ref="item1">
+					<u--input v-model="form.oldPassword" placeholder="请输入原密码" type="password"></u--input>
+				</u-form-item>
+
+				<u-form-item :labelWidth="80" label="新密码：" prop="newPassword" ref="item1">
+					<u--input v-model="form.newPassword" placeholder="请输入新密码" type="password"></u--input>
+				</u-form-item>
+
+			</u--form>
+
+			<view :style="{'marginTop':'100rpx'}">
+				<u-button type="primary" text="提交" @click="updatePassword"></u-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form:{
+					phone:'',
+					oldPassword:'',
+					newPassword:''
+				},
+				rules: {
+					'phone': {
+						type: 'string',
+						required: true,
+						min:11,
+						max: 11,
+						message: '请输入电话号码',
+						trigger: ['blur', 'change']
+					},
+					'oldPassword': {
+						type: 'string',
+						min:11,
+						max: 16,
+						required: true,
+						message: '请输入6-18位老密码',
+						trigger: ['blur', 'change']
+					},
+					'newPassword': {
+						type: 'string',
+						min:6,
+						max: 16,
+						required: true,
+						message: '请输入6-18位新密码',
+						trigger: ['blur', 'change']
+					}
+				},
+			}
+		},
+		methods: {
+			updatePassword(){
+				console.log("+++++++++++++++++++")
+				this.$refs.uForm.validate().then(res => {
+					uni.$u.toast('校验通过')
+				}).catch(errors => {
+					uni.$u.toast('校验失败')
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+	@import './index.rpx.css';
+</style>

pages/userInfo/index.rpx.css

@@ -15,6 +15,7 @@
     border-radius: 50rpx;
     padding: 0;
     margin: 30rpx 0;
+    overflow: hidden;
 }
 
 

pages/userInfo/userInfo.vue

@@ -11,7 +11,7 @@
 						<text>头像</text>
 					</view>
 					<view class="photoView">
-						<image class="photoImage" :src="userInfo.selfPhotoUrl || '/static/logo.png'"></image>
+						<image class="photoImage" :src="userInfo.avatarUrl || '/static/ud4.png'"></image>
 					</view>
 				</view>
 
@@ -20,7 +20,7 @@
 						<text>姓名</text>
 					</view>
 					<view class="nikeName flex-col justify-center">
-						<input disabled type="nickname" name="nickname" v-model="userInfo.nickName"   placeholder="请输入昵称"/>
+						<input disabled type="nickname" name="nickname" v-model="userInfo.name"   placeholder="请输入昵称"/>
 					</view>
 				</view>
 
@@ -31,8 +31,7 @@
 						<view class="flex-row justify-end groupItemContent">
 							<text v-if="userInfo.sex == 0">男</text>
 							<text v-else-if="userInfo.sex == 1">女</text>
-							<text v-else-if="userInfo.sex == 2">未知</text>
-							<text v-else>请选择性别</text>
+							<text v-else>未知</text>
 <!--							<u-icon name="arrow-right" color="#666" size="18"></u-icon>-->
 						</view>
 				</view>
@@ -46,9 +45,21 @@
 <!--						<u-icon name="arrow-right" color="#666" size="18"></u-icon>-->
 					</view>
 				</view>
+				<view class="flex-row justify-between bordBot" >
+					<view class="key flex-col justify-center ">
+						<text>修改密码</text>
+					</view>
+					<view class="flex-row justify-end groupItemContent " @click="updatePassword">
+						<text>点击修改</text>
+						<u-icon name="arrow-right" color="#666" size="18"></u-icon>
+					</view>
+				</view>
 			</form>
 		</view>
-		<u-button class="logoutButton" type="error" text="退出登录" @click="logout"></u-button>
+
+		<view  class="logoutButton">
+			<u-button type="error" text="退出登录" @click="logout"></u-button>
+		</view>
 	</view>
 </template>
 
@@ -77,6 +88,14 @@
 
 		},
 		methods: {
+
+			updatePassword(){
+
+				uni.navigateTo({
+					url:'/pages/updatePassword/updatePassword'
+				})
+
+			},
 			back() {
 				uni.navigateBack({
 					delta: 1