Merge branch 'master' into dev

src/mobile/components/xFrom/dateTimePicker.vue

@@ -9,7 +9,7 @@
     @close="visible = false"
   >
     <div class="flex_row v1">
-      <div class="v1_1" id="left">
+      <div id="left" class="v1_1">
         <div
           v-for="(item, index) in dateList"
           :key="index"
@@ -20,7 +20,7 @@
           {{ item.str }}
         </div>
       </div>
-      <div class="v1_2" id="right">
+      <div id="right" class="v1_2">
         <div :class="['v1_2_1', { v1_2_2: type === 1 }]">
           <div
             v-for="(item, index) in timeList"
@@ -38,12 +38,7 @@
       </div>
     </div>
     <div class="v2">
-      <Button
-        type="primary"
-        class="main_sure_bt"
-        block
-        @click="onConfirm"
-      >
+      <Button type="primary" class="main_sure_bt" block @click="onConfirm">
         确定
       </Button>
     </div>
@@ -272,29 +267,29 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style scoped lang="scss">
 .v1 {
   height: 50vh;
   align-items: flex-start;
   overflow: hidden;
   background: #fff;
-  margin-top: 0.16rem;
+  margin-top: 8px;
   display: flex;
   flex-direction: row;
 
   .v1_1 {
     height: 100%;
-    width: 2.2rem;
+    width: 110px;
     overflow-y: scroll;
     overflow-x: hidden;
     background: #f1f4f8;
 
     .v1_1_1 {
-      font-size: 0.28rem;
+      font-size: 14px;
       color: #3c3c3c;
       font-weight: bolder;
       text-align: center;
-      line-height: 1.2rem;
+      line-height: 44px;
     }
 
     .active {
@@ -317,15 +312,15 @@ export default {
       flex-direction: row;
 
       .v1_2_1_1 {
-        width: 2.2rem;
-        height: 1.2rem;
-        line-height: 1.2rem;
+        width: 110px;
+        height: 44px;
+        line-height: 44px;
         text-align: center;
-        border-radius: 0.6rem;
+        border-radius: 30px;
         border: 1px solid #e6e6e6;
         color: #696969;
-        font-size: 0.28rem;
-        margin-top: 0.28rem;
+        font-size: 14px;
+        margin-top: 14px;
       }
 
       .active {
@@ -344,31 +339,31 @@ export default {
 
       .v1_2_1_1 {
         width: 80%;
-        height: 0.8rem;
-        border-radius: 0.4rem;
-        line-height: 0.8rem;
+        height: 40px;
+        border-radius: 20px;
+        line-height: 40px;
       }
     }
   }
 }
 
 .v2 {
-  height: 1.76rem;
+  height: 84px;
   background: #fff;
   box-shadow: 0px -2px 2px 0px rgba(243, 243, 243, 0.75);
 
   .main_sure_bt {
-    width: 6.9rem;
-    height: 0.88rem;
+    width: 350px;
+    height: 44px;
     background: linear-gradient(135deg, #fd7c32 0, #fb4529 100%);
     box-shadow: 0px 4px 8px 0px rgba(255, 105, 51, 0.3);
-    border-radius: 0.44rem;
+    border-radius: 22px;
     text-align: center;
-    line-height: 0.88rem;
-    font-size: 0.3rem;
+    line-height: 44px;
+    font-size: 15px;
     color: #fff;
     font-weight: 600;
-    margin: 0.18rem auto;
+    margin: 9px auto;
     border: none;
   }
 }