1

pages/Login/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<!-- 客户端 -->
+<<<<<<< Updated upstream
   <!-- #ifdef H5-->
 	<ClientLoginBox></ClientLoginBox>
   <!--	#endif-->
@@ -9,6 +10,9 @@
 	<AdminloginBox></AdminloginBox>
 	<!-- #endif -->
 
+=======
+	<AdminloginBox></AdminloginBox>
+>>>>>>> Stashed changes
 </template>
 <script setup>
 	import ClientLoginBox  from './components/clientloginBox.vue'

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,13 +1,13 @@
 {
-  "hash": "e4126def",
-  "configHash": "ee829940",
+  "hash": "7375ca5a",
+  "configHash": "fdaa8c6f",
   "lockfileHash": "e3b0c442",
-  "browserHash": "3202c580",
+  "browserHash": "520c72ef",
   "optimized": {
     "ts-md5/dist/md5": {
       "src": "../../../../../node_modules/ts-md5/dist/md5.js",
       "file": "ts-md5_dist_md5.js",
-      "fileHash": "850f551d",
+      "fileHash": "763602ac",
       "needsInterop": true
     }
   },