diff --git a/App.vue b/App.vue index 63f625f..5019ebe 100644 --- a/App.vue +++ b/App.vue @@ -72,8 +72,8 @@ padding: 0; background: #F8F6F9; -webkit-text-size-adjust: 100%; - font-family: PingFangSC-Regular,sans-serif; - font-weight: 400; + font-family: "PingFang SC","Helvetica Neue", Helvetica, Arial, sans-serif;; + font-weight: normal; height: 100%; } .fl { @@ -136,31 +136,22 @@ font-size: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{ - font-family: PingFangSC-Medium, sans-serif !important; - font-weight: 500 !important; + font-weight: 600; } .PfScSemibold{ - font-family: PingFangSC-Semibold, sans-serif !important; - font-weight: 600 !important; + font-weight: 700; } - .PfScHeavy{ - font-family: PingFangSC-Heavy, sans-serif !important; - font-weight: 800 !important; + + @supports (-webkit-touch-callout: none) { + .PfScMedium{ + font-weight: 500; + } + .PfScSemibold{ + font-family: PingFangSC-Semibold; + } } + .over{ overflow: hidden; text-overflow: ellipsis; @@ -235,4 +226,36 @@ line-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; + } + + + diff --git a/components/preBookList.vue b/components/preBookList.vue index 8b767d1..034e329 100644 --- a/components/preBookList.vue +++ b/components/preBookList.vue @@ -1,6 +1,6 @@