yjryu / KERIS star
kimgkdud898 2023-11-06
231106김하영
@2cc6b12596d45421660764f96ab9d6835308f4cf
client/resources/css/Main.css
--- client/resources/css/Main.css
+++ client/resources/css/Main.css
@@ -558,7 +558,7 @@
   position: relative;
 }
 
-.matchingbox div:nth-child(1):before {
+/* .matchingbox div:nth-child(1):before {
   position: absolute;
   content: "AA등급";
   line-height: 40px;
@@ -572,7 +572,7 @@
   background-color: #3f87f7;
   border-radius: 45px;
   transform: translateX(-50%);
-}
+} */
 
 .matchingbox-1 {
   display: flex;
@@ -1671,6 +1671,7 @@
 .wg-grid-1 {
   padding: 1rem;
   display: grid;
+
   grid-template-columns: 20% 1fr;
   gap: 1rem;
 }
client/views/layout/Menu.vue
--- client/views/layout/Menu.vue
+++ client/views/layout/Menu.vue
@@ -1,5 +1,5 @@
 <template>
-    <div style="width: 100%;box-shadow: 1px 1px 5px #afafaf91;">
+    <div style="width: 100%;box-shadow: 1px 1px 5px #afafaf45;">
         <div class="w1400 header-wrap">
             <div class="logo-toggle">
 
client/views/pages/user/introduction/Introduction.vue
--- client/views/pages/user/introduction/Introduction.vue
+++ client/views/pages/user/introduction/Introduction.vue
@@ -11,7 +11,7 @@
 
                 <section class="intro-text">
                     <h3>AI 디지털교과서 통합지원센터 소개</h3>
-                    <p><i class="fa-solid fa-circle fa-2xs"></i>양질의 AI 디지털교과서 개발을 위한 기술 표준과 정책을 연구합니다.</p>
+                    <p><i class="fa-solid fa-check"></i>양질의 AI 디지털교과서 개발을 위한 기술 표준과 정책을 연구합니다.</p>
                     <p><i class="fa-solid fa-circle fa-2xs"></i>개발사 간의 소통하고 협력적인 동반관계를 형성할 수 있도록 네트워킹을 지원합니다.</p>
                     <p><i class="fa-solid fa-circle fa-2xs"></i>민간 개발사가 개발하는 AI 디지털교과서와 공공에서 제공하는 서비스 간의 원활한 연계 체계를 지원합니다.
                     </p>
client/views/pages/user/join/Join.vue
--- client/views/pages/user/join/Join.vue
+++ client/views/pages/user/join/Join.vue
@@ -19,11 +19,15 @@
                     <img src="../../../../resources/jpg/join-bt.png" alt="">
 
                 </label>
+                <div class="join-text">
+                    <p>※올바른 가입방법을 선택하세요.</p>
+                </div>
             </div>
+
         </section>
 
         <!-- <div v-if="selectedMembership === 'company'"> -->
-        <div v-if="selectedMembership === 'company'">
+        <div v-show="selectedMembership === 'company'">
             <div class="login-info2">
                 <div>
                     <h3>회사소개</h3>
@@ -54,10 +58,11 @@
                                 <span>사업자등록번호</span>
                             </div>
                             <div>
-                                <input type="text" v-model="company['company_id']" placeholder="사업자등록번호를 입력하세요.">
+                                <input type="text" v-model="combinedUserId" class="id-input" placeholder="사업자등록번호를 입력하세요."
+                                    @click="openModal">
                             </div>
                             <div>
-                                <button @click="companyIdCheck">중복확인</button>
+                                <button @click="openModal2">중복확인</button>
                             </div>
                             <!-- <div v-if="this.companyIdCheck_boolean" style="color:chartreuse"></div>
                             <div v-else style="color:red">사업자등록번호: 이미 등록되어있는 사업자등록번호 입니다.</div> -->
@@ -129,10 +134,10 @@
                     </div>
                     <div>
                         <!-- <input type="text" v-model="user['user_id']" placeholder="아이디를 입력하세요."> -->
-                        <input type="text" v-model="combinedUserId" placeholder="아이디를 입력하세요.">
+                        <input type="text" v-model="combinedUserId" class="id-input" placeholder="아이디를 입력하세요.">
                     </div>
                     <div>
-                        <button @click="userIdCheck">중복확인</button>
+                        <button>중복확인</button>
                     </div>
                 </section>
                 <section class="join-sec3 joinsub">
@@ -156,7 +161,7 @@
                 </section>
                 <section class="join-sec5 joinsub">
                     <div class="join-sec-sub">
-                        <span>담당자명<span>(필수)</span></span>
+                        <span>담당자명</span>
                     </div>
                     <div class="join-uplodebox">
                         <input type="text" v-model="user['user_nm']">
@@ -175,7 +180,7 @@
                 </section>
                 <section class="join-sec6">
                     <div class="join-sec-sub">
-                        <span>이메일<span>(필수)</span></span>
+                        <span>이메일</span>
                     </div>
                     <div class="email-sec">
                         <div>
@@ -197,6 +202,21 @@
                         </div>
                     </div>
                 </section>
+                <div>
+
+                    <section class="join-email-bt">
+                        <input type="checkbox">
+                        <span>E-mail 구독서비스를 신청하시겠습니까?</span>
+                    </section>
+
+                    <section class="join-end-bt">
+                        <button>이전</button>
+
+                        <button v-if="selectedMembership === 'company'" @click="commonFileInsert">회원가입</button>
+                        <button v-else @click="userInsert">회원가입</button>
+                    </section>
+                </div>
+
             </div>
         </div>
         <!-- <div v-if="selectedMembership === 'two'"> -->
@@ -280,31 +300,33 @@
                         </div>
                     </div>
                 </section>
+                <div>
+
+                    <section class="join-email-bt">
+                        <input type="checkbox">
+                        <span>E-mail 구독서비스를 신청하시겠습니까?</span>
+                    </section>
+
+                    <section class="join-end-bt">
+                        <button>이전</button>
+
+                        <button v-if="selectedMembership === 'company'" @click="commonFileInsert">회원가입</button>
+                        <button v-else @click="userInsert">회원가입</button>
+                    </section>
+                </div>
             </div>
         </div>
-
-
-
-        <!---------------------------------------------------------------------------------------------------------------->
-
-
-
-        <div class="join-w1400">
-
-            <section class="join-email-bt">
-                <input type="checkbox">
-                <span>E-mail 구독서비스를 신청하시겠습니까?</span>
-            </section>
-
-            <section class="join-end-bt">
-                <button>이전</button>
-
-                <button v-if="selectedMembership === 'company'" @click="commonFileInsert">회원가입</button>
-                <button v-else @click="userInsert">회원가입</button>
-            </section>
-        </div>
-
     </div>
+
+
+
+
+
+    <!---------------------------------------------------------------------------------------------------------------->
+
+
+
+
 
 
 
@@ -328,6 +350,30 @@
                 <button @click="hideDiv">확인</button>
             </div>
         </section>
+    </div>
+    <!-- 사업자등록번호 모달창 -->
+    <div v-show="showModal" class="join-modal">
+        <div>
+            <h2>사업자 등록번호 조회</h2>
+            <button class="join-text-bt" @click="closeModal"><i class="fa-solid fa-xmark"></i></button>
+        </div>
+
+        <div>
+
+            <input type="text" placeholder="사업자 등록번호를 입력하세요.">
+            <button class="join-text-bt2">조회</button>
+        </div>
+        <div>
+            <p>등록번호 여기에 넣어주세요!</p>
+        </div>
+
+    </div>
+    <div v-show="showModal2" class="join-modal2">
+        <div>
+
+            <h2>이미 가입된 사업자 등록번호 입니다.</h2>
+            <button class="join-text-bt3" @click="closeModal2">닫기</button>
+        </div>
     </div>
 </template>
 
@@ -368,15 +414,30 @@
             email_id: null,
             email_dns: null,
             select_email_dns: null,
-            selectedMembership: 'company',
+            selectedMembership: '',
             isVisible: false,
             selectedImage: null,
             oEditors: [],
             logoPreview: null,
+            combinedUserId: '',
+            showModal: false,
+            showModal2: false
         }
     },
     methods: {
-
+        // 사업자등록번호 모달
+        openModal() {
+            this.showModal = true;
+        },
+        closeModal() {
+            this.showModal = false;
+        },
+        openModal2() {
+            this.showModal2 = true;
+        },
+        closeModal2() {
+            this.showModal2 = false;
+        },
         //비밀번호 매칭 확인
         passwordSyncCheck: function () {
             console.log("this.user.user_pw : ", this.user.user_pw);
@@ -680,6 +741,88 @@
 </script>
 
 <style scoped>
+.w1400 {
+    padding-bottom: 22rem;
+
+}
+
+.join-modal {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    width: 20%;
+    height: 50%;
+    transform: translate(-50%, -50%);
+    background: white;
+    padding: 20px;
+    border: 1px solid #ccc;
+    border-radius: 10px;
+    z-index: 999;
+}
+
+.join-modal p {
+    font-size: 2rem;
+    padding: 1rem;
+}
+
+.join-modal h2 {
+    padding: 1rem;
+}
+
+.join-modal div {
+    padding: 1rem;
+    display: grid;
+    gap: 1rem;
+    grid-template-columns: 1fr 15%;
+}
+
+.join-text-bt {
+
+    background-color: #00000000;
+
+}
+
+.join-text-bt2 {
+    background-color: #3f87f7;
+    color: white;
+    border-radius: 0.5rem;
+}
+
+.join-modal2 {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    width: 20%;
+    /* height: 10%; */
+    transform: translate(-50%, -50%);
+    background: white;
+    padding: 20px;
+    border: 1px solid #ccc;
+    border-radius: 10px;
+    z-index: 999;
+}
+
+.join-modal2 div {
+    display: grid;
+    gap: 1rem;
+    grid-template-columns: 1fr;
+}
+
+.join-modal2 h2 {
+    padding: 1rem 0;
+    text-align: center;
+}
+
+.join-text-bt3 {
+    width: 20%;
+    margin: 0 auto;
+    height: 3rem;
+    color: white;
+    border-radius: 0.5rem;
+
+    background-color: #3f87f7;
+}
+
 /* 명함추가 */
 .join-sec5-1 {
     width: 100%;
@@ -796,9 +939,16 @@
     display: grid;
     grid-template-columns: 1fr 1fr;
     margin: 0 auto;
-    gap: 6rem;
+
+    column-gap: 6rem;
     flex-direction: row;
     /* padding: 9rem; */
+}
+
+.join-text {
+    font-size: 1.2rem;
+    color: red;
+    padding: 2rem;
 }
 
 .join-b-button input[type="radio"] {
@@ -1123,8 +1273,7 @@
     border-radius: 50%;
     overflow: hidden;
     margin-bottom: 2rem;
-    margin-left: 4rem;
-    /* margin: 0 auto;/ */
+    margin: 0 auto;
     position: relative;
     top: 0;
     left: 0;
client/views/pages/user/main/Main.vue
--- client/views/pages/user/main/Main.vue
+++ client/views/pages/user/main/Main.vue
@@ -202,12 +202,12 @@
             </div>
 
         </section>
-        <section class="main-sec sec1">
+        <!-- <section class="main-sec sec1">
 
-            <div class=" flex">
-                <!-- 히스토리 -->
+            <div class=" flex"> -->
+        <!-- 히스토리 -->
 
-                <div class="main-history">
+        <!-- <div class="main-history">
                     <div class="w1400">
                         <div class="main-history-wrap">
                             <h1>History</h1>
@@ -249,79 +249,82 @@
 
             </div>
 
-        </section>
+        </section> -->
 
 
-        <section class="main-sec sec1">
-            <div class=" flex">
-                <!-- 파트너사 -->
+        <!-- <section class="main-sec sec1">
+                    <div class=" flex"> -->
+        <!-- 파트너사 -->
 
-                <div class="main-partner">
+        <!-- <div class="main-partner">
 
-                    <div class="main-partner-wrap">
-                        <h1>파트너사</h1>
-                        <div class="m-p-sw">
+                            <div class="main-partner-wrap">
+                                <h1>파트너사</h1>
+                                <div class="m-p-sw">
 
-                            <div class="m-p-sw-1">
+                                    <div class="m-p-sw-1">
 
-                                <swiper :slides-per-view="7" :space-between="30" :loop="true" :speed="1000"
-                                    :centered-slides="true" :autoplay="{ delay: 0, disableOnInteraction: false }"
-                                    :breakpoints="{
-                                        300: { slidesPerView: 1 },
-                                        479: { slidesPerView: 2 },
-                                        768: { slidesPerView: 3 },
-                                        1023: { slidesPerView: 5 }
-                                    }" :navigation="false" :modules="modules" class="mySwiper swiper-2">
+                                        <swiper :slides-per-view="7" :space-between="30" :loop="true" :speed="1000"
+                                            :centered-slides="true" :autoplay="{ delay: 0, disableOnInteraction: false }"
+                                            :breakpoints="{
+                                                300: { slidesPerView: 1 },
+                                                479: { slidesPerView: 2 },
+                                                768: { slidesPerView: 3 },
+                                                1023: { slidesPerView: 5 }
+                                            }" :navigation="false" :modules="modules" class="mySwiper swiper-2">
 
-                                    <swiper-slide>
-                                        <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
-                                    </swiper-slide>
-                                    <swiper-slide>
-                                        <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
-                                    </swiper-slide>
-                                    <swiper-slide>
-                                        <img src="../../../../resources/jpg/logo/kefa.png" alt="">
-                                    </swiper-slide>
-                                    <swiper-slide>
-                                        <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
-                                    </swiper-slide>
-                                    <swiper-slide>
-                                        <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
-                                    </swiper-slide>
-                                    <swiper-slide>
-                                        <img src="../../../../resources/jpg/logo/keris.gif" alt="">
-                                    </swiper-slide>
-                                    <swiper-slide>
-                                        <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
-                                    </swiper-slide>
-                                    <swiper-slide>
-                                        <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
-                                    </swiper-slide>
-                                    <swiper-slide>
-                                        <img src="../../../../resources/jpg/logo/ko.png" alt="">
-                                    </swiper-slide>
+                                            <swiper-slide>
+                                                <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
+                                            </swiper-slide>
+                                            <swiper-slide>
+                                                <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
+                                            </swiper-slide>
+                                            <swiper-slide>
+                                                <img src="../../../../resources/jpg/logo/kefa.png" alt="">
+                                            </swiper-slide>
+                                            <swiper-slide>
+                                                <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
+                                            </swiper-slide>
+                                            <swiper-slide>
+                                                <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
+                                            </swiper-slide>
+                                            <swiper-slide>
+                                                <img src="../../../../resources/jpg/logo/keris.gif" alt="">
+                                            </swiper-slide>
+                                            <swiper-slide>
+                                                <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
+                                            </swiper-slide>
+                                            <swiper-slide>
+                                                <img src="../../../../resources/jpg/logo/ko-go.jpg" alt="">
+                                            </swiper-slide>
+                                            <swiper-slide>
+                                                <img src="../../../../resources/jpg/logo/ko.png" alt="">
+                                            </swiper-slide>
 
-                                </swiper>
-                            </div>
-                        </div>
-
-                        <div class="w1400">
-
-                            <div class="main-partner-logo">
-                                <div class="main-partner-img lo1">
+                                        </swiper>
+                                    </div>
                                 </div>
-                                <div class="main-partner-img lo2">
 
-                                </div>
-                                <div class="main-partner-img lo3">
+                                <div class="w1400">
 
-                                </div>
-                                <div class="main-partner-img lo4">
+                                    <div class="main-partner-logo">
+                                        <div class="main-partner-img lo1">
+                                        </div>
+                                        <div class="main-partner-img lo2">
+
+                                        </div>
+                                        <div class="main-partner-img lo3">
+
+                                        </div>
+                                        <div class="main-partner-img lo4">
 
 
-                                </div>
-                                <div class="main-partner-img lo5">
+                                        </div>
+                                        <div class="main-partner-img lo5">
 
+
+                                        </div>
+                                    </div>
 
                                 </div>
                             </div>
@@ -329,13 +332,10 @@
                         </div>
                     </div>
 
-                </div>
-            </div>
+ -->
 
-
-
-
-        </section>
+        <!-- 
+        </section> -->
 
 
 
Add a comment
List