Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # pages.json
This commit is contained in:
shidongli
commit
0203e5e3e3
40
pages.json
40
pages.json
@ -253,12 +253,6 @@
|
||||
"onReachBottomDistance": 100, //距离底部多远时触发 单位为px
|
||||
"enablePullDownRefresh": true //设置参数为true
|
||||
}
|
||||
}, {
|
||||
"path": "utabs/u-tabs",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}, {
|
||||
"path": "classification/classification",
|
||||
"style": {
|
||||
@ -312,41 +306,57 @@
|
||||
}
|
||||
,{
|
||||
"path" : "doctordetails/doctordetails",
|
||||
"style" :
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "医生详情",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
,{
|
||||
"path" : "ExpertlookOrder/ExpertlookOrder",
|
||||
"style" :
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "专家咨询订单",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
,{
|
||||
"path" : "consulted/consulted",
|
||||
"style" :
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "待咨询",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
,{
|
||||
"path" : "cancel/cancel",
|
||||
"style" :
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "取消订单",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"path": "PointsMall/PointsMall",
|
||||
"style": {
|
||||
"navigationBarTitleText": "积分商城",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "doctordetails/doctordetails",
|
||||
"style": {
|
||||
"navigationBarTitleText": "医生详情",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"root": "pagesC",
|
||||
@ -398,4 +408,4 @@
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
103
pages/homepage/homepage.scss
Normal file
103
pages/homepage/homepage.scss
Normal file
@ -0,0 +1,103 @@
|
||||
.app {
|
||||
height: 100vh;
|
||||
background-color: #F7F5F5;
|
||||
|
||||
.contentbottom {
|
||||
width: 95%;
|
||||
height: 446rpx;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
border-radius: 5rpx;
|
||||
margin: 0 auto;
|
||||
transform: translateY(-16%);
|
||||
|
||||
|
||||
.item {
|
||||
display: flex;
|
||||
|
||||
.signmyself {
|
||||
display: inline-block;
|
||||
width: 48%;
|
||||
padding: 30rpx 10rpx 0 20rpx;
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
height: 278rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.sign {
|
||||
display: inline-block;
|
||||
padding: 30rpx 0 0 0;
|
||||
width: 48%;
|
||||
|
||||
image {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 132rpx;
|
||||
margin-bottom: 15rpx;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.health {
|
||||
padding: 30rpx 30rpx 0 30rpx;
|
||||
font-size: 28rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
line-height: 38rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.contentcenter {
|
||||
width: 96%;
|
||||
height: 446rpx;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
border-radius: 5rpx;
|
||||
margin: 0 auto;
|
||||
transform: translateY(-20%);
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-around;
|
||||
padding: 38rpx 2% 8rpx 88rpx;
|
||||
|
||||
.home {
|
||||
width: 32%;
|
||||
.name{
|
||||
margin: 10rpx 0 0 0;
|
||||
}
|
||||
|
||||
image {
|
||||
width: 102rpx;
|
||||
height: 102rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content {
|
||||
position: relative;
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
height: 562rpx;
|
||||
}
|
||||
.loginmount {
|
||||
position: absolute;
|
||||
top: 12%;
|
||||
left: 7%;
|
||||
font-size: 28rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
color: #717070;
|
||||
|
||||
image {
|
||||
width: 22rpx;
|
||||
height: 12rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,13 +1,70 @@
|
||||
<template>
|
||||
<view class="content">
|
||||
<view class="text-area">
|
||||
<text class="title">{{title}}</text>
|
||||
<view class="app">
|
||||
<view class="content">
|
||||
<image src="/static/pageC/homepage.png" mode=""></image>
|
||||
<view class="loginmount">
|
||||
<image src="/static/pageC/TAB.png" mode=""></image>
|
||||
你好，请登录
|
||||
</view>
|
||||
</view>
|
||||
<view class="contentcenter">
|
||||
<view class="home">
|
||||
<image src="/static/pageC/qianyue.png" mode=""></image>
|
||||
<view class="name">
|
||||
家医签约
|
||||
</view>
|
||||
</view>
|
||||
<view class="home">
|
||||
<image src="/static/pageC/health.png" mode=""></image>
|
||||
<view class="name">
|
||||
健康档案
|
||||
</view>
|
||||
</view>
|
||||
<view class="home">
|
||||
<image src="/static/pageC/serveappoint.png" mode=""></image>
|
||||
<view class="name">
|
||||
服务预约
|
||||
</view>
|
||||
</view>
|
||||
<view class="home">
|
||||
<image src="/static/pageC/exchange.png" mode=""></image>
|
||||
<view class="name">
|
||||
积分兑换
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="home">
|
||||
<image src="/static/pageC/appointmen.png" mode=""></image>
|
||||
<view class="name">
|
||||
我的预约
|
||||
</view>
|
||||
</view>
|
||||
<view class="home">
|
||||
<image src="/static/pageC/SERVERECOD.png" mode=""></image>
|
||||
<view class="name">
|
||||
服务记录
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="contentbottom">
|
||||
<view class="health">
|
||||
健康管理
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="signmyself">
|
||||
<image src="/static/pageC/tizheng.png" mode=""></image>
|
||||
</view>
|
||||
<view class="sign">
|
||||
<image src="/static/pageC/healthmyself.png" mode=""></image>
|
||||
<image src="/static/pageC/records.png" mode=""></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getOpenId, getCurrentUser } from '@/api/pages/api.js'
|
||||
// import { getOpenId, getCurrentUser } from '@/api/pages/api.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@ -23,7 +80,7 @@
|
||||
uni.login({
|
||||
success(res) {
|
||||
getOpenId(res.code).then(Res => {
|
||||
if(Res.code == 200) {
|
||||
if (Res.code == 200) {
|
||||
_this.isWxBing(Res.msg, '1')
|
||||
}
|
||||
})
|
||||
@ -33,7 +90,7 @@
|
||||
isWxBing(openid, cityCode) {
|
||||
getCurrentUser(openid, cityCode).then(res => {
|
||||
console.log(res);
|
||||
if(!res.data) {
|
||||
if (!res.data) {
|
||||
// 注册
|
||||
}
|
||||
})
|
||||
@ -42,30 +99,6 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.logo {
|
||||
height: 200rpx;
|
||||
width: 200rpx;
|
||||
margin-top: 200rpx;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
margin-bottom: 50rpx;
|
||||
}
|
||||
|
||||
.text-area {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 36rpx;
|
||||
color: #8f8f94;
|
||||
}
|
||||
</style>
|
||||
<style lang="scss">
|
||||
@import "./homepage.scss";
|
||||
</style>
|
||||
@ -10,7 +10,7 @@
|
||||
<view class="PointsMall" @tap='gointegral'>
|
||||
积分商城
|
||||
</view>
|
||||
<view class="Exchangerecords">
|
||||
<view class="Exchangerecords" @tap="goexchange">
|
||||
兑换记录
|
||||
</view>
|
||||
</view>
|
||||
@ -27,7 +27,7 @@
|
||||
<view class="timeone">
|
||||
2023-03-09 13:23:12
|
||||
</view>
|
||||
<view class="Establishingarchives">
|
||||
<view class="Establishingarchives" >
|
||||
兑换商品
|
||||
</view>
|
||||
<view class="integraltwo">
|
||||
@ -52,6 +52,11 @@
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
goexchange(){
|
||||
uni.navigateTo({
|
||||
url: '/pagesB/exchangerecords/exchangerecords'
|
||||
})
|
||||
},
|
||||
//积分页面
|
||||
...mapActions(["integralopenPopup"]),
|
||||
gointegral() {
|
||||
@ -65,7 +70,10 @@
|
||||
})
|
||||
}, 0)
|
||||
} else {
|
||||
this.gologin();
|
||||
uni.navigateTo({
|
||||
url: '/pagesB/PointsMall/PointsMall'
|
||||
})
|
||||
// this.gologin();
|
||||
}
|
||||
},
|
||||
},
|
||||
@ -73,4 +81,4 @@
|
||||
</script>
|
||||
<style lang="scss">
|
||||
@import './Behaviorpoints.scss'
|
||||
</style>
|
||||
</style>
|
||||
|
||||
126
pagesB/PointsMall/PointsMall.vue
Normal file
126
pagesB/PointsMall/PointsMall.vue
Normal file
@ -0,0 +1,126 @@
|
||||
<template>
|
||||
<view class="app">
|
||||
<view class="content">
|
||||
<view class="imageitem">
|
||||
<image src="/static/pagesB/Behave.png" mode=""></image>
|
||||
</view>
|
||||
<view class="servename">
|
||||
服务名称
|
||||
</view>
|
||||
<view class="PointsRecord">
|
||||
200000
|
||||
</view>
|
||||
<view class="button" @tap="goexchange">
|
||||
兑换
|
||||
</view>
|
||||
</view>
|
||||
<view class="content">
|
||||
<view class="imageitem">
|
||||
<image src="/static/pagesB/Behave.png" mode=""></image>
|
||||
</view>
|
||||
<view class="servename">
|
||||
服务名称
|
||||
</view>
|
||||
<view class="PointsRecord">
|
||||
200000
|
||||
</view>
|
||||
<view class="button" @tap="goexchange">
|
||||
兑换
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
|
||||
methods: {
|
||||
goexchange() {
|
||||
uni.navigateTo({
|
||||
url: '/pagesB/exchangerecords/exchangerecords'
|
||||
});
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.app {
|
||||
background-color: #F7F5F5;
|
||||
padding-top: 30rpx;
|
||||
height: 100vh;
|
||||
display: flex;
|
||||
width: 100%;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-start;
|
||||
|
||||
.content {
|
||||
width: 352rpx;
|
||||
height: 514rpx;
|
||||
background: #fff;
|
||||
width: 45%;
|
||||
position: relative;
|
||||
border-radius: 5rpx;
|
||||
left: 18rpx;
|
||||
margin: 0 0 20rpx 15rpx;
|
||||
|
||||
.button {
|
||||
width: 100rpx;
|
||||
height: 44rpx;
|
||||
line-height: 44rpx;
|
||||
position: absolute;
|
||||
text-align: center;
|
||||
font-size: 22rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
color: #fff;
|
||||
right: 3%;
|
||||
bottom: 5%;
|
||||
background: #26A888;
|
||||
border-radius: 5rpx;
|
||||
}
|
||||
|
||||
.PointsRecord {
|
||||
// width: 83px;
|
||||
// height: 19px;
|
||||
font-size: 20rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
color: #26A888;
|
||||
line-height: 33rpx;
|
||||
padding-left: 3%;
|
||||
}
|
||||
|
||||
.servename {
|
||||
// width: 102px;
|
||||
// height: 24px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
font-size: 26rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
color: #000000;
|
||||
line-height: 33rpx;
|
||||
padding-left: 3%;
|
||||
}
|
||||
|
||||
.imageitem {
|
||||
image {
|
||||
width: 100%;
|
||||
height: 355rpx;
|
||||
background: red;
|
||||
border-radius: 5rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
</style>
|
||||
@ -17,7 +17,8 @@
|
||||
<span>上门时间：</span>
|
||||
<span class='addition'>请您选择希望护理员到达的时间</span>
|
||||
</view>
|
||||
<tabs :list="orderlist.appointmentTimeList" :current="timecurrent" @change="timechange" active-color="#26A888">
|
||||
<tabs :list="orderlist.appointmentTimeList" :current="timecurrent" @change="timechange"
|
||||
active-color="#26A888">
|
||||
</tabs>
|
||||
<view class="timeyear">
|
||||
<view class="toptext">
|
||||
@ -136,7 +137,7 @@
|
||||
} from '@/api/pagesB/appointmenttime/appointmenttime.js'
|
||||
import baseurl from '@/api/baseurl.js'
|
||||
import appointmenttext from '../../components/appointmenttimetext.vue'
|
||||
import tabs from '../utabs/u-tabs.vue'
|
||||
import tabs from '@/components/utabs/u-tabs.vue'
|
||||
export default {
|
||||
components: {
|
||||
appointmenttext,
|
||||
@ -484,4 +485,4 @@
|
||||
</script>
|
||||
<style lang="scss">
|
||||
@import './appointmenttime.scss'
|
||||
</style>
|
||||
</style>
|
||||
@ -1,6 +1,15 @@
|
||||
<template>
|
||||
<view>
|
||||
|
||||
<view class="app">
|
||||
<image src="../../static/headsculpture.png" mode=""></image>
|
||||
<view class="name">
|
||||
张三
|
||||
</view>
|
||||
<view class="position">
|
||||
主任医师 肾内科
|
||||
</view>
|
||||
<view class="Affiliation">
|
||||
山东大学齐鲁医院
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -8,12 +17,47 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
|
||||
};
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
page {
|
||||
background-color: #F4F5F7;
|
||||
}
|
||||
|
||||
</style>
|
||||
.app {
|
||||
width: 96%;
|
||||
margin: 20rpx auto;
|
||||
color: #666666;
|
||||
|
||||
image {
|
||||
display: block;
|
||||
width: 150rpx;
|
||||
height: 150rpx;
|
||||
margin: 40rpx auto 0;
|
||||
}
|
||||
|
||||
.name {
|
||||
text-align: center;
|
||||
margin: 40rpx auto 0;
|
||||
font-size: 32rpx;
|
||||
font-weight: 500;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.Affiliation {
|
||||
text-align: center;
|
||||
margin: 16rpx auto 0;
|
||||
font-size: 20rpx;
|
||||
}
|
||||
|
||||
.position {
|
||||
text-align: center;
|
||||
margin: 20rpx auto 0;
|
||||
font-size: 22rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -1,6 +1,22 @@
|
||||
<template>
|
||||
<view class="app">
|
||||
|
||||
<view class="content">
|
||||
<view class="time">
|
||||
2023-08-13 23:43:49
|
||||
<span>
|
||||
2000积分
|
||||
</span>
|
||||
</view>
|
||||
<view class="imageitem">
|
||||
<image src="../../static/pagesB/Behave.png" mode=""></image>
|
||||
</view>
|
||||
<view class="servename">
|
||||
服务名称
|
||||
</view>
|
||||
<view class="servetime">
|
||||
服务时间：2023-12-12 08:30
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -15,5 +31,83 @@
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.app {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
text-align: justify;
|
||||
background-color: #F7F5F5;
|
||||
padding: 25rpx 0 30rpx 0;
|
||||
|
||||
.content {
|
||||
width: 90%;
|
||||
height: 321rpx;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
border-radius: 5rpx;
|
||||
margin: 20rpx auto;
|
||||
position: relative;
|
||||
|
||||
.servetime {
|
||||
|
||||
font-size: 28rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
color: #959595;
|
||||
line-height: 38rpx;
|
||||
position: absolute;
|
||||
bottom: 23%;
|
||||
left: 35%;
|
||||
}
|
||||
|
||||
.servename {
|
||||
|
||||
font-size: 32rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
line-height: 38rpx;
|
||||
position: absolute;
|
||||
top: 38%;
|
||||
left: 35%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.imageitem {
|
||||
position: absolute;
|
||||
left: 3%;
|
||||
top: 28%;
|
||||
|
||||
image {
|
||||
width: 180rpx;
|
||||
height: 180rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.time {
|
||||
padding: 25rpx 0 0 20rpx;
|
||||
font-size: 28rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
color: #000000;
|
||||
line-height: 38rpx;
|
||||
position: relative;
|
||||
|
||||
span {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
font-size: 28rpx;
|
||||
position: absolute;
|
||||
font-family: Source Han Sans CN;
|
||||
font-weight: 500;
|
||||
color: #26A888;
|
||||
line-height: 38rpx;
|
||||
right: 3%;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</style>
|
||||
BIN
static/pageC/SERVERECOD.png
Normal file
BIN
static/pageC/SERVERECOD.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
BIN
static/pageC/TAB.png
Normal file
BIN
static/pageC/TAB.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 254 B |
BIN
static/pageC/appointmen.png
Normal file
BIN
static/pageC/appointmen.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.9 KiB |
BIN
static/pageC/exchange.png
Normal file
BIN
static/pageC/exchange.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
BIN
static/pageC/health.png
Normal file
BIN
static/pageC/health.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
BIN
static/pageC/healthmyself.png
Normal file
BIN
static/pageC/healthmyself.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
BIN
static/pageC/homepage.png
Normal file
BIN
static/pageC/homepage.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
BIN
static/pageC/qianyue.png
Normal file
BIN
static/pageC/qianyue.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
BIN
static/pageC/records.png
Normal file
BIN
static/pageC/records.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
BIN
static/pageC/serveappoint.png
Normal file
BIN
static/pageC/serveappoint.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
BIN
static/pageC/tizheng.png
Normal file
BIN
static/pageC/tizheng.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.8 KiB |
Loading…
Reference in New Issue
Block a user