shish преди 7 месеца
родител
ревизия
d685f9aec1
променени са 2 файла, в които са добавени 34 реда и са изтрити 32 реда
  1. 17 16
      ghsPad/src/components/TimePicker.vue
  2. 17 16
      hdPad/src/components/TimePicker.vue

+ 17 - 16
ghsPad/src/components/TimePicker.vue

@@ -43,7 +43,7 @@ export default {
       days: [],
       days: [],
       hours: [],
       hours: [],
       minutes: [],
       minutes: [],
-      indicatorStyle: `height: 70rpx;`,
+      indicatorStyle: `height: 70upx;`,
     };
     };
   },
   },
   created() {
   created() {
@@ -239,9 +239,9 @@ export default {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .time-picker-container {
 .time-picker-container {
   background-color: #fff;
   background-color: #fff;
-  border-radius: 20rpx;
-  width: 300rpx;
-  height: 400rpx;
+  border-radius: 20upx;
+  width: 300upx;
+  height: 400upx;
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   overflow: hidden;
   overflow: hidden;
@@ -249,44 +249,45 @@ export default {
 .picker-header {
 .picker-header {
   position: relative;
   position: relative;
   text-align: center;
   text-align: center;
-  padding: 20rpx;
+  padding: 20upx;
   flex-shrink: 0;
   flex-shrink: 0;
 
 
   .title {
   .title {
-    font-size: 26rpx;
+    font-size: 26upx;
     font-weight: 350;
     font-weight: 350;
   }
   }
 
 
   .close-btn {
   .close-btn {
     position: absolute;
     position: absolute;
-    right: 24rpx;
+    right: 24upx;
     top: 50%;
     top: 50%;
     transform: translateY(-50%);
     transform: translateY(-50%);
-    padding: 10rpx;
+    padding: 10upx;
   }
   }
 }
 }
 .picker-view {
 .picker-view {
   width: 100%;
   width: 100%;
-  height: 100%;
+  flex: 1;
+  overflow: hidden;
 }
 }
 .picker-item {
 .picker-item {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: center;
   justify-content: center;
-  font-size: 22rpx;
+  font-size: 22upx;
 }
 }
 .confirm-button-wrapper {
 .confirm-button-wrapper {
-  padding: 15rpx 20rpx;
-  padding-bottom: 25rpx;
+  padding: 15upx 20upx;
+  padding-bottom: 25upx;
   flex-shrink: 0;
   flex-shrink: 0;
 }
 }
 .confirm-btn {
 .confirm-btn {
   background: linear-gradient(to right, #409eff, #67c2ff);
   background: linear-gradient(to right, #409eff, #67c2ff);
   color: white;
   color: white;
-  border-radius: 50rpx;
-  font-size: 24rpx;
-  height: 50rpx;
-  line-height: 50rpx;
+  border-radius: 50upx;
+  font-size: 24upx;
+  height: 50upx;
+  line-height: 50upx;
   border: none;
   border: none;
   &::after {
   &::after {
     border: none;
     border: none;

+ 17 - 16
hdPad/src/components/TimePicker.vue

@@ -43,7 +43,7 @@ export default {
       days: [],
       days: [],
       hours: [],
       hours: [],
       minutes: [],
       minutes: [],
-      indicatorStyle: `height: 70rpx;`,
+      indicatorStyle: `height: 70upx;`,
     };
     };
   },
   },
   created() {
   created() {
@@ -239,9 +239,9 @@ export default {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .time-picker-container {
 .time-picker-container {
   background-color: #fff;
   background-color: #fff;
-  border-radius: 20rpx;
-  width: 300rpx;
-  height: 400rpx;
+  border-radius: 20upx;
+  width: 300upx;
+  height: 400upx;
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   overflow: hidden;
   overflow: hidden;
@@ -249,44 +249,45 @@ export default {
 .picker-header {
 .picker-header {
   position: relative;
   position: relative;
   text-align: center;
   text-align: center;
-  padding: 20rpx;
+  padding: 20upx;
   flex-shrink: 0;
   flex-shrink: 0;
 
 
   .title {
   .title {
-    font-size: 26rpx;
+    font-size: 24upx;
     font-weight: 350;
     font-weight: 350;
   }
   }
 
 
   .close-btn {
   .close-btn {
     position: absolute;
     position: absolute;
-    right: 24rpx;
+    right: 24upx;
     top: 50%;
     top: 50%;
     transform: translateY(-50%);
     transform: translateY(-50%);
-    padding: 10rpx;
+    padding: 10upx;
   }
   }
 }
 }
 .picker-view {
 .picker-view {
   width: 100%;
   width: 100%;
-  height: 100%;
+  flex: 1;
+  overflow: hidden;
 }
 }
 .picker-item {
 .picker-item {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: center;
   justify-content: center;
-  font-size: 22rpx;
+  font-size: 22upx;
 }
 }
 .confirm-button-wrapper {
 .confirm-button-wrapper {
-  padding: 15rpx 20rpx;
-  padding-bottom: 25rpx;
+  padding: 15upx 20upx;
+  padding-bottom: 25upx;
   flex-shrink: 0;
   flex-shrink: 0;
 }
 }
 .confirm-btn {
 .confirm-btn {
   background: linear-gradient(to right, #409eff, #67c2ff);
   background: linear-gradient(to right, #409eff, #67c2ff);
   color: white;
   color: white;
-  border-radius: 50rpx;
-  font-size: 24rpx;
-  height: 50rpx;
-  line-height: 50rpx;
+  border-radius: 50upx;
+  font-size: 24upx;
+  height: 50upx;
+  line-height: 50upx;
   border: none;
   border: none;
   &::after {
   &::after {
     border: none;
     border: none;