admin/src/views/login.vue
@@ -3,13 +3,8 @@ <img src="@/assets/images/bg@2x.png" class="main_bg" alt=""> <div class="login_wrap"> <div class="login_img"> <<<<<<< HEAD <div class="h3" style="font-size: 30px; margin-bottom: 0;">{{sysConfig.title || ''}}</div> <div class="h3">{{sysConfig.subtitle || title}}</div> ======= <div class="h2">芜湖烟草智慧安消安全防范系统</div> <div class="h3">智慧物流园区安消一体化系统</div> >>>>>>> c5675caa (最新版本541200007) </div> <div class="form_wrap"> <div class="tabs">
