Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
闫晓茹 2023-10-23 16:58:06 +08:00
commit 88ec847a3a
15 changed files with 742 additions and 60 deletions

20
App.vue
View File

@ -15,14 +15,14 @@
@import "uview-ui/index.scss";
/*每个页面公共css */
// page {
// background-color: #F4F5F7;
// }
page {
background-color: #F4F5F7;
}
// .app {
// width: 100%;
// height: 100%;
// text-align: justify;
// color: #000000;
// }
</style>
.app {
width: 100%;
height: 100%;
text-align: justify;
color: #000000;
}
</style>

3
package-lock.json generated
View File

@ -10,8 +10,7 @@
"license": "ISC",
"dependencies": {
"uview-ui": "^1.8.8"
},
"devDependencies": {}
}
},
"node_modules/uview-ui": {
"version": "1.8.8",

View File

@ -3,52 +3,73 @@
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/myinformation/myinformation",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/myinformation/myinformation",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
// "navigationBarBackgroundColor": "#4ac4ab"
// "navigationStyle": "custom"
}
},
{
"path": "pages/homepage/homepage",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
"navigationBarTitleText": "工单"
}
},
}
// {
// "path": "pages/login/login",
// "path": "pages/index/index",
// "style": {
// "navigationBarTitleText": "",
// "enablePullDownRefresh": false,
// "navigationStyle": "custom"
// }
// },
{
"path": "pages/myinformation/myinformation",
"style": {
"navigationBarTitleText": "我的",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#4ac4ab"
// }
// "navigationStyle": "custom"
}
}
],
,{
"path" : "pages/Personalinfo/Personalinfo",
"style" :
{
"navigationBarTitleText": "个人信息",
"enablePullDownRefresh": false
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTextStyle": "white",
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#F8F8F8",
"navigationBarBackgroundColor": "#18CBB3",
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {},
"tabBar": {
"color": "#7A7E83",
"selectedColor": "#435950",
"borderStyle": "black",
"borderStyle": "white",
"backgroundColor": "#ffffff",
"list": [{
"pagePath": "pages/homepage/homepage",
@ -56,11 +77,10 @@
"selectedIconPath": "static/homepage.png",
"text": "首页"
},
{
"pagePath": "pages/myinformation/myinformation",
"iconPath": "static/myinformation.png",
"selectedIconPath": "static/myinformations.png",
"iconPath": "static/myinformations.png",
"selectedIconPath": "static/myinformation.png",
"text": "我的"
}
]

View File

@ -0,0 +1,72 @@
<template>
<view class="app">
<view class="myorder titles">
<view class="title">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;99999
</view>
</view>
<view class="myorder titles">
<view class="title">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;99999
</view>
</view>
<view class="myorder titles">
<view class="title">
身份证号372926199812158850
</view>
</view>
<view class="myorder titles">
<view class="title">
家庭住址山东省济南市
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style lang="scss">
.app {
background-color: #fff;
height: 100vh;
overflow: hidden;
.myorder {
position: relative;
.orderStatus {
text-align: center;
margin: 60rpx auto 30rpx;
width: 90%;
background: red;
// display: flex;
// justify-content: space-around;
padding-bottom: 30rpx;
}
.title {
font-size: 28rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
margin-left: 30rpx;
height: 110rpx;
line-height: 110rpx;
border-bottom: 1rpx solid #E6E6E6;
width: 93%;
}
}
}
</style>

View File

@ -1,7 +1,16 @@
<template>
<view class="app">
<view class="content">
111
<u-tabs :list="tabslist" :is-scroll="false" :current="tabscurrent" @change="tabschange" inactive-color='#fff'
active-color='#fff'></u-tabs>
<view class="top">
<u-dropdown active-color='#26A888'>
<u-dropdown-item v-model="optionindex" :title="optionname" :options="options"
@change='dropitemchange'></u-dropdown-item>
</u-dropdown>
<view class="inputs">
<!-- <i class="icon"></i> -->
<!-- <input type="text" name="" id="" class="input" placeholder="搜索" v-model="query.label"> -->
</view>
</view>
</view>
</template>
@ -10,16 +19,130 @@
export default {
data() {
return {
tabslist: [{
name: '全部工单'
}, {
name: '我的工单'
}, {
name: '已完成工单',
}],
tabscurrent: 0,
optionindex: 1,
optionname: '待处理',
options: [{
label: '待处理',
value: 1,
}, {
label: '已完成',
value: 2,
}],
query: {
label: '',
}
}
},
onLoad() {
},
methods: {
tabschange(index) {
this.tabscurrent = index;
},
dropitemchange(e) {
this.optionname = this.options.find(m => m.value === e).label
console.log(e)
},
}
}
</script>
<style lang="scss">
.app {
width: 100%;
// margin: 20rpx auto;
padding: 0 0 100rpx 0;
background-color: #fff;
font-size: 24rpx;
::v-deep .u-tabs {
background-color: #18CBB3 !important;
}
.top {
width: 90%;
margin: 0 auto;
display: flex;
height: 84rpx;
justify-content: space-around;
.inputs {
background-color: #fff;
width: 65%;
// height: 60rpx;
// border: 1px solid #F6F6F6;
height: 0rpx;
border-radius: 5rpx;
background-color: #ffffff;
z-index: 999;
position: relative;
top: 50%;
transform: translateY(-50%);
background: #F6F6F6;
border-radius: 38rpx;
.input {
margin: 0 auto;
position: absolute;
height: 60rpx;
// top: 8%;
left: 13%;
width: 80%;
font-size: 26rpx;
color: #000000;
}
.icon {
background: url(@/static/sousuo.png) no-repeat;
width: 30rpx;
height: 28rpx;
background-size: cover;
position: absolute;
top: 50%;
transform: translateY(-50%);
left: 3%;
}
}
::v-deep .u-flex {
width: 100% !important;
}
::v-deep .u-dropdown__content {
overflow-y: scroll !important;
height: 500rpx;
.u-flex {
width: 0 !important;
}
}
::v-deep .u-dropdown__content__mask {
background: none !important;
}
::v-deep .u-dropdown__menu__item {
width: 100% !important;
}
::v-deep .u-cell__value {
flex: 0;
}
::v-deep .u-dropdown {
:v-deep .u-dropdown__menu {}
}
::v-deep .u-cell-box {}
}
}
</style>

171
pages/login/login.vue Normal file
View File

@ -0,0 +1,171 @@
<template>
<view class="app">
<image src="../../static/logos.png" mode=""></image>
<view class="text">
欢迎加入新医路
</view>
<view class="body">
<view class="login">
<view class="logins">
登录
</view>
<view class="border">
</view>
</view>
<view class="name">
<u-form :model="form" ref="uForm" label-width="110">
<u-form-item label="用户名:"><u-input placeholder="请输入用户名" /></u-form-item>
<u-form-item label="密码:">
<u-input placeholder="请输入密码" :password-icon="true" type="password"/>
<!-- <span class="pwd">忘记密码</span> -->
</u-form-item>
</u-form>
</view>
<view class="loginsubmit">
登录
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
title: 'Hello',
form: {
name: '',
}
}
},
// onReady() {
// this.$refs.uForm.setRules(this.rules);
// },
onLoad() {
},
methods: {
}
}
</script>
<style lang="scss">
.app {
height: 100vh;
background-image: url(../../static/bg.png);
background-size: 100% 100%;
position: relative;
overflow: scroll;
.text {
width: 235rpx;
height: 30rpx;
font-size: 32rpx;
font-family: SourceHanSansCN-Medium, SourceHanSansCN;
font-weight: 500;
color: #333333;
position: absolute;
top: 22%;
left: 50%;
transform: translateX(-50%);
}
image {
position: absolute;
width: 114rpx;
height: 114rpx;
left: 50%;
top: 12%;
transform: translateX(-50%);
}
.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;
}
}
.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;
}
}
.loginsubmit{
text-align: center;
width: 83%;
height: 88rpx;
line-height: 88rpx;
background: #18CBB3;
/* position: absolute; */
margin: 177rpx auto;
color: #fff;
border-radius: 100rpx
}
}
}
</style>

View File

@ -1,9 +1,100 @@
<template>
<view class="app">
<view class="content">
个人信息
<view class="title">
<!-- 家医 -->
<!-- <view class="Familydoctor">
<div class="imgs">
<image src="../../static/top.png" mode=""></image>
<view class="my">
我的
</view>
</div>
<view class="Familybody">
<view class="myorder titles">
<view class="title">
个人信息
</view>
<view class="righttitle">
<image src="../../static/huijiantou.png" mode=""></image>
</view>
</view>
<view class="myorder titles">
<view class="title">
修改手机号
</view>
<view class="righttitle">
<image src="../../static/huijiantou.png" mode=""></image>
</view>
</view>
<view class="myorder titles">
<view class="title">
修改密码
</view>
<view class="righttitle">
<image src="../../static/huijiantou.png" mode=""></image>
</view>
</view>
<view class="myorder titles">
<view class="title">
检查更新
</view>
<view class="righttitle">
<image src="../../static/huijiantou.png" mode=""></image>
</view>
</view>
<view class="myorder titles">
<view class="title">
用户协议与隐私政策
</view>
<view class="righttitle">
<image src="../../static/huijiantou.png" mode=""></image>
</view>
</view>
</view>
</view> -->
<!-- 泉医 -->
<view class="Quanyi">
<div class="imgs">
<image src="../../static/top.png" mode=""></image>
<view class="my">
我的
</view>
</div>
<image src="/static/headsculpture.png" mode="" class="headsculpture">
</image>
<view class="bodys">
<view class="name">
张三族
</view>
<image src="../../static/time.png" mode="" class="fist"></image>
<image src="../../static/see.png" mode="" class="two"></image>
<view class="myorder titles" @tap="personlinfo">
<view class="title">
个人信息
</view>
<view class="righttitle">
<image src="../../static/huijiantou.png" mode=""></image>
</view>
</view>
<view class="myorder titles">
<view class="title">
修改手机号
</view>
<view class="righttitle">
<image src="../../static/huijiantou.png" mode=""></image>
</view>
</view>
<view class="myorder titles">
<view class="title">
修改密码
</view>
<view class="righttitle">
<image src="../../static/huijiantou.png" mode=""></image>
</view>
</view>
</view>
</view>
</view>
@ -13,8 +104,8 @@
export default {
data() {
return {
form:{
name:''
form: {
name: ''
}
}
},
@ -22,6 +113,15 @@
},
methods: {
//
personlinfo(){
uni.navigateTo({
url:'/pages/Personalinfo/Personalinfo'
})
},
}
}
@ -31,15 +131,212 @@
.app {
background-color: #fff;
height: 100vh;
.content{
// width: 111px;
// height: 27px;
font-size: 28rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
line-height: 38rpx;
padding-left: 20rpx;
overflow: hidden;
//
.Familydoctor {
.imgs {
// background: red;
// height: 335rpx;
width: 100%;
image {
position: absolute;
width: 100%;
// top: 0;
}
.my {
padding-top: 50rpx;
height: 150rpx;
text-align: center;
line-height: 120rpx;
font-size: 34rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #FFFFFF;
position: relative;
}
}
.Familybody {
width: 100%;
background: #fff;
position: absolute;
.myorder {
position: relative;
.orderStatus {
text-align: center;
margin: 60rpx auto 30rpx;
width: 90%;
background: red;
display: flex;
justify-content: space-around;
padding-bottom: 30rpx;
}
.righttitle {
font-size: 26rpx;
color: #969494;
position: absolute;
right: 30rpx;
top: 44rpx;
image {
vertical-align: middle;
padding-left: 20rpx;
width: 13rpx;
height: 23rpx;
display: inline-block;
}
}
.title {
font-size: 28rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
// line-height: 38rpx;
margin-left: 30rpx;
// color: #4B4B4B;
height: 110rpx;
/* background: red; */
line-height: 110rpx;
border-bottom: 1rpx solid #E6E6E6;
width: 93%;
}
}
}
}
//
.Quanyi {
width: 100%;
position: relative;
.imgs {
width: 100%;
image {
position: absolute;
width: 100%;
}
.my {
padding-top: 50rpx;
height: 300rpx;
text-align: center;
line-height: 120rpx;
font-size: 34rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #FFFFFF;
position: relative;
}
}
.bodys {
width: 750rpx;
height: 100%;
overflow: hidden;
background: #FFFFFF;
border-radius: 12px;
opacity: 1;
height: 100vh;
overflow: hidden;
position: relative;
.name {
height: 38rpx;
font-size: 32rpx;
font-family: SourceHanSansCN-Medium, SourceHanSansCN;
font-weight: 500;
color: #333333;
line-height: 38rpx;
position: absolute;
top: 7%;
left: 50%;
transform: translateX(-50%);
}
.fist {
position: relative;
width: 96%;
height: 117rpx;
left: 50%;
top: 13%;
transform: translateX(-50%);
}
.two {
width: 168rpx;
height: 54rpx;
position: relative;
left: 72%;
top: 7%;
}
.myorder {
position: relative;
top: 10%;
.orderStatus {
text-align: center;
margin: 60rpx auto 30rpx;
width: 90%;
background: red;
display: flex;
justify-content: space-around;
padding-bottom: 30rpx;
}
.righttitle {
font-size: 26rpx;
color: #969494;
position: absolute;
right: 30rpx;
top: 44rpx;
image {
vertical-align: middle;
padding-left: 20rpx;
width: 13rpx;
height: 23rpx;
display: inline-block;
}
}
.title {
font-size: 28rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
margin-left: 30rpx;
height: 110rpx;
line-height: 110rpx;
border-bottom: 1rpx solid #E6E6E6;
width: 93%;
}
}
}
.headsculpture {
position: absolute;
top: 13%;
left: 50%;
transform: translateX(-50%);
width: 150rpx;
height: 150rpx;
z-index: 999;
}
}
}
</style>

BIN
static/headsculpture.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
static/huijiantou.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 316 B

BIN
static/myinformation.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 807 B

BIN
static/myinformations.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B

BIN
static/see.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/sousuo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/time.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
static/top.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB