修改

xg
修改
2024-01-03 09:33:28 +08:00 · 2023-12-28 16:44:47 +08:00 · 2023-12-28 15:35:03 +08:00 · 2023-12-25 10:52:29 +08:00 · 2023-12-25 10:40:41 +08:00 · 2023-12-06 16:43:05 +08:00
33 changed files with 234 additions and 212 deletions
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@ -1,37 +1,37 @@
 {
-	"version": "1",
-	"prompt": "template",
-	"title": "用户协议与隐私政策",
-	"message": "请你务必审慎阅读、充分理解“用户协议与隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://app.xinelu.cn/privacypolicy/content.html\">《用户协议与隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-	"buttonAccept": "同意并接受",
-	"buttonRefuse": "暂不同意",
-	"hrefLoader": "system|default",
-	"second": {
-		"title": "确认提示",
-		"message": "进入应用前，你需先同意<a href=\"https://app.xinelu.cn/privacypolicy/content.html\">《用户协议与隐私政策》</a>，否则将退出应用。",
-		"buttonAccept": "同意并继续",
-		"buttonRefuse": "退出应用"
-	},
-	"disagreeMode": {
-		"support": false,
-		"loadNativePlugins": false,
-		"visitorEntry": false,
-		"showAlways": false
-	},
-	"styles": {
-		"backgroundColor": "#ffffff",
-		"borderRadius": "5px",
-		"title": {
-			"color": "#000000"
-		},
-		"buttonAccept": {
-			"color": "#000000"
-		},
-		"buttonRefuse": {
-			"color": "#000000"
-		},
-		"buttonVisitor": {
-			"color": "#000000"
-		}
-	}
+    "version" : "1",
+    "prompt" : "template",
+    "title" : "用户协议与隐私政策",
+    "message" : "请你务必审慎阅读、充分理解“用户协议与隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://app.xinelu.cn/privacypolicy/content.html\">《用户协议与隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system|default",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "进入应用前，你需先同意<a href=\"https://app.xinelu.cn/privacypolicy/content.html\">《用户协议与隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : false
+    },
+    "styles" : {
+        "backgroundColor" : "#ffffff",
+        "borderRadius" : "5px",
+        "title" : {
+            "color" : "#000000"
+        },
+        "buttonAccept" : {
+            "color" : "#000000"
+        },
+        "buttonRefuse" : {
+            "color" : "#000000"
+        },
+        "buttonVisitor" : {
+            "color" : "#000000"
+        }
+    }
 }
--- a/api/baseurl.js
+++ b/api/baseurl.js
@ -1,5 +1,2 @@
-// var baseurl = "https://quanyidaojia.xinelu.cn";
-
-var baseurl = "http://192.168.16.76:8080";
-// var baseurl = "https://1608.xinelu.cn";
-export default baseurl
+var baseurl = "https://hekou-nurse-api.xinyilu.cn";
+export default baseurl
--- a/manifest.json
+++ b/manifest.json
@ -1,9 +1,9 @@
 {
-    "name" : "泉医助手",
-    "appid" : "__UNI__EE607B0",
+    "name" : "医护助手",
+    "appid" : "__UNI__E8EBFB1",
    "description" : "",
-    "versionName" : "1.0.7",
-    "versionCode" : 107,
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
@ -97,6 +97,9 @@
                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                    }
                }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
            }
        }
    },
--- a/pages.json
+++ b/pages.json
@ -166,7 +166,7 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "",
-		"navigationBarBackgroundColor": "#4271B9",
+		"navigationBarBackgroundColor": "#18CBB3",
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {},
--- a/pages/Healthknowledge/Healthknowledge.vue
+++ b/pages/Healthknowledge/Healthknowledge.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="app">
-		<u-tabs :list="tabList" :current="tabcurrent" @change="change"></u-tabs>
+		<u-tabs :list="tabList" :current="tabcurrent" @change="change" active-color='#18CBB3'></u-tabs>
 		<view class="Healthknowledge" v-if="NurseNewslist">
 			<view class="list">
 				<view class="item" v-for="(item,index) in NurseNewslist" :key="index" @tap='gohealthitem(item)'>
--- 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 {
--- a/pages/Modifyinformation/Modifyinformation.vue
+++ b/pages/Modifyinformation/Modifyinformation.vue
@ -45,20 +45,18 @@
 					</text>
 					<!-- {{getNurseStationName(appPersonallist)}} -->
 				</view>
-				<view class="nursetype" @tap='positionalTitleLevelshow=true'>
+			<!-- 	<view class="nursetype" @tap='positionalTitleLevelshow=true'>
 					<span>职称级别：</span>
 					<text v-if="appPersonallist.positionalTitleLevelvalue">
 						{{appPersonallist.positionalTitleLevelvalue}}
 					</text>
-				</view>
-				<view class="name" style="">
+				</view> -->
+			<!-- 	<view class="name" style="">
 					擅长项目：
 					<input type="text" placeholder=" " v-model="appPersonallist.geniusItem" />
-					<!-- <input type="text" v-model="appPersonallist.geniusItem" /> -->
-					<!-- <text v-if="appPersonallist.geniusItem"> {{}}
-					</text> -->
-				</view>
-				<view class="nursetype " style="border: none;">
+				
+				</view> -->
+				<!-- <view class="nursetype " style="border: none;">
 					证书上传：
 					<view class="upload" @tap='uploadcertificate' v-if="certificateimg.length==0">
 						<view class="">
@ -78,7 +76,7 @@
 							</view>
 						</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="finish" @tap="uploadcertificateimgs">提交</view>
@ -275,9 +273,8 @@
 				updateNursePersonCheck(obj).then(res => {
 					if (res.code == 200) {
 						that.$refs.uToast.show({
-							title: '为了保证资料真实，平台需要对你的资料进行审核，请耐心等待',
+							title: '修改成功',
 							type: 'success',
-							duration: '10000',
 						})
 						if (that.timer) {
 							clearTimeout(that.timer)
--- a/pages/MyBenefits/MyBenefits.vue
+++ b/pages/MyBenefits/MyBenefits.vue
@ -65,7 +65,7 @@
 			<view class="timemask">
 				<view class="tabs">
 					<view class="tab" v-for="(item,index) in timetablist" @tap='timechange(index)'
-						:style="timeindex == index?'border-bottom: 5rpx solid #4C7BC9;':''">
+						:style="timeindex == index?'border-bottom: 5rpx solid #18CBB3;':''">
 						{{item.name}}
 					</view>
 				</view>
--- 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;
 					}
 				}
--- 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;
--- 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;
--- a/pages/Orderlist/Orderlist.vue
+++ b/pages/Orderlist/Orderlist.vue
@ -19,7 +19,7 @@
 					</view>
 				</view>
 				<view class="submit" @tap='goOrderdetails(item)' v-if="item.trainingOrderStatus=='WAIT_PAY'"
-					style="background-color: #4271B9;">
+					style="background-color: #18CBB3;">
 					去支付
 				</view>
 			</view>
--- 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;
--- 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;
 		}
 	}
--- 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;
--- 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;
 		}
 	}
--- 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;
--- 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; //返回前面
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@ -32,7 +32,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="centerfloat">
+		<!-- <view class="centerfloat">
 			<view class="title">
 				在线学习
 			</view>
@ -41,7 +41,7 @@
 				<image src="../../static/jnks.png" mode="" @tap='gostudy'></image>
 				<image src="../../static/zxkf.png" mode="" @tap='gostudy'></image>
 			</view>
-		</view>
+		</view> -->
 		<view class="centerfloat bottomfloat">
 			<view class="title">
 				护理新闻
@ -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;
 		}
 	}
-</style>
+</style>
--- 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;
--- a/pages/learning/learning.vue
+++ b/pages/learning/learning.vue
@ -11,7 +11,7 @@
 		</view>
 		<view class="" style="background-color: #F4F5F7;height: 17rpx;width:100%"></view>
 		<u-tabs :list="tablist" :is-scroll="false" :current="tabcurrent" @change="tabchange" font-size='34'
-			bar-height='7' bar-width='43' inactive-color='#A09F9F' active-color='#4271B9'>
+			bar-height='7' bar-width='43' inactive-color='#A09F9F' active-color='#18CBB3'>
 		</u-tabs>
 		<view class="content" v-if="tabcurrent==0">
 			<!-- <view class="" v-html="infoslist.trainingItemContent"></view> -->
--- 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;
-
+			color: #18CBB3;
+			margin-top: 20rpx;
+			text-align: right;
 		}
-		.switch {
+
+		.text {
+			font-size: 32rpx;
+			font-family: SourceHanSansCN-Medium, SourceHanSansCN;
+			font-weight: 500;
+			color: #333333;
+			position: absolute;
 			text-align: center;
-			height: 100rpx;
-			color: #46ABD7;
-			position: absolute;
-			top: 67%;
-			left: 10%;
+			top: 22%;
+			width: 100%;
+			left:0;
+			margin: 0 auto;
 		}

-		.loginbtn {
-			width: 80%;
-			height: 100rpx;
-			text-align: center;
-			line-height: 100rpx;
-			background: #4C7BC9;
-			border-radius: 51rpx;
-			font-size: 41rpx;
-			color: #FFFFFF;
+		image {
 			position: absolute;
-			top: 60%;
-			left: 10%;
+			width: 114rpx;
+			height: 114rpx;
+			left: 50%;
+			top: 12%;
+			transform: translateX(-50%);
 		}

-		.loginphone {
-			background-color: #fff;
-			width: 80%;
-			height: 162rpx;
-			position: absolute;
-			left: 10%;
-			top: 23%;
+		.body {
+			width: 100%;
+			height: 70%;
+			position: relative;
+			top: 32%;
+			overflow: scroll;
+			background: #F9F9F9;
+			border-radius: 30rpx 0rpx 0rpx 30rpx;
+			opacity: 1;

-			input {
-				font-size: 45rpx;
-				color: #000000;
+			.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: 92%;
+				/* 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%;
 		}
 	}
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@ -1,26 +1,30 @@
 <template>
 	<view class="app">
-		<view class="title">
-			账号登录
+		<image src="../../static/logo.png" mode=""></image>
+		<view class="text">
+			欢迎登录医护助手
 		</view>
-		<view class="loginphone">
-			<input class="phone" type="text" placeholder="手机号码" maxlength="11" v-model="phonenumber" />
-		</view>
-		<view class="logincode loginphone" style="top: 40%;">
-			<u-input class='code phone' placeholder="密码" maxlength="10" v-model="password" type="password"
-				:border="true" :password-icon="true" />
-		</view>
-		<view class="forget" @tap='forgetpassword'>
-			忘记密码
-		</view>
-		<!-- <u-checkbox-group>
-			<u-checkbox v-model="checked" shape="circle">记住密码</u-checkbox>
-		</u-checkbox-group> -->
-		<view class="loginbtn" @tap='pwdlogin'>
-			登录
-		</view>
-		<view class="loginbtn" style="top: 70%; color: #969394;background-color: #ffffff;" @tap='goregister'>
-			注册
+		<view class="body">
+			<view class="name">
+				<u-form :model="form" ref="uForm" label-width="200">
+					<u-form-item label="手机号码:">
+						<u-input placeholder="请输入手机号码" maxlength="11" v-model="phonenumber" /></u-form-item>
+					<u-form-item label="密码:">
+						<u-input class='code phone' placeholder="密码" maxlength="10" v-model="password" type="password"
+							:password-icon="true" />
+					</u-form-item>
+				</u-form>
+				<view class="forget" @tap='forgetpassword'>
+					忘记密码
+				</view>
+			</view>
+			<view class="loginsubmit" @tap="pwdlogin">
+				登录
+			</view>
+			<view class="loginsubmit" @tap='goregister'
+				style="top: 70%; color: #969394;background-color: #ffffff; margin-top: 10rpx;">
+				注册
+			</view>
 		</view>
 		<u-toast ref="uToast" />
 	</view>
@ -33,6 +37,7 @@
 	export default {
 		data() {
 			return {
+				form: {},
 				checked: false,
 				phonenumber: '',
 				password: '',
@ -101,4 +106,4 @@

 <style lang="scss">
 	@import './login.scss';
-</style>
+</style>
--- a/pages/personal/personal.vue
+++ b/pages/personal/personal.vue
@ -1,6 +1,7 @@
 <template>
 	<view class="app">
-		<image class="circular" :src="beijingurl" mode=""></image>
+		<!-- <image class="circular" :src="beijingurl" mode=""></image> -->
+		<image class="circular" src="@/static/homepage.png" mode=""></image>
 		<view class="user" v-if="nursePersonId">
 			<image class="img" :src="baseurl+Personallist.avatar" mode="" v-if="Personallist.avatar"></image>
 			<image class="img" src="../../static/user2.png" mode="" v-else></image>
@ -49,7 +50,7 @@
 			</view>
 		</view>
 		<view class="bottomitems">
-			<view class="bottomitem" @tap='goMyBenefits'>
+			<!-- <view class="bottomitem" @tap='goMyBenefits'>
 				<image src="../../static/shouyi.png" mode=""></image>
 				<view class="">
 					我的收益
@ -66,7 +67,7 @@
 				<view class="">
 					我的考试
 				</view>
-			</view>
+			</view> -->
 			<view class="bottomitem" @tap='goremove'>
 				<image src="../../static/shezhi.png" mode=""></image>
 				<view class="">
@ -350,4 +351,4 @@
 			top: 0;
 		}
 	}
-</style>
+</style>
--- a/pages/register/register.scss
+++ b/pages/register/register.scss
@ -43,7 +43,7 @@
 				font-size: 32rpx;
 				width: 50%;
 				color: #F4F5F7;
-				background: #4C7BC9;
+				background: #18CBB3;
 				position: absolute;
 				bottom:0;
 				left:0;
@ -150,7 +150,7 @@
 		.switch {
 			text-align: center;
 			line-height: 60rpx;
-			color: #46ABD7;
+			color: #18CBB3;
 			position: absolute;
 			top: 70%;
 		}
@ -160,7 +160,7 @@
 			height: 100rpx;
 			text-align: center;
 			line-height: 100rpx;
-			background: #4C7BC9;
+			background: #18CBB3;
 			border-radius: 51rpx;
 			font-size: 41rpx;
 			color: #FFFFFF;
--- a/pages/startup/startup.vue
+++ b/pages/startup/startup.vue
@ -2,7 +2,7 @@
 	<view class="app">
 		<image src="../../static/logo.png" mode=""></image>
 		<view class="title">
-			泉医助手
+			医护助手
 		</view>
 		<u-toast ref="uToast" />
 	</view>
--- a/pages/study/study.vue
+++ b/pages/study/study.vue
@ -30,7 +30,7 @@
 		.concent {
 			width: 701rpx;
 			height: 550rpx;
-			background: #4C7BC9;
+			background: #18CBB3;
 			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 20rpx;
 			margin: 5% auto 20px;
--- a/pages/taskDetails/taskDetails.scss
+++ b/pages/taskDetails/taskDetails.scss
@ -11,14 +11,14 @@

 		.btnsuccess {
 			margin: 100rpx auto 0;
-			background: #4271B9;
+			background: #18CBB3;
 			color: #fff;
 		}

 		.btnreturn {
 			margin: 25rpx auto 0;
-			color: #4271B9;
-			border: 1px solid #4271B9;
+			color: #18CBB3;
+			border: 1px solid #18CBB3;
 		}

 		.top {
--- a/pages/taskReturn/taskReturn.vue
+++ b/pages/taskReturn/taskReturn.vue
@ -161,7 +161,7 @@
 		.btn {
 			width: 496rpx;
 			height: 70rpx;
-			background: #4271B9;
+			background: #18CBB3;
 			border-radius: 5rpx;
 			margin: 80rpx auto;
 			text-align: center;
--- a/pages/ucalendar/u-calendar.vue
+++ b/pages/ucalendar/u-calendar.vue
@ -183,7 +183,7 @@
 			// 选中|起始结束日期背景色
 			activeBgColor: {
 				type: String,
-				default: '#4271B9'
+				default: '#18CBB3'
 			},
 			// 选中|起始结束日期字体颜色
 			activeColor: {
@ -198,7 +198,7 @@
 			// 范围内日期字体颜色
 			rangeColor: {
 				type: String,
-				default: '#4271B9'
+				default: '#18CBB3'
 			},
 			// mode=range时生效，起始日期自定义文案
 			startText: {
@ -514,7 +514,7 @@
 		.btn {
 			width: 496rpx;
 			height: 70rpx;
-			background: #4271B9;
+			background: #18CBB3;
 			border-radius: 5rpx;
 			line-height: 70rpx;
 			text-align: center;
--- a/pages/upicker/u-picker.vue
+++ b/pages/upicker/u-picker.vue
@ -604,7 +604,7 @@
 	.btn {
 		width: 496rpx;
 		height: 70rpx;
-		background: #4271B9;
+		background: #18CBB3;
 		border-radius: 5rpx;
 		margin: 90rpx auto;
 		line-height: 70rpx;
--- a/static/bg.png
+++ b/static/bg.png
--- a/static/logo.png
+++ b/static/logo.png
Author	SHA1	Message	Date
辉	2125d24ba2	修改	2024-01-03 09:33:28 +08:00
辉	8514752a7b	xg	2023-12-28 16:44:47 +08:00
辉	01f3428232	修改	2023-12-28 15:35:03 +08:00
辉	d1b2c79a8f	修改	2023-12-25 10:52:29 +08:00
辉	b368afe610	修改	2023-12-25 10:40:41 +08:00
闫晓茹	7df58ad6f6	修改	2023-12-06 16:43:05 +08:00
辉	8f5dabb9f1	Merge remote-tracking branch 'origin/jh_20231124_河口项目功能分支' into jh_20231124_河口项目功能分支	2023-12-05 15:17:19 +08:00
辉	b77769ff70	修改	2023-12-05 15:17:08 +08:00
闫晓茹	851fa1eb8e	Merge remote-tracking branch 'origin/jh_20231124_河口项目功能分支' into jh_20231124_河口项目功能分支	2023-12-05 15:16:50 +08:00
闫晓茹	7ffd9cd4d7	关闭在线学习	2023-12-05 15:16:22 +08:00
辉	f2046849e0	修改	2023-12-05 15:13:48 +08:00
辉	97d42e4521	修改	2023-12-05 15:11:28 +08:00