Merge pull request #842 from wsd000/feat_license_plate_keyboard

feat: 优化新能源键位空值显示状态
didi · Nov 21, 2023 · c88aa86 · c88aa86
2 parents f6d2da1 + 550308a
commit c88aa86
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 22 deletions.
diff --git a/components/_style/images/new-energy.png b/components/_style/images/new-energy.png
diff --git a/components/license-plate-input/index.vue b/components/license-plate-input/index.vue
@@ -22,11 +22,8 @@
         v-else
         class="md-license-plate-input-item_content"
       >
-        <div v-if="item">{{ item }}</div>
-        <div v-else class="emptyValue">
-          <div>+</div>
-          <div class="emptyValue_text">新能源</div>
-        </div>
+        <div v-if="item && item !== ' '">{{ item }}</div>
+        <div v-else class="emptyValue"></div>
       </div>
     </div>
   </div>
@@ -75,7 +72,7 @@
     &_content {
       width: 100%;
       height: 100%;
-      font-family: PingFangSC-Medium;
+      font-family: font-family-number;
       font-size: 40px;
       color: #111A34;
       letter-spacing: 0;
@@ -85,19 +82,8 @@
       .emptyValue{
         width: 100%;
         height: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        color: #12BB42;
-        font-size: 36px;
-        line-height: 36px;
-        &_text{
-          color: #61686F;
-          font-size: 16px;
-          line-height: 16px;
-          margin-top: 10px;
-        }
+        background: url(../_style/images/new-energy.png) center no-repeat;
+        background-size: 49px 51px;
       }
     }
   }

diff --git a/components/license-plate-keyboard/mixed-key-board.vue b/components/license-plate-keyboard/mixed-key-board.vue
@@ -78,7 +78,7 @@
       background: #FFFFFF;
       box-shadow: 0px 2px 0px 0px rgba(159,159,159,0.5);
       border-radius: 10px;
-      font-family: PingFangSC-Regular;
+      font-family: font-family-normal;
       font-size: 40px;
       color: #111A34;
       font-weight: 400;

diff --git a/components/license-plate-keyboard/short-cut-row.vue b/components/license-plate-keyboard/short-cut-row.vue
@@ -50,7 +50,7 @@
     background: #FFFFFF;
     box-shadow: 0px 2px 0px 0px rgba(159,159,159,0.5);
     border-radius: 12px;
-    font-family: PingFangSC-Regular;
+    font-family: font-family-normal;
     font-size: 40px;
     color: #01080F;
     letter-spacing: 0;

diff --git a/components/license-plate/demo/cases/demo0.vue b/components/license-plate/demo/cases/demo0.vue
@@ -18,7 +18,7 @@ export default {
   },
   mounted() {
     // setTimeout(()=>{
-    //   this.defaultValue = '23338888888'
+    //   this.defaultValue = '2333888 '
     // },10000)
   },
   methods: {},