Merge branch 'liuxin' into develop

a9614940 · linxin · 05c262ce · 00adc6ed · 05c262ce · a9614940
Commit a9614940 authored Nov 28, 2019 by linxin
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

close.png src/assets/intoApproval/close.png +0 -0

confirm-detail.vue src/pages/carConfirm/confirm-detail.vue +7 -6

No files found.
--- a/src/assets/intoApproval/close.png
+++ b/src/assets/intoApproval/close.png
--- a/src/pages/carConfirm/confirm-detail.vue
+++ b/src/pages/carConfirm/confirm-detail.vue
@@ -5,7 +5,8 @@
        <div class="down">
          <div class="top">
            录入产品信息
-            <img src="@/assets/intoApproval/close.png" @click="downNum=false" >
+            <!-- <img src="@/assets/intoApproval/close.png"  > -->
+            <span @click="downNum=false">x</span>
          </div>
          <div class="down-content">
            <span>请上传照片</span>
@@ -318,12 +319,12 @@ export default {
      line-height: 44px;
      color: #fff;
      background: #0041c4;
-      img {
+      span{
-        width: 16px;
+        font-size:24px;
-        height: 16px;
        float: right;
-        margin-top: 13px;
+        margin-right:10px;
-        margin-right: 20px;
+        font-family: YouYuan;
+        // margin-left:100px;
      }
    }
    .down-content {