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