zhangqi
/
circulation_ancientCoins_new
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

走查样式问题修复

master
kuaileWu 8 months ago
parent
bd1e2814ec
commit
4de3f64ecf
7 changed files with 104 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      App.vue
  2. 39
      components/preBookList.vue
  3. 28
      pages/book_detail/book_detail.vue
  4. 6
      pages/index/index.vue
  5. 1
      pages/prebook/prebook.vue
  6. 11
      pages/prebook_list/prebook_list.vue
  7. 8
      pages/visitors/visitors.vue

67
App.vue
View File

@ -72,8 +72,8 @@
padding: 0; padding: 0;
background: #F8F6F9; background: #F8F6F9;
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
font-family: PingFangSC-Regular,sans-serif; font-family: "PingFang SC","Helvetica Neue", Helvetica, Arial, sans-serif;;
font-weight: 400; font-weight: normal;
height: 100%; height: 100%;
} }
.fl { .fl {
@ -136,31 +136,22 @@
font-size:50rpx; font-size:50rpx;
line-height: 50rpx; line-height: 50rpx;
} }
.PfScRegular{
font-family: PingFangSC-Regular, sans-serif !important;
font-weight: 400 !important;
}
.PfScUltralight{
font-family: PingFangSC-Ultralight, sans-serif !important;
}
.PfScLight{
font-family: PingFangSC-Light, sans-serif !important;
}
.PfScThin{
font-family: PingFangSC-Thin, sans-serif !important;
}
.PfScMedium{ .PfScMedium{
font-family: PingFangSC-Medium, sans-serif !important; font-weight: 600;
font-weight: 500 !important;
} }
.PfScSemibold{ .PfScSemibold{
font-family: PingFangSC-Semibold, sans-serif !important; font-weight: 700;
font-weight: 600 !important;
} }
.PfScHeavy{
font-family: PingFangSC-Heavy, sans-serif !important; @supports (-webkit-touch-callout: none) {
font-weight: 800 !important; .PfScMedium{
font-weight: 500;
}
.PfScSemibold{
font-family: PingFangSC-Semibold;
}
} }
.over{ .over{
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -235,4 +226,36 @@
line-height: 40rpx !important; line-height: 40rpx !important;
height: 40rpx !important; height: 40rpx !important;
} }
.pages-visitors-visitors /deep/ .uni-actionsheet__cell{
color:#31333B !important;
font-size: 34rpx;
line-height: 112rpx;
height: 112rpx;
padding: 0rpx 6rpx;
}
.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet {
left: 0;
right: 0;
bottom: 0;
background: #F6F6F6;
border-radius: 20rpx 20rpx 0 0;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
.pages-visitors-visitors /deep/ .uni-actionsheet__menu{
border-radius: 20rpx 20rpx 0 0;
}
.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__cell:before {
border-top: 2rpx solid #EEEEEE;
color: #EEEEEE;
}
.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__action{
margin-top: 24rpx;
margin-bottom: 10rpx;
}
</style> </style>

39
components/preBookList.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="prebook-list-com"> <view class="prebook-list-com">
<view class="list btPadding" v-if="dataList.length>0"> <view :class="'list btPadding'+(topnopadding?' topnopadding':'')" v-if="dataList.length>0">
<view :class="'item '+item" v-for="(item, key) in dataList" @click="toBookDetail(item)"> <view :class="'item '+item" v-for="(item, key) in dataList" @click="toBookDetail(item)">
<view class="left"> <view class="left">
<view class="title PfScMedium"><text v-if="item.name">{{item.name}}</text><text v-else>无</text></view> <view class="title PfScMedium"><text v-if="item.name">{{item.name}}</text><text v-else>无</text></view>
@ -22,12 +22,16 @@
export default { export default {
name: "preBookList", name: "preBookList",
props: { props: {
dataList:{ dataList:{
type: Array, type: Array,
default: function(){ default: function(){
return [] return []
}
},
topnopadding:{
type:Boolean,
default:false
} }
}
}, },
data() { data() {
return { return {
@ -58,6 +62,11 @@ export default {
overflow: hidden; overflow: hidden;
background: #FFFFFF; background: #FFFFFF;
.list{ .list{
&.topnopadding{
.item:first-of-type{
padding: 0 13rpx 35rpx 13rpx;
}
}
width: 100%; width: 100%;
height: auto; height: auto;
background: #FFFFFF; background: #FFFFFF;
@ -108,20 +117,26 @@ export default {
flex-shrink: 1; flex-shrink: 1;
text-align: right; text-align: right;
word-break: break-all; word-break: break-all;
height: 42rpx;
display: flex;
align-items: center;
justify-content: flex-end;
.status{ .status{
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
view{ view{
display: flex; display: flex;
border-radius: 6rpx; border-radius: 6rpx;
font-size: 22rpx; font-size: 26rpx;
height: 32rpx; line-height: 40rpx;
line-height: 32rpx;
padding: 0 10rpx; padding: 0 10rpx;
box-sizing: border-box; box-sizing: border-box;
min-width: 90rpx; min-width: 90rpx;
display: block; display: block;
text-align: center; text-align: center;
height: 40rpx;
min-width: 128rpx;
box-sizing: border-box;
} }
&.status_wait{ &.status_wait{
@ -134,15 +149,15 @@ export default {
&.status_out_num{ &.status_out_num{
view{ view{
background: #FFFAF7; background: #FFFAF7;
border: 1rpx solid #FE6710;
color: #FE6710; color: #FE6710;
border: 1px solid #FE6710;
} }
} }
&.status_down{ &.status_down{
view{ view{
background: #FCFCFC; background: #FCFCFC;
border: 1rpx solid #AEB0B8; border: 1px solid #999999;
color: #B6B8BF; color: #999999;
} }
} }
&.status_expire,&.status_cancle{ &.status_expire,&.status_cancle{

28
pages/book_detail/book_detail.vue
View File

@ -116,7 +116,6 @@
// this.$pop.modelShow('预约信息为空') // this.$pop.modelShow('预约信息为空')
// return // return
// } // }
bookInfo = data bookInfo = data
this.bookInfo = bookInfo this.bookInfo = bookInfo
this.status = this.statusStyleList[bookInfo.status] this.status = this.statusStyleList[bookInfo.status]
@ -166,47 +165,48 @@
.status_text{ .status_text{
display: flex; display: flex;
border-radius: 6rpx; border-radius: 6rpx;
font-size: 22rpx; font-size: 26rpx;
height: 32rpx; height: 40rpx;
line-height: 32rpx; line-height: 40rpx;
padding: 0 10rpx; padding: 0 10rpx;
box-sizing: border-box; box-sizing: border-box;
min-width: 90rpx; min-width: 90rpx;
display: block; display: block;
text-align: center; text-align: center;
min-width: 128rpx;
} }
&.status_wait{ &.status_wait{
.status_text{ .status_text{
background: #EEFFF6; background: #F8FFF7;
// border: 1rpx solid #5BD07A; border: 1rpx solid #5BD07A;
color: #4FC381; color: #58CA7F;
} }
} }
&.status_out_num{ &.status_out_num{
.status_text{ .status_text{
background: #FFF2EE; background: #FFFAF7;
// border: 1rpx solid #FE6710;
color: #FE6710; color: #FE6710;
border: 1px solid #FE6710;
} }
} }
&.status_down{ &.status_down{
.status_text{ .status_text{
background: #FCFCFC; background: #FCFCFC;
// border: 1rpx solid #AEB0B8; border: 1px solid #999999;
color: #B6B8BF; color: #999999;
} }
} }
&.status_expire,&.status_cancle{ &.status_expire,&.status_cancle{
.status_text{ .status_text{
background: #FCFCFC; background: #FCFCFC;
// border: 1rpx solid #AEB0B8; border: 1rpx solid #AEB0B8;
color: #B6B8BF; color: #B6B8BF;
} }
} }
&.status_ing{ &.status_ing{
.status_text{ .status_text{
// border: 1rpx solid #5FA1CB; border: 1rpx solid #5FA1CB;
background: #EEF8FF; background: #F7FCFF;
color: #5FA1CB; color: #5FA1CB;
} }
} }

6
pages/index/index.vue
View File

@ -73,7 +73,7 @@
</view> </view>
</view> </view>
</view> </view>
<pre-book-list class="preg-books" :dataList="recentAppoint"></pre-book-list> <pre-book-list class="preg-books" :dataList="recentAppoint" :topnopadding="true"></pre-book-list>
<tabbar current="1" leftButtonText="预约"></tabbar> <tabbar current="1" leftButtonText="预约"></tabbar>
</view> </view>
@ -223,6 +223,7 @@
this.pageShow = true; this.pageShow = true;
let visitFlag = true; let visitFlag = true;
this.doctorInfo = data; this.doctorInfo = data;
console.log(data)
if(this.doctorInfo.doctor_info && this.doctorInfo.doctor_info.depart_name && this.doctorInfo.doctor_info.depart_name.length>0){ if(this.doctorInfo.doctor_info && this.doctorInfo.doctor_info.depart_name && this.doctorInfo.doctor_info.depart_name.length>0){
this.doctor_dept = this.doctorInfo.doctor_info.depart_name; this.doctor_dept = this.doctorInfo.doctor_info.depart_name;
} }
@ -332,7 +333,7 @@
width: auto; width: auto;
padding: 0 15rpx; padding: 0 15rpx;
min-width: 125rpx; min-width: 125rpx;
margin-top: 14rpx; margin-top: 5rpx;
line-height: 42rpx; line-height: 42rpx;
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
@ -428,6 +429,7 @@
.right{ .right{
width: 200rpx; width: 200rpx;
height: 100%; height: 100%;
color: #666666;
img{ img{
width: 52rpx; width: 52rpx;
height: 52rpx; height: 52rpx;

1
pages/prebook/prebook.vue
View File

@ -200,6 +200,7 @@
if(uids.length <= 0){ if(uids.length <= 0){
this.$pop.modelShow('请选择预约就诊人') this.$pop.modelShow('请选择预约就诊人')
console.log(88888);
return return
} }

11
pages/prebook_list/prebook_list.vue
View File

@ -100,10 +100,13 @@
border-radius: 30rpx; border-radius: 30rpx;
box-sizing: border-box; box-sizing: border-box;
font-size: 24rpx; font-size: 24rpx;
color: #616266; color: #616266;
&.active{ min-width: 136rpx;
border: 1rpx solid #5BD07A; text-align: center;
color: #58CA7F; &.active{
border: 1rpx solid #5BD07A;
color: #58CA7F;
background: #F8FFF7;
} }
} }
} }

8
pages/visitors/visitors.vue
View File

@ -377,16 +377,20 @@
min-height: 40rpx; min-height: 40rpx;
line-height: 40rpx; line-height: 40rpx;
font-size: 28rpx; font-size: 28rpx;
color: #949699; color: #666;
letter-spacing: 2rpx; letter-spacing: 2rpx;
max-width: 250rpx; max-width: 250rpx;
align-items: flex-end; align-items: flex-end;
} }
.depart{ .depart{
margin-left: 10rpx; margin-left: 10rpx;
color: #666;
min-height: 40rpx;
line-height: 40rpx;
} }
.status2{ .status2{
height: 38rpx; min-height: 40rpx;
line-height: 40rpx;
background: #FFE9E9; background: #FFE9E9;
line-height: 38rpx; line-height: 38rpx;
padding: 0 7rpx; padding: 0 7rpx;

Write Preview
Loading…
Cancel
Save