diff --git a/pages.json b/pages.json index 74561c2..b0b8e09 100644 --- a/pages.json +++ b/pages.json @@ -166,7 +166,7 @@ "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#4271B9", + "navigationBarBackgroundColor": "#18CBB3", "backgroundColor": "#F8F8F8" }, "uniIdRouter": {}, diff --git a/pages/Modifyinformation/Modifyinformation.scss b/pages/Modifyinformation/Modifyinformation.scss index c533e1a..7a8edb1 100644 --- a/pages/Modifyinformation/Modifyinformation.scss +++ b/pages/Modifyinformation/Modifyinformation.scss @@ -6,14 +6,14 @@ .finish { width: 496rpx; - background: #4271B9; + background: #18CBB3; border-radius: 5rpx; color: #FFFFFF; height: 68rpx; line-height: 68rpx; text-align: center; margin: 100rpx auto; - background: #4C7BC9; + background: #18CBB3; } .centercontent { diff --git a/pages/Modifyinformation/Modifyinformation.vue b/pages/Modifyinformation/Modifyinformation.vue index bcbaa94..e0e2a33 100644 --- a/pages/Modifyinformation/Modifyinformation.vue +++ b/pages/Modifyinformation/Modifyinformation.vue @@ -275,7 +275,6 @@ that.$refs.uToast.show({ title: '修改成功', type: 'success', - duration: '10000', }) if (that.timer) { clearTimeout(that.timer) diff --git a/pages/MyBenefits/MyBenefits.vue b/pages/MyBenefits/MyBenefits.vue index 56ca869..20dab38 100644 --- a/pages/MyBenefits/MyBenefits.vue +++ b/pages/MyBenefits/MyBenefits.vue @@ -65,7 +65,7 @@ + :style="timeindex == index?'border-bottom: 5rpx solid #18CBB3;':''"> {{item.name}} diff --git a/pages/Mymission/Mymission.vue b/pages/Mymission/Mymission.vue index e368bdf..0ca708d 100644 --- a/pages/Mymission/Mymission.vue +++ b/pages/Mymission/Mymission.vue @@ -244,19 +244,19 @@ text-align: center; line-height: 55rpx; border-radius: 5rpx; - border: 1px solid #4271B9; + border: 1px solid #18CBB3; position: absolute; } .btnaccept { right: 24rpx; color: #fff; - background-color: #4271B9; + background-color: #18CBB3; } .btnreturn { right: 220rpx; - color: #4271B9; + color: #18CBB3; background: #FFFFFF; } } diff --git a/pages/Orderdetails/Orderdetails.scss b/pages/Orderdetails/Orderdetails.scss index e83e2c5..1bb86ec 100644 --- a/pages/Orderdetails/Orderdetails.scss +++ b/pages/Orderdetails/Orderdetails.scss @@ -29,7 +29,7 @@ height: 68rpx; text-align: center; color: #ffffff; - background: #4C7BC9; + background: #18CBB3; border-radius: 26rpx; font-size: 36rpx; line-height: 68rpx; @@ -130,11 +130,11 @@ height: 70rpx; margin: 10rpx auto 0; line-height: 70rpx; - background-color:#4C7BC9 ; + background-color:#18CBB3 ; border-radius: 50rpx; - // color: #4C7BC9; + // color: #18CBB3; color: #FFFFFF; - border: 1rpx solid #4C7BC9; + border: 1rpx solid #18CBB3; } .time { height: 80rpx; diff --git a/pages/Orderlist/Orderlist.scss b/pages/Orderlist/Orderlist.scss index f338464..691d470 100644 --- a/pages/Orderlist/Orderlist.scss +++ b/pages/Orderlist/Orderlist.scss @@ -24,7 +24,7 @@ margin: 0 auto; span { - color: #4C7BC9; + color: #18CBB3; float: right; } @@ -71,7 +71,7 @@ width: 25%; height: 68rpx; line-height: 68rpx; - background: #4C7BC9; + background: #18CBB3; border-radius: 26rpx; text-align: center; font-size: 32rpx; diff --git a/pages/Orderlist/Orderlist.vue b/pages/Orderlist/Orderlist.vue index 0aa7bed..926ccbb 100644 --- a/pages/Orderlist/Orderlist.vue +++ b/pages/Orderlist/Orderlist.vue @@ -19,7 +19,7 @@ + style="background-color: #18CBB3;"> 去支付 diff --git a/pages/Ordervideolearning/Ordervideolearning.scss b/pages/Ordervideolearning/Ordervideolearning.scss index 118069b..ad336ac 100644 --- a/pages/Ordervideolearning/Ordervideolearning.scss +++ b/pages/Ordervideolearning/Ordervideolearning.scss @@ -37,7 +37,7 @@ .buybtn { width: 70%; height: 70rpx; - background: #4271B9; + background: #18CBB3; border-radius: 5rpx; line-height: 70rpx; color: #fff; @@ -66,7 +66,7 @@ .buy { width: 150rpx; height: 70rpx; - background: #4271B9; + background: #18CBB3; line-height: 70rpx; border-radius: 5rpx; text-align: center; @@ -176,7 +176,7 @@ .buy { width: 140rpx; height: 60rpx; - background: #4271B9; + background: #18CBB3; border-radius: 5rpx; color: #fff; text-align: center; diff --git a/pages/RevenueDetails/RevenueDetails.vue b/pages/RevenueDetails/RevenueDetails.vue index 2a17d32..8350191 100644 --- a/pages/RevenueDetails/RevenueDetails.vue +++ b/pages/RevenueDetails/RevenueDetails.vue @@ -333,12 +333,12 @@ .submit { width: 496rpx; height: 58rpx; - background: #4271B9; + background: #18CBB3; border-radius: 5rpx; color: #FFFFFF; text-align: center; line-height: 58rpx; - background: #4C7BC9; + background: #18CBB3; margin: 90rpx auto; } } diff --git a/pages/Videolearning/Videolearning.scss b/pages/Videolearning/Videolearning.scss index 20f4440..b4c25d0 100644 --- a/pages/Videolearning/Videolearning.scss +++ b/pages/Videolearning/Videolearning.scss @@ -37,7 +37,7 @@ .buybtn { width: 70%; height: 70rpx; - background: #4271B9; + background: #18CBB3; border-radius: 5rpx; line-height: 70rpx; color: #fff; @@ -66,7 +66,7 @@ .buy { width: 150rpx; height: 70rpx; - background: #4271B9; + background: #18CBB3; line-height: 70rpx; border-radius: 5rpx; text-align: center; @@ -176,7 +176,7 @@ .buy { width: 140rpx; height: 60rpx; - background: #4271B9; + background: #18CBB3; border-radius: 5rpx; color: #fff; text-align: center; diff --git a/pages/confirmCompletion/confirmCompletion.vue b/pages/confirmCompletion/confirmCompletion.vue index ee0a9dc..7e3dd65 100644 --- a/pages/confirmCompletion/confirmCompletion.vue +++ b/pages/confirmCompletion/confirmCompletion.vue @@ -330,14 +330,14 @@ } .leftbtn { - border: 1px solid #4271B9; + border: 1px solid #18CBB3; background: #FFFFFF; - color: #4271B9; + color: #18CBB3; left: 61rpx; } .rightbtn { - background: #4271B9; + background: #18CBB3; color: #fff; right: 61rpx; } @@ -479,12 +479,12 @@ .submit { width: 496rpx; height: 58rpx; - background: #4271B9; + background: #18CBB3; border-radius: 5rpx; color: #FFFFFF; text-align: center; line-height: 58rpx; - background: #4C7BC9; + background: #18CBB3; margin: 90rpx auto; } } diff --git a/pages/forgotPassword/forgotPassword.scss b/pages/forgotPassword/forgotPassword.scss index f5f1a96..198929f 100644 --- a/pages/forgotPassword/forgotPassword.scss +++ b/pages/forgotPassword/forgotPassword.scss @@ -50,7 +50,7 @@ .obtaincode { text-align: center; font-size: 36rpx; - color: #4C7BC9; + color: #18CBB3; line-height: 100rpx; position: absolute; right: 5%; @@ -63,7 +63,7 @@ height: 100rpx; text-align: center; line-height: 100rpx; - background: #4C7BC9; + background: #18CBB3; border-radius: 51rpx; font-size: 41rpx; color: #FFFFFF; diff --git a/pages/forgotPassword/forgotPassword.vue b/pages/forgotPassword/forgotPassword.vue index 6076e1a..f13b574 100644 --- a/pages/forgotPassword/forgotPassword.vue +++ b/pages/forgotPassword/forgotPassword.vue @@ -47,7 +47,7 @@ password: '', newpassword: '', getCodeText: '获取验证码', //获取验证码的文字 - getCodeBtnColor: "#4C7BC9", //获取验证码的color + getCodeBtnColor: "#18CBB3", //获取验证码的color timer: null, } }, @@ -126,7 +126,7 @@ this.Timer = setInterval(() => { if (holdTime <= 0) { this.getCodeisWaiting = false; - this.getCodeBtnColor = "#4C7BC9"; + this.getCodeBtnColor = "#18CBB3"; this.getCodeText = "获取验证码" clearInterval(this.Timer); //清除该函数 return; //返回前面 diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 812efc2..603d4b3 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -231,7 +231,7 @@ color: #333333; margin: 0 0 40rpx 0; padding-left: 10rpx; - border-left: 6rpx solid #4271B9; + border-left: 6rpx solid #18CBB3; } } @@ -270,7 +270,7 @@ .tapbtn { width: 239rpx; height: 70rpx; - background: #4271B9; + background: #4C7BC9; border-radius: 35rpx; text-align: center; line-height: 70rpx; @@ -294,4 +294,4 @@ top: 0; } } - + \ No newline at end of file diff --git a/pages/learning/learning.scss b/pages/learning/learning.scss index 13e073d..e94fd2b 100644 --- a/pages/learning/learning.scss +++ b/pages/learning/learning.scss @@ -125,7 +125,7 @@ .buy { width: 150rpx; height: 70rpx; - background: #4271B9; + background: #18CBB3; line-height: 70rpx; border-radius: 5rpx; text-align: center; @@ -205,7 +205,7 @@ .buybtn { width: 70%; height: 70rpx; - background: #4271B9; + background: #18CBB3; border-radius: 5rpx; line-height: 70rpx; color: #fff; diff --git a/pages/learning/learning.vue b/pages/learning/learning.vue index b52fafb..9ae438f 100644 --- a/pages/learning/learning.vue +++ b/pages/learning/learning.vue @@ -11,7 +11,7 @@ + bar-height='7' bar-width='43' inactive-color='#A09F9F' active-color='#18CBB3'> diff --git a/pages/login/login.scss b/pages/login/login.scss index 7447532..bb89f65 100644 --- a/pages/login/login.scss +++ b/pages/login/login.scss @@ -1,97 +1,116 @@ - .app { - font-family: DengXian; - color: #C3C1C1; - font-weight: 400; - +.app { + padding: 0; + height: 100vh; + background-image: url(../../static/bg.png); + background-size: 100% 100%; + position: relative; + overflow: scroll; .forget { - position: absolute; - top: 56%; - left: 70%; - color: #46ABD7; - - } - .switch { - text-align: center; - height: 100rpx; - color: #46ABD7; - position: absolute; - top: 67%; - left: 10%; + color: #18CBB3; + margin-top: 20rpx; + text-align: right; } - .loginbtn { - width: 80%; - height: 100rpx; - text-align: center; - line-height: 100rpx; - background: #4C7BC9; - border-radius: 51rpx; - font-size: 41rpx; - color: #FFFFFF; + .text { + width: 235rpx; + height: 30rpx; + font-size: 32rpx; + font-family: SourceHanSansCN-Medium, SourceHanSansCN; + font-weight: 500; + color: #333333; position: absolute; - top: 60%; - left: 10%; + top: 22%; + left: 50%; + transform: translateX(-50%); } - .loginphone { - background-color: #fff; - width: 80%; - height: 162rpx; + image { position: absolute; - left: 10%; - top: 23%; + width: 114rpx; + height: 114rpx; + left: 50%; + top: 12%; + transform: translateX(-50%); + } - input { - font-size: 45rpx; - color: #000000; + .body { + width: 100%; + height: 70%; + position: relative; + top: 32%; + overflow: scroll; + background: #F9F9F9; + border-radius: 30rpx 0rpx 0rpx 30rpx; + opacity: 1; + + .login { + top: 31px; + width: 36%; + height: 49px; + font-size: 23px; + font-family: SourceHanSansCN-Medium, SourceHanSansCN; + font-weight: 500; + color: #18CBB3; + /* background: red; */ + position: relative; + + .logins { + position: absolute; + left: 50%; + transform: translateX(-50%); + // top: 5%; + + } + + .border { + width: 30rpx; + height: 8rpx; + background: #18CBB3; + border-radius: 4rpx 4rpx 4rpx 4rpx; + opacity: 1; + position: absolute; + left: 50%; + transform: translateX(-50%); + border: 1rpx solid #18CBB3; + top: 65rpx; + } } - ::v-deep .uni-input-placeholder { - padding-left: 40rpx; - font-size: 41rpx; - font-weight: 400; - color: #C3C1C1; + .name { + position: relative; + width: 83%; + /* background: red; */ + left: 50%; + transform: translateX(-50%); + top: 9%; + + ::v-deep .u-form-item--left { + font-size: 30rpx; + } + + .pwd { + display: inline-block; + position: absolute; + right: 10%; + font-size: 30rpx; + font-family: SourceHanSansCN-Regular, SourceHanSansCN; + font-weight: 400; + color: #18CBB3; + line-height: 38rpx; + } } - .phone { - padding-left: 40rpx; - height: 100%; - box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03); - } - } - - .logincode { - position: absolute; - left: 10%; - - .obtaincode { + .loginsubmit { text-align: center; - font-size: 37rpx; - color: #4C7BC9; - line-height: 162rpx; - position: absolute; - left: 65%; - top: 0%; + width: 83%; + height: 88rpx; + line-height: 88rpx; + background: #18CBB3; + /* position: absolute; */ + margin: 177rpx auto 40rpx; + color: #fff; + border-radius: 100rpx } - - ::v-deep .u-input__input { - padding-left: 20rpx; - color: #000000; - font-size: 42rpx; - font-weight: 400; - height: 100%; - } - } - - .title { - height: 50rpx; - font-size: 52rpx; - font-weight: bold; - color: #000000; - line-height: 44rpx; - position: absolute; - top: 13%; - left: 13%; } } \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 20d5072..4588f72 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,26 +1,30 @@