Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

Merge branch 'chronic-master' of…
Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master
9d26b311 · songrui · abde4e26 · 1fb477c3 · 9d26b311 · 9d26b311
Commit 9d26b311 authored Sep 20, 2024 by songrui
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

index.html public/index.html +3 -2

Search.vue src/doctor/followUp/search/Search.vue +2 -2

IdCheck.vue src/resident/screening/first/form/IdCheck.vue +3 -3

No files found.
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,7 @@
    <meta name='viewport' content='width=device-width, initial-scale=1.0, user-scalable=0, viewport-fit=cover' />
    <link rel='icon' href='<%= BASE_URL %>favicon.ico'>
    <title><%= htmlWebpackPlugin.options.title %></title>
-    <script src='https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js'></script>
+<!--    <script src='https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js'></script>-->
 </head>
 <body>
 <noscript>
@@ -78,6 +78,7 @@
 <!-- built files will be auto injected -->
 </body>
 <script>
-    var vConsole =new VConsole();
+   /* var vConsole =new VConsole();
+    console.log('Hello world');*/
 </script>
 </html>
--- a/src/doctor/followUp/search/Search.vue
+++ b/src/doctor/followUp/search/Search.vue
@@ -11,9 +11,9 @@
                    clearable
                    @clear="idCardClear"
                    ref="idCardField"/>
-                <van-uploader :max-size="5 * 1024 * 1024" :after-read="afterRead" max-count="1">
+<!--                <van-uploader :max-size="5 * 1024 * 1024" :after-read="afterRead" max-count="1">
                        <doc-icon type="doc-camera" class="shrink-0 mr-3" style="color: #575B66"/>
-                </van-uploader>
+                </van-uploader>-->
            </div>
            <span class="text-16 shrink-0 text-primary" @click="search">
                搜索

--- a/src/resident/screening/first/form/IdCheck.vue
+++ b/src/resident/screening/first/form/IdCheck.vue
@@ -14,7 +14,7 @@
                name="certificateType"
                label="证件类型"
                placeholder="请选择" />
-            <van-field v-model="form.idCard"
+            <van-field v-model.trim="form.idCard"
                required
                clearable
                name="idCard"  
@@ -24,9 +24,9 @@
            >
            <template #right-icon>
                <div class="flex items-center">
-                    <van-uploader :max-size="5 * 1024 * 1024" :after-read="afterRead" max-count="1">
+<!--                    <van-uploader :max-size="5 * 1024 * 1024" :after-read="afterRead" max-count="1">
                        <doc-icon type="doc-scan" style="font-size: .2rem;"/>
-                    </van-uploader>
+                    </van-uploader>-->
                </div>
            </template>
            </van-field>