Kaynağa Gözat

Merge branch 'master' of https://gogs.interscope.i234.me/mo0647/influence

* 'master' of https://gogs.interscope.i234.me/mo0647/influence:
  브랜드사 회원가입
  뒤엎기 전 마지막 커밋
  고객센터 완료
  고객센터 완료, 검색 작업예정
  개별구매/공동구매 탭 분리, 각 페이지별 검색기능 완료, 고객센터 진행중
송용우 4 ay önce
ebeveyn
işleme
1cd3672587

+ 833 - 5
assets/scss/default.scss

@@ -146,7 +146,7 @@
         border-radius: 15px;
         padding:20px;
         margin-top:25px;
-        background: #f8f8f8;
+        background: #f0f4ff;
         &.type2{
           flex-direction: column;
           align-items: flex-start;
@@ -261,7 +261,7 @@
             width: calc((100% - 80px) / 5);
             border-radius: 20px;
             border: 1px solid #cccccc;
-            padding: 1rem 1rem 2rem 1rem;
+            padding: 1rem 1rem 1rem 1rem;
             .item--img {
               width: 100%;
               height: 10rem;
@@ -281,7 +281,7 @@
                 left: 0;
               }
             }
-            >h3{
+            h3{
               color: #444444;
               font-size: 1rem;
               overflow: hidden;
@@ -292,13 +292,13 @@
               -webkit-box-orient: vertical;
               margin-bottom: 1rem;
             }
-            >p{
+            p{
               color: #888;
               line-height: 1.2;
               font-size: 0.8rem;
               margin-bottom: 0.8rem;
             }
-            >span{
+            span{
               color: #999;
               line-height: 1.2;
               display: block;
@@ -333,6 +333,168 @@
             }
           }
         }
+        .cs--list--wrap{
+          border: 1px solid #eee;
+          border-radius: 15px;
+          overflow: hidden;
+          box-shadow: 0 2px 10px rgba(0,0,0,0.05);
+          .cs--header{
+            background-color: #f0f4ff;
+            padding: 20px 25px;
+            height: 4rem;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            border-bottom: 1px solid #eee;
+            
+            h3{
+              font-size: 1.2rem;
+              font-weight: 600;
+              color: #555;
+            }
+            
+            .custom-btn{
+              height: 2.5rem;
+              background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+              border-radius: 10px;
+              width: 10%;
+              color:#fff;
+              font-weight: 500;
+              transition: all 0.3s ease;
+              box-shadow: 0 2px 8px rgba(102, 126, 234, 0.3);
+              
+              &:hover {
+                transform: translateY(-1px);
+                box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
+              }
+            }
+          }
+          
+          .cs--list{
+            .list{
+              padding: 20px 25px;
+              cursor: pointer;
+              border-bottom: 1px solid #f0f0f0;
+              transition: all 0.3s ease;
+              display: flex;
+              gap: 15px;
+              align-items: center;
+              
+              &:hover {
+                background-color: #f8f9ff;
+                border-left: 4px solid #667eea;
+                padding-left: 21px;
+              }
+              
+              &:last-child {
+                border-bottom: none;
+              }
+              
+              > span, > div, > h3 {
+                font-size: 0.9rem;
+                
+                &.list--seq { // SEQ
+                  font-weight: 600;
+                  color: #667eea;
+                  text-align: center;
+                  background: #f0f4ff;
+                  padding: 5px 10px;
+                  border-radius: 12px;
+                  font-size: 0.8rem;
+                }
+                
+                &.list--circle {
+                  background: linear-gradient(135deg, #667eea, #764ba2);
+                  color: white;
+                  padding: 6px 12px;
+                  border-radius: 15px;
+                  font-size: 0.8rem;
+                  font-weight: 500;
+                  text-align: center;
+                  white-space: nowrap;
+                  
+                  // 마감  
+                  &.status--off {
+                    background: linear-gradient(135deg, #727c89 0%, #8ca6ce 100%);
+                    color: white;
+                    box-shadow: 0 2px 6px rgba(145, 168, 200, 0.3);
+                  }
+                }
+                
+                &.list--writer { // NICK_NAME + NAME + COM
+                  color: #666;
+                  font-weight: 500;
+                  font-size: 0.9rem;
+                }
+                
+                &.list--title { // TITLE
+                  color: #333;
+                  font-weight: 600;
+                  line-height: 1.4;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  width: 70%;
+                  white-space: nowrap;
+                }
+                
+                &.list--ml {
+                  margin-left: auto;
+                  
+                }
+                &.status-waiting {
+                  color: #ffffff;
+                  background: linear-gradient(135deg, #ff6b6b 0%, #ee5a5a 100%);
+                  padding: 4px 8px;
+                  border-radius: 10px;
+                  font-size: 0.8rem;
+                  font-weight: 600;
+                  box-shadow: 0 2px 6px rgba(255, 107, 107, 0.3);
+                }
+                
+                &.status-completed {
+                  color: #ffffff;
+                  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+                  padding: 4px 8px;
+                  border-radius: 10px;
+                  font-size: 0.8rem;
+                  font-weight: 600;
+                  box-shadow: 0 2px 6px rgba(102, 126, 234, 0.3);
+                }
+                
+                &.list--date { // REGDATE
+                  color: #999;
+                  font-size: 0.8rem;
+                  text-align: right;
+                }
+              }
+            }
+            
+            // 데이터가 없을 때
+            .no-data {
+              padding: 60px 20px;
+              text-align: center;
+              color: #999;
+              
+              &:before {
+                content: "📋";
+                display: block;
+                font-size: 3rem;
+                margin-bottom: 15px;
+              }
+              
+              h4 {
+                font-size: 1.1rem;
+                color: #666;
+                margin-bottom: 8px;
+              }
+              
+              p {
+                font-size: 0.9rem;
+                color: #999;
+              }
+            }
+          }
+        }
         .item--pagination{
           display: flex;
           justify-content: center;
@@ -740,4 +902,670 @@
   height:15px;
   display: inline-flex;
   background: url(../img/ic_radio_off.svg) no-repeat center; 
+}
+
+/**********************************************
+| 문의 등록 팝업 모달
+**********************************************/
+.inquiry-modal {
+  border-radius: 20px !important;
+  overflow: hidden;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.2) !important;
+
+  .modal-header {
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    color: white;
+    padding: 1rem 25px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    
+    h3 {
+      font-size: 1rem;
+      font-weight: 600;
+      margin: 0;
+    }
+    
+    .close-btn {
+      background: rgba(255, 255, 255, 0.2) !important;
+      color: white !important;
+      border-radius: 50%;
+      width: 40px;
+      height: 40px;
+      
+      &:hover {
+        background: rgba(255, 255, 255, 0.3) !important;
+      }
+      
+      .v-icon {
+        font-size: 20px;
+      }
+    }
+  }
+
+  .modal-body {
+    padding: 30px;
+    background: #fafafa;
+    
+    .form-group {
+      &:last-child{
+        margin-bottom: 0;
+      }
+      margin-bottom: 20px;
+      
+      label {
+        display: block;
+        font-size: 0.95rem;
+        font-weight: 600;
+        color: #333;
+        margin-bottom: 8px;
+        
+        .required {
+          color: #ff6b6b;
+          margin-left: 3px;
+        }
+      }
+      
+      .custom-select,
+      .custom-file-input {
+        border-radius: 8px !important;
+        
+        .v-field {
+          border-radius: 8px !important;
+          background: white;
+          box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+          border: 1px solid #e1e5e9 !important;
+          min-height: 3.63rem !important;
+          
+          &.v-field--focused {
+            border-color: #667eea !important;
+            box-shadow: 0 0 0 2px rgba(102, 126, 234, 0.1);
+          }
+          
+          .v-field__outline {
+            border-radius: 8px !important;
+            
+            &__start {
+              border-radius: 8px 0 0 8px !important;
+            }
+            
+            &__end {
+              border-radius: 0 8px 8px 0 !important;
+            }
+          }
+          
+          &__field {
+            border-radius: 8px !important;
+          }
+          
+          &__overlay {
+            border-radius: 8px !important;
+          }
+        }
+        
+        .v-field__input {
+          padding: 12px 16px;
+          font-size: 0.9rem;
+          min-height: 3.63rem !important;
+          
+          &::placeholder {
+            color: #9ca3af;
+          }
+        }
+        
+        .v-field__field {
+          border-radius: 8px !important;
+          min-height: 3.63rem !important;
+          
+          .v-field__input {
+            min-height: 3.63rem !important;
+            align-items: center;
+            display: flex;
+          }
+        }
+        
+        .v-input__control {
+          min-height: 3.63rem !important;
+        }
+        
+        // Select dropdown
+        .v-select__selection {
+          border-radius: 8px !important;
+        }
+        
+        // Input 요소들
+        input, textarea {
+          border-radius: 8px !important;
+        }
+      }
+      
+      .custom-title-input {
+        border-radius: 8px !important;
+        
+        .v-field {
+          border-radius: 8px !important;
+          background: white;
+          box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+          border: 1px solid #e1e5e9 !important;
+          min-height: 2.25rem !important;
+          
+          &.v-field--focused {
+            border-color: #667eea !important;
+            box-shadow: 0 0 0 2px rgba(102, 126, 234, 0.1);
+          }
+          
+          .v-field__outline {
+            border-radius: 8px !important;
+            
+            &__start {
+              border-radius: 8px 0 0 8px !important;
+            }
+            
+            &__end {
+              border-radius: 0 8px 8px 0 !important;
+            }
+          }
+          
+          &__field {
+            border-radius: 8px !important;
+          }
+          
+          &__overlay {
+            border-radius: 8px !important;
+          }
+        }
+        
+        .v-field__input {
+          padding: 12px 16px;
+          font-size: 0.9rem;
+          min-height: 3.63rem !important;
+          
+          &::placeholder {
+            color: #9ca3af;
+          }
+        }
+        
+        .v-field__field {
+          border-radius: 8px !important;
+          min-height: 3.63rem !important;
+          
+          .v-field__input {
+            min-height: 3.63rem !important;
+            align-items: center;
+            display: flex;
+          }
+        }
+        
+        .v-input__control {
+          min-height: 3.63rem !important;
+        }
+        
+        input {
+          border-radius: 8px !important;
+        }
+      }
+      
+      .custom-textarea {
+        border-radius: 8px !important;
+        
+        .v-field {
+          border-radius: 8px !important;
+          background: white;
+          box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+          border: 1px solid #e1e5e9 !important;
+          
+          &.v-field--focused {
+            border-color: #667eea !important;
+            box-shadow: 0 0 0 2px rgba(102, 126, 234, 0.1);
+          }
+          
+          .v-field__outline {
+            border-radius: 8px !important;
+            
+            &__start {
+              border-radius: 8px 0 0 8px !important;
+            }
+            
+            &__end {
+              border-radius: 0 8px 8px 0 !important;
+            }
+          }
+          
+          &__field {
+            border-radius: 8px !important;
+          }
+          
+          &__overlay {
+            border-radius: 8px !important;
+          }
+        }
+        
+        .v-field__input {
+          padding: 16px;
+          font-size: 0.9rem;
+          
+          &::placeholder {
+            color: #9ca3af;
+          }
+        }
+        
+        .v-field__field {
+          border-radius: 8px !important;
+        }
+        
+        input, textarea {
+          border-radius: 8px !important;
+        }
+      }
+      
+      .custom-textarea {
+        .v-field__field {
+          .v-field__input {
+            padding: 16px;
+            line-height: 1.5;
+            resize: none !important;
+          }
+        }
+        
+        textarea {
+          resize: none !important;
+        }
+      }
+      
+      .custom-file-input {
+        .v-file-input__text {
+          display: flex;
+          align-items: center;
+          min-height: 2.25rem;
+        }
+      }
+      
+      .file-info {
+        font-size: 0.8rem;
+        color: #6b7280;
+        margin-top: 8px;
+        margin-bottom: 0;
+      }
+    }
+  }
+
+  .modal-footer {
+    padding: 20px 30px;
+    background: white;
+    border-top: 1px solid #e5e7eb;
+    display: flex;
+    justify-content: flex-end;
+    gap: 12px;
+    
+    .cancel-btn {
+      background: #f3f4f6 !important;
+      color: #6b7280 !important;
+      border: 1px solid #d1d5db;
+      border-radius: 10px;
+      padding: 0 24px;
+      height: 42px;
+      font-weight: 500;
+      
+      &:hover {
+        background: #e5e7eb !important;
+      }
+    }
+    
+    .submit-btn {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
+      color: white !important;
+      border-radius: 10px;
+      padding: 0 24px;
+      height: 42px;
+      font-weight: 600;
+      box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3);
+      
+      &:hover {
+        transform: translateY(-1px);
+        box-shadow: 0 6px 16px rgba(102, 126, 234, 0.4);
+      }
+      
+      &:disabled {
+        opacity: 0.7;
+        transform: none !important;
+        box-shadow: 0 4px 12px rgba(102, 126, 234, 0.2) !important;
+      }
+    }
+  }
+}
+
+// 모달 배경 오버레이 스타일
+.v-overlay__content {
+  .inquiry-modal {
+    max-height: 90vh;
+    overflow-y: auto;
+  }
+}
+
+/**********************************************
+| CS 디테일 페이지
+**********************************************/
+.cs--detail--wrap {
+  border: 1px solid #eee;
+  border-radius: 15px;
+  overflow: hidden;
+  box-shadow: 0 2px 10px rgba(0,0,0,0.05);
+  background: white;
+  
+  .cs--detail--header {
+    background: linear-gradient(135deg, #f8f9ff 0%, #f0f4ff 100%);
+    padding: 25px 30px;
+    border-bottom: 1px solid #eee;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    
+    .status-badge {
+      padding: 8px 16px;
+      border-radius: 20px;
+      font-size: 0.85rem;
+      font-weight: 600;
+      
+      &.status-waiting {
+        background: linear-gradient(135deg, #ff6b6b 0%, #ee5a5a 100%);
+        color: #ffffff;
+        border: 1px solid #ff6b6b;
+        box-shadow: 0 2px 8px rgba(255, 107, 107, 0.3);
+        font-weight: 600;
+      }
+      
+      &.status-completed {
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        color: #ffffff;
+        border: 1px solid #667eea;
+        box-shadow: 0 2px 8px rgba(102, 126, 234, 0.3);
+        font-weight: 600;
+      }
+    }
+    
+    .inquiry-meta {
+      display: flex;
+      align-items: center;
+      gap: 15px;
+      
+      .category-badge {
+        background: linear-gradient(135deg, #667eea, #764ba2);
+        color: white;
+        padding: 6px 12px;
+        border-radius: 15px;
+        font-size: 0.8rem;
+        font-weight: 500;
+      }
+      
+      .date {
+        color: #666;
+        font-size: 0.9rem;
+      }
+    }
+  }
+  
+  .cs--detail--content {
+    padding: 30px;
+    
+    .inquiry-title {
+      font-size: 1.5rem;
+      font-weight: 700;
+      color: #333;
+      margin-bottom: 25px;
+      line-height: 1.4;
+      border-bottom: 2px solid #f0f4ff;
+      padding-bottom: 15px;
+    }
+    
+    .inquiry-info {
+      display: flex;
+      gap: 30px;
+      margin-bottom: 30px;
+      padding: 20px;
+      background: #fafbfc;
+      border-radius: 12px;
+      border-left: 4px solid #667eea;
+      
+      .info-item {
+        display: flex;
+        flex-direction: column;
+        gap: 5px;
+        
+        .label {
+          font-size: 0.85rem;
+          color: #666;
+          font-weight: 500;
+        }
+        
+        .value {
+          font-size: 1rem;
+          color: #333;
+          font-weight: 600;
+        }
+      }
+    }
+    
+    .inquiry-content {
+      margin-bottom: 30px;
+      
+      h4 {
+        font-size: 1.1rem;
+        font-weight: 600;
+        color: #333;
+        margin-bottom: 15px;
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        
+        &:before {
+          content: "📝";
+          font-size: 1.2rem;
+        }
+      }
+      
+      .content-text {
+        background: white;
+        border: 1px solid #e1e5e9;
+        border-radius: 12px;
+        padding: 25px;
+        line-height: 1.6;
+        color: #333;
+        font-size: 1rem;
+        min-height: 120px;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+      }
+    }
+    
+    .attachment-section {
+      margin-bottom: 30px;
+      
+      h4 {
+        font-size: 1.1rem;
+        font-weight: 600;
+        color: #333;
+        margin-bottom: 15px;
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        
+        &:before {
+          content: "📎";
+          font-size: 1.2rem;
+        }
+      }
+      
+      .attachment-item {
+        background: white;
+        border: 1px solid #e1e5e9;
+        border-radius: 12px;
+        padding: 20px;
+        display: flex;
+        align-items: center;
+        gap: 15px;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+        
+        .mdi-paperclip {
+          font-size: 1.5rem;
+          color: #667eea;
+        }
+        
+        .file-name {
+          flex: 1;
+          font-size: 1rem;
+          color: #333;
+          font-weight: 500;
+        }
+        
+        .download-btn {
+          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
+          color: white !important;
+          border-radius: 8px;
+          box-shadow: 0 2px 8px rgba(102, 126, 234, 0.3);
+          
+          &:hover {
+            transform: translateY(-1px);
+            box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
+          }
+          
+          .mdi-download {
+            margin-right: 5px;
+          }
+        }
+      }
+    }
+    
+    .answer-section {
+      border-top: 2px solid #f0f4ff;
+      padding-top: 30px;
+      
+      h4 {
+        font-size: 1.1rem;
+        font-weight: 600;
+        color: #333;
+        margin-bottom: 15px;
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        
+        &:before {
+          content: "💬";
+          font-size: 1.2rem;
+        }
+      }
+      
+      .answer-content {
+        background: linear-gradient(135deg, #f8f9ff 0%, #f0f4ff 100%);
+        border: 1px solid #e1e5e9;
+        border-radius: 12px;
+        padding: 25px;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+        
+        .answer-meta {
+          display: flex;
+          align-items: center;
+          gap: 15px;
+          margin-bottom: 15px;
+          padding-bottom: 15px;
+          border-bottom: 1px solid rgba(102, 126, 234, 0.1);
+          
+          .admin-badge {
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            color: white;
+            padding: 4px 12px;
+            border-radius: 12px;
+            font-size: 0.8rem;
+            font-weight: 600;
+          }
+          
+          .answer-date {
+            color: #666;
+            font-size: 0.9rem;
+          }
+        }
+        
+        .answer-text {
+          line-height: 1.6;
+          color: #333;
+          font-size: 1rem;
+        }
+      }
+    }
+  }
+}
+
+// 하단 버튼 스타일 개선
+.view-btm-btn {
+  margin-top: 40px;
+  padding: 25px 0;
+  border-top: 1px solid #eee;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  
+  .btn-l, .btn-r {
+    display: flex;
+    gap: 12px;
+  }
+  
+  .custom-btn {
+    &.btn-list {
+      background: #f3f4f6 !important;
+      color: #6b7280 !important;
+      border: 1px solid #d1d5db;
+      border-radius: 10px;
+      padding: 0 24px;
+      height: 42px;
+      font-weight: 500;
+      
+      &:hover {
+        background: #e5e7eb !important;
+      }
+      
+      .mdi-format-list-bulleted {
+        margin-right: 8px;
+      }
+    }
+  }
+}
+
+// 팝업 내 모든 Vuetify 필드 요소들의 border-radius 강제 적용
+.inquiry-modal {
+  .v-field,
+  .v-field__field,
+  .v-field__overlay,
+  .v-field__outline,
+  .v-field__outline__start,
+  .v-field__outline__end,
+  .v-input__control,
+  .v-input__slot,
+  input,
+  textarea,
+  .v-select__slot {
+    border-radius: 8px !important;
+  }
+  
+  .v-field__outline__start {
+    border-radius: 8px 0 0 8px !important;
+  }
+  
+  .v-field__outline__end {
+    border-radius: 0 8px 8px 0 !important;
+  }
+  
+  // 포커스 상태에서도 border-radius 유지
+  .v-field--focused {
+    .v-field__outline,
+    .v-field__outline__start,
+    .v-field__outline__end {
+      border-radius: 8px !important;
+    }
+    
+    .v-field__outline__start {
+      border-radius: 8px 0 0 8px !important;
+    }
+    
+    .v-field__outline__end {
+      border-radius: 0 8px 8px 0 !important;
+    }
+  }
 }

+ 499 - 3
assets/scss/mode-w-m.scss

@@ -24,6 +24,7 @@
     padding: 20px;
     z-index: 22;
     .pro--wrap{
+      z-index: 30;
       border: 1px solid #cccccc;
       border-radius: 30px;
       padding: 30px;
@@ -5852,7 +5853,7 @@ z
     align-items: center;
     padding: 1.25rem 1.88rem;
     width: 100%;
-    background-color: #0B318B;
+    background-color: rgba(255, 255, 255, 0.1);
     height: 4.75rem;
     z-index: 100;
     .login--header--l{
@@ -5860,7 +5861,6 @@ z
       gap: 0.9375rem;
       align-items: center;
       .logo{        
-        height: 2rem;        
         color:#fff;        
       }
       p{
@@ -6029,7 +6029,6 @@ z
         .logo{
           background: none;
           font-size: 1.5625rem;
-          color: #0b318b;
           font-weight: 700;
           letter-spacing: -0.04688rem;
           pointer-events: none;
@@ -6697,4 +6696,501 @@ z
 .sun-editor{
   width: 100%;
   text-align: left;
+}
+
+// CS 답변 관련 스타일
+.answer-write-section {
+  margin-top: 32px;
+  padding: 24px;
+  border: 2px solid #e8f4fd;
+  border-radius: 12px;
+  background: linear-gradient(135deg, #fafbff 0%, #f0f7ff 100%);
+  box-shadow: 0 2px 8px rgba(0, 148, 255, 0.08);
+
+  h4 {
+    margin-bottom: 20px;
+    color: #1a365d;
+    font-weight: 700;
+    font-size: 1.1rem;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    
+    &::before {
+      content: "💬";
+      font-size: 1.2rem;
+    }
+  }
+
+  .answer-write-form {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+    
+    .v-textarea {
+      .v-field {
+        background: white !important;
+        border: 1px solid #e1e5e9 !important;
+        border-radius: 12px !important;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05) !important;
+        
+        &.v-field--focused {
+          border-color: #667eea !important;
+          box-shadow: 0 0 0 2px rgba(102, 126, 234, 0.1) !important;
+        }
+      }
+      
+      textarea {
+        resize: none !important;
+        padding: 25px !important;
+        line-height: 1.6 !important;
+        color: #333 !important;
+        font-size: 1rem !important;
+        font-family: inherit !important;
+        min-height: 120px !important;
+        
+        &::placeholder {
+          color: #999;
+          font-size: 1rem;
+        }
+      }
+    }
+  }
+
+  .answer-actions {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .submit-answer-btn {
+    min-width: 130px;
+    height: 44px;
+    border-radius: 22px;
+    box-shadow: 0 4px 12px rgba(0, 148, 255, 0.3);
+    transition: all 0.3s ease;
+    
+    &:hover {
+      transform: translateY(-2px);
+      box-shadow: 0 6px 16px rgba(0, 148, 255, 0.4);
+    }
+  }
+}
+
+// 송장번호 등록 버튼 스타일 개선
+.item-content{
+  padding-bottom: 20px;
+}
+.delivery-btn {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
+  color: white !important;
+  border-radius: 25px !important;
+  padding: 8px 20px !important;
+  font-size: 0.85rem !important;
+  font-weight: 600 !important;
+  box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3) !important;
+  transition: all 0.3s ease !important;
+  border: none !important;
+  position: relative !important;
+  overflow: hidden !important;
+  width: 100%!important;
+  
+  &:hover {
+    transform: translateY(-2px) !important;
+    box-shadow: 0 6px 16px rgba(102, 126, 234, 0.4) !important;
+    
+    &::before {
+      transform: translateX(100%) !important;
+    }
+  }
+  
+  &::before {
+    content: '' !important;
+    position: absolute !important;
+    top: 0 !important;
+    left: -100% !important;
+    width: 100% !important;
+    height: 100% !important;
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent) !important;
+    transition: transform 0.5s ease !important;
+  }
+  
+  &:disabled {
+    background: linear-gradient(135deg, #9ca3af 0%, #6b7280 100%) !important;
+    color: rgba(255, 255, 255, 0.7) !important;
+    transform: none !important;
+    box-shadow: 0 2px 6px rgba(156, 163, 175, 0.2) !important;
+    cursor: not-allowed !important;
+    
+    &:hover {
+      transform: none !important;
+      box-shadow: 0 2px 6px rgba(156, 163, 175, 0.2) !important;
+    }
+    
+    &::before {
+      display: none !important;
+    }
+  }
+  
+  .ico {
+    width: 16px !important;
+    height: 16px !important;
+    background-image: url(../img/ico_delivery.svg) !important;
+    background-repeat: no-repeat !important;
+    background-position: center !important;
+    background-size: contain !important;
+    margin-right: 6px !important;
+    display: inline-block !important;
+    vertical-align: middle !important;
+  }
+  
+  .v-btn__content {
+    display: flex !important;
+    align-items: center !important;
+    color: #fff!important;
+    gap: 6px !important;
+  }
+}
+
+// 마이페이지 스타일
+.mypage-container {
+  min-height: 100vh;
+  background: linear-gradient(135deg, #f8faff 0%, #f0f4ff 100%);
+  
+  .mypage-header {
+    position: relative;
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    color: white;
+    padding: 60px 40px 40px;
+    border-radius: 0 0 30px 30px;
+    margin-bottom: 30px;
+    overflow: hidden;
+    
+    .header-bg {
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><circle cx="20" cy="20" r="2" fill="rgba(255,255,255,0.1)"/><circle cx="80" cy="40" r="3" fill="rgba(255,255,255,0.08)"/><circle cx="40" cy="80" r="2" fill="rgba(255,255,255,0.12)"/></svg>');
+      opacity: 0.3;
+    }
+    
+    .header-content {
+      position: relative;
+      z-index: 2;
+    }
+    
+    .profile-section {
+      display: flex;
+      align-items: center;
+      gap: 30px;
+    }
+    
+    .profile-avatar {
+      .avatar-placeholder {
+        width: 120px;
+        height: 120px;
+        border-radius: 50%;
+        background: rgba(255, 255, 255, 0.2);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        backdrop-filter: blur(10px);
+        border: 3px solid rgba(255, 255, 255, 0.3);
+        
+        i {
+          font-size: 60px;
+          color: rgba(255, 255, 255, 0.8);
+        }
+      }
+    }
+    
+    .profile-info {
+      flex: 1;
+      
+      .user-name {
+        font-size: 2.5rem;
+        font-weight: 700;
+        margin-bottom: 8px;
+        text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+      }
+      
+      .user-type {
+        font-size: 1.2rem;
+        opacity: 0.9;
+        margin-bottom: 20px;
+      }
+      
+      .user-stats {
+        display: flex;
+        gap: 40px;
+        
+        .stat-item {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          
+          .stat-number {
+            font-size: 2rem;
+            font-weight: 700;
+            text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+          }
+          
+          .stat-label {
+            font-size: 0.9rem;
+            opacity: 0.8;
+            margin-top: 4px;
+          }
+        }
+      }
+    }
+  }
+  
+  .dashboard-section {
+    padding: 0 40px 40px;
+    
+    .dashboard-cards {
+      display: grid;
+      grid-template-columns: 1fr 1fr 1fr;
+      gap: 30px;
+    }
+    
+    .dashboard-card {
+      background: white;
+      border-radius: 20px;
+      box-shadow: 0 8px 25px rgba(0, 0, 0, 0.08);
+      transition: all 0.3s ease;
+      overflow: hidden;
+      
+      &:hover {
+        transform: translateY(-5px);
+        box-shadow: 0 15px 35px rgba(0, 0, 0, 0.12);
+      }
+      
+      .card-header {
+        padding: 25px 30px 20px;
+        border-bottom: 1px solid #f0f0f0;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        
+        h3 {
+          font-size: 1.3rem;
+          font-weight: 600;
+          color: #333;
+        }
+        
+        i {
+          font-size: 1.5rem;
+          color: #667eea;
+        }
+      }
+      
+      .card-content {
+        padding: 25px 30px 30px;
+      }
+    }
+    
+    .quick-actions {
+      .action-buttons {
+        display: flex;
+        flex-direction: column;
+        gap: 15px;
+        
+        .action-btn {
+          background: linear-gradient(135deg, #f8faff 0%, #f0f4ff 100%) !important;
+          color: #667eea !important;
+          border: 1px solid #e8f0fe !important;
+          border-radius: 15px !important;
+          padding: 20px !important;
+          height: auto !important;
+          display: flex !important;
+          align-items: center !important;
+          justify-content: flex-start !important;
+          transition: all 0.3s ease !important;
+          
+          &:hover {
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
+            color: white !important;
+            transform: translateX(5px);
+            box-shadow: 0 8px 20px rgba(102, 126, 234, 0.3);
+          }
+          
+          i {
+            font-size: 1.2rem;
+            margin-right: 12px;
+          }
+          
+          span {
+            font-weight: 500;
+          }
+        }
+      }
+    }
+    
+    .recent-inquiries {
+      .inquiry-list {
+        .inquiry-item {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 15px 0;
+          border-bottom: 1px solid #f5f5f5;
+          cursor: pointer;
+          transition: all 0.2s ease;
+          
+          &:hover {
+            background: #f8faff;
+            margin: 0 -15px;
+            padding: 15px;
+            border-radius: 10px;
+          }
+          
+          &:last-child {
+            border-bottom: none;
+          }
+          
+          .inquiry-info {
+            h4 {
+              font-size: 1rem;
+              font-weight: 500;
+              color: #333;
+              margin-bottom: 5px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              max-width: 200px;
+            }
+            
+            p {
+              font-size: 0.85rem;
+              color: #888;
+            }
+          }
+          
+          .inquiry-status {
+            .status-waiting,
+            .status-completed {
+              padding: 4px 12px;
+              border-radius: 20px;
+              font-size: 0.8rem;
+              font-weight: 500;
+            }
+          }
+        }
+        
+        .no-inquiries {
+          text-align: center;
+          padding: 40px 0;
+          color: #999;
+          
+          i {
+            font-size: 3rem;
+            margin-bottom: 15px;
+            display: block;
+          }
+        }
+      }
+      
+      .view-all {
+        text-align: center;
+        margin-top: 20px;
+        padding-top: 20px;
+        border-top: 1px solid #f0f0f0;
+      }
+    }
+    
+    .notifications {
+      .notification-list {
+        .notification-item {
+          display: flex;
+          align-items: flex-start;
+          gap: 15px;
+          padding: 15px 0;
+          
+          .notification-icon {
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex-shrink: 0;
+            
+            i {
+              color: white;
+              font-size: 1.1rem;
+            }
+          }
+          
+          .notification-content {
+            h4 {
+              font-size: 1rem;
+              font-weight: 500;
+              color: #333;
+              margin-bottom: 5px;
+            }
+            
+            p {
+              font-size: 0.9rem;
+              color: #666;
+              line-height: 1.4;
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  // 반응형 디자인
+  @media (max-width: 1200px) {
+    .dashboard-section .dashboard-cards {
+      grid-template-columns: 1fr 1fr;
+      
+      .notifications {
+        grid-column: 1 / -1;
+      }
+    }
+  }
+  
+  @media (max-width: 768px) {
+    .mypage-header {
+      padding: 40px 20px 30px;
+      
+      .profile-section {
+        flex-direction: column;
+        text-align: center;
+        gap: 20px;
+      }
+      
+      .profile-avatar .avatar-placeholder {
+        width: 100px;
+        height: 100px;
+        
+        i {
+          font-size: 50px;
+        }
+      }
+      
+      .profile-info {
+        .user-name {
+          font-size: 2rem;
+        }
+        
+        .user-stats {
+          justify-content: center;
+        }
+      }
+    }
+    
+    .dashboard-section {
+      padding: 0 20px 40px;
+      
+      .dashboard-cards {
+        grid-template-columns: 1fr;
+        gap: 20px;
+      }
+    }
+  }
 }

+ 362 - 138
assets/scss/style.scss

@@ -730,7 +730,7 @@
 }
 
 .custom-input.v-text-field {
-  flex: 0 0 auto;
+  // flex: 0 0 auto;
   width: 100%;
   min-height: 3.63rem;
   padding: 0;
@@ -901,7 +901,6 @@
         padding: 0 1.25rem;
         border: 0.06rem solid #e0e0e0;
         background: #fff;
-        border-radius: 0;
         color: #000;
         font-size: 0.88rem;
         font-weight: 400;
@@ -3507,176 +3506,401 @@ p.success-txt {
   align-items: center;
   justify-content: center;
   width: 100%;
-  height: 100%;
-  padding: 3.63rem 0;
-  background: #F2F6FF;
-  &.type--join{
-    overflow-y: auto;
-    .login-box {
-      height: auto;
-      padding:45px 0px!important;
-      background: #fff;
+  height: 100vh;
+  min-height: 700px;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  overflow: hidden;
+  
+  &::after {
+    content: '';
+    position: absolute;
+    top: 20%;
+    right: 10%;
+    width: 300px;
+    height: 300px;
+    border-radius: 50%;
+    background: linear-gradient(45deg, rgba(255,255,255,0.1), rgba(255,255,255,0.05));
+    animation: pulse 4s infinite ease-in-out;
+    z-index: 1;
+  }
+  
+  @keyframes float {
+    0% { transform: translate(-50%, -50%) rotate(0deg); }
+    100% { transform: translate(-50%, -50%) rotate(360deg); }
+  }
+  
+  @keyframes pulse {
+    0%, 100% { transform: scale(1) rotate(0deg); opacity: 0.5; }
+    50% { transform: scale(1.1) rotate(180deg); opacity: 0.8; }
+  }
+  
+  overflow-y: auto;
+  .login-box {
+    height: auto;
+    box-shadow: 0 25px 50px rgba(0,0,0,0.15);
+    &.type--join{
+      padding: 45px 0px!important;
+      background-color: #fff;
+      width: 30%;
+      max-width: 1000px;
+      padding: 3rem!important;
+      .login-r{
+        height: 100%;
+        overflow-x: hidden;
+        overflow-y: auto;
+        padding: 0;
+        .login-btn-wrap{
+          margin-bottom: 0;
+        }
+      }
     }
   }
 
+  // 게이트 페이지 스타일
+  .login--gate {
+    display: flex;
+    width: 100%;
+    height: 100vh;
+    z-index: 10;
+    
+    .inf--gate,
+    .ven--gate {
+      flex: 1;
+      position: relative;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: all 0.3s ease;
+      cursor: pointer;
+      overflow: hidden;
+      
+      &::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0,0,0,0.3);
+        z-index: 1;
+        transition: all 0.3s ease;
+      }
+      
+      .btn--contents {
+        position: relative;
+        z-index: 2;
+        text-align: center;
+        color: white;
+        transform: translateY(20px);
+        opacity: 0.8;
+        transition: all 0.3s ease;
+        
+        h2 {
+          font-size: 3.5rem;
+          font-weight: 300;
+          margin-bottom: 2rem;
+          text-transform: uppercase;
+          letter-spacing: 0.2em;
+        }
+        
+        .loc--btn {
+          background: rgba(255,255,255,0.1);
+          backdrop-filter: blur(10px);
+          border: 2px solid rgba(255,255,255,0.3);
+          color: white;
+          padding: 15px 30px;
+          border-radius: 50px;
+          font-weight: 500;
+          letter-spacing: 0.1em;
+          transition: all 0.3s ease;
+          
+          &:hover {
+            background: rgba(255,255,255,0.2);
+            transform: translateY(-2px);
+            box-shadow: 0 10px 25px rgba(0,0,0,0.2);
+          }
+        }
+      }
+      
+      &.actv {
+        &::before {
+          background: rgba(0,0,0,0.1);
+        }
+        
+        .btn--contents {
+          transform: translateY(0);
+          opacity: 1;
+          
+          h2 {
+            transform: scale(1.1);
+          }
+        }
+      }
+    }
+    
+    .inf--gate {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    }
+    
+    .ven--gate {
+      background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%);
+    }
+  }
+
+  .login--cock {
+    width: 100%;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    z-index: 10;
+  }
+
+  .login--header {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 80px;
+    background: rgba(255,255,255,0.1);
+    backdrop-filter: blur(20px);
+    border-bottom: 1px solid rgba(255,255,255,0.1);
+    display: flex;
+    align-items: center;
+    padding: 0 2rem;
+    z-index: 100;
+
+    .login--header--l {
+      .logo {
+        color: white;
+        font-size: 1.5rem;
+        font-weight: 700;
+        letter-spacing: 0.1em;
+      }
+    }
+  }
 
   .login-box {
     display: flex;
-    height: 43.63rem;    
+    width: 100%;
+    max-width: 1200px;
+    margin: auto;
+    border-radius: 20px;
+    overflow: hidden;
+    box-shadow: 0 25px 50px rgba(0,0,0,0.15);
+    backdrop-filter: blur(20px);
+    z-index: 10;
 
     .login-l {
-      flex-shrink: 0;
-      width: 39.94rem;
-      background: #064F9E url("../img/bg_login.svg") no-repeat center / 100%;
+      flex: 1;
+      background: linear-gradient(135deg, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0.05) 100%);
+      backdrop-filter: blur(20px);
+      border: 1px solid rgba(255,255,255,0.1);
       display: flex;
       align-items: center;
-      flex-direction: column;
       justify-content: center;
+      position: relative;
+      overflow: hidden;
 
       .login-l-center {
-        width: 15.63rem;
-        height: 13.13rem;
-        background: #fff;
-        display: flex;
-        align-items: center;
-        flex-direction: column;
-        justify-content: center;
+        position: relative;
+        z-index: 2;
+        text-align: center;
+        padding: 3rem;
+        background: rgba(255,255,255,0.1);
+        backdrop-filter: blur(10px);
+        border-radius: 15px;
+        border: 1px solid rgba(255,255,255,0.2);
 
         .logo {
-          font-size: 0;
+          color: white;
+          font-size: 2.5rem;
+          font-weight: 700;
+          letter-spacing: 0.1em;
           display: block;
-          height: 1.25rem;
-          width: 100%;
-          background: url("../img/logo_login.svg") no-repeat center / auto 100%;
         }
 
         p {
-          margin: 0.75rem 0 0;
-          text-align: center;
-          color: #333;
-          letter-spacing: -0.02rem;
-          font-size: 1.19rem;
-          line-height: 1.19rem;
+          color: rgba(255,255,255,0.8);
+          font-size: 1rem;
+          font-weight: 300;
+          letter-spacing: 0.05em;
         }
       }
     }
 
     .login-r {
-      width: 36.25rem;
-      background: #fff;
-      padding: 0 6.25rem;
+      flex: 1;
+      background: rgba(255,255,255,0.95);
+      backdrop-filter: blur(20px);
+      padding: 3rem;
       display: flex;
       flex-direction: column;
       justify-content: center;
+      position: relative;
 
+      .custom-input.v-text-field .v-input__control .v-field__field .v-field__input{
+        border: none;
+        background-color: transparent;
+      }
 
       .mk--title{
-        font-size:35px;
+        font-size: 35px;
         font-weight: 900;
-        margin-bottom:45px;
+        margin-bottom: 45px;
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        -webkit-background-clip: text;
+        background-clip: text;
+        -webkit-text-fill-color: transparent;
       }
       
       .tit-login {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 1.88rem;
+        margin-bottom: 2rem;
+        text-align: center;
 
-        > span{
-          font-size: 14px;
-          font-weight: bold;
-          i{
-            color:red;
-            font-style: normal;
-            margin-right: 3px;
-            position: relative;
-            top:2px;
-          }
-        }
         strong {
-          color: #333;
-          font-size: 1.38rem;
+          color: #2d3748;
+          font-size: 2rem;
           font-weight: 700;
-          line-height: 1.38rem;
-          display: block;
-        }
-
-        .lang-set {
-          width: 6.00rem;
-
-          .custom-select {
-            width: 6.00rem;
-          }
+          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+          -webkit-background-clip: text;
+          background-clip: text;
+          -webkit-text-fill-color: transparent;
         }
       }
 
       .login-input-wrap {
-        width: 100%;
+        margin-bottom: 1.5rem;
 
         .txt-field-box {
-          margin-bottom: 0.63rem;
-          &:first-of-type {
-            margin-bottom: 0.63rem;
+          margin-bottom: 1rem;
+          position: relative;
+          display: flex;
+          
+          .custom-input {
+            .v-input__control {
+              .v-field {
+                background: rgba(255,255,255,0.8);
+                backdrop-filter: blur(10px);
+                border: 2px solid rgba(102, 126, 234, 0.2);
+                border-radius: 12px;
+                transition: all 0.3s ease;
+                
+                &:hover {
+                  border-color: rgba(102, 126, 234, 0.4);
+                  background: rgba(255,255,255,0.9);
+                }
+                
+                &.v-field--focused {
+                  border-color: #667eea;
+                  box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
+                }
+              }
+            }
+          }
+          
+          .ico {
+            position: absolute;
+            left: 15px;
+            top: 50%;
+            transform: translateY(-50%);
+            width: 20px;
+            height: 20px;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            border-radius: 50%;
+            z-index: 10;
+          }
+          
+          .ico-eye {
+            position: absolute;
+            right: 15px;
+            top: 50%;
+            transform: translateY(-50%);
+            cursor: pointer;
+            color: #667eea;
+            font-size: 1.2rem;
+            z-index: 10;
+            transition: all 0.3s ease;
+            
+            &:hover {
+              color: #764ba2;
+              transform: translateY(-50%) scale(1.1);
+            }
           }
         }
       }
 
-      .login-radio {
-        margin-top: 1.25rem;
-      }
-
-      .login-otp {
-        display: flex;
-        gap: 0.63rem;
-        margin-top: 1.25rem;
-
-        .txt-field-box {
+      .login-btn-wrap {
+        margin-bottom: 1.5rem;
+        
+        .custom-btn {
           width: 100%;
+          height: 50px;
+          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+          border: none;
+          border-radius: 12px;
+          color: white;
+          font-size: 1.1rem;
+          font-weight: 600;
+          letter-spacing: 0.05em;
+          box-shadow: 0 8px 25px rgba(102, 126, 234, 0.3);
+          transition: all 0.3s ease;
+          
+          &:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 12px 35px rgba(102, 126, 234, 0.4);
+          }
+          
+          &:active {
+            transform: translateY(0);
+          }
         }
-
-        .btn-blue-bor {
-          width: 8.31rem;
-          height: 3.63rem;
-          flex-shrink: 0;
-        }
-      }
-
-      .login-btn-wrap {
-        margin-top: 1.88rem;
       }
-
-      .login-chk {
-        margin: 1.25rem 0 0;
-      }
-
-      .login-find {
+      
+      .join--btn--wrap {
         display: flex;
-        align-items: center;
-        margin-top: 2.19rem;
-        padding-top: 2.19rem;
-        border-top: 0.06rem solid #EEEEEE;
         justify-content: center;
-
-        button {
-          display: flex;
-          align-items: center;
-          font-size: 0.88rem;
-          font-weight: 400;
-          color: #333;
-
-          &.blue-color {
-            &:after {
-              display: inline-block;
-              background: #E3E3E3;
-              width: 0.06rem;
-              height: 1rem;
-              content: "";
-              margin: 0 1rem;
-            }
+        gap: 1rem;
+        margin-bottom: 1.5rem;
+        
+        .text--btn {
+          background: none;
+          border: none;
+          color: #667eea;
+          font-size: 0.9rem;
+          font-weight: 500;
+          padding: 0.5rem 1rem;
+          border-radius: 8px;
+          transition: all 0.3s ease;
+          
+          &:hover {
+            background: rgba(102, 126, 234, 0.1);
+            color: #764ba2;
           }
-
-          &.blue-color {
-            color: #034EA2;
+        }
+      }
+      
+      .short--login--wrap {
+        display: flex;
+        justify-content: center;
+        gap: 1rem;
+        padding-top: 1.5rem;
+        border-top: 1px solid rgba(102, 126, 234, 0.2);
+        
+        .btn--google,
+        .btn--kakao,
+        .btn--naver {
+          width: 50px;
+          height: 50px;
+          border-radius: 50%;
+          border: 2px solid rgba(102, 126, 234, 0.2);
+          background-color: white;
+          transition: all 0.3s ease;
+          position: relative;
+          
+          &:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 8px 25px rgba(0,0,0,0.1);
+            border-color: #667eea;
           }
         }
       }
@@ -3684,31 +3908,31 @@ p.success-txt {
   }
 
   .login-footer {
-    position: fixed;
+    position: absolute;
     bottom: 0;
     left: 0;
     right: 0;
-    width: 100%;
-    background: #fff;
+    height: 60px;
+    background: rgba(255,255,255,0.1);
+    backdrop-filter: blur(20px);
+    border-top: 1px solid rgba(255,255,255,0.1);
     display: flex;
-    justify-content: flex-end;
     align-items: center;
-    height: 3.63rem;
-    padding: 0 1.88rem;
-
-    p {
-      color: #333333;
-      opacity: 0.8;
-      font-size: 0.69rem;
-      font-weight: 400;
-    }
+    justify-content: space-between;
+    padding: 0 2rem;
+    z-index: 100;
 
-    .logo {
-      margin-left: 4.38rem;
-      width: 8.19rem;
-      height: 1.44rem;
-      background: url("../img/logo_foot.svg") no-repeat center / 100%;
-      font-size: 0;
+    .login--footer--l {
+      p {
+        color: rgba(255,255,255,0.8);
+        font-size: 0.8rem;
+        margin: 0;
+        
+        &:first-child {
+          font-weight: 500;
+          margin-bottom: 0.25rem;
+        }
+      }
     }
   }
 }

+ 10 - 8
backend/app/Config/Routes.php

@@ -9,6 +9,7 @@
   $routes->get('auth/callback', 'Auth::callback');
   $routes->post('auth/joinmember', 'Auth::join');
   $routes->post('auth/joinvendor', 'Auth::joinVendor');
+  $routes->post('auth/joinbrand', 'Auth::joinBrand');
   $routes->post('auth/withdrawal', 'Auth::withdrawal'); //구글 회원탈퇴 , 일반회원 탈퇴
   $routes->post('auth/kakaowithdrawal', 'Auth::kakaoWithdrawal'); //카카오 회웥탈퇴
   $routes->get('auth/kakaoLogin', 'Auth::kakaoLogin');
@@ -50,18 +51,19 @@
   $routes->get('item/download/(:segment)', 'Item::file/$1');
 
 // 제품 주문 라우트
+  $routes->post('deli/search', 'Deli::deliSearch');
   $routes->post('deli/itemlist', 'Deli::itemlist');
   $routes->post('deli/list', 'Deli::delilist');
   $routes->post('deli/reg', 'Deli::deliRegister');
 
-// 당첨자 라우트
-  $routes->post('winner/list', 'Winner::winnerlist');
-  $routes->get('winner/detail/(:num)', 'Winner::winnerDetail/$1');
-  $routes->post('winner/partclist', 'Winner::getParticipationByItem');
-  $routes->post('winner/matcheduser', 'Winner::matchedUser');
-  
-  $routes->group('', ['filter' => 'auth'], function ($routes) {
-  });
+// 고객센터 라우트
+  $routes->post('cs/list', 'Cs::csList');
+  $routes->post('cs/search', 'Cs::csSearch');
+  $routes->get('cs/detail/(:num)', 'Cs::csDetail/$1');
+  $routes->post('cs/reg', 'Cs::csRegister');
+  $routes->post('cs/answer', 'Cs::csAnswer');
+// 파일 다운로드
+  $routes->get('cs/download/(:segment)', 'Cs::file/$1');
 
 // API 라우트 그룹
   $routes->group('api', ['namespace' => 'App\Controllers'], function($routes) {

+ 69 - 5
backend/app/Controllers/Auth.php

@@ -15,7 +15,7 @@
   {
     private const FRONTEND_BASE_URL = "http://localhost:3000";
     
-  //private const FRONTEND_BASE_URL = 'https://shopdeli.mycafe24.com';
+    //private const FRONTEND_BASE_URL = 'https://shopdeli.mycafe24.com';
     protected $userModel;
     
     public function __construct()
@@ -289,10 +289,74 @@
         'message' => '회원가입이 완료되었습니다.'
       ])->setStatusCode(200);
     }
-    
-    
-    
-    //구글 로그인 환경 회원 탈퇴
+
+    public function joinBrand()
+      {
+          $postData = $this->request->getJSON(true);
+
+
+          // 필수값 추출
+          $id = $postData['ID'] ?? null;
+          $password = $postData['PASSWORD'] ?? null;
+          $name = $postData['NAME'] ?? null;
+          $company_name = $postData['COMPANY_NAME'] ?? null;
+          $company_number = $postData['COMPANY_NUMBER'] ?? null;
+          $hp = $postData['HP'] ?? null;
+          $email = $postData['EMAIL'] ?? null;
+
+
+
+          // 필수값 검증
+          if (empty($name) || empty($email)) {
+              return redirect()->back()->with('error', '필수 정보를 입력해 주세요.');
+          }
+
+          // insert용 데이터 준비
+          $insertData = [
+              'ID' => $id,
+              'PASSWORD' => $password,
+              'NAME' => $name,
+              'COMPANY_NAME' => $company_name,
+              'HP' => $hp,
+              'EMAIL' => $email,
+              'COMPANY_NUMBER' => $company_number
+          ];
+
+          if (!empty($password)) {
+              $insertData['PASSWORD'] = password_hash($password, PASSWORD_DEFAULT);
+          }
+
+          // DB 연결 및 INSERT
+          try {
+              $db = \Config\Database::connect();
+              $builder = $db->table('BRAND_LIST');
+              $result = $builder->insert($insertData);
+
+              if (!$result) {
+                  $error = $db->error();
+                  return $this->response->setJSON([
+                      'status' => 'fail',
+                      'message' => 'DB Error: '.$error['message']
+                  ])->setStatusCode(500);
+              }
+          } catch (\Throwable $e) {
+              return $this->response->setJSON([
+                  'status' => 'fail',
+                  'message' => 'Exception: ' . $e->getMessage()
+              ])->setStatusCode(500);
+          }
+
+
+          // 회원가입 성공 시, JSON 응답으로 결과 반환 (200 OK)
+          return $this->response->setJSON([
+              'status'  => 'success',
+              'message' => '회원가입이 완료되었습니다.'
+          ])->setStatusCode(200);
+      }
+
+
+
+      //구글 로그인 환경 회원 탈퇴
     public function withdrawal()
     {
       

+ 291 - 0
backend/app/Controllers/Cs.php

@@ -0,0 +1,291 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\RESTful\ResourceController;
+
+class Cs extends ResourceController
+{
+    //문의 리스트
+    public function csList()
+    {
+        $db = \Config\Database::connect();
+
+        // POST JSON 파라미터 받기
+        $request = $this->request->getJSON(true);
+        $userSeq = isset($request['USER_SEQ']) ? $request['USER_SEQ'] : null;
+
+        $builder = $db->table('CS_BOARD C')
+            ->select('C.*, U.NICK_NAME, U.NAME, V.COMPANY_NAME, V.NAME')
+            ->join('USER_LIST U', 'C.USER_SEQ = U.SEQ', 'left')
+            ->join('VENDOR_LIST V', 'C.USER_SEQ = V.SEQ', 'left');
+
+        //userSeq가 0이 아니면 본인이 쓴 글만 조회
+        if( $userSeq !== 0 ){
+            $builder->where('C.USER_SEQ', $userSeq);
+        }
+
+        $builder->orderBy('C.SEQ', 'DESC');
+
+        $lists = $builder->get()->getResultArray();
+        return $this->respond($lists, 200);
+    }
+
+    //문의 등록
+    public function csRegister()
+    {
+        $db = \Config\Database::connect();
+        $request = \Config\Services::request();
+        $regdate = date('Y-m-d H:i:s');
+
+        // 기본 유효성 검사
+        if (
+            !$request->getPost('USER_SEQ') ||
+            !$request->getPost('CATEGORY') ||
+            !$request->getPost('TITLE') ||
+            !$request->getPost('CONTENT')
+        ) {
+            return $this->respond([
+                'status' => 'fail',
+                'message' => '필수 값이 누락됐습니다.'
+            ], 400);
+        }
+
+        $db->transBegin(); // 트랜잭션 시작
+
+        try {
+            // 첨부파일 처리
+            $fileName = null;
+            $fileNameOrigin = null;
+            $files = $request->getFiles();
+
+            if (isset($files['files']) && !empty($files['files'])) {
+                $file = $files['files'][0]; // 첫 번째 파일만 처리
+                if ($file && $file->isValid() && !$file->hasMoved()) {
+                    $fileNameOrigin = $file->getClientName(); // 원본 파일명
+                    $fileName = $file->getRandomName(); // 랜덤파일명 생성
+                    $file->move(WRITEPATH . 'uploads/cs/', $fileName); // 저장
+                }
+            }
+
+            // CS_BOARD에 문의 정보 등록
+            $csData = [
+                'USER_SEQ' => $request->getPost('USER_SEQ'),
+                'CATEGORY' => $request->getPost('CATEGORY'),
+                'TITLE' => $request->getPost('TITLE'),
+                'CONTENT' => $request->getPost('CONTENT'),
+                'STATUS' => '0', // 0: 대기중, 1: 답변완료
+                'REGDATE' => $regdate
+            ];
+
+            // 파일이 있으면 파일 정보도 추가
+            if ($fileName) {
+                $csData['FILE_NAME'] = $fileName;
+                $csData['FILE_NAME_ORIGIN'] = $fileNameOrigin;
+            }
+
+            $insertResult = $db->table('CS_BOARD')->insert($csData);
+            if (!$insertResult) {
+                $error = $db->error();
+                return $this->respond([
+                    'status' => 'fail',
+                    'message' => 'Insert 실패: ' . $error['message']
+                ], 500);
+            }
+            $csSeq = $db->insertID(); // 생성된 문의 SEQ값
+
+            $db->transCommit();
+            return $this->respond([
+                'status' => 'success',
+                'success' => true,
+                'cs_seq' => $csSeq
+            ], 201);
+        } catch (\Exception $e) {
+            $db->transRollback();
+            return $this->respond([
+                'status' => 'fail',
+                'message' => 'DB 오류: ' . $e->getMessage()
+            ], 500);
+        }
+    }
+
+    //문의 상세
+    public function csDetail($seq)
+    {
+        // DB 객체 얻기
+        $db = \Config\Database::connect();
+
+        $builder = $db->table('CS_BOARD C')
+            ->select('C.*, U.NICK_NAME, U.NAME, V.COMPANY_NAME, V.NAME')
+            ->join('USER_LIST U', 'C.USER_SEQ = U.SEQ', 'left')
+            ->join('VENDOR_LIST V', 'C.USER_SEQ = V.SEQ', 'left');
+        $item = $builder->where('C.seq', $seq)->get()->getRowArray();
+
+        if($item){
+            return $this->respond($item, 200);
+        } else {
+            return $this->respond([
+                'status' => 'fail',
+                'message' => '유효하지 않은 seq입니다.'
+            ], 404);
+        }
+    }
+
+    //답변 등록
+    public function csAnswer()
+    {
+        $db = \Config\Database::connect();
+        $request = $this->request->getJSON(true);
+        $answerDate = date('Y-m-d H:i:s');
+
+        // 기본 유효성 검사
+        if (
+            !isset($request['CS_SEQ']) ||
+            !isset($request['ANSWER']) ||
+            !isset($request['ADMIN_SEQ'])
+        ) {
+            return $this->respond([
+                'status' => 'fail',
+                'message' => '필수 값이 누락됐습니다.'
+            ], 400);
+        }
+
+        $db->transBegin(); // 트랜잭션 시작
+
+        try {
+            // CS_BOARD 업데이트
+            $updateData = [
+                'ADMIN_ANSWER' => $request['ANSWER'],
+                'ANSWER_REGDATE' => $answerDate,
+                'ADMIN_SEQ' => $request['ADMIN_SEQ'],
+                'STATUS' => '1' // 답변완료 상태로 변경
+            ];
+
+            $updateResult = $db->table('CS_BOARD')
+                ->where('SEQ', $request['CS_SEQ'])
+                ->update($updateData);
+
+            if (!$updateResult) {
+                throw new \Exception('답변 등록에 실패했습니다.');
+            }
+
+            $db->transCommit();
+            return $this->respond([
+                'status' => 'success',
+                'message' => '답변이 등록되었습니다.'
+            ], 200);
+        } catch (\Exception $e) {
+            $db->transRollback();
+            return $this->respond([
+                'status' => 'fail',
+                'message' => 'DB 오류: ' . $e->getMessage()
+            ], 500);
+        }
+    }
+
+    //상세 다운로드
+    public function file($fileName)
+    {
+        helper('filesystem');
+        $db = \Config\Database::connect();
+
+        $path = WRITEPATH . 'uploads/cs/' . $fileName;
+
+        if (!file_exists($path)) {
+            return $this->failNotFound('파일을 찾을 수 없습니다.');
+        }
+
+        // DB에서 원본 파일명 조회
+        $fileInfo = $db->table('CS_BOARD')
+            ->select('FILE_NAME_ORIGIN')
+            ->where('FILE_NAME', $fileName)
+            ->get()
+            ->getRowArray();
+
+        $originalFileName = $fileInfo && $fileInfo['FILE_NAME_ORIGIN']
+            ? $fileInfo['FILE_NAME_ORIGIN']
+            : $fileName;
+
+        return $this->response
+            ->download($path, null)
+            ->setFileName($originalFileName);
+    }
+
+    //문의 검색
+    public function csSearch()
+    {
+        $db = \Config\Database::connect();
+
+        // 요청 바디에서 filter와 keyword 추출
+        $request = $this->request->getJSON(true);
+        $userSeq = isset($request['USER_SEQ']) ? $request['USER_SEQ'] : null;
+        $filter = isset($request['filter']) ? $request['filter'] : null;
+        $keyword = isset($request['keyword']) ? $request['keyword'] : null;
+        $startDate = isset($request['startDate']) ? $request['startDate'] : null;
+        $endDate = isset($request['endDate']) ? $request['endDate'] : null;
+
+        $filterMap = [
+            'title' => 'C.TITLE',
+            'content' => 'C.CONTENT',
+            'writer' => 'WRITER',
+        ];
+
+        // CS_BOARD 테이블 검색
+        $builder = $db->table('CS_BOARD C')
+            ->select('C.*, U.NICK_NAME, U.NAME, V.COMPANY_NAME, V.NAME')
+            ->join('USER_LIST U', 'C.USER_SEQ = U.SEQ', 'left')
+            ->join('VENDOR_LIST V', 'C.USER_SEQ = V.SEQ', 'left');
+
+        // userSeq가 0이 아니면 본인이 쓴 글만 조회
+        if ($userSeq !== 0) {
+            $builder->where('C.USER_SEQ', $userSeq);
+        }
+
+        // 키워드 검색
+        if (!empty($keyword)) {
+            if (empty($filter) || $filter === '') {
+                // 필터를 선택 안했으면 전체 검색 (제목 + 내용 + 작성자)
+                $builder->groupStart()
+                    ->like('C.TITLE', $keyword)
+                    ->orLike('C.CONTENT', $keyword)
+                    ->orLike('U.NICK_NAME', $keyword)
+                    ->orLike('U.NAME', $keyword)
+                    ->orLike('V.COMPANY_NAME', $keyword)
+                    ->orLike('V.NAME', $keyword)
+                    ->groupEnd();
+            } elseif (isset($filterMap[$filter])) {
+                if ($filter === 'title') {
+                    // 제목 검색
+                    $builder->like($filterMap[$filter], $keyword);
+                } elseif ($filter === 'content') {
+                    // 내용 검색
+                    $builder->like($filterMap[$filter], $keyword);
+                } elseif ($filter === 'writer') {
+                    // 작성자 검색
+                    $builder->groupStart()
+                        ->like('U.NICK_NAME', $keyword)
+                        ->orLike('U.NAME', $keyword)
+                        ->orLike('V.COMPANY_NAME', $keyword)
+                        ->orLike('V.NAME', $keyword)
+                        ->groupEnd();
+                }
+            }
+        }
+
+        // 날짜 범위 검색
+        if (!empty($startDate)) {
+            $builder->where('DATE(C.REGDATE) >=', $startDate);
+        }
+        if (!empty($endDate)) {
+            $builder->where('DATE(C.REGDATE) <=', $endDate);
+        }
+
+        // 정렬: 최신순
+        $builder->orderBy('C.SEQ', 'DESC');
+
+        // 조회
+        $lists = $builder->get()->getResultArray();
+
+        return $this->respond($lists, 200);
+    }
+}

+ 267 - 476
backend/app/Controllers/Deli.php

@@ -36,7 +36,7 @@ class Deli extends ResourceController
         // 배송정보가 등록되지 않은 주문만 (배송관리 페이지용)
         // 배송업체와 송장번호가 모두 비어있는 경우만 포함 (AND 조건)
         $subQuery->where('(DELI_COMP IS NULL OR DELI_COMP = "")')
-                 ->where('(DELI_NUMB IS NULL OR DELI_NUMB = "")');
+            ->where('(DELI_NUMB IS NULL OR DELI_NUMB = "")');
 
         $subQuery->groupBy('ITEM_SEQ');
 
@@ -69,6 +69,191 @@ class Deli extends ResourceController
         return $this->respond($lists, 200);
     }
 
+    //아이템 검색
+    public function deliSearch()
+    {
+        $db = \Config\Database::connect();
+
+        // 요청 바디에서 filter와 keyword 추출
+        $request = $this->request->getJSON(true);
+        $filter = isset($request['filter']) ? $request['filter'] : null;
+        $keyword = isset($request['keyword']) ? $request['keyword'] : null;
+        $startDate = $request['startDate'] ?? null;
+        $endDate = $request['endDate'] ?? null;
+        $showYN = $request['showYN'] ?? null;
+        $itemType = isset($request['TYPE']) ? $request['TYPE'] : null;
+        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
+        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
+        $memberSeq = isset($request['MEMBER_SEQ']) ? $request['MEMBER_SEQ'] : null;
+        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
+
+        $filterMap = [
+            'name' => 'I.NAME',
+        ];
+
+        // 서브쿼리: 사용자 타입에 따른 주문 집계
+        $subQuery = $db->table('ITEM_ORDER_LIST')
+            ->select('ITEM_SEQ, SUM(QTY) AS sum_qty, SUM(TOTAL) AS sum_total, MAX(REG_DATE) AS latest_reg_date');
+
+        // 인플루언서: 본인이 받은 주문만
+        if ($memberType === 'INFLUENCER') {
+            if (is_null($infSeq)) {
+                // INF_SEQ가 없으면 빈 결과 반환
+                return $this->respond([], 200);
+            }
+            $subQuery->where('INF_SEQ', $infSeq);
+        }
+
+        // 배송정보가 등록되지 않은 주문만 (배송관리 페이지용)
+        $subQuery->where('(DELI_COMP IS NULL OR DELI_COMP = "")')
+            ->where('(DELI_NUMB IS NULL OR DELI_NUMB = "")');
+
+        $subQuery->groupBy('ITEM_SEQ');
+
+        // 메인 쿼리: ITEM_LIST와 위 서브쿼리 조인 (실제 주문이 있는 제품만)
+        $builder = $db->table('ITEM_LIST I')
+            ->select('I.*, O.sum_qty, O.sum_total, O.latest_reg_date')
+            ->join("(" . $subQuery->getCompiledSelect() . ") O", 'I.SEQ = O.ITEM_SEQ', 'inner')
+            ->where('I.DEL_YN', 'N');
+
+        // 사용자 타입별 필터링
+        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
+            // 벤더사의 경우: 자사 제품만 검색
+            $builder->where('I.COMPANY_NUMBER', $companyNumber);
+        } elseif ($memberType === 'INFLUENCER' && !empty($memberSeq)) {
+            // 인플루언서의 경우: 파트너십이 체결된 벤더사의 제품만 검색
+            $builder->select('I.*, O.sum_qty, O.sum_total, O.latest_reg_date, VIP.STATUS as PARTNERSHIP_STATUS');
+            $builder->join('VENDOR_LIST VL', 'I.COMPANY_NUMBER = VL.COMPANY_NUMBER', 'inner');
+            $builder->join('VENDOR_INFLUENCER_PARTNERSHIP VIP', 'VL.SEQ = VIP.VENDOR_SEQ', 'inner');
+            $builder->where('VIP.INFLUENCER_SEQ', $memberSeq);
+            $builder->where('VIP.STATUS', 'APPROVED');
+            $builder->where('VIP.IS_ACTIVE', 'Y');
+        }
+
+        // 키워드 검색
+        if (!empty($keyword)) {
+            if (empty($filter)) {
+                // 필터를 선택 안했으면 전체 검색
+                $first = true;
+                foreach ($filterMap as $column) {
+                    if ($first) {
+                        $builder->like($column, $keyword);
+                        $first = false;
+                    } else {
+                        $builder->orLike($column, $keyword);
+                    }
+                }
+            } elseif (isset($filterMap[$filter])) {
+                // 특정 필터 검색
+                $builder->like($filterMap[$filter], $keyword);
+            }
+        }
+
+        // 노출중, 비노출 여부 확인
+        if (!empty($showYN)) {
+            $builder->where('I.SHOW_YN', $showYN);
+        }
+        if (!empty($itemType)) {
+            $builder->where('I.TYPE', $itemType);
+        }
+
+        // INF_SEQ 조건 추가 (값이 있을 때만)
+        if (!empty($infSeq)) {
+            $builder->where('I.CONTACT_INF', $infSeq);
+        }
+
+        // 날짜 범위 검색 (latest_reg_date 기준)
+        if (!empty($startDate)) {
+            $builder->where('O.latest_reg_date >=', $startDate . ' 00:00:00');
+        }
+        if (!empty($endDate)) {
+            $builder->where('O.latest_reg_date <=', $endDate . ' 23:59:59');
+        }
+
+        $builder->orderBy('I.UDPDATE', 'DESC');
+
+        // 조회
+        $lists = $builder->get()->getResultArray();
+
+        return $this->respond($lists, 200);
+    }
+
+    //배송중 검색
+    public function shippingSearch()
+    {
+        $db = \Config\Database::connect();
+        $request = $this->request->getJSON(true);
+
+        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
+        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
+        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
+        $itemType = isset($request['TYPE']) ? $request['TYPE'] : null;
+        $filter = isset($request['filter']) ? $request['filter'] : null;
+        $keyword = isset($request['keyword']) ? $request['keyword'] : null;
+        $startDate = isset($request['startDate']) ? $request['startDate'] : null;
+        $endDate = isset($request['endDate']) ? $request['endDate'] : null;
+
+        $builder = $db->table('ITEM_ORDER_LIST IOL')
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2')
+            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
+            ->where('IOL.DELI_COMP !=', '')
+            ->where('IOL.DELI_NUMB !=', '')
+            ->where('IOL.DELI_COMP IS NOT NULL')
+            ->where('IOL.DELI_NUMB IS NOT NULL');
+
+        // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
+        $columns = $db->getFieldNames('ITEM_ORDER_LIST');
+        if (in_array('DELIVERY_STATUS', $columns)) {
+            $builder->where('IOL.DELIVERY_STATUS', 'SHIPPING');
+        } else {
+            // DELIVERY_STATUS 컬럼이 없으면 배송업체와 송장번호가 있는 것을 배송중으로 간주
+            // 단, 배송완료된 것은 제외 (DELIVERED_DATE가 없는 것만)
+            if (in_array('DELIVERED_DATE', $columns)) {
+                $builder->where('IOL.DELIVERED_DATE IS NULL');
+            }
+        }
+
+        // 아이템 타입 필터링
+        if (!empty($itemType)) {
+            $builder->where('IL.TYPE', $itemType);
+        }
+
+        // 검색 조건 추가
+        if (!empty($keyword)) {
+            if ($filter === 'name') {
+                $builder->like('IL.NAME', $keyword);
+            } elseif ($filter === 'buyer') {
+                $builder->like('IOL.BUYER_NAME', $keyword);
+            } else {
+                // 전체 검색
+                $builder->groupStart()
+                    ->like('IL.NAME', $keyword)
+                    ->orLike('IOL.BUYER_NAME', $keyword)
+                    ->groupEnd();
+            }
+        }
+
+        // 날짜 범위 검색
+        if (!empty($startDate)) {
+            $builder->where('DATE(IOL.SHIPPING_DATE) >=', $startDate);
+        }
+        if (!empty($endDate)) {
+            $builder->where('DATE(IOL.SHIPPING_DATE) <=', $endDate);
+        }
+
+        // 사용자 타입에 따른 필터링
+        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
+            $builder->where('IL.COMPANY_NUMBER', $companyNumber);
+        } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
+            $builder->where('IOL.INF_SEQ', $infSeq);
+        }
+
+        $builder->orderBy('IOL.REG_DATE', 'DESC');
+        $lists = $builder->get()->getResultArray();
+
+        return $this->respond($lists, 200);
+    }
+
 
     //구매자 리스트
     public function delilist()
@@ -91,7 +276,7 @@ class Deli extends ResourceController
         // 배송정보가 등록되지 않은 주문만 표시 (송장번호 등록용)
         // 배송업체와 송장번호가 모두 비어있는 경우만 포함
         $builder->where('(I.DELI_COMP IS NULL OR I.DELI_COMP = "")')
-                ->where('(I.DELI_NUMB IS NULL OR I.DELI_NUMB = "")');
+            ->where('(I.DELI_NUMB IS NULL OR I.DELI_NUMB = "")');
 
         // 주문일 기준으로 정렬
         $builder->orderBy('I.ORDER_DATE', 'DESC');
@@ -110,7 +295,6 @@ class Deli extends ResourceController
         $itemSeq = isset($request['item_seq']) ? $request['item_seq'] : null;
         $infSeq = isset($request['inf_seq']) ? $request['inf_seq'] : null;
         $deliveryList = $request['deliveryList'] ?? [];
-        $useOrderDateMatching = isset($request['useOrderDateMatching']) ? $request['useOrderDateMatching'] : false;
 
         // 🔍 먼저 전체 유효성 검사
         foreach ($deliveryList as $index => $delivery) {
@@ -122,125 +306,32 @@ class Deli extends ResourceController
             }
         }
 
-        $db->transBegin();
-        $insertCount = 0;
-        $updateCount = 0;
-
-        try {
-            if ($useOrderDateMatching) {
-                // 주문일 기준 매칭 방식 (신규 로직)
-                foreach ($deliveryList as $delivery) {
-                    $orderDate = date('Y-m-d', strtotime($delivery['orderDate']));
-                    
-                    // 기존 데이터 확인 (구매자명, 연락처, 주문일로 매칭)
-                    $existingOrder = $db->table('ITEM_ORDER_LIST')
-                        ->where('ITEM_SEQ', $itemSeq)
-                        ->where('INF_SEQ', $infSeq)
-                        ->where('BUYER_NAME', $delivery['buyerName'])
-                        ->where('PHONE', $delivery['phone'])
-                        ->where('DATE(ORDER_DATE)', $orderDate)
-                        ->get()
-                        ->getRowArray();
-
-                    $data = [
-                        'ITEM_SEQ' => $itemSeq,
-                        'INF_SEQ' => $infSeq,
-                        'BUYER_NAME' => $delivery['buyerName'],
-                        'ADDRESS' => $delivery['address'],
-                        'PHONE' => $delivery['phone'],
-                        'EMAIL' => $delivery['email'],
-                        'QTY' => $delivery['qty'],
-                        'TOTAL' => $delivery['total'],
-                        'DELI_COMP' => $delivery['deliComp'] ?? '',
-                        'DELI_NUMB' => $delivery['deliNumb'] ?? '',
-                        'ORDER_DATE' => date('Y-m-d H:i:s', strtotime($delivery['orderDate'])),
-                        'REG_DATE' => date('Y-m-d'),
-                    ];
-
-                    // DELIVERY_STATUS 컬럼이 있으면 상태 설정
-                    $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-                    if (in_array('DELIVERY_STATUS', $columns)) {
-                        // 배송업체와 송장번호가 모두 있으면 SHIPPING, 없으면 PENDING
-                        if (!empty($delivery['deliComp']) && !empty($delivery['deliNumb'])) {
-                            $data['DELIVERY_STATUS'] = 'SHIPPING';
-                            if (in_array('SHIPPING_DATE', $columns)) {
-                                $data['SHIPPING_DATE'] = date('Y-m-d H:i:s');
-                            }
-                        } else {
-                            $data['DELIVERY_STATUS'] = 'PENDING';
-                        }
-                    }
-
-                    if ($existingOrder) {
-                        // 기존 주문 업데이트
-                        $db->table('ITEM_ORDER_LIST')
-                            ->where('SEQ', $existingOrder['SEQ'])
-                            ->update($data);
-                        $updateCount++;
-                    } else {
-                        // 신규 주문 삽입
-                        $db->table('ITEM_ORDER_LIST')->insert($data);
-                        $insertCount++;
-                    }
-                }
-            } else {
-                // 기존 방식 (전체 삭제 후 재등록)
-                $db->table('ITEM_ORDER_LIST')
-                    ->where('ITEM_SEQ', $itemSeq)
-                    ->where('INF_SEQ', $infSeq)
-                    ->delete();
-
-                foreach ($deliveryList as $delivery) {
-                    $data = [
-                        'ITEM_SEQ' => $itemSeq,
-                        'INF_SEQ' => $infSeq,
-                        'BUYER_NAME' => $delivery['buyerName'],
-                        'ADDRESS' => $delivery['address'],
-                        'PHONE' => $delivery['phone'],
-                        'EMAIL' => $delivery['email'],
-                        'QTY' => $delivery['qty'],
-                        'TOTAL' => $delivery['total'],
-                        'DELI_COMP' => $delivery['deliComp'] ?? '',
-                        'DELI_NUMB' => $delivery['deliNumb'] ?? '',
-                        'ORDER_DATE' => date('Y-m-d H:i:s', strtotime($delivery['orderDate'])),
-                        'REG_DATE' => date('Y-m-d'),
-                    ];
-
-                    // DELIVERY_STATUS 컬럼이 있으면 상태 설정
-                    $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-                    if (in_array('DELIVERY_STATUS', $columns)) {
-                        // 배송업체와 송장번호가 모두 있으면 SHIPPING, 없으면 PENDING
-                        if (!empty($delivery['deliComp']) && !empty($delivery['deliNumb'])) {
-                            $data['DELIVERY_STATUS'] = 'SHIPPING';
-                            if (in_array('SHIPPING_DATE', $columns)) {
-                                $data['SHIPPING_DATE'] = date('Y-m-d H:i:s');
-                            }
-                        } else {
-                            $data['DELIVERY_STATUS'] = 'PENDING';
-                        }
-                    }
-
-                    $db->table('ITEM_ORDER_LIST')->insert($data);
-                    $insertCount++;
-                }
-            }
-
-            $db->transCommit();
-            
-            if ($useOrderDateMatching) {
-                return $this->respond([
-                    'message' => '배송 데이터가 성공적으로 저장되었습니다.',
-                    'insert_count' => $insertCount,
-                    'update_count' => $updateCount
-                ], 200);
-            } else {
-                return $this->respond(['message' => '배송 데이터가 성공적으로 저장되었습니다.'], 200);
-            }
-
-        } catch (\Exception $e) {
-            $db->transRollback();
-            return $this->fail('배송 데이터 저장 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
-        }
+        // ✅ 유효성 통과 후 삭제 + 삽입
+        $db->table('ITEM_ORDER_LIST')
+            ->where('ITEM_SEQ', $itemSeq)
+            ->where('INF_SEQ', $infSeq)
+            ->delete();
+
+        foreach ($deliveryList as $delivery) {
+            $data = [
+                'ITEM_SEQ' => $itemSeq,
+                'INF_SEQ' => $infSeq,
+                'BUYER_NAME' => $delivery['buyerName'],
+                'ADDRESS' => $delivery['address'],
+                'PHONE' => $delivery['phone'],
+                'EMAIL' => $delivery['email'],
+                'QTY' => $delivery['qty'],
+                'TOTAL' => $delivery['total'],
+                'DELI_COMP' => $delivery['deliComp'] ?? '',
+                'DELI_NUMB' => $delivery['deliNumb'] ?? '',
+                'ORDER_DATE' => date('Y-m-d H:i:s', strtotime($delivery['orderDate'])),
+                'REG_DATE' => date('Y-m-d'),
+            ];
+
+            $db->table('ITEM_ORDER_LIST')->insert($data);
+        }
+
+        return $this->respond(['message' => '배송 데이터가 성공적으로 저장되었습니다.'], 200);
     }
 
     //벤더사용 배송정보 업데이트
@@ -259,22 +350,14 @@ class Deli extends ResourceController
         $db->transBegin();
         $updatedCount = 0;
         $errors = [];
-        $debugLogs = []; // 디버깅 로그 수집용
 
         try {
-            log_message('info', '벤더 배송정보 업데이트 요청: ' . json_encode($request));
-            $debugLogs[] = '벤더 배송정보 업데이트 요청: ' . json_encode($request);
-            
             foreach ($deliveryUpdates as $update) {
                 $buyerName = $update['buyerName'] ?? '';
                 $phone = $update['phone'] ?? '';
                 $deliComp = $update['deliComp'] ?? '';
                 $deliNumb = $update['deliNumb'] ?? '';
 
-                $logMessage = "배송정보 업데이트 시도: {$buyerName}({$phone}) - 배송업체: {$deliComp}, 송장번호: {$deliNumb}";
-                log_message('info', $logMessage);
-                $debugLogs[] = $logMessage;
-
                 if (!$buyerName || !$phone) {
                     $errors[] = "구매자명과 연락처는 필수입니다.";
                     continue;
@@ -286,62 +369,21 @@ class Deli extends ResourceController
                     'DELI_NUMB' => $deliNumb
                 ];
 
-                // 배송업체와 송장번호가 모두 있을 때만 DELIVERY_STATUS를 SHIPPING으로 변경
+                // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 추가
                 $columns = $db->getFieldNames('ITEM_ORDER_LIST');
                 if (in_array('DELIVERY_STATUS', $columns)) {
-                    if (!empty($deliComp) && !empty($deliNumb)) {
-                        $updateData['DELIVERY_STATUS'] = 'SHIPPING';
-                        
-                        // 배송 시작일도 함께 업데이트
-                        if (in_array('SHIPPING_DATE', $columns)) {
-                            $updateData['SHIPPING_DATE'] = date('Y-m-d H:i:s');
-                        }
-                    }
+                    $updateData['DELIVERY_STATUS'] = 'SHIPPING';
+                }
+                if (in_array('SHIPPING_DATE', $columns)) {
+                    $updateData['SHIPPING_DATE'] = date('Y-m-d H:i:s');
                 }
 
-                // 먼저 해당 조건의 데이터가 존재하는지 확인
-                $existingOrder = $db->table('ITEM_ORDER_LIST')
+                // 구매자명과 연락처로 해당 주문 찾기
+                $result = $db->table('ITEM_ORDER_LIST')
                     ->where('ITEM_SEQ', $itemSeq)
                     ->where('BUYER_NAME', $buyerName)
                     ->where('PHONE', $phone)
-                    ->get()
-                    ->getRowArray();
-                
-                $conditionLog = '업데이트 조건: ITEM_SEQ=' . $itemSeq . ', BUYER_NAME=' . $buyerName . ', PHONE=' . $phone;
-                log_message('info', $conditionLog);
-                $debugLogs[] = $conditionLog;
-                
-                $existsLog = '기존 주문 존재 여부: ' . ($existingOrder ? 'YES' : 'NO');
-                log_message('info', $existsLog);
-                $debugLogs[] = $existsLog;
-                
-                if ($existingOrder) {
-                    $existingLog = '기존 주문 데이터: ' . json_encode($existingOrder);
-                    log_message('info', $existingLog);
-                    $debugLogs[] = $existingLog;
-                }
-                
-                $updateLog = '업데이트 데이터: ' . json_encode($updateData);
-                log_message('info', $updateLog);
-                $debugLogs[] = $updateLog;
-                
-                // SQL 쿼리 로깅을 위해 쿼리 빌더 분리
-                $builder = $db->table('ITEM_ORDER_LIST')
-                    ->where('ITEM_SEQ', $itemSeq)
-                    ->where('BUYER_NAME', $buyerName)
-                    ->where('PHONE', $phone);
-                
-                // 실행될 SQL 쿼리 로그
-                // $sql = $builder->getCompiledUpdate($updateData);
-                // $sqlLog = '실행될 SQL 쿼리: ' . $sql;
-                // log_message('info', $sqlLog);
-                // $debugLogs[] = $sqlLog;
-                
-                $result = $builder->update($updateData);
-
-                $resultLog = '업데이트 결과: ' . ($result ? 'SUCCESS' : 'FAILED') . ' (affected rows: ' . $result . ')';
-                log_message('info', $resultLog);
-                $debugLogs[] = $resultLog;
+                    ->update($updateData);
 
                 if ($result) {
                     $updatedCount++;
@@ -355,25 +397,16 @@ class Deli extends ResourceController
                 return $this->respond([
                     'message' => "배송정보가 성공적으로 업데이트되었습니다.",
                     'updated_count' => $updatedCount,
-                    'errors' => $errors,
-                    'debug_logs' => $debugLogs
+                    'errors' => $errors
                 ], 200);
             } else {
                 $db->transRollback();
-                return $this->fail([
-                    'message' => '업데이트할 수 있는 데이터가 없습니다.',
-                    'debug_logs' => $debugLogs,
-                    'errors' => $errors
-                ], 400);
+                return $this->fail('업데이트할 수 있는 데이터가 없습니다.', 400);
             }
 
         } catch (\Exception $e) {
             $db->transRollback();
-            $debugLogs[] = 'Exception: ' . $e->getMessage();
-            return $this->fail([
-                'message' => '배송정보 업데이트 중 오류가 발생했습니다: ' . $e->getMessage(),
-                'debug_logs' => $debugLogs
-            ], 500);
+            return $this->fail('배송정보 업데이트 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
         }
     }
 
@@ -420,82 +453,47 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
-
-        // 디버깅 로그
-        log_message('info', '배송중 리스트 조회 파라미터: ' . json_encode($request));
+        $itemType = isset($request['TYPE']) ? $request['TYPE'] : null;
 
         $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, U.NICK_NAME')
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2')
             ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
-            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left');
+            ->where('IOL.DELI_COMP !=', '')
+            ->where('IOL.DELI_NUMB !=', '')
+            ->where('IOL.DELI_COMP IS NOT NULL')
+            ->where('IOL.DELI_NUMB IS NOT NULL');
 
         // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
         $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-        log_message('info', 'ITEM_ORDER_LIST 컬럼: ' . json_encode($columns));
-        
         if (in_array('DELIVERY_STATUS', $columns)) {
-            // DELIVERY_STATUS 컬럼이 있는 경우 - 배송업체와 송장번호가 있으면서 SHIPPING 상태인 것
-            $builder->where('IOL.DELI_COMP !=', '')
-                    ->where('IOL.DELI_NUMB !=', '')
-                    ->where('IOL.DELI_COMP IS NOT NULL')
-                    ->where('IOL.DELI_NUMB IS NOT NULL')
-                    ->where('IOL.DELIVERY_STATUS', 'SHIPPING');
-            log_message('info', '배송중 조건: 배송정보 있고 DELIVERY_STATUS = SHIPPING');
+            $builder->where('IOL.DELIVERY_STATUS', 'SHIPPING');
         } else {
             // DELIVERY_STATUS 컬럼이 없으면 배송업체와 송장번호가 있는 것을 배송중으로 간주
-            $builder->where('IOL.DELI_COMP !=', '')
-                    ->where('IOL.DELI_NUMB !=', '')
-                    ->where('IOL.DELI_COMP IS NOT NULL')
-                    ->where('IOL.DELI_NUMB IS NOT NULL');
-            
-            // 배송완료된 것은 제외 (DELIVERED_DATE가 없는 것만)
+            // 단, 배송완료된 것은 제외 (DELIVERED_DATE가 없는 것만)
             if (in_array('DELIVERED_DATE', $columns)) {
                 $builder->where('IOL.DELIVERED_DATE IS NULL');
             }
-            log_message('info', '배송중 조건: 배송업체+송장번호 있고 배송완료일 없음');
+        }
+
+        // 아이템 타입 필터링
+        if (!empty($itemType)) {
+            $builder->where('IL.TYPE', $itemType);
         }
 
         // 사용자 타입에 따른 필터링
         if ($memberType === 'VENDOR' && !empty($companyNumber)) {
             $builder->where('IL.COMPANY_NUMBER', $companyNumber);
-            log_message('info', '벤더 필터링: COMPANY_NUMBER = ' . $companyNumber);
         } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
             $builder->where('IOL.INF_SEQ', $infSeq);
-            log_message('info', '인플루언서 필터링: INF_SEQ = ' . $infSeq);
         }
 
         $builder->orderBy('IOL.REG_DATE', 'DESC');
-        
-        // 실행된 쿼리 로그
-        $query = $builder->getCompiledSelect(false);
-        log_message('info', '배송중 리스트 쿼리: ' . $query);
-        
         $lists = $builder->get()->getResultArray();
-        log_message('info', '배송중 리스트 결과 개수: ' . count($lists));
-        
-        // 첫 번째 결과 로그
-        if (!empty($lists)) {
-            log_message('info', '첫 번째 배송중 데이터: ' . json_encode($lists[0]));
-        }
 
-        // 디버깅을 위해 조건 없이 전체 데이터도 확인
-        $allDataBuilder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner');
-            
-        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
-            $allDataBuilder->where('IL.COMPANY_NUMBER', $companyNumber);
-        } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
-            $allDataBuilder->where('IOL.INF_SEQ', $infSeq);
-        }
-        
-        $allDataBuilder->orderBy('IOL.REG_DATE', 'DESC')->limit(5);
-        $allData = $allDataBuilder->get()->getResultArray();
-        log_message('info', '전체 주문 데이터 (최근 5건): ' . json_encode($allData));
 
         return $this->respond($lists, 200);
     }
@@ -505,15 +503,15 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
+        $itemType = isset($request['TYPE']) ? $request['TYPE'] : null;
 
         $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, U.NICK_NAME')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
-            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left');
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2')
+            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner');
 
         // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
         $columns = $db->getFieldNames('ITEM_ORDER_LIST');
@@ -522,9 +520,14 @@ class Deli extends ResourceController
         } else {
             // DELIVERY_STATUS 컬럼이 없으면 배송업체와 송장번호가 있는 것을 배송완료로 간주
             $builder->where('IOL.DELI_COMP !=', '')
-                    ->where('IOL.DELI_NUMB !=', '')
-                    ->where('IOL.DELI_COMP IS NOT NULL')
-                    ->where('IOL.DELI_NUMB IS NOT NULL');
+                ->where('IOL.DELI_NUMB !=', '')
+                ->where('IOL.DELI_COMP IS NOT NULL')
+                ->where('IOL.DELI_NUMB IS NOT NULL');
+        }
+
+        // 아이템 타입 필터링
+        if (!empty($itemType)) {
+            $builder->where('IL.TYPE', $itemType);
         }
 
         // 정산완료되지 않은 주문만 표시 (배송완료 페이지용)
@@ -545,7 +548,7 @@ class Deli extends ResourceController
         } else {
             $builder->orderBy('IOL.REG_DATE', 'DESC');
         }
-        
+
         $lists = $builder->get()->getResultArray();
 
 
@@ -557,15 +560,15 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $orderIds = isset($request['order_ids']) ? $request['order_ids'] : [];
-        
+
         if (empty($orderIds)) {
             return $this->fail('처리할 주문이 선택되지 않았습니다.', 400);
         }
 
         $db->transBegin();
-        
+
         try {
             foreach ($orderIds as $orderId) {
                 $db->table('ITEM_ORDER_LIST')
@@ -575,10 +578,10 @@ class Deli extends ResourceController
                         'DELIVERED_DATE' => date('Y-m-d H:i:s')
                     ]);
             }
-            
+
             $db->transCommit();
             return $this->respond(['message' => '배송완료 처리되었습니다.'], 200);
-            
+
         } catch (\Exception $e) {
             $db->transRollback();
             return $this->fail('배송완료 처리 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
@@ -590,15 +593,15 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $orderIds = isset($request['order_ids']) ? $request['order_ids'] : [];
-        
+
         if (empty($orderIds)) {
             return $this->fail('처리할 주문이 선택되지 않았습니다.', 400);
         }
 
         $db->transBegin();
-        
+
         try {
             foreach ($orderIds as $orderId) {
                 $db->table('ITEM_ORDER_LIST')
@@ -608,10 +611,10 @@ class Deli extends ResourceController
                         'SETTLED_DATE' => date('Y-m-d H:i:s')
                     ]);
             }
-            
+
             $db->transCommit();
             return $this->respond(['message' => '정산완료 처리되었습니다.'], 200);
-            
+
         } catch (\Exception $e) {
             $db->transRollback();
             return $this->fail('정산완료 처리 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
@@ -623,16 +626,16 @@ class Deli extends ResourceController
     {
         $db = \Config\Database::connect();
         $request = $this->request->getJSON(true);
-        
+
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
         $settlementStatus = isset($request['SETTLEMENT_STATUS']) ? $request['SETTLEMENT_STATUS'] : null;
 
         $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, U.NICK_NAME')
+            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, IL.TYPE as ITEM_TYPE, UL.NICK_NAME as INF_NICK_NAME')
             ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
-            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left');
+            ->join('USER_LIST UL', 'IOL.INF_SEQ = UL.SEQ', 'left');
 
         // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
         $columns = $db->getFieldNames('ITEM_ORDER_LIST');
@@ -641,9 +644,9 @@ class Deli extends ResourceController
         } else {
             // DELIVERY_STATUS 컬럼이 없으면 배송업체와 송장번호가 있는 것을 대상으로 함
             $builder->where('IOL.DELI_COMP !=', '')
-                    ->where('IOL.DELI_NUMB !=', '')
-                    ->where('IOL.DELI_COMP IS NOT NULL')
-                    ->where('IOL.DELI_NUMB IS NOT NULL');
+                ->where('IOL.DELI_NUMB !=', '')
+                ->where('IOL.DELI_COMP IS NOT NULL')
+                ->where('IOL.DELI_NUMB IS NOT NULL');
         }
 
         // 정산 상태 필터링 (SETTLEMENT_STATUS 컬럼이 존재하는 경우만)
@@ -664,216 +667,4 @@ class Deli extends ResourceController
         return $this->respond($lists, 200);
     }
 
-    // 벤더용 대기중 주문 목록 조회
-    public function getPendingOrdersForVendor()
-    {
-        $db = \Config\Database::connect();
-        $request = $this->request->getJSON(true);
-        
-        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
-        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
-        
-        if ($memberType !== 'VENDOR' || empty($companyNumber)) {
-            return $this->respond([], 200);
-        }
-        
-        // 벤더의 제품에 대한 대기중 주문만 조회
-        $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.COMPANY_NUMBER, U.NICK_NAME')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
-            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left')
-            ->where('IL.COMPANY_NUMBER', $companyNumber);
-            
-        // DELIVERY_STATUS 컬럼이 존재하는지 확인하고 조건 추가
-        $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-        if (in_array('DELIVERY_STATUS', $columns)) {
-            // DELIVERY_STATUS가 PENDING이거나 NULL인 경우 (대기중)
-            $builder->where('(IOL.DELIVERY_STATUS = "PENDING" OR IOL.DELIVERY_STATUS IS NULL)');
-        } else {
-            // DELIVERY_STATUS 컬럼이 없으면 기존 방식으로 배송정보로 판단
-            $builder->where('(IOL.DELI_COMP IS NULL OR IOL.DELI_COMP = "")')
-                    ->where('(IOL.DELI_NUMB IS NULL OR IOL.DELI_NUMB = "")');
-        }
-        
-        $builder->orderBy('IOL.REG_DATE', 'DESC');
-            
-        $lists = $builder->get()->getResultArray();
-        
-        return $this->respond($lists, 200);
-    }
-
-    // 배송 상태 업데이트
-    public function updateStatus()
-    {
-        $db = \Config\Database::connect();
-        $request = $this->request->getJSON(true);
-        
-        $itemSeq = isset($request['item_seq']) ? $request['item_seq'] : null;
-        $status = isset($request['status']) ? $request['status'] : null;
-        
-        if (!$itemSeq || !$status) {
-            return $this->fail('필수 파라미터가 누락되었습니다.', 400);
-        }
-        
-        // 유효한 상태값인지 확인
-        $validStatuses = ['PENDING', 'SHIPPING', 'DELIVERED', 'COMPLETE'];
-        if (!in_array($status, $validStatuses)) {
-            return $this->fail('유효하지 않은 상태값입니다.', 400);
-        }
-        
-        $db->transBegin();
-        
-        try {
-            // DELIVERY_STATUS 컬럼이 존재하는지 확인
-            $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-            if (in_array('DELIVERY_STATUS', $columns)) {
-                $updateData = ['DELIVERY_STATUS' => $status];
-                
-                // 상태에 따라 추가 필드 업데이트
-                if ($status === 'SHIPPING' && in_array('SHIPPING_DATE', $columns)) {
-                    $updateData['SHIPPING_DATE'] = date('Y-m-d H:i:s');
-                } elseif ($status === 'DELIVERED' && in_array('DELIVERED_DATE', $columns)) {
-                    $updateData['DELIVERED_DATE'] = date('Y-m-d H:i:s');
-                }
-                
-                $result = $db->table('ITEM_ORDER_LIST')
-                    ->where('ITEM_SEQ', $itemSeq)
-                    ->update($updateData);
-                
-                if ($result) {
-                    $db->transCommit();
-                    return $this->respond([
-                        'message' => '상태가 성공적으로 업데이트되었습니다.',
-                        'status' => $status
-                    ], 200);
-                } else {
-                    $db->transRollback();
-                    return $this->fail('상태 업데이트에 실패했습니다.', 500);
-                }
-            } else {
-                $db->transRollback();
-                return $this->fail('DELIVERY_STATUS 컬럼이 존재하지 않습니다.', 500);
-            }
-            
-        } catch (\Exception $e) {
-            $db->transRollback();
-            return $this->fail('상태 업데이트 중 오류가 발생했습니다: ' . $e->getMessage(), 500);
-        }
-    }
-
-    // 디버깅용 주문 데이터 조회
-    public function debugOrderData()
-    {
-        $db = \Config\Database::connect();
-        $request = $this->request->getJSON(true);
-        
-        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
-        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
-        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
-
-        // 전체 주문 데이터 조회
-        $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.COMPANY_NUMBER as ITEM_COMPANY')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner');
-
-        // 사용자 타입에 따른 필터링
-        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
-            $builder->where('IL.COMPANY_NUMBER', $companyNumber);
-        } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
-            $builder->where('IOL.INF_SEQ', $infSeq);
-        }
-
-        $builder->orderBy('IOL.REG_DATE', 'DESC')
-                ->limit(10); // 최근 10건만
-
-        $orders = $builder->get()->getResultArray();
-
-        // 컬럼 정보도 함께 반환
-        $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-
-        return $this->respond([
-            'columns' => $columns,
-            'orders' => $orders,
-            'count' => count($orders),
-            'filter' => [
-                'memberType' => $memberType,
-                'companyNumber' => $companyNumber,
-                'infSeq' => $infSeq
-            ]
-        ], 200);
-    }
-
-    // 배송중 데이터 강제 조회 (디버깅용)
-    public function getShippingListDebug()
-    {
-        $db = \Config\Database::connect();
-        $request = $this->request->getJSON(true);
-        
-        $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
-        $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
-        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
-
-        $builder = $db->table('ITEM_ORDER_LIST IOL')
-            ->select('IOL.*, IL.NAME as ITEM_NAME, IL.PRICE1, IL.PRICE2, U.NICK_NAME')
-            ->join('ITEM_LIST IL', 'IOL.ITEM_SEQ = IL.SEQ', 'inner')
-            ->join('USER_LIST U', 'IOL.INF_SEQ = U.SEQ', 'left');
-
-        // 사용자 타입에 따른 필터링만 적용 (배송 조건 제외)
-        if ($memberType === 'VENDOR' && !empty($companyNumber)) {
-            $builder->where('IL.COMPANY_NUMBER', $companyNumber);
-        } elseif ($memberType === 'INFLUENCER' && !empty($infSeq)) {
-            $builder->where('IOL.INF_SEQ', $infSeq);
-        }
-
-        $builder->orderBy('IOL.REG_DATE', 'DESC');
-        $allData = $builder->get()->getResultArray();
-
-        // 각 조건별로 분류
-        $withDeliveryInfo = [];
-        $withShippingStatus = [];
-        $withBoth = [];
-        
-        $columns = $db->getFieldNames('ITEM_ORDER_LIST');
-        
-        foreach ($allData as $item) {
-            $hasDeliveryInfo = !empty($item['DELI_COMP']) && !empty($item['DELI_NUMB']);
-            $hasShippingStatus = isset($item['DELIVERY_STATUS']) && $item['DELIVERY_STATUS'] === 'SHIPPING';
-            
-            if ($hasDeliveryInfo) {
-                $withDeliveryInfo[] = $item;
-            }
-            
-            if ($hasShippingStatus) {
-                $withShippingStatus[] = $item;
-            }
-            
-            if ($hasDeliveryInfo && $hasShippingStatus) {
-                $withBoth[] = $item;
-            }
-        }
-
-        return $this->respond([
-            'columns' => $columns,
-            'total_count' => count($allData),
-            'with_delivery_info' => [
-                'count' => count($withDeliveryInfo),
-                'data' => array_slice($withDeliveryInfo, 0, 3)
-            ],
-            'with_shipping_status' => [
-                'count' => count($withShippingStatus),
-                'data' => array_slice($withShippingStatus, 0, 3)
-            ],
-            'with_both_conditions' => [
-                'count' => count($withBoth),
-                'data' => array_slice($withBoth, 0, 3)
-            ],
-            'sample_all_data' => array_slice($allData, 0, 3),
-            'filter' => [
-                'memberType' => $memberType,
-                'companyNumber' => $companyNumber,
-                'infSeq' => $infSeq
-            ]
-        ], 200);
-    }
-
 }

+ 24 - 19
backend/app/Controllers/Item.php

@@ -20,33 +20,27 @@ class Item extends ResourceController
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $memberSeq = isset($request['MEMBER_SEQ']) ? $request['MEMBER_SEQ'] : null;
 
-        // 쿼리 빌더
-        $builder = $db->table('ITEM_LIST')->where('DEL_YN', 'N');
+        // 쿼리 빌더 (VENDOR_LIST 조인 추가)
+        $builder = $db->table('ITEM_LIST I')
+            ->select('I.*, V.COMPANY_NAME')
+            ->join('VENDOR_LIST V', 'I.COMPANY_NUMBER = V.COMPANY_NUMBER', 'left')
+            ->where('I.DEL_YN', 'N');
 
         // 노출중, 비노출 여부 확인
-        if (!is_null($showYn) && $showYn !== '') {
-            $builder->where('SHOW_YN', $showYn);
-        }
-
-        $builder->where('TYPE', $itemType);
+        $builder->where('I.SHOW_YN', $showYn);
+        $builder->where('I.TYPE', $itemType);
 
         // 사용자 타입별 필터링
         if ($memberType === 'VENDOR' && !empty($companyNumber)) {
             // 벤더사의 경우: 자사 제품만 조회
-            $builder->where('COMPANY_NUMBER', $companyNumber);
+            $builder->where('I.COMPANY_NUMBER', $companyNumber);
         } elseif ($memberType === 'INFLUENCER' && !empty($memberSeq)) {
-            // 인플루언서의 경우: 파트너십이 체결된 벤더사의 제품만 조회
-            // VENDOR_INFLUENCER_PARTNERSHIP 테이블과 VENDOR_LIST를 통해 조인
-            $builder->select('ITEM_LIST.*, VIP.STATUS as PARTNERSHIP_STATUS');
-            $builder->join('VENDOR_LIST VL', 'ITEM_LIST.COMPANY_NUMBER = VL.COMPANY_NUMBER', 'inner');
-            $builder->join('VENDOR_INFLUENCER_PARTNERSHIP VIP', 'VL.SEQ = VIP.VENDOR_SEQ', 'inner');
-            $builder->where('VIP.INFLUENCER_SEQ', $memberSeq);
-            $builder->where('VIP.STATUS', 'APPROVED');
-            $builder->where('VIP.IS_ACTIVE', 'Y');
+            // 인플루언서의 경우: 공동구매 담당 제품만
+            $builder->where('I.CONTACT_INF', $memberSeq);
         }
 
         // 업데이트 날짜 기준으로 정렬
-        $builder->orderBy('ITEM_LIST.UDPDATE', 'DESC');
+        $builder->orderBy('I.REGDATE', 'DESC');
         $lists = $builder->get()->getResultArray();
 
         return $this->respond($lists, 200);
@@ -68,6 +62,7 @@ class Item extends ResourceController
         $memberType = isset($request['MEMBER_TYPE']) ? $request['MEMBER_TYPE'] : null;
         $companyNumber = isset($request['COMPANY_NUMBER']) ? $request['COMPANY_NUMBER'] : null;
         $memberSeq = isset($request['MEMBER_SEQ']) ? $request['MEMBER_SEQ'] : null;
+        $infSeq = isset($request['INF_SEQ']) ? $request['INF_SEQ'] : null;
 
         $filterMap = [
             'name' => 'NAME',
@@ -115,6 +110,12 @@ class Item extends ResourceController
         if (!empty($itemType)) {
             $builder->where('TYPE', $itemType);
         }
+
+        // INF_SEQ 조건 추가 (값이 있을 때만)
+        if (!empty($infSeq)) {
+            $builder->where('CONTACT_INF', $infSeq);
+        }
+
         // 정렬: UPDATE 기준 최신순
         $builder->where('UDPDATE >=', $startDate . ' 00:00:00');
         $builder->where('UDPDATE <=', $endDate . ' 23:59:59');
@@ -181,8 +182,8 @@ class Item extends ResourceController
                 'ADD_INFO' => $request->getPost('add_info') ?? 0,
                 'CONTACT_INF' => $request->getPost('contact_inf') ?? 0,
                 'ORDER_LINK' => $request->getPost('order_link') ?? 0,
-                'ORDER_START_DATE' => $request->getPost('order_start_date') ?? 0,
-                'ORDER_END_DATE' => $request->getPost('order_end_date') ?? 0,
+                'ORDER_START_DATE' => $request->getPost('order_start_date'),
+                'ORDER_END_DATE' => $request->getPost('order_end_date'),
                 'COMPANY_NUMBER' => $request->getPost('company_number'),
                 'REGDATE' => $regdate,
                 'UDPDATE' => $regdate,
@@ -315,6 +316,10 @@ class Item extends ResourceController
             'SHOW_YN' => $request->getPost('show_yn'),
             'ADD_INFO' => $request->getPost('add_info') ?? 0,
             'COMPANY_NUMBER' => $request->getPost('company_number'),
+            'CONTACT_INF' => $request->getPost('contact_inf') ?? 0,
+            'ORDER_LINK' => $request->getPost('order_link') ?? 0,
+            'ORDER_START_DATE' => $request->getPost('order_start_date'),
+            'ORDER_END_DATE' => $request->getPost('order_end_date'),
             'UDPDATE' => $upddate,
             'THUMB_FILE' => $thumbFileName,
             'ZIP_FILE' => $zipFileName,

+ 3 - 0
backend/app/Models/LoginModel.php

@@ -23,6 +23,9 @@
         case 'influence':
           $tableName = 'USER_LIST';
           break;
+        case 'brand':
+          $tableName = 'BRAND_LIST';
+          break;
         default:
           throw new \InvalidArgumentException("Invalid login type provided: " . $loginType);
       }

+ 84 - 80
components/common/header.vue

@@ -3,7 +3,7 @@
     <div class="pro--wrap">
       <div class="pro--img"></div>
       <div class="pro--id" @click="proOn ? (proOn = false) : (proOn = true)">
-        {{ useStoreAuth.getSnsTempData?.user?.NICK_NAME || "사용자" }}
+        {{ userName }}
         <i class="ico" :class="[proOn ? 'on' : '']">></i>
         <div class="id--box" v-show="proOn">
           <button type="button" class="btn-profile" @click="myPage(userId)">
@@ -90,6 +90,12 @@
     const currentUser = snsUser || authUser;
     let memberType = currentUser?.memberType || currentUser?.MEMBER_TYPE;
 
+    if (memberType === 'I'){
+      userName.value = currentUser?.NICK_NAME || currentUser?.name
+    } else {
+      userName.value =  currentUser?.companyName;
+    }
+
     // memberType이 없으면 URL로 판단
     if (!memberType) {
       const currentPath = route.path;
@@ -126,44 +132,44 @@
         {
           menuId: "menu01",
           parentMenuId: "menu01",
-          menuName: "제품 관리",
+          menuName: "공동구매",
           linkType: "/view/common/item",
         },
-        {
-          menuId: "menu02",
-          parentMenuId: "menu02",
-          menuName: "배송 관리",
-          linkType: "/view/common/deli",
-          subMenus: [
-            {
-              menuId: "menu02-1",
-              menuName: "배송 관리",
-              linkType: "/view/common/deli",
-            },
-            {
-              menuId: "menu02-2",
-              menuName: "배송중",
-              linkType: "/view/common/deli/shipping",
-            },
-            {
-              menuId: "menu02-3",
-              menuName: "배송완료",
-              linkType: "/view/common/deli/delivered",
-            },
-          ],
-        },
-        {
-          menuId: "menu03",
-          parentMenuId: "menu03",
-          menuName: "인플루언서 관리",
-          linkType: "/view/vendor/dashboard/influencer-requests",
-        },
-        {
-          menuId: "menu04",
-          parentMenuId: "menu04",
-          menuName: "정산 관리",
-          linkType: "/view/common/settlement",
-        },
+        // {
+        //   menuId: "menu02",
+        //   parentMenuId: "menu02",
+        //   menuName: "배송 관리",
+        //   linkType: "/view/common/deli",
+        //   subMenus: [
+        //     {
+        //       menuId: "menu02-1",
+        //       menuName: "배송 관리",
+        //       linkType: "/view/common/deli",
+        //     },
+        //     {
+        //       menuId: "menu02-2",
+        //       menuName: "배송중",
+        //       linkType: "/view/common/deli/shipping",
+        //     },
+        //     {
+        //       menuId: "menu02-3",
+        //       menuName: "배송완료",
+        //       linkType: "/view/common/deli/delivered",
+        //     },
+        //   ],
+        // },
+        // {
+        //   menuId: "menu03",
+        //   parentMenuId: "menu03",
+        //   menuName: "인플루언서 관리",
+        //   linkType: "/view/vendor/dashboard/influencer-requests",
+        // },
+        // {
+        //   menuId: "menu04",
+        //   parentMenuId: "menu04",
+        //   menuName: "정산 관리",
+        //   linkType: "/view/common/settlement",
+        // },
         {
           menuId: "menu05",
           parentMenuId: "menu05",
@@ -181,41 +187,41 @@
           menuName: "제품 관리",
           linkType: "/view/common/item",
         },
-        {
-          menuId: "menu02",
-          parentMenuId: "menu02",
-          menuName: "배송 관리",
-          linkType: "/view/common/deli",
-          subMenus: [
-            {
-              menuId: "menu02-1",
-              menuName: "배송 관리",
-              linkType: "/view/common/deli",
-            },
-            {
-              menuId: "menu02-2",
-              menuName: "배송중",
-              linkType: "/view/common/deli/shipping",
-            },
-            {
-              menuId: "menu02-3",
-              menuName: "배송완료",
-              linkType: "/view/common/deli/delivered",
-            },
-          ],
-        },
-        {
-          menuId: "menu03",
-          parentMenuId: "menu03",
-          menuName: "벤더 관리",
-          linkType: "/view/influencer/search",
-        },
-        {
-          menuId: "menu04",
-          parentMenuId: "menu04",
-          menuName: "정산 관리",
-          linkType: "/view/common/settlement",
-        },
+        // {
+        //   menuId: "menu02",
+        //   parentMenuId: "menu02",
+        //   menuName: "배송 관리",
+        //   linkType: "/view/common/deli",
+        //   subMenus: [
+        //     {
+        //       menuId: "menu02-1",
+        //       menuName: "배송 관리",
+        //       linkType: "/view/common/deli",
+        //     },
+        //     {
+        //       menuId: "menu02-2",
+        //       menuName: "배송중",
+        //       linkType: "/view/common/deli/shipping",
+        //     },
+        //     {
+        //       menuId: "menu02-3",
+        //       menuName: "배송완료",
+        //       linkType: "/view/common/deli/delivered",
+        //     },
+        //   ],
+        // },
+        // {
+        //   menuId: "menu03",
+        //   parentMenuId: "menu03",
+        //   menuName: "벤더 관리",
+        //   linkType: "/view/influencer/search",
+        // },
+        // {
+        //   menuId: "menu04",
+        //   parentMenuId: "menu04",
+        //   menuName: "정산 관리",
+        //   linkType: "/view/common/settlement",
+        // },
         {
           menuId: "menu05",
           parentMenuId: "menu05",
@@ -290,12 +296,10 @@
     logout();
   };
 
-  const myPage = (userId) => {
+  const myPage = () => {
     router.push({
-      path: "/view/mng/mngAdd",
+      path: "/view/common/mypage",
     });
-    useDtStore.adminInfo.adminId = userId;
-    useDtStore.adminInfo.pageType = "U";
   };
 
   const withdrawal = () => {
@@ -353,10 +357,10 @@
   onMounted(() => {
     console.log(useStoreAuth.getSnsTempData.user);
     userId.value = localStorage.getItem("tempAccess");
-    userName.value = JSON.parse(localStorage.getItem("authStore"))?.auth.name;
-    userCompanyName.value = JSON.parse(
-      localStorage.getItem("authStore")
-    )?.auth.companyName;
+    // userName.value = JSON.parse(localStorage.getItem("authStore"))?.auth.name;
+    // userCompanyName.value = JSON.parse(
+    //   localStorage.getItem("authStore")
+    // )?.auth.companyName;
     fnSetMenu();
   });
 </script>

+ 42 - 40
pages/auth/join.vue

@@ -13,16 +13,10 @@
     <!-- login -->
     <div class="login-box type--join">
       <div class="login-r">
-        <h2 class="mk--title">{{ titleh }}</h2>
-        <!-- <div class="join--type">
-          <v-radio-group v-model="form.formValue0" row inline class="custom-radio type2">
-            <v-radio value="Y" label="인플루언스"></v-radio>
-            <v-radio value="N" label="벤더"></v-radio>
-          </v-radio-group>
-        </div> -->
+        <!-- <h2 class="mk--title"></h2> -->
         <div class="tit-login">
-          <strong>회원가입</strong>
-          <span><i>*</i>필수입력 항목</span>
+          <strong>{{ titleh }} 회원가입</strong>
+          <!-- <span><i>*</i>필수입력 항목</span> -->
         </div>
 
         <div v-show="form.formValue0 === 'Y'" class="login-input-wrap">
@@ -165,8 +159,7 @@
             ></v-text-field>
             <v-btn
               v-if="!useStore.getSnsTempData?.ID"
-              small
-              class="ml-2"
+              class="ml-2 custom-btn mini btn-white"
               @click="checkIdVendor"
               >중복확인</v-btn
             >
@@ -277,11 +270,17 @@
             >회원가입</v-btn
           >
           <v-btn
-            v-show="form.formValue0 === 'N'"
+            v-show="typeParam === 'vendor'"
             class="custom-btn btn-blue"
             @click.stop="joinMember('vendor')"
             >회원가입</v-btn
           >
+          <v-btn
+            v-show="typeParam === 'brand'"
+            class="custom-btn btn-blue"
+            @click.stop="joinMember('brand')"
+            >회원가입</v-btn
+          >
         </div>
       </div>
     </div>
@@ -299,9 +298,7 @@
   /************************
    *    import
    ************************/
-  import apiUrl from "@/composables/useApi";
-  import { useI18n } from "vue-i18n";
-  const { $log, $toast } = useNuxtApp();
+      const { $log, $toast } = useNuxtApp();
 
   /************************
    *    layout setting
@@ -313,7 +310,7 @@
   /************************
    *    전역
    ************************/
-  const titleh = ref("인플루언");
+  const titleh = ref("인플루언");
   const useStore = useAuthStore();
   const randomString = ref("");
 
@@ -480,7 +477,7 @@
     try {
       const response = await useAxios().post("/auth/checkId", {
         ID: formVendor.value.formValue1,
-        TYPE: "vendor",
+        TYPE: typeParam.value,
       });
 
       if (response.data.isDuplicate) {
@@ -511,12 +508,6 @@
           $toast.error("아이디를 입력해주세요.");
           return;
         }
-
-        const idRegex = /^[a-zA-Z0-9]{6,20}$/;
-        if (!idRegex.test(form.value.formValue1)) {
-          $toast.error("아이디는 영문, 숫자 조합 6~20자로 입력해주세요.");
-          return;
-        }
       }
     }
 
@@ -537,8 +528,19 @@
         GOOGLE_REFRESH_TOKEN: useStore.getSnsTempData?.GOOGLE_REFRESH_TOKEN || "",
         TYPE: useStore.getSnsTempData ? "1" : "0", // SNS 가입일경우 1, 일반회원 가입일경우 0
       };
-    } else {
+    } else if (id_type === "vendor") {
       _api = "/auth/joinvendor";
+      _req = {
+        ID: formVendor.value.formValue1,
+        PASSWORD: formVendor.value.formValue3,
+        COMPANY_NAME: formVendor.value.formValue4,
+        COMPANY_NUMBER: (randomString.value = generateRandomAlphanumeric(100)),
+        NAME: formVendor.value.formValue5,
+        HP: `${formVendor.value.formValue8}-${formVendor.value.formValue9}-${formVendor.value.formValue10}`,
+        EMAIL: formVendor.value.formValue12,
+      }
+    } else {
+      _api = "/auth/joinbrand";
       _req = {
         ID: formVendor.value.formValue1,
         PASSWORD: formVendor.value.formValue3,
@@ -586,30 +588,30 @@
       });
   };
 
+  /************************
+   *    반응형 변수
+   ************************/
+  const route = useRoute();
+  const typeParam = ref(route.query.type);
+
   /************************
    *    마운트
    ************************/
   onMounted(() => {
-    const route = useRoute();
-    const typeParam = route.query.type;
-    typeParam === "influence"
-      ? (form.value.formValue0 = "Y")
-      : (form.value.formValue0 = "N");
+    if(typeParam.value === "influence"){
+      (form.value.formValue0 = "Y");
+      titleh.value = "인플루언서"
+    } else if(typeParam.value === "vendor"){
+      (form.value.formValue0 = "N") ;
+      titleh.value = "벤더사"
+    } else {
+      (form.value.formValue0 = "N") ;
+      titleh.value = "브랜드사"
+    }
 
     if (useStore.getSnsTempData?.EMAIL) {
       form.value.formValue12 = useStore.getSnsTempData.EMAIL;
       form.value.formValue11 = "direct"; // 이메일 직접입력으로 설정
     }
   });
-
-  watch(
-    () => form.value.formValue0,
-    (newValue) => {
-      if (newValue === "Y") {
-        titleh.value = "인플루언서";
-      } else {
-        titleh.value = "벤더";
-      }
-    }
-  );
 </script>

+ 10 - 2
pages/index.vue

@@ -30,7 +30,6 @@
       <div class="login--header">
         <div class="login--header--l">
           <div class="logo">
-            <!-- prettier-ignore  -->
             SHOPDELI
           </div>
         </div>
@@ -109,6 +108,13 @@
               @click="loginAction(loginForm.userId, loginForm.passwd, 'vendor')"
               >로그인</v-btn
             >
+            <v-btn
+              v-else-if="loginForm.loginType == 'brand'"
+              class="custom-btn btn-blue"
+              @keyup.enter="loginAction(loginForm.userId, loginForm.passwd, 'brand')"
+              @click="loginAction(loginForm.userId, loginForm.passwd, 'brand')"
+              >로그인</v-btn
+            >
           </div>
           <div class="join--btn--wrap">
             <v-btn class="custom-btn text--btn">아이디 찾기</v-btn>
@@ -446,6 +452,8 @@
       loginForm.value.loginType = "influence";
     } else if (typeParam == "vendor") {
       loginForm.value.loginType = "vendor";
+    } else if (typeParam == "brand") {
+      loginForm.value.loginType = "brand"; 
     } else {
       loginVisible.value = "Y";
     }
@@ -493,7 +501,7 @@
   watch(
     () => route.query.type,
     (newType) => {
-      if (newType === "influence" || newType === "vendor") {
+      if (newType === "influence" || newType === "vendor" || newType === "brand") {
         loginForm.value.loginType = newType;
         loginVisible.value = "N"; // 로그인 폼 보이기
       } else {

+ 262 - 0
pages/view/common/cs/detail.vue

@@ -0,0 +1,262 @@
+<template>
+  <div>
+    <div class="inner--headers">
+      <h2>{{ pageId }}</h2>
+      <div class="bread--crumbs--wrap">
+        <span>홈</span>
+        <span>고객센터</span>
+        <span>{{ pageId }}</span>
+      </div>
+    </div>
+
+    <div class="data--list--wrap">
+      <div class="item--list--wrap">
+        <!-- 문의 상세 카드 -->
+        <div class="cs--detail--wrap">
+          <div class="cs--detail--header">
+            <div class="status-badge" :class="getStatusClass(csDetail.STATUS)">
+              {{ csDetail.STATUS == '0' ? '답변대기' : '답변완료' }}
+            </div>
+            <div class="inquiry-meta">
+              <span class="category-badge">{{ getCategoryName(csDetail.CATEGORY) }}</span>
+              <span class="date">{{ formatDate(csDetail.REGDATE) }}</span>
+            </div>
+          </div>
+
+          <div class="cs--detail--content">
+            <h3 class="inquiry-title">{{ csDetail.TITLE }}</h3>
+            
+            <div class="inquiry-info">
+              <div class="info-item">
+                <span class="label">작성자</span>
+                <span class="value">{{ csDetail.NICK_NAME || csDetail.COMPANY_NAME || '알 수 없음' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="label">등록일</span>
+                <span class="value">{{ formatDetailDate(csDetail.REGDATE) }}</span>
+              </div>
+            </div>
+
+            <div class="inquiry-content">
+              <h4>문의 내용</h4>
+              <div class="content-text" v-html="formatContent(csDetail.CONTENT)"></div>
+            </div>
+
+            <!-- 첨부파일 -->
+            <div v-if="csDetail.FILE_NAME" class="attachment-section">
+              <h4>첨부파일</h4>
+              <div class="attachment-item">
+                <i class="mdi mdi-paperclip"></i>
+                <span class="file-name">{{ csDetail.FILE_NAME_ORIGIN }}</span>
+                <v-btn class="download-btn" size="small" @click="downloadFile">
+                  <i class="mdi mdi-download"></i>
+                  다운로드
+                </v-btn>
+              </div>
+            </div>
+
+            <!-- 답변 섹션 -->
+            <div v-if="csDetail.STATUS == '1'" class="answer-section">
+              <h4>답변</h4>
+              <div class="answer-content">
+                <div class="answer-meta">
+                  <span class="admin-badge">관리자</span>
+                  <span class="answer-date">{{ formatDetailDate(csDetail.ANSWER_REGDATE) }}</span>
+                </div>
+                <div class="answer-text" v-html="formatContent(csDetail.ADMIN_ANSWER)"></div>
+              </div>
+            </div>
+
+            <!-- 답변 작성 섹션 (관리자만) -->
+            <div class="answer-write-section" v-if="useAtStore.auth.seq === '2' && csDetail.STATUS == '0'">
+              <h4>답변 작성</h4>
+              <div class="answer-write-form">
+                <v-textarea
+                  v-model="answerContent"
+                  placeholder="답변 내용을 입력하세요."
+                  rows="4"
+                  variant="outlined"
+                  hide-details
+                ></v-textarea>
+                <div class="answer-actions">
+                  <v-btn 
+                    class="submit-answer-btn" 
+                    color="primary" 
+                    @click="submitAnswer"
+                    :loading="isSubmitting"
+                  >
+                    답변 등록
+                  </v-btn>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 하단 버튼 -->
+      <div class="view-btm-btn">
+        <div class="btn-l">
+          <v-btn class="custom-btn btn-list" @click="listLocated">
+            <i class="mdi mdi-format-list-bulleted"></i>목록
+          </v-btn>
+        </div>
+        <div class="btn-r">
+          <!-- 필요시 수정/삭제 버튼 추가 -->
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import useAxios from "@/composables/useAxios";
+import dayjs from 'dayjs';
+
+/************************************************************************
+|    레이아웃
+************************************************************************/
+definePageMeta({
+  layout: "default",
+});
+
+/************************************************************************
+|    스토어
+************************************************************************/
+const useDtStore = useDetailStore();
+const useAtStore = useAuthStore();
+
+/************************************************************************
+|    전역
+************************************************************************/
+const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
+const router = useRouter();
+const pageId = ref("문의 상세");
+
+// CS 상세 정보
+const csDetail = ref({
+  SEQ: '',
+  USER_SEQ: '',
+  CATEGORY: '',
+  TITLE: '',
+  CONTENT: '',
+  STATUS: '',
+  REGDATE: '',
+  FILE_NAME: '',
+  FILE_NAME_ORIGIN: '',
+  ANSWER: '',
+  ANSWER_DATE: '',
+  NICK_NAME: '',
+  COMPANY_NAME: ''
+});
+
+// 답변 작성 관련
+const answerContent = ref('');
+const isSubmitting = ref(false);
+const isAdmin = computed(() => {
+  // 관리자 권한 체크 (실제 권한 체크 로직에 맞게 수정 필요)
+  return useAtStore.auth.seq === '2';
+});
+
+/************************************************************************
+|    함수(METHODS)
+************************************************************************/
+
+const listLocated = () => {
+  router.push({
+    path: "/view/common/cs",
+  });
+};
+
+const getCategoryName = (category) => {
+  switch(category) {
+    case 'D': return '기능문의';
+    case 'E': return '기타문의';
+  }
+};
+
+const getStatusClass = (status) => {
+  switch(status) {
+    case '0': return 'status-waiting';
+    case '1': return 'status-completed';
+    default: return '';
+  }
+};
+
+const formatDate = (dateStr) => {
+  if (!dateStr) return '';
+  const date = new Date(dateStr);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  return `${year}.${month}.${day}`;
+};
+
+const formatDetailDate = (dateStr) => {
+  if (!dateStr) return '';
+  return dayjs(dateStr).format('YYYY년 MM월 DD일 HH:mm');
+};
+
+const formatContent = (content) => {
+  if (!content) return '';
+  return content.replace(/\n/g, '<br>');
+};
+
+const downloadFile = () => {
+  if (csDetail.value.FILE_NAME) {
+    window.open(`https://shopdeli.mycafe24.com/cs/download/${csDetail.value.FILE_NAME}`, '_blank');
+  }
+};
+
+const fnDetail = () => {
+  let req = {
+    seq: useDtStore.boardInfo.seq,
+  };
+  
+  useAxios()
+  .get(`/cs/detail/${req.seq}`)
+  .then((res) => {
+      csDetail.value = res.data;
+    })
+    .catch((error) => {
+      console.error('CS 상세 조회 실패:', error);
+      $toast.error('문의 상세 정보를 불러올 수 없습니다.');
+    });
+};
+
+const submitAnswer = async () => {
+  if (!answerContent.value.trim()) {
+    $toast.error('답변 내용을 입력해주세요.');
+    return;
+  }
+
+  isSubmitting.value = true;
+  
+  try {
+    const response = await useAxios().post('/cs/answer', {
+      CS_SEQ: csDetail.value.SEQ,
+      ANSWER: answerContent.value,
+      ADMIN_SEQ: useAtStore.auth.seq,
+    });
+
+    if (response.data.status === 'success') {
+      $toast.success('답변이 등록되었습니다.');
+      answerContent.value = '';
+      // 상세 정보 다시 불러오기
+      fnDetail();
+    }
+  } catch (error) {
+    console.error('답변 등록 실패:', error);
+    $toast.error('답변 등록에 실패했습니다.');
+  } finally {
+    isSubmitting.value = false;
+  }
+};
+
+/************************************************************************
+|    라이프사이클
+************************************************************************/
+onMounted(() => {
+  fnDetail();
+});
+</script>

+ 0 - 980
pages/view/common/cs/financial.vue

@@ -1,980 +0,0 @@
-<template>
-  <div>
-    <div class="inner--headers">
-      <h2>{{ pageId }}</h2>
-      <div class="bread--crumbs--wrap">
-        <span>홈</span>
-        <span>{{ pageId }}</span>
-        <span v-if="pageIdSub">{{ pageIdSub }}</span>
-      </div>
-    </div>
-    <div class="data--list--wrap">
-      <div class="table--wrap">
-        <div class="table--t">
-          <h3>요약 연결 재무상태표</h3>
-          <span>단위 : 백만원</span>
-        </div>
-        <table>
-          <colgroup>
-            <col width="30%" />
-            <col width="20%" />
-            <col width="20%" />
-            <col width="20%" />
-          </colgroup>
-          <thead>
-            <tr>
-              <th>구분</th>
-              <th>
-                <v-text-field
-                  maxlength="4"
-                  class="custom-input mini"
-                  v-model="form.year1"
-                  placeholder="연도를 입력하세요"
-                ></v-text-field>
-              </th>
-              <th>
-                <v-text-field
-                  maxlength="4"
-                  class="custom-input mini"
-                  v-model="form.year2"
-                  placeholder="연도를 입력하세요"
-                ></v-text-field>
-              </th>
-              <th>
-                <v-text-field
-                  maxlength="4"
-                  class="custom-input mini"
-                  v-model="form.year3"
-                  placeholder="연도를 입력하세요"
-                ></v-text-field>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>유동자산</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_1')"
-                  class="custom-input mini"
-                  v-model="form.value1_1"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_1')"
-                  class="custom-input mini"
-                  v-model="form.value2_1"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_1')"
-                  class="custom-input mini"
-                  v-model="form.value3_1"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>비유동자산</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_2')"
-                  class="custom-input mini"
-                  v-model="form.value1_2"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_2')"
-                  class="custom-input mini"
-                  v-model="form.value2_2"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_2')"
-                  class="custom-input mini"
-                  v-model="form.value3_2"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td class="bg">자산총계</td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_3')"
-                  class="custom-input mini"
-                  v-model="form.value1_3"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_3')"
-                  class="custom-input mini"
-                  v-model="form.value2_3"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_3')"
-                  class="custom-input mini"
-                  v-model="form.value3_3"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>유동부채</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_4')"
-                  class="custom-input mini"
-                  v-model="form.value1_4"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_4')"
-                  class="custom-input mini"
-                  v-model="form.value2_4"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_4')"
-                  class="custom-input mini"
-                  v-model="form.value3_4"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>비유동부채</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_5')"
-                  class="custom-input mini"
-                  v-model="form.value1_5"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_5')"
-                  class="custom-input mini"
-                  v-model="form.value2_5"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_5')"
-                  class="custom-input mini"
-                  v-model="form.value3_5"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td class="bg">부채총계</td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_6')"
-                  class="custom-input mini"
-                  v-model="form.value1_6"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_6')"
-                  class="custom-input mini"
-                  v-model="form.value2_6"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_6')"
-                  class="custom-input mini"
-                  v-model="form.value3_6"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>자본금</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_7')"
-                  class="custom-input mini"
-                  v-model="form.value1_7"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_7')"
-                  class="custom-input mini"
-                  v-model="form.value2_7"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_7')"
-                  class="custom-input mini"
-                  v-model="form.value3_7"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>주식발행 초과금</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_8')"
-                  class="custom-input mini"
-                  v-model="form.value1_8"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_8')"
-                  class="custom-input mini"
-                  v-model="form.value2_8"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_8')"
-                  class="custom-input mini"
-                  v-model="form.value3_8"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>기타자본 구성요소</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_9')"
-                  class="custom-input mini"
-                  v-model="form.value1_9"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_9')"
-                  class="custom-input mini"
-                  v-model="form.value2_9"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_9')"
-                  class="custom-input mini"
-                  v-model="form.value3_9"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>이익잉여금</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_10')"
-                  class="custom-input mini"
-                  v-model="form.value1_10"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_10')"
-                  class="custom-input mini"
-                  v-model="form.value2_10"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_10')"
-                  class="custom-input mini"
-                  v-model="form.value3_10"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td class="bg">자본총계</td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_11')"
-                  class="custom-input mini"
-                  v-model="form.value1_11"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_11')"
-                  class="custom-input mini"
-                  v-model="form.value2_11"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_11')"
-                  class="custom-input mini"
-                  v-model="form.value3_11"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <div class="table--wrap">
-        <di class="table--t">
-          <h3>요약 연결 손익계산서</h3>
-          <span>단위 : 백만원</span>
-        </di>
-        <table>
-          <colgroup>
-            <col width="30%" />
-            <col width="20%" />
-            <col width="20%" />
-            <col width="20%" />
-          </colgroup>
-          <thead>
-            <tr>
-              <th>구분</th>
-              <th>
-                <v-text-field
-                  maxlength="4"
-                  class="custom-input mini"
-                  v-model="form.year1_1"
-                  placeholder="연도를 입력하세요"
-                ></v-text-field>
-              </th>
-              <th>
-                <v-text-field
-                  maxlength="4"
-                  class="custom-input mini"
-                  v-model="form.year2_1"
-                  placeholder="연도를 입력하세요"
-                ></v-text-field>
-              </th>
-              <th>
-                <v-text-field
-                  maxlength="4"
-                  class="custom-input mini"
-                  v-model="form.year3_1"
-                  placeholder="연도를 입력하세요"
-                ></v-text-field>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td class="bg">매출액</td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_12')"
-                  class="custom-input mini"
-                  v-model="form.value1_12"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_12')"
-                  class="custom-input mini"
-                  v-model="form.value2_12"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_12')"
-                  class="custom-input mini"
-                  v-model="form.value3_12"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>매출원가</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_13')"
-                  class="custom-input mini"
-                  v-model="form.value1_13"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_13')"
-                  class="custom-input mini"
-                  v-model="form.value2_13"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_13')"
-                  class="custom-input mini"
-                  v-model="form.value3_13"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>매출총이익</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_14')"
-                  class="custom-input mini"
-                  v-model="form.value1_14"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_14')"
-                  class="custom-input mini"
-                  v-model="form.value2_14"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_14')"
-                  class="custom-input mini"
-                  v-model="form.value3_14"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>판매비와 관리비</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_15')"
-                  class="custom-input mini"
-                  v-model="form.value1_15"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_15')"
-                  class="custom-input mini"
-                  v-model="form.value2_15"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_15')"
-                  class="custom-input mini"
-                  v-model="form.value3_15"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td class="bg">영업이익</td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_16')"
-                  class="custom-input mini"
-                  v-model="form.value1_16"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_16')"
-                  class="custom-input mini"
-                  v-model="form.value2_16"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_16')"
-                  class="custom-input mini"
-                  v-model="form.value3_16"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td>법인세 차감전순이익</td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_17')"
-                  class="custom-input mini"
-                  v-model="form.value1_17"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_17')"
-                  class="custom-input mini"
-                  v-model="form.value2_17"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td>
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_17')"
-                  class="custom-input mini"
-                  v-model="form.value3_17"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <td class="bg">당기순이익</td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value1_18')"
-                  class="custom-input mini"
-                  v-model="form.value1_18"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value2_18')"
-                  class="custom-input mini"
-                  v-model="form.value2_18"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-              <td class="bg">
-                <v-text-field
-                  maxlength="12"
-                  @input="(e) => formatNumber(e, 'value3_18')"
-                  class="custom-input mini"
-                  v-model="form.value3_18"
-                  placeholder="금액을 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <div class="view-btm-btn">
-        <div class="btn-l"></div>
-        <div class="btn-r">
-          <v-btn class="custom-btn btn-blue2" @click="fnUpdEvt"
-            ><i class="ico"></i>저장</v-btn
-          >
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-/************************************************************************
-|    레이아웃
-************************************************************************/
-definePageMeta({
-  layout: "default",
-});
-
-/************************************************************************
-|   PROPS
- ************************************************************************/
-const props = defineProps({
-  propsData: {
-    type: Object,
-    default: () => {},
-  },
-});
-
-/************************************************************************
-|    스토어
- ************************************************************************/
-const useDtStore = useDetailStore();
-/************************************************************************
-|    전역
- ************************************************************************/
-const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
-const router = useRouter();
-const pageId = ref("재무제표");
-const pageIdSub = ref();
-/* eslint-disable */
-const form = ref({
-  year1: "",
-  year2: "",
-  year3: "",
-  year1_1: "",
-  year2_1: "",
-  year3_1: "",
-  value1_1: "",
-  value1_2: "",
-  value1_3: "",
-  value1_4: "",
-  value1_5: "",
-  value1_6: "",
-  value1_7: "",
-  value1_8: "",
-  value1_9: "",
-  value1_10: "",
-  value1_11: "",
-  value1_12: "",
-  value1_13: "",
-  value1_14: "",
-  value1_15: "",
-  value1_16: "",
-  value1_17: "",
-  value1_18: "",
-  value2_1: "",
-  value2_2: "",
-  value2_3: "",
-  value2_4: "",
-  value2_5: "",
-  value2_6: "",
-  value2_7: "",
-  value2_8: "",
-  value2_9: "",
-  value2_10: "",
-  value2_11: "",
-  value2_12: "",
-  value2_13: "",
-  value2_14: "",
-  value2_15: "",
-  value2_16: "",
-  value2_17: "",
-  value2_18: "",
-  value3_1: "",
-  value3_2: "",
-  value3_3: "",
-  value3_4: "",
-  value3_5: "",
-  value3_6: "",
-  value3_7: "",
-  value3_8: "",
-  value3_9: "",
-  value3_10: "",
-  value3_11: "",
-  value3_12: "",
-  value3_13: "",
-  value3_14: "",
-  value3_15: "",
-  value3_16: "",
-  value3_17: "",
-  value3_18: "",
-});
-/* eslint-disable */
-/* prettier-ignore */
-
-/************************************************************************
-|    함수(METHODS)
-************************************************************************/
-const formatNumber = (event, key) => {
-  // 숫자만 남기기
-  const input = event.target.value.replace(/[^0-9]/g, '');
-  // 3자리마다 쉼표 추가
-  const formattedInput = new Intl.NumberFormat().format(input);
-  // 실시간으로 업데이트
-  form.value[key] = String(formattedInput);
-};
-
-const fnUpdate = () => {
-  let wterGet = localStorage.getItem("tempAccess");
-  let _req = {
-    wter: wterGet,
-
-    // 요약 연결 재무상태표
-    dd_1: form.value.year1,
-    dd_2: form.value.year2,
-    dd_3: form.value.year3,
-
-    dd_amt_1_1: form.value.value1_1,
-    dd_amt_1_2: form.value.value1_2,
-    dd_amt_1_3: form.value.value1_3,
-    dd_amt_1_4: form.value.value1_4,
-    dd_amt_1_5: form.value.value1_5,
-    dd_amt_1_6: form.value.value1_6,
-    dd_amt_1_7: form.value.value1_7,
-    dd_amt_1_8: form.value.value1_8,
-    dd_amt_1_9: form.value.value1_9,
-    dd_amt_1_10: form.value.value1_10,
-    dd_amt_1_11: form.value.value1_11,
-
-    dd_amt_2_1: form.value.value2_1,
-    dd_amt_2_2: form.value.value2_2,
-    dd_amt_2_3: form.value.value2_3,
-    dd_amt_2_4: form.value.value2_4,
-    dd_amt_2_5: form.value.value2_5,
-    dd_amt_2_6: form.value.value2_6,
-    dd_amt_2_7: form.value.value2_7,
-    dd_amt_2_8: form.value.value2_8,
-    dd_amt_2_9: form.value.value2_9,
-    dd_amt_2_10: form.value.value2_10,
-    dd_amt_2_11: form.value.value2_11,
-
-    dd_amt_3_1: form.value.value3_1,
-    dd_amt_3_2: form.value.value3_2,
-    dd_amt_3_3: form.value.value3_3,
-    dd_amt_3_4: form.value.value3_4,
-    dd_amt_3_5: form.value.value3_5,
-    dd_amt_3_6: form.value.value3_6,
-    dd_amt_3_7: form.value.value3_7,
-    dd_amt_3_8: form.value.value3_8,
-    dd_amt_3_9: form.value.value3_9,
-    dd_amt_3_10: form.value.value3_10,
-    dd_amt_3_11: form.value.value3_11,
-
-    // 요약 연결 손익계산서
-    dd_1_1: form.value.year1_1,
-    dd_2_1: form.value.year2_1,
-    dd_3_1: form.value.year3_1,
-
-    dd_amt_1_12: form.value.value1_12,
-    dd_amt_1_13: form.value.value1_13,
-    dd_amt_1_14: form.value.value1_14,
-    dd_amt_1_15: form.value.value1_15,
-    dd_amt_1_16: form.value.value1_16,
-    dd_amt_1_17: form.value.value1_17,
-    dd_amt_1_18: form.value.value1_18,
-
-    dd_amt_2_12: form.value.value2_12,
-    dd_amt_2_13: form.value.value2_13,
-    dd_amt_2_14: form.value.value2_14,
-    dd_amt_2_15: form.value.value2_15,
-    dd_amt_2_16: form.value.value2_16,
-    dd_amt_2_17: form.value.value2_17,
-    dd_amt_2_18: form.value.value2_18,
-
-    dd_amt_3_12: form.value.value3_12,
-    dd_amt_3_13: form.value.value3_13,
-    dd_amt_3_14: form.value.value3_14,
-    dd_amt_3_15: form.value.value3_15,
-    dd_amt_3_16: form.value.value3_16,
-    dd_amt_3_17: form.value.value3_17,
-    dd_amt_3_18: form.value.value3_18,
-  };
-
-  _req = Object.fromEntries(
-    Object.entries(_req).map(([key, value]) => [
-      key,
-      typeof value === "string"
-        ? value.replace(/,/g, "") // 문자열인 경우에만 replace
-        : value == null
-        ? "" // null 또는 undefined 값은 빈 문자열로 처리
-        : String(value), // 그 외 값은 문자열로 변환
-    ])
-  );
-
-  useAxios()
-    .post("/balance/ins", _req)
-    .then((res) => {
-      window.location.reload();
-      //console.error(res)
-    })
-    .catch((error) => {});
-};
-const fnDetail = () => {
-  let _req = {};
-
-  useAxios()
-    .post("/balance/detail", _req)
-    .then((res) => {
-      const formattedData = Object.fromEntries(
-        Object.entries(res.data).map(([key, value]) => {
-          let formattedValue = null;
-          // 연도는 쉼표 제거, 금액은 쉼표 추가
-          if(key !== 'dd_1' && key !== 'dd_2' && key !== 'dd_3' && key !== 'dd_1_1' && key !== 'dd_2_1' && key !== 'dd_3_1'){
-            formattedValue = !isNaN(value)
-            ? new Intl.NumberFormat().format(Number(value))
-            : value;
-          } else {
-            formattedValue = value;
-          }
-          return [key, formattedValue];
-        })
-      );
-      res.data = formattedData;
-      form.value.year1 = res.data.dd_1;
-      form.value.value1_1 = res.data.dd_amt_1_1;
-      form.value.value1_2 = res.data.dd_amt_1_2;
-      form.value.value1_3 = res.data.dd_amt_1_3;
-      form.value.value1_4 = res.data.dd_amt_1_4;
-      form.value.value1_5 = res.data.dd_amt_1_5;
-      form.value.value1_6 = res.data.dd_amt_1_6;
-      form.value.value1_7 = res.data.dd_amt_1_7;
-      form.value.value1_8 = res.data.dd_amt_1_8;
-      form.value.value1_9 = res.data.dd_amt_1_9;
-      form.value.value1_10 = res.data.dd_amt_1_10;
-      form.value.value1_11 = res.data.dd_amt_1_11;
-
-      form.value.year2 = res.data.dd_2;
-      form.value.value2_1 = res.data.dd_amt_2_1;
-      form.value.value2_2 = res.data.dd_amt_2_2;
-      form.value.value2_3 = res.data.dd_amt_2_3;
-      form.value.value2_4 = res.data.dd_amt_2_4;
-      form.value.value2_5 = res.data.dd_amt_2_5;
-      form.value.value2_6 = res.data.dd_amt_2_6;
-      form.value.value2_7 = res.data.dd_amt_2_7;
-      form.value.value2_8 = res.data.dd_amt_2_8;
-      form.value.value2_9 = res.data.dd_amt_2_9;
-      form.value.value2_10 = res.data.dd_amt_2_10;
-      form.value.value2_11 = res.data.dd_amt_2_11;
-
-      form.value.year3 = res.data.dd_3;
-      form.value.value3_1 = res.data.dd_amt_3_1;
-      form.value.value3_2 = res.data.dd_amt_3_2;
-      form.value.value3_3 = res.data.dd_amt_3_3;
-      form.value.value3_4 = res.data.dd_amt_3_4;
-      form.value.value3_5 = res.data.dd_amt_3_5;
-      form.value.value3_6 = res.data.dd_amt_3_6;
-      form.value.value3_7 = res.data.dd_amt_3_7;
-      form.value.value3_8 = res.data.dd_amt_3_8;
-      form.value.value3_9 = res.data.dd_amt_3_9;
-      form.value.value3_10 = res.data.dd_amt_3_10;
-      form.value.value3_11 = res.data.dd_amt_3_11;
-
-      // 요약 연결 손익계산서
-      form.value.year1_1 = res.data.dd_1_1;
-      form.value.value1_12 = res.data.dd_amt_1_12;
-      form.value.value1_13 = res.data.dd_amt_1_13;
-      form.value.value1_14 = res.data.dd_amt_1_14;
-      form.value.value1_15 = res.data.dd_amt_1_15;
-      form.value.value1_16 = res.data.dd_amt_1_16;
-      form.value.value1_17 = res.data.dd_amt_1_17;
-      form.value.value1_18 = res.data.dd_amt_1_18;
-
-      form.value.year2_1 = res.data.dd_2_1;
-      form.value.value2_12 = res.data.dd_amt_2_12;
-      form.value.value2_13 = res.data.dd_amt_2_13;
-      form.value.value2_14 = res.data.dd_amt_2_14;
-      form.value.value2_15 = res.data.dd_amt_2_15;
-      form.value.value2_16 = res.data.dd_amt_2_16;
-      form.value.value2_17 = res.data.dd_amt_2_17;
-      form.value.value2_18 = res.data.dd_amt_2_18;
-
-      form.value.year3_1 = res.data.dd_3_1;
-      form.value.value3_12 = res.data.dd_amt_3_12;
-      form.value.value3_13 = res.data.dd_amt_3_13;
-      form.value.value3_14 = res.data.dd_amt_3_14;
-      form.value.value3_15 = res.data.dd_amt_3_15;
-      form.value.value3_16 = res.data.dd_amt_3_16;
-      form.value.value3_17 = res.data.dd_amt_3_17;
-      form.value.value3_18 = res.data.dd_amt_3_18;
-    })
-    .catch((error) => {});
-};
-
-const fnUpdEvt = () => {
-  let param = {
-    id: pageId,
-    title: "재무제표 저장",
-    content: "저장하시겠습니까?",
-    yes: {
-      text: "저장",
-      isProc: true,
-      event: "FN_UPDATE",
-      param: "",
-    },
-    no: {
-      text: "취소",
-      isProc: false,
-    },
-  };
-  $eventBus.emit("OPEN_CONFIRM_POP_UP", param);
-};
-
-$eventBus.off("FN_UPDATE");
-$eventBus.on("FN_UPDATE", () => {
-  fnUpdate();
-});
-
-/************************************************************************
-|    WATCH
-************************************************************************/
-
-watch(() => {});
-
-onMounted(() => {
-  fnDetail();
-});
-</script>

+ 440 - 299
pages/view/common/cs/index.vue

@@ -5,334 +5,475 @@
       <div class="bread--crumbs--wrap">
         <span>홈</span>
         <span>{{ pageId }}</span>
-        <span v-if="pageIdSub">{{ pageIdSub }}</span>
       </div>
     </div>
-    <div class="data--list--wrap">
-      <div class="table--wrap">
-        <di class="table--t">
-          <h3>기 발행 주식 수</h3>
-        </di>
-        <table>
-          <colgroup>
-            <col width="20%" />
-            <col width="80%" />
-          </colgroup>
-          <tbody>
-            <tr>
-              <th class="bg le">주식 수<span class="bul">*</span></th>
-              <td>
-                <v-text-field
-                  maxlength="13"
-                  @input="(e) => formatNumber(e, 'formValue1')"
-                  v-model="form.formValue1"
-                  style="width: 300px"
-                  class="custom-input mini left"
-                  placeholder="주식 수를 입력하세요"
-                ></v-text-field>
-              </td>
-            </tr>
-            <tr>
-              <th class="bg le">
-                발행 주식 수 기준 일자(현재)<span class="bul">*</span>
-              </th>
-              <td>
-                <div class="calendar-wrap ml--0">
-                  <div class="calendar">
-                    <VueDatePicker
-                      :format="datePickerFormat"
-                      v-model="form.formValue2"
-                      auto-apply="true"
-                      week-start="0"
-                    ></VueDatePicker>
-                  </div>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
+
+    <div class="search--modules type2">
+      <div class="search--inner">
+        <div class="form--cont--filter">
+          <v-select
+            v-model="filter"
+            :items="filderArr"
+            variant="outlined"
+            class="custom-select"
+          >
+          </v-select>
+        </div>
+        <div class="form--cont--text">
+          <v-text-field
+            v-model="searchModel"
+            class="custom-input mini"
+            style="width: 100%"
+            placeholder="검색어를 입력하세요"
+          ></v-text-field>
+        </div>
       </div>
-      <div class="table--wrap">
-        <di class="table--t">
-          <h3>주주구성</h3>
-        </di>
-        <table>
-          <colgroup>
-            <col width="20%" />
-            <col width="80%" />
-          </colgroup>
-          <tbody>
-            <tr>
-              <th class="bg le">최대주주 및 특수 관계인<span class="bul">*</span></th>
-              <td>
-                <div class="input--wrap">
-                  <v-text-field
-                    maxlength="10"
-                    style="width: 300px"
-                    v-model="form.formValue3"
-                    @input="(e) => formatNumber(e, 'formValue3')"
-                    class="custom-input mini left"
-                    placeholder="비율을 입력하세요"
-                  ></v-text-field>
-                  <span>%</span>
-                </div>
-              </td>
-            </tr>
-            <tr>
-              <th class="bg le">기관<span class="bul">*</span></th>
-              <td>
-                <div class="input--wrap">
-                  <v-text-field
-                    maxlength="10"
-                    style="width: 300px"
-                    v-model="form.formValue4"
-                    @input="(e) => formatNumber(e, 'formValue4')"
-                    class="custom-input mini left"
-                    placeholder="비율을 입력하세요"
-                  ></v-text-field>
-                  <span>%</span>
-                </div>
-              </td>
-            </tr>
-            <tr>
-              <th class="bg le">외국인<span class="bul">*</span></th>
-              <td>
-                <div class="input--wrap">
-                  <v-text-field
-                    maxlength="10"
-                    style="width: 300px"
-                    @input="(e) => formatNumber(e, 'formValue5')"
-                    v-model="form.formValue5"
-                    class="custom-input mini left"
-                    placeholder="비율을 입력하세요"
-                  ></v-text-field>
-                  <span>%</span>
-                </div>
-              </td>
-            </tr>
-            <tr>
-              <th class="bg le">자사주<span class="bul">*</span></th>
-              <td>
-                <div class="input--wrap">
-                  <v-text-field
-                    maxlength="10"
-                    style="width: 300px"
-                    v-model="form.formValue6"
-                    @input="(e) => formatNumber(e, 'formValue6')"
-                    class="custom-input mini left"
-                    placeholder="비율을 입력하세요"
-                  ></v-text-field>
-                  <span>%</span>
-                </div>
-              </td>
-            </tr>
-            <tr>
-              <th class="bg le">기타<span class="bul">*</span></th>
-              <td>
-                <div class="input--wrap">
-                  <v-text-field
-                    maxlength="10"
-                    v-model="form.formValue7"
-                    @input="(e) => formatNumber(e, 'formValue7')"
-                    style="width: 300px"
-                    class="custom-input mini left"
-                    placeholder="비율을 입력하세요"
-                  ></v-text-field>
-                  <span>%</span>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
+      <div class="search--inner">
+        <div class="calendar-wrap ml--0">
+          <div class="calendar">
+            <VueDatePicker
+              :format="datePickerFormat"
+              v-model="searchStartDate"
+              placeholder="날짜를 선택하세요"
+              :auto-apply="true"
+              week-start="0"
+            ></VueDatePicker>
+          </div>
+          <span class="text">~</span>
+          <div class="calendar">
+            <VueDatePicker
+              v-model="searchEndDate"
+              :format="datePickerFormat"
+              placeholder="날짜를 선택하세요"
+              :auto-apply="true"
+              week-start="0"
+            ></VueDatePicker>
+          </div>
+          <div class="month--selector">
+            <v-btn
+              v-for="option in dateOptions"
+              :key="option.value"
+              :class="{ actv: selectedRange === option.value }"
+              @click="setDateRange(option.value)"
+              elevation="0"
+            >
+              {{ option.label }}
+            </v-btn>
+          </div>
+        </div>
       </div>
-      <div class="view-btm-btn">
-        <div class="btn-l"></div>
-        <div class="btn-r">
-          <v-btn class="custom-btn btn-blue2" @click="fnUpdEvt"
-            ><i class="ico"></i>저장</v-btn
-          >
+      <v-btn
+        class="custom-btn btn-blue mini sch--btn"
+        @click="fnSearch(searchModel, filter)"
+        >검색</v-btn
+      >
+    </div>
+
+    <div class="data--list--wrap">
+      <div class="item--list--wrap">
+        <div class="cs--list--wrap">
+          <div class="cs--header">
+            <h3>문의 등록</h3>
+            <v-btn class="custom-btn" @click="addLocated()">문의 등록</v-btn>
+          </div>
+          <div class="cs--header">
+            <h3>나의 문의 내역</h3>
+          </div>
+          <div class="cs--list" v-if="csList.length > 0">
+            <div v-for="(items, index) in paginatedItems" :key="index">
+              <div class="list" @click="toItemDetail(items.SEQ)">
+                <span class="list--seq">{{ items.SEQ }}</span>
+                <span class="list--circle">{{ items.CATEGORY == 'D' ? '기능문의' : '기타문의' }}</span>
+                <span class="list--writer">{{ items.NICK_NAME ? items.NICK_NAME : items.COMPANY_NAME }}</span>
+                <span class="list--title">{{ items.TITLE }}</span>
+                <span class="list--ml" :class="getStatusClass(items.STATUS)">{{ items.STATUS == '0' ? "답변대기" : "답변완료" }}</span>
+                <span class="list--date">{{ formatDate(items.REGDATE) }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="cs--list" v-else>
+            <div class="no-data">
+              <h4>등록된 문의가 없습니다</h4>
+              <p>새로운 문의를 등록해보세요</p>
+            </div>
+          </div>
+        </div>
+        <div class="item--pagination" v-if="csList.length > 0">
+          <v-pagination
+            v-model="currentPage"
+            :length="Math.ceil(csList.length / itemsPerPage)"
+          ></v-pagination>
         </div>
       </div>
     </div>
+
+    <!-- 문의 등록 팝업 -->
+    <v-dialog v-model="showInquiryModal" max-width="600px" persistent>
+      <v-card class="inquiry-modal">
+        <v-card-title class="modal-header">
+          <h3>문의 등록</h3>
+          <v-btn icon @click="closeModal" class="close-btn">
+            <v-icon>mdi-close</v-icon>
+          </v-btn>
+        </v-card-title>
+
+        <v-card-text class="modal-body">
+          <form @submit.prevent="submitInquiry">
+            <div class="form-group">
+              <label>문의 유형 <span class="required">*</span></label>
+              <v-select
+                v-model="inquiryForm.category"
+                :items="categoryOptions"
+                variant="outlined"
+                placeholder="문의 유형을 선택하세요"
+                class="custom-select"
+                :rules="[v => !!v || '문의 유형을 선택해주세요']"
+              ></v-select>
+            </div>
+
+            <div class="form-group">
+              <label>제목 <span class="required">*</span></label>
+              <v-text-field
+                v-model="inquiryForm.title"
+                variant="outlined"
+                placeholder="문의 제목을 입력하세요"
+                class="custom-input"
+                :rules="[v => !!v || '제목을 입력해주세요']"
+              ></v-text-field>
+            </div>
+
+            <div class="form-group">
+              <label>내용 <span class="required">*</span></label>
+              <v-textarea
+                v-model="inquiryForm.content"
+                variant="outlined"
+                placeholder="문의 내용을 상세히 입력해주세요"
+                rows="6"
+                class="custom-textarea"
+                :rules="[v => !!v || '내용을 입력해주세요']"
+              ></v-textarea>
+            </div>
+
+            <div class="form-group">
+              <label>첨부파일</label>
+              <v-file-input
+                v-model="inquiryForm.attachments"
+                variant="outlined"
+                placeholder="파일을 선택하세요"
+                hide-details=""
+                prepend-icon=""
+                append-inner-icon="mdi-paperclip"
+                class="custom-file-input mb--30"
+                accept="image/*,.pdf,.doc,.docx,.hwp"
+                multiple
+                show-size
+              ></v-file-input>
+              <p class="file-info">* 이미지, PDF, 문서 파일만 업로드 가능 (최대 10MB)</p>
+            </div>
+          </form>
+        </v-card-text>
+
+        <v-card-actions class="modal-footer">
+          <v-btn @click="closeModal" class="cancel-btn">취소</v-btn>
+          <v-btn @click="submitInquiry" class="submit-btn" :loading="isSubmitting">등록하기</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
   </div>
 </template>
 
 <script setup>
 import VueDatePicker from "@vuepic/vue-datepicker";
 import "@vuepic/vue-datepicker/dist/main.css";
-/************************************************************************
+import dayjs from 'dayjs';
+  /************************************************************************
 |    레이아웃
 ************************************************************************/
-definePageMeta({
-  layout: "default",
-});
-
-/************************************************************************
+  definePageMeta({
+    layout: "default",
+  });
+  /************************************************************************
 |   PROPS
  ************************************************************************/
-const props = defineProps({
-  propsData: {
-    type: Object,
-    default: () => {},
-  },
-});
-
-/************************************************************************
+  const props = defineProps({
+    propsData: {
+      type: Object,
+      default: () => {},
+    },
+  });
+  /************************************************************************
 |    스토어
  ************************************************************************/
-const useDtStore = useDetailStore();
-/************************************************************************
+  const useDtStore = useDetailStore();
+  const useAtStore = useAuthStore();
+  /************************************************************************
 |    전역
  ************************************************************************/
-const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
-const router = useRouter();
-const pageId = ref("기업경영구조");
-const pageIdSub = ref();
-const datePickerFormat = "yyyy-MM-dd";
-const form = ref({
-  formValue1: "",
-  formValue2: "",
-  formValue3: "",
-  formValue4: "",
-  formValue5: "",
-  formValue6: "",
-  formValue7: "",
-});
-
-/* eslint-disable */
-/* prettier-ignore */
-
-/************************************************************************
+  const memberType = useAtStore.auth.memberType;
+  const searchModel = ref("");
+  const selectedRange = ref('all');
+  const searchStartDate = ref("");
+  const searchEndDate = ref("");
+  const dateOptions = [
+    { label: '오늘', value: 'today' },
+    { label: '7일', value: '7d' },
+    { label: '1개월', value: '1m' },
+    { label: '3개월', value: '3m' },
+    { label: '전체', value: 'all' },
+  ]
+  const datePickerFormat = "yyyy-MM-dd";
+  const filter = ref("");
+  const filderArr = ref([
+    { title: "전체", value: "" },
+    { title: "제목", value: "title" },
+    { title: "내용", value: "content" },
+    { title: "작성자", value: "writer" }
+  ]);
+  const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
+  const router = useRouter();
+  const pageId = computed(() => {
+    return '고객센터';
+  });
+  const csList = ref([]);
+  const itemsPerPage = 7;
+  const currentPage = ref(1);
+
+  // 문의 등록 팝업 관련
+  const showInquiryModal = ref(false);
+  const isSubmitting = ref(false);
+  const inquiryForm = ref({
+    category: '',
+    title: '',
+    content: '',
+    attachments: []
+  });
+  const categoryOptions = ref([
+    { title: '기능문의', value: 'D' },
+    { title: '기타문의', value: 'E' }
+  ]);
+
+  /* eslint-disable */
+  /* prettier-ignore */
+
+  /************************************************************************
 |    함수(METHODS)
 ************************************************************************/
-const formatNumber = (event, key) => {
-  let formattedInput = "";
-  // 숫자만 남기기
-  const input = event.target.value.replace(/[^0-9.]/g, '');
-  // 3자리마다 쉼표 추가
-  formattedInput = input;
-  if(key == 'formValue1'){
-    formattedInput = new Intl.NumberFormat().format(input);
+
+  const isRecentUpdate = (dateStr) => {
+    const today = new Date();
+    const updateDate = new Date(dateStr);
+    const diffDays = (today - updateDate) / (1000 * 60 * 60 * 24);
+    // 업데이트 날짜가 오늘 날짜 기준 최근 7일인지 확인
+    return diffDays <= 7;
   }
-  // 실시간으로 업데이트
-  form.value[key] = String(formattedInput);
-};
-
-const formatDate = (date) => {
-  const d = new Date(date);
-  const year = d.getFullYear();
-  const month = ("0" + (d.getMonth() + 1)).slice(-2);
-  const day = ("0" + d.getDate()).slice(-2);
-  return `${year}-${month}-${day}`;
-};
-
-const fnUpdate = () => {
-  let wterGet = localStorage.getItem("tempAccess");
-  let _req = {
-    wter: wterGet,
-    shar_count: form.value.formValue1,
-    iss_shar_stan_date: form.value.formValue2,
-    major_shar: form.value.formValue3,
-    corp_inve: form.value.formValue4,
-    fogn_inve: form.value.formValue5,
-    repu_shar: form.value.formValue6,
-    etc_shar: form.value.formValue7,
+
+  const paginatedItems = computed(() => {
+    const start = (currentPage.value - 1) * itemsPerPage;
+    return csList.value.slice(start, start + itemsPerPage);
+  });
+
+  const setDateRange = (range) => {
+    const today = dayjs();
+
+    switch(range) {
+      case 'today' :
+        searchStartDate.value = today.format('YYYY-MM-DD');
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = 'today';
+        break;
+      case '7d':
+        searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = '7d';
+        break;
+      case '1m':
+        searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = '1m';
+        break;
+      case '3m':
+        searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = '3m';
+        break;
+      case 'all':
+        searchStartDate.value = "";
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = 'all';
+        break
+    }
+  }
+
+  const addLocated = () => {
+    showInquiryModal.value = true;
   };
 
-  _req = Object.fromEntries(
-    Object.entries(_req).map(([key, value]) => [
-      key,
-      typeof value === "string"
-        ? value.replace(/,/g, "") // 문자열인 경우에만 replace
-        : value == null
-        ? "" // null 또는 undefined 값은 빈 문자열로 처리
-        : String(value), // 그 외 값은 문자열로 변환
-    ])
-  );
-
-  console.error(_req);
-
-  useAxios()
-    .post("/bm/ins", _req)
-    .then((res) => {
-      window.location.reload();
-    })
-    .catch((error) => {});
-};
-
-const fnDetail = () => {
-  let _req = {};
-
-  useAxios()
-    .post("/bm/detail", _req)
-    .then((res) => {
-      console.error(res.data);
-      // const formattedData = Object.fromEntries(
-      //   Object.entries(res.data).map(([key, value]) => {
-      //     let formattedValue = null;
-      //     // 연도는 쉼표 제거, 금액은 쉼표 추가
-      //     if(key !== shar_count){
-      //       formattedValue = !isNaN(value)
-      //       ? new Intl.NumberFormat().format(Number(value))
-      //       : value;
-      //     } else {
-      //       formattedValue = value;
-      //     }
-      //     return [key, formattedValue];
-      //   })
-      // );
-      // res.data = formattedData;
-      // console.error(formattedData)
-
-      form.value.formValue1 = new Intl.NumberFormat().format(res.data.shar_count);
-
-      form.value.formValue2 = res.data.iss_shar_stan_date;
-      form.value.formValue3 = res.data.major_shar; //최대주주
-      form.value.formValue4 = res.data.corp_inve; //기관
-      form.value.formValue5 = res.data.fogn_inve; //외국인
-      form.value.formValue6 = res.data.repu_shar; //자사주
-      form.value.formValue7 = res.data.etc_shar; //기타
-    })
-    .catch((error) => {});
-};
-
-const fnUpdEvt = () => {
-  let param = {
-    id: pageId,
-    title: "기업경영구조 저장",
-    content: "저장하시겠습니까?",
-    yes: {
-      text: "저장",
-      isProc: true,
-      event: "FN_UPDATE",
-      param: "",
-    },
-    no: {
-      text: "취소",
-      isProc: false,
-    },
+  const toItemDetail = (__EVENT) => {
+    router.push({
+      path: "/view/common/cs/detail",
+    });
+    useDtStore.boardInfo.seq = __EVENT;
   };
-  $eventBus.emit("OPEN_CONFIRM_POP_UP", param);
-};
 
-$eventBus.off("FN_UPDATE");
-$eventBus.on("FN_UPDATE", () => {
-  fnUpdate();
-});
+  const csListGet = async () => {
+    let _req = {
+      USER_SEQ : useAtStore.auth.seq,
+      keyword: '',
+      filter: '',
+      startDate: '',
+      endDate: ''
+    };
+    if(useAtStore.auth.seq == 2){
+      _req.USER_SEQ = 0;
+    }
+
+    await useAxios()
+      .post("/cs/list", _req)
+      .then((res) => {
+        csList.value = res.data;
+      });
+  };
+
+  const fnSearch = (__KEYWORD, __FILTER) => {
+    let _req = {
+      USER_SEQ: useAtStore.auth.seq,
+      filter: __FILTER,
+      keyword: __KEYWORD,
+      startDate: searchStartDate.value ? dayjs(searchStartDate.value).format('YYYY-MM-DD') : '',
+      endDate: searchEndDate.value ? dayjs(searchEndDate.value).format('YYYY-MM-DD') : ''
+    };
+
+    // 관리자인 경우 모든 문의 조회
+    if(useAtStore.auth.seq == 2){
+      _req.USER_SEQ = 0;
+    }
+
+    useAxios()
+      .post("/cs/search", _req)
+      .then((res) => {
+        csList.value = res.data;
+        currentPage.value = 1; // 검색 후 첫 페이지로 이동
+      })
+      .catch((error) => {
+        console.error('검색 실패:', error);
+        $toast.error('검색에 실패했습니다.');
+      });
+  };
+
+
+  const goToDeliveryDetail = (item) => {
+    // 제품 정보를 스토어에 저장
+    useDtStore.boardInfo.seq = item.SEQ;
+    useDtStore.boardInfo.pageType = "D";
+    
+    // 배송 관리 페이지로 이동
+    router.push({
+      path: "/view/common/deli/detail",
+      query: {
+        itemId: item.SEQ,
+        itemName: item.NAME,
+        price1: item.PRICE1,
+        price2: item.PRICE2 || item.PRICE1,
+        thumbFile: item.THUMB_FILE || ''
+      }
+    });
+  };
+
+  const getStatusClass = (status) => {
+    switch(status) {
+      case '0':
+        return 'status-waiting';
+      case '1':
+        return 'status-completed';
+    }
+  };
+
+  const formatDate = (dateStr) => {
+    if (!dateStr) return '';
+    const date = new Date(dateStr);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}.${month}.${day}`;
+  };
+
+  // 팝업 관련 함수들
+  const closeModal = () => {
+    showInquiryModal.value = false;
+    resetForm();
+  };
+
+  const resetForm = () => {
+    inquiryForm.value = {
+      category: '',
+      title: '',
+      content: '',
+      attachments: []
+    };
+  };
 
-/************************************************************************
+  const submitInquiry = async () => {
+    // 폼 유효성 검사
+    if (!inquiryForm.value.category) {
+      $toast.error('문의 유형을 선택해주세요.');
+      return;
+    }
+    if (!inquiryForm.value.title) {
+      $toast.error('제목을 입력해주세요.');
+      return;
+    }
+    if (!inquiryForm.value.content) {
+      $toast.error('내용을 입력해주세요.');
+      return;
+    }
+
+    isSubmitting.value = true;
+    
+    try {
+      const formData = new FormData();
+      formData.append('USER_SEQ', useAtStore.auth.seq);
+      formData.append('CATEGORY', inquiryForm.value.category);
+      formData.append('TITLE', inquiryForm.value.title);
+      formData.append('CONTENT', inquiryForm.value.content);
+      
+      // 첨부파일 처리
+      if (inquiryForm.value.attachments && inquiryForm.value.attachments.length > 0) {
+        inquiryForm.value.attachments.forEach((file, index) => {
+          formData.append(`files[${index}]`, file);
+        });
+      }
+
+      await useAxios()
+        .post("/cs/reg", formData, {
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        })
+        .then((res) => {
+          if (res.data.success) {
+            $toast.success('문의가 성공적으로 등록되었습니다.');
+            closeModal();
+            csListGet(); // 목록 새로고침
+          } else {
+            $toast.error('문의 등록에 실패했습니다.');
+          }
+        });
+    } catch (error) {
+      $toast.error('문의 등록 중 오류가 발생했습니다.');
+      console.error('Error submitting inquiry:', error);
+    } finally {
+      isSubmitting.value = false;
+    }
+  };
+
+  /************************************************************************
 |    WATCH
 ************************************************************************/
-watch(
-  () => form.value.formValue2,
-  (newVal) => {
-    if (newVal) {
-      form.value.formValue2 = formatDate(newVal);
-    }
-  }
-);
+  onMounted(() => {
+    csListGet();
 
-onMounted(() => {
-  fnDetail();
-});
-</script>
+    // 날짜 초기화
+    const today = dayjs();
+    searchEndDate.value = today.format('YYYY-MM-DD');
+  });
+</script>

+ 106 - 3
pages/view/common/deli/delivered.vue

@@ -49,6 +49,17 @@
               week-start="0"
             ></VueDatePicker>
           </div>
+          <div class="month--selector">
+            <v-btn
+              v-for="option in dateOptions"
+              :key="option.value"
+              :class="{ actv: selectedRange === option.value }"
+              @click="setDateRange(option.value)"
+              elevation="0"
+            >
+              {{ option.label }}
+            </v-btn>
+          </div>
         </div>
       </div>
       <v-btn
@@ -59,11 +70,34 @@
     </div>
 
     <div class="data--list--wrap">
+      <div class="btn--actions--wrap">
+        <div class="left--sections">
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-pink' : 'btn-white'" @click="itemType = 'E'"
+            ><i class="ico"></i>개별 배송</v-btn
+          >
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-white' : 'btn-pink'" @click="itemType = 'G'"
+            ><i class="ico"></i>공동구매 배송</v-btn
+          >
+        </div>
+        <div class="right--sections">
+          <!-- <div class="status-filter">
+            <v-select
+              v-model="statusFilter"
+              :items="statusOptions"
+              variant="outlined"
+              class="custom-select mini"
+              style="width: 120px; margin-right: 8px;"
+              @update:modelValue="applyStatusFilter"
+            >
+            </v-select>
+          </div> -->
+        </div>
+      </div>
       <div class="btn--actions--wrap">
         <div class="left--sections">
           <v-btn 
             v-if="memberType === 'VENDOR'"
-            class="custom-btn btn-green mini"
+            class="custom-btn btn-blue mini"
             @click="markAsSettled"
             :disabled="selectedItems.length === 0"
           >
@@ -121,12 +155,21 @@ const props = defineProps({
 const useDtStore = useDetailStore();
 const useAtStore = useAuthStore();
 
+const itemType = ref("E");
 const memberType = useAtStore.auth.memberType;
 const memberSeq = useAtStore.auth.seq;
 const searchModel = ref("");
+const selectedRange = ref('all');
 const searchStartDate = ref("");
 const searchEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
+const dateOptions = [
+  { label: '오늘', value: 'today' },
+  { label: '7일', value: '7d' },
+  { label: '1개월', value: '1m' },
+  { label: '3개월', value: '3m' },
+  { label: '전체', value: 'all' },
+]
 const filter = ref("");
 const filderArr = ref([
   { title: "전체", value: "" },
@@ -239,6 +282,7 @@ const gridOptions = {
   rowHeight: rowHeightPx,
   pagination: true,
   suppressPaginationPanel: true,
+  rowMultiSelectWithClick: true,
   ...(memberType === 'VENDOR' ? {
     rowSelection: {
       checkboxes: true,
@@ -249,6 +293,38 @@ const gridOptions = {
   } : {}),
 };
 
+const setDateRange = (range) => {
+  const today = dayjs();
+
+  switch(range) {
+    case 'today' :
+      searchStartDate.value = today.format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'today';
+      break;
+    case '7d':
+      searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '7d';
+      break;
+    case '1m':
+      searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '1m';
+      break;
+    case '3m':
+      searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '3m';
+      break;
+    case 'all':
+      searchStartDate.value = "";
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'all';
+      break
+  }
+}
+
 const onGridReady = (__PARAMS) => {
   gridApi.value = __PARAMS.api;
 };
@@ -266,7 +342,8 @@ const chgPage = (__PAGE) => {
 
 const getDeliveredList = async () => {
   let _req = {
-    MEMBER_TYPE: memberType
+    MEMBER_TYPE: memberType,
+    TYPE: itemType.value
   };
 
   if (memberType === "INFLUENCER") {
@@ -305,6 +382,29 @@ const fnSearch = (__KEYWORD, __FILTER) => {
       }
     });
   }
+
+  // 날짜 범위 검색 적용 (배송완료일 기준)
+  if (searchStartDate.value || searchEndDate.value) {
+    filteredData = filteredData.filter(item => {
+      if (!item.DELIVERED_DATE) return false;
+      
+      const deliveredDate = dayjs(item.DELIVERED_DATE).format('YYYY-MM-DD');
+      
+      // 시작날짜와 끝날짜가 모두 있는 경우
+      if (searchStartDate.value && searchEndDate.value) {
+        const startDate = dayjs(searchStartDate.value).format('YYYY-MM-DD');
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate >= startDate && deliveredDate <= endDate;
+      }
+      // 끝날짜만 있는 경우
+      else if (searchEndDate.value) {
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate <= endDate;
+      }
+      
+      return true;
+    });
+  }
   
   if (gridApi.value) {
     gridApi.value.setGridOption('rowData', filteredData);
@@ -331,12 +431,15 @@ const markAsSettled = async () => {
     });
 };
 
+watch(itemType, () => {
+  getDeliveredList();
+});
+
 onMounted(() => {
   getDeliveredList();
   
   // 날짜 초기화
   const today = dayjs();
-  searchStartDate.value = today.subtract(30, 'day').format('YYYY-MM-DD');
   searchEndDate.value = today.format('YYYY-MM-DD');
 });
 </script>

+ 21 - 12
pages/view/common/deli/detail.vue

@@ -8,15 +8,6 @@
       </div>
     </div>
     <div class="data--list--wrap">
-      <div class="btn--actions--wrap">
-        <div class="left--sections">
-          <v-btn class="custom-btn btn-pink bdrs--10"><i class="ico"></i>개별 배송</v-btn>
-          <v-btn class="custom-btn bdrs--10 btn-white" @click="deliLocated()"
-            ><i class="ico"></i>공동구매 배송</v-btn
-          >
-        </div>
-        <div class="right--sections"></div>
-      </div>
       <div class="item--section">
         <div v-if="imgTemp" class="item--thumb">
           <img :src="imgTemp" alt="" />
@@ -26,6 +17,20 @@
           <h2>{{ form.formValue1 }}</h2>
           <p>공급가: {{ Number(form.formValue2).toLocaleString() }}원</p>
           <p>판매가: {{ Number(form.formValue3).toLocaleString() }}원</p>
+          <p v-if="itemType == 'G'">공동구매 기간<br>
+            {{ form.order_start_date }} ~ {{ form.order_end_date }}</p>
+          <p v-if="form.order_link">
+            공동구매 링크: 
+            <a  
+            :href="form.order_link" 
+            target="_blank" 
+            rel="noopener noreferrer"
+            class="order-link"
+            >
+            {{ form.order_link }}
+            <v-icon size="small" class="ml-1">mdi-open-in-new</v-icon>
+            </a>
+          </p>
         </div>
       </div>
       <div class="btn--actions--wrap">
@@ -105,9 +110,9 @@
 
 <script setup>
   import "@vuepic/vue-datepicker/dist/main.css";
-  import { AgGridVue } from "ag-grid-vue3";
-  import * as XLSX from "xlsx";
-  import pagination from "../components/common/pagination.vue";
+import { AgGridVue } from "ag-grid-vue3";
+import * as XLSX from "xlsx";
+import pagination from "../components/common/pagination.vue";
   /************************************************************************
 |    레이아웃
 ************************************************************************/
@@ -1049,12 +1054,16 @@
         form.value.formValue8 = res.data.STATUS;
         form.value.formValue9 = res.data.SHOW_YN;
         form.value.formValue10 = res.data.ADD_INFO;
+        form.value.order_link = res.data.ORDER_LINK;
+        form.value.order_start_date = res.data.ORDER_START_DATE ? res.data.ORDER_START_DATE.slice(0, 10) : '';
+        form.value.order_end_date = res.data.ORDER_END_DATE ? res.data.ORDER_END_DATE.slice(0, 10) : '';
         //썸네일 파일이 있으면 넣어줌
         if (form.value.formValue5) {
           imgTemp.value = `https://shopdeli.mycafe24.com/writable/uploads/item/thumb/${form.value.formValue5}`;
         }
       })
       .catch((error) => {
+        console.error('제품 상세 정보 로드 오류:', error);
         $toast.error("제품 정보를 불러오는 중 오류가 발생했습니다.");
       })
       .finally(() => {});

+ 22 - 30
pages/view/common/deli/index.vue

@@ -72,10 +72,10 @@
     <div class="data--list--wrap">
       <div class="btn--actions--wrap">
         <div class="left--sections">
-          <v-btn class="custom-btn btn-pink bdrs--10"
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-pink' : 'btn-white'" @click="itemType = 'E'"
             ><i class="ico"></i>개별 배송</v-btn
           >
-          <v-btn class="custom-btn bdrs--10 btn-white" @click="deliLocated()"
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-white' : 'btn-pink'" @click="itemType = 'G'"
             ><i class="ico"></i>공동구매 배송</v-btn
           >
         </div>
@@ -148,11 +148,11 @@ import pagination from "../components/common/pagination.vue";
   /************************************************************************
    |    전역
    ************************************************************************/
+  const itemType = ref("E");
   const memberType = useAtStore.auth.memberType;
   const memberSeq = useAtStore.auth.seq;
   const searchModel = ref("");
   const selectedRange = ref('all');
-  const itemStartDate = ref("");
   const searchStartDate = ref("");
   const searchEndDate = ref("");
   const datePickerFormat = "yyyy-MM-dd";
@@ -299,12 +299,6 @@ import pagination from "../components/common/pagination.vue";
   /************************************************************************
 |    함수(METHODS)
 ************************************************************************/
-  const deliLocated = () => {
-    router.push({
-      path: "/view/common/deli/index2",
-    });
-  };
-
   const setDateRange = (range) => {
     const today = dayjs();
 
@@ -330,7 +324,7 @@ import pagination from "../components/common/pagination.vue";
         selectedRange.value = '3m';
         break;
       case 'all':
-        searchStartDate.value = itemStartDate.value;
+        searchStartDate.value = "";
         searchEndDate.value = today.format('YYYY-MM-DD');
         selectedRange.value = 'all';
         break
@@ -351,16 +345,19 @@ import pagination from "../components/common/pagination.vue";
       path: "/view/common/deli/detail",
     });
     useDtStore.boardInfo.seq = __EVENT.data.SEQ;
+    useDtStore.boardInfo.itemType = itemType.value;
   };
 
   const itemListGet = async () => {
     let _req = {
       MEMBER_TYPE: memberType,
-      TYPE: "E"
+      TYPE: itemType.value,
+      INF_SEQ: "",
     };
 
     if (memberType === "INFLUENCER") {
       _req.INF_SEQ = memberSeq;
+      
     } else if (memberType === "VENDOR") {
       _req.COMPANY_NUMBER = useAtStore.auth.companyNumber || "1";
     }
@@ -370,12 +367,6 @@ import pagination from "../components/common/pagination.vue";
       .then((res) => {
         originalTblItems.value = res.data;
         applyStatusFilter();
-
-        if (res.data.length > 0) {
-          itemStartDate.value = res.data[res.data.length-1].UDPDATE;
-          searchStartDate.value = itemStartDate.value;
-          searchEndDate.value = dayjs();
-        }
       });
   };
 
@@ -383,13 +374,14 @@ import pagination from "../components/common/pagination.vue";
     let _req = {
       filter: __FILTER,
       keyword: __KEYWORD,
-      startDate: searchStartDate.value,
-      endDate: searchEndDate.value,
-      TYPE: "E"
+      startDate: searchStartDate.value ? dayjs(searchStartDate.value).format('YYYY-MM-DD') : '',
+      endDate: searchEndDate.value ? dayjs(searchEndDate.value).format('YYYY-MM-DD') : '',
+      TYPE: itemType.value,
+      COMPANY_NUMBER: useAtStore.auth.companyNumber || "1",
     };
 
     useAxios()
-      .post("/item/search", _req)
+      .post("/deli/search", _req)
       .then((res) => {
         originalTblItems.value = res.data;
         applyStatusFilter();
@@ -421,17 +413,12 @@ import pagination from "../components/common/pagination.vue";
   /************************************************************************
 |    WATCH
 ************************************************************************/
-
-  watch(
-    () => props,
-    () => {
-      searchObj.value = props.propsData;
-      fnGetStat();
-    },
-    { deep: true }
-  );
+  watch(itemType, () => {
+    itemListGet();
+  });
 
   onMounted(() => {
+    //itemType.value = useDtStore.boardInfo.itemType || 'E';
     itemListGet();
     
     // 업로드 상태 확인 및 사용자 피드백
@@ -449,7 +436,12 @@ import pagination from "../components/common/pagination.vue";
     // 실시간 이벤트 리스너 등록
     $eventBus.on('DELIVERY_STATUS_CHANGED', handleDeliveryStatusChange);
     $eventBus.on('NEW_ORDER_RECEIVED', handleNewOrderReceived);
+
+    // 날짜 초기화
+    const today = dayjs();
+    searchEndDate.value = today.format('YYYY-MM-DD');
   });
+  
 
   onUnmounted(() => {
     // 이벤트 리스너 제거

+ 0 - 500
pages/view/common/deli/index2.vue

@@ -1,500 +0,0 @@
-<template>
-  <div>
-    <div class="inner--headers">
-      <h2>{{ pageId }}</h2>
-      <div class="bread--crumbs--wrap">
-        <span>홈</span>
-        <span>{{ pageId }}</span>
-      </div>
-    </div>
-
-    <div class="search--modules type2">
-      <div class="search--inner">
-        <div class="form--cont--filter">
-          <v-select
-            v-model="filter"
-            :items="filderArr"
-            variant="outlined"
-            class="custom-select"
-          >
-          </v-select>
-        </div>
-        <div class="form--cont--text">
-          <v-text-field
-            v-model="searchModel"
-            class="custom-input mini"
-            style="width: 100%"
-            placeholder="검색어를 입력하세요"
-          ></v-text-field>
-        </div>
-      </div>
-      <div class="search--inner">
-        <div class="calendar-wrap ml--0">
-          <div class="calendar">
-            <VueDatePicker
-              :format="datePickerFormat"
-              v-model="searchStartDate"
-              placeholder="날짜를 선택하세요"
-              :auto-apply="true"
-              week-start="0"
-            ></VueDatePicker>
-          </div>
-          <span class="text">~</span>
-          <div class="calendar">
-            <VueDatePicker
-              v-model="searchEndDate"
-              :format="datePickerFormat"
-              placeholder="날짜를 선택하세요"
-              :auto-apply="true"
-              week-start="0"
-            ></VueDatePicker>
-          </div>
-          <div class="month--selector">
-            <v-btn
-              v-for="option in dateOptions"
-              :key="option.value"
-              :class="{ actv: selectedRange === option.value }"
-              @click="setDateRange(option.value)"
-              elevation="0"
-            >
-              {{ option.label }}
-            </v-btn>
-          </div>
-        </div>
-      </div>
-      <v-btn
-        class="custom-btn btn-blue mini sch--btn"
-        @click="fnSearch(searchModel, filter)"
-        >검색</v-btn
-      >
-    </div>
-
-    <div class="data--list--wrap">
-      <div class="btn--actions--wrap">
-        <div class="left--sections">
-          <v-btn class="custom-btn btn-white bdrs--10" @click="deliLocated()"
-            ><i class="ico"></i>개별 배송</v-btn
-          >
-          <v-btn class="custom-btn bdrs--10 btn-pink"
-            ><i class="ico"></i>공동구매 배송</v-btn
-          >
-        </div>
-        <div class="right--sections">
-          <div class="status-filter">
-            <v-select
-              v-model="statusFilter"
-              :items="statusOptions"
-              variant="outlined"
-              class="custom-select mini"
-              style="width: 120px; margin-right: 8px;"
-              @update:modelValue="applyStatusFilter"
-            >
-            </v-select>
-          </div>
-        </div>
-      </div>
-      <div class="tbl-wrapper">
-        <div class="tbl-wrap">
-          <!-- ag grid -->
-          <ag-grid-vue
-            style="width: 100%; height: calc(10 * 2.94rem)"
-            class="ag-theme-quartz"
-            :gridOptions="gridOptions"
-            :rowData="tblItems"
-            rowSelection="multiple"
-            :paginationPageSize="pageObj.pageSize"
-            :suppressPaginationPanel="true"
-            @grid-ready="onGridReady"
-            @rowClicked="detailLocated"
-          >
-          </ag-grid-vue>
-
-          <!-- 페이징 -->
-          <div class="ag-grid-custom-pagenations">
-            <pagination @chg_page="chgPage" :pageObj="pageObj"></pagination>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import VueDatePicker from "@vuepic/vue-datepicker";
-import "@vuepic/vue-datepicker/dist/main.css";
-import { AgGridVue } from "ag-grid-vue3";
-import dayjs from 'dayjs';
-import pagination from "../components/common/pagination.vue";
-  /************************************************************************
-|    레이아웃
-************************************************************************/
-  definePageMeta({
-    layout: "default",
-  });
-  /************************************************************************
-|   PROPS
- ************************************************************************/
-  const props = defineProps({
-    propsData: {
-      type: Object,
-      default: () => {},
-    },
-  });
-  /************************************************************************
-|    스토어
- ************************************************************************/
-  const useDtStore = useDetailStore();
-  const useAtStore = useAuthStore();
-  /************************************************************************
-   |    전역
-   ************************************************************************/
-  const memberType = useAtStore.auth.memberType;
-  const memberSeq = useAtStore.auth.seq;
-  const searchModel = ref("");
-  const selectedRange = ref('all');
-  const itemStartDate = ref("");
-  const searchStartDate = ref("");
-  const searchEndDate = ref("");
-  const datePickerFormat = "yyyy-MM-dd";
-  const dateOptions = [
-    { label: '오늘', value: 'today' },
-    { label: '7일', value: '7d' },
-    { label: '1개월', value: '1m' },
-    { label: '3개월', value: '3m' },
-    { label: '전체', value: 'all' },
-  ]
-  const filter = ref("");
-  const filderArr = ref([
-    { title: "전체", value: "" },
-    { title: "제품명", value: "name" },
-  ]);
-  const statusFilter = ref("ALL");
-  const statusOptions = ref([
-    { title: "전체", value: "ALL" },
-    { title: "신규", value: "NEW" },
-    { title: "대기", value: "PENDING" },
-    { title: "완료", value: "COMPLETE" }
-  ]);
-  const originalTblItems = ref([]); // 원본 데이터 저장용
-  const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
-  const router = useRouter();
-  const pageId = ref("배송 관리");
-  let pageObj = ref({
-    page: 1, // 현재 페이지
-    pageMaxNumSize: 10, // 페이지 숫자 최대 표현 개수
-    pageSize: 10, // 테이블 조회 데이터 개수
-    totalCnt: 0, // 전체 페이지
-  });
-  const tblItems = ref([]); // stat 데이터
-
-  /* eslint-disable */
-  /* prettier-ignore */
-
-  pageObj.value.totalCnt = tblItems.value.length;
-
-  const remToPx = () => parseFloat(getComputedStyle(document.documentElement).fontSize);
-  const rowHeightRem = 2.65; // 원하는 rem 값
-  const rowHeightPx = rowHeightRem * remToPx();
-  const gridApi = shallowRef();
-
-  // gridOption
-  const gridOptions = {
-    columnDefs: [
-      //{ checkboxSelection: true, headerCheckboxSelection: true, width: 0 },
-      {
-        headerName: "No",
-        valueGetter: (params) => params.api.getDisplayedRowCount() - params.node.rowIndex,
-        sortable: false,
-        width: 70,
-      },
-      // { headerName: "번호", field: "NO", sortable: false },
-      {
-        headerName: "제품명",
-        field: "NAME",
-        //sortable: useAuthStore().getCompanyId == "0-000000" ? true : false,
-        cellRenderer: (params) => {
-          const status = params.data.status || 'NEW';
-          const productName = params.value || '';
-          const isVendor = memberType !== 'INFLUENCER';
-          
-          if (isVendor && status === 'NEW') {
-            return `
-              <div style="display: flex; align-items: center; gap: 8px; justify-content: space-between; width: 100%;">
-                <span style="flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">${productName}</span>
-                <span class="custom-new-badge" style="
-                  background: #f44336 !important;
-                  color: white;
-                  font-size: 10px;
-                  padding: 2px 6px;
-                  border-radius: 12px;
-                  min-width: 30px;
-                  height: 18px;
-                  display: inline-flex;
-                  align-items: center;
-                  justify-content: center;
-                  font-weight: bold;
-                  flex-shrink: 0;
-                ">NEW</span>
-              </div>
-            `;
-          }
-          return productName;
-        }
-      },
-      {
-        headerName: "제품 총수량",
-        field: "sum_qty",
-        width: 140,
-        cellRenderer: (params) => {
-          return Number(params.value).toLocaleString();
-        },
-      },
-      {
-        headerName: "총 주문금액",
-        field: "sum_total",
-        width: 140,
-        cellRenderer: (params) => {
-          return Number(params.value).toLocaleString();
-        },
-      },
-      {
-        headerName: "주문일",
-        field: "latest_reg_date",
-        width: 140,
-      },
-      {
-        headerName: "상태",
-        field: "status",
-        width: 120,
-        cellRenderer: (params) => {
-          const status = params.value || 'NEW';
-          const statusMap = {
-            'NEW': { text: '신규', color: 'primary', variant: 'elevated' },
-            'PENDING': { text: '대기', color: 'warning', variant: 'elevated' },
-            'COMPLETE': { text: '완료', color: 'success', variant: 'elevated' }
-          };
-          const config = statusMap[status] || statusMap['NEW'];
-          
-          return `<span class="v-chip v-chip--density-default v-chip--size-default v-chip--variant-${config.variant} bg-${config.color}" style="font-size: 12px; padding: 4px 8px;">${config.text}</span>`;
-        }
-      },
-    ],
-    rowData: tblItems.value, // 테이블 데이터
-    autoSizeStrategy: {
-      type: "fitGridWidth", // width맞춤
-    },
-    suppressMovableColumns: true,
-    headerHeight: rowHeightPx,
-    rowHeight: rowHeightPx,
-    pagination: true,
-    suppressPaginationPanel: true, // 하단 default 페이징 컨트롤 숨김
-    //rowSelection: {
-    // checkboxes: true,
-    // headerCheckbox: true,
-    // enableClickSelection: false,
-    // mode: "multiRow",
-    //},
-  };
-
-  /************************************************************************
-|    함수(METHODS)
-************************************************************************/
-  const deliLocated = () => {
-    router.push({
-      path: "/view/common/deli",
-    });
-  };
-
-  const setDateRange = (range) => {
-    const today = dayjs();
-
-    switch(range) {
-      case 'today' :
-        searchStartDate.value = today.format('YYYY-MM-DD');
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = 'today';
-        break;
-      case '7d':
-        searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = '7d';
-        break;
-      case '1m':
-        searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = '1m';
-        break;
-      case '3m':
-        searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = '3m';
-        break;
-      case 'all':
-        searchStartDate.value = itemStartDate.value;
-        searchEndDate.value = today.format('YYYY-MM-DD');
-        selectedRange.value = 'all';
-        break
-    }
-  }
-
-  const onGridReady = (__PARAMS) => {
-    gridApi.value = __PARAMS.api;
-  };
-
-  const chgPage = (__PAGE) => {
-    pageObj.value.page = __PAGE;
-    gridApi.value.paginationGoToPage(__PAGE - 1);
-  };
-
-  const detailLocated = (__EVENT) => {
-    router.push({
-      path: "/view/common/deli/detail",
-    });
-    useDtStore.boardInfo.seq = __EVENT.data.SEQ;
-  };
-
-  const itemListGet = async () => {
-    let _req = {
-      MEMBER_TYPE: memberType,
-      TYPE: "G",
-    };
-
-    if (memberType === "INFLUENCER") {
-      _req.INF_SEQ = memberSeq;
-    } else if (memberType === "VENDOR") {
-      _req.COMPANY_NUMBER = useAtStore.auth.companyNumber || "1";
-    }
-
-    useAxios()
-      .post("/deli/itemlist", _req)
-      .then((res) => {
-        originalTblItems.value = res.data;
-        applyStatusFilter();
-
-        if (res.data.length > 0) {
-          itemStartDate.value = res.data[res.data.length-1].UDPDATE;
-          searchStartDate.value = itemStartDate.value;
-          searchEndDate.value = dayjs();
-        }
-      });
-  };
-
-  const fnSearch = (__KEYWORD, __FILTER) => {
-    let _req = {
-      filter: __FILTER,
-      keyword: __KEYWORD,
-      startDate: searchStartDate.value,
-      endDate: searchEndDate.value,
-    };
-
-    useAxios()
-      .post("/item/search", _req)
-      .then((res) => {
-        originalTblItems.value = res.data;
-        applyStatusFilter();
-      })
-      .catch((error) => {});
-  };
-
-  const applyStatusFilter = () => {
-    let filteredData = originalTblItems.value;
-    
-    if (statusFilter.value !== "ALL") {
-      filteredData = originalTblItems.value.filter(item => {
-        const itemStatus = item.status || 'NEW';
-        return itemStatus === statusFilter.value;
-      });
-    }
-    
-    tblItems.value = filteredData;
-    pageObj.value.totalCnt = tblItems.value.length;
-    
-    // ag-grid 데이터 갱신
-    if (gridApi.value) {
-      gridApi.value.setGridOption('rowData', tblItems.value);
-    }
-  };
-  /************************************************************************
-|    팝업 이벤트버스 정의
-************************************************************************/
-  /************************************************************************
-|    WATCH
-************************************************************************/
-
-  watch(
-    () => props,
-    () => {
-      searchObj.value = props.propsData;
-      fnGetStat();
-    },
-    { deep: true }
-  );
-
-  onMounted(() => {
-    itemListGet();
-    
-    // 업로드 상태 확인 및 사용자 피드백
-    const route = useRoute();
-    if (route.query.uploadStatus === 'success') {
-      const recordCount = route.query.recordCount || '0';
-      const itemId = route.query.itemId;
-      
-      $toast.success(`송장 정보가 성공적으로 등록되었습니다. (${recordCount}건)`);
-      
-      // URL에서 쿼리 파라미터 제거
-      router.replace({ path: '/view/common/deli' });
-    }
-
-    // 실시간 이벤트 리스너 등록
-    $eventBus.on('DELIVERY_STATUS_CHANGED', handleDeliveryStatusChange);
-    $eventBus.on('NEW_ORDER_RECEIVED', handleNewOrderReceived);
-  });
-
-  onUnmounted(() => {
-    // 이벤트 리스너 제거
-    $eventBus.off('DELIVERY_STATUS_CHANGED', handleDeliveryStatusChange);
-    $eventBus.off('NEW_ORDER_RECEIVED', handleNewOrderReceived);
-  });
-
-  const handleDeliveryStatusChange = (data) => {
-    // 해당 아이템의 상태 업데이트
-    const itemIndex = originalTblItems.value.findIndex(item => item.SEQ == data.itemId);
-    if (itemIndex !== -1) {
-      originalTblItems.value[itemIndex].status = data.status;
-      
-      // 필터 재적용
-      applyStatusFilter();
-      
-      console.log('배송 상태 업데이트됨:', data);
-    }
-  };
-
-  const handleNewOrderReceived = (data) => {
-    // 새 주문 데이터를 리스트에 추가
-    const newOrder = {
-      SEQ: data.itemId,
-      NAME: data.itemName,
-      sum_qty: data.totalQty || 0,
-      sum_total: data.totalAmount || 0,
-      latest_reg_date: data.orderDate,
-      status: 'NEW'
-    };
-    
-    originalTblItems.value.unshift(newOrder);
-    applyStatusFilter();
-    
-    console.log('새 주문 추가됨:', data);
-  };
-</script>
-
-<style scoped>
-.status-filter {
-  display: flex;
-  align-items: center;
-}
-
-.btn--actions--wrap .right--sections {
-  display: flex;
-  align-items: center;
-}
-</style>

+ 108 - 2
pages/view/common/deli/shipping.vue

@@ -49,6 +49,17 @@
               week-start="0"
             ></VueDatePicker>
           </div>
+          <div class="month--selector">
+            <v-btn
+              v-for="option in dateOptions"
+              :key="option.value"
+              :class="{ actv: selectedRange === option.value }"
+              @click="setDateRange(option.value)"
+              elevation="0"
+            >
+              {{ option.label }}
+            </v-btn>
+          </div>
         </div>
       </div>
       <v-btn
@@ -59,6 +70,29 @@
     </div>
 
     <div class="data--list--wrap">
+      <div class="btn--actions--wrap">
+        <div class="left--sections">
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-pink' : 'btn-white'" @click="itemType = 'E'"
+            ><i class="ico"></i>개별 배송</v-btn
+          >
+          <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-white' : 'btn-pink'" @click="itemType = 'G'"
+            ><i class="ico"></i>공동구매 배송</v-btn
+          >
+        </div>
+        <div class="right--sections">
+          <!-- <div class="status-filter">
+            <v-select
+              v-model="statusFilter"
+              :items="statusOptions"
+              variant="outlined"
+              class="custom-select mini"
+              style="width: 120px; margin-right: 8px;"
+              @update:modelValue="applyStatusFilter"
+            >
+            </v-select>
+          </div> -->
+        </div>
+      </div>
       <div class="btn--actions--wrap">
         <div class="left--sections">
           <v-btn 
@@ -121,12 +155,21 @@ const props = defineProps({
 const useDtStore = useDetailStore();
 const useAtStore = useAuthStore();
 
+const itemType = ref("E");
 const memberType = useAtStore.auth.memberType;
 const memberSeq = useAtStore.auth.seq;
 const searchModel = ref("");
+const selectedRange = ref('all');
 const searchStartDate = ref("");
 const searchEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
+const dateOptions = [
+  { label: '오늘', value: 'today' },
+  { label: '7일', value: '7d' },
+  { label: '1개월', value: '1m' },
+  { label: '3개월', value: '3m' },
+  { label: '전체', value: 'all' },
+]
 const filter = ref("");
 const filderArr = ref([
   { title: "전체", value: "" },
@@ -223,6 +266,7 @@ const gridOptions = {
   headerHeight: rowHeightPx,
   rowHeight: rowHeightPx,
   pagination: true,
+  rowMultiSelectWithClick: true,
   suppressPaginationPanel: true,
   ...(memberType === 'VENDOR' ? {
     rowSelection: {
@@ -234,6 +278,39 @@ const gridOptions = {
   } : {}),
 };
 
+const setDateRange = (range) => {
+  const today = dayjs();
+
+  switch(range) {
+    case 'today' :
+      searchStartDate.value = today.format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'today';
+      break;
+    case '7d':
+      searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '7d';
+      break;
+    case '1m':
+      searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '1m';
+      break;
+    case '3m':
+      searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '3m';
+      break;
+    case 'all':
+      searchStartDate.value = '';
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'all';
+      break
+  }
+}
+
+
 const onGridReady = (__PARAMS) => {
   gridApi.value = __PARAMS.api;
 };
@@ -251,7 +328,8 @@ const chgPage = (__PAGE) => {
 
 const getShippingList = async () => {
   let _req = {
-    MEMBER_TYPE: memberType
+    MEMBER_TYPE: memberType,
+    TYPE: itemType.value,
   };
 
   if (memberType === "INFLUENCER") {
@@ -300,11 +378,35 @@ const fnSearch = (__KEYWORD, __FILTER) => {
     });
   }
   
+  // 날짜 범위 검색 적용 (배송시작일 기준)
+  if (searchStartDate.value || searchEndDate.value) {
+    filteredData = filteredData.filter(item => {
+      if (!item.SHIPPING_DATE) return false;
+      
+      const shippingDate = dayjs(item.SHIPPING_DATE).format('YYYY-MM-DD');
+      
+      // 시작날짜와 끝날짜가 모두 있는 경우
+      if (searchStartDate.value && searchEndDate.value) {
+        const startDate = dayjs(searchStartDate.value).format('YYYY-MM-DD');
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return shippingDate >= startDate && shippingDate <= endDate;
+      }
+      // 끝날짜만 있는 경우
+      else if (searchEndDate.value) {
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return shippingDate <= endDate;
+      }
+      
+      return true;
+    });
+  }
+  
   if (gridApi.value) {
     gridApi.value.setGridOption('rowData', filteredData);
   }
 };
 
+
 const markAsDelivered = async () => {
   if (selectedItems.value.length === 0) {
     $toast.error('배송완료 처리할 항목을 선택해주세요.');
@@ -325,12 +427,16 @@ const markAsDelivered = async () => {
     });
 };
 
+watch(itemType, () => {
+  getShippingList();
+});
+
 onMounted(() => {
+  //itemType.value = useDtStore.boardInfo.itemType || 'E';
   getShippingList();
   
   // 날짜 초기화
   const today = dayjs();
-  searchStartDate.value = today.subtract(30, 'day').format('YYYY-MM-DD');
   searchEndDate.value = today.format('YYYY-MM-DD');
 });
 </script>

+ 215 - 32
pages/view/common/item/add.vue

@@ -34,43 +34,49 @@
                   </div>
                 </td>
               </tr>
-              <tr  v-if="itemType == 'G'">
+              <tr  v-if="itemType == 'G' && pageType !== 'D'">
                 <th class="bg le">인플루언서<span v-if="pageType !== 'D'" class="bul">*</span></th>
                 <td>
-                  <v-text-field
+                  <div class="input--wrap">
+                    <v-text-field
                     maxlength="50"
-                    v-model="form.contact_inf"
-                    style="width: 20%"
+                    v-model="form.contact_inf_display"
+                    style="width: 30%;"
                     :rules="[useValid.required('인플루언서')]"
                     readonly=""
                     class="custom-input mini left"
-                    placeholder="인플루언서를 입력하세요"
-                  ></v-text-field>
+                    placeholder="인플루언서를 선택하세요"
+                    ></v-text-field>
+                    <v-btn class="custom-btn btn-white mini" @click="openInfluencerModal">선택</v-btn>
+                  </div>
                 </td>
               </tr>
               <tr v-if="itemType == 'G'">
                 <th class="bg le">공동구매 기간<span v-if="pageType !== 'D'" class="bul">*</span></th>
                 <td>
                   <div class="search--inner">
-                    <div class="calendar-wrap ml--0">
+                    <div class="calendar--wrap ml--0" v-if="pageType == 'D'">
+                      <span class="text">{{ form.order_start_date?.slice(0, 10) }}&nbsp;~&nbsp;{{ form.order_end_date?.slice(0, 10) }}</span>
+                    </div>
+                    <div class="calendar-wrap ml--0" v-if="pageType !== 'D'">
                       <div class="calendar">
                         <VueDatePicker
-                          :format="datePickerFormat"
-                          v-model="orderStartDate"
-                          placeholder="날짜를 선택하세요"
-                          :auto-apply="true"
-                          week-start="0"
+                        :format="datePickerFormat"
+                        v-model="form.order_start_date"
+                        placeholder="날짜를 선택하세요"
+                        :auto-apply="true"
+                        week-start="0"
                         ></VueDatePicker>
                       </div>
                       <span class="text">~</span>
                       <div class="calendar">
                         <VueDatePicker
-                          v-model="orderEndDate"
+                          v-model="form.order_end_date"
                           :format="datePickerFormat"
                           placeholder="날짜를 선택하세요"
                           :auto-apply="true"
                           week-start="0"
-                          :min-date="orderStartDate"
+                          :min-date="form.order_start_date"
                         ></VueDatePicker>
                       </div>
                     </div>
@@ -132,7 +138,20 @@
               </tr>
               <tr v-if="itemType == 'G'">
                 <th class="bg le">공동구매 링크</th>
-                <td>
+                <td v-if="pageType == 'D'">
+                  <a 
+                    v-if="form.order_link" 
+                    :href="form.order_link" 
+                    target="_blank" 
+                    rel="noopener noreferrer"
+                    class="order-link"
+                  >
+                    {{ form.order_link }}
+                    <v-icon size="small" class="ml-1">mdi-open-in-new</v-icon>
+                  </a>
+                  <span v-else class="no-link">링크가 없습니다</span>
+                </td>
+                <td v-else>
                   <div class="input--wrap">
                       <v-text-field
                       maxlength="50"
@@ -316,6 +335,36 @@
         </div>
       </div>
     </div>
+
+    <!-- 인플루언서 선택 모달 -->
+    <v-dialog v-model="influencerModal" max-width="600px" persistent>
+      <v-card>
+        <v-card-title class="text-h6">인플루언서 선택</v-card-title>
+        <v-card-text>
+          <div v-if="influencerList.length === 0" class="text-center pa-4">
+            <p>승인된 인플루언서가 없습니다.</p>
+          </div>
+          <div v-else>
+            <v-list>
+              <v-list-item
+                v-for="influencer in influencerList"
+                :key="influencer.SEQ"
+                @click="selectInfluencer(influencer)"
+                class="cursor-pointer"
+              >
+                <v-list-item-content>
+                  <v-list-item-title>{{ influencer.INFLUENCER_NICKNAME }} ({{influencer.INFLUENCER_NAME }}) </v-list-item-title>
+                </v-list-item-content>
+              </v-list-item>
+            </v-list>
+          </div>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer></v-spacer>
+          <v-btn color="grey darken-1" text @click="closeInfluencerModal">취소</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
   </div>
 </template>
 
@@ -324,6 +373,7 @@ import SunEditorWrapper from "@/components/sunEdt.vue";
 import useAxios from "@/composables/useAxios";
 import VueDatePicker from "@vuepic/vue-datepicker";
 import "@vuepic/vue-datepicker/dist/main.css";
+import dayjs from 'dayjs';
 /************************************************************************
 |    레이아웃
 ************************************************************************/
@@ -344,8 +394,6 @@ const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
 const router = useRouter();
 const pageId = ref("");
 const itemType = useDtStore.boardInfo.itemType;
-const orderStartDate = ref("");
-const orderEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
 const sunEditorWrapper = ref(null); //에디터용 전역
 const updatedContent = ref(null); //에디터용 전역
@@ -380,9 +428,16 @@ const form = ref({
     { title: "비노출", value: "N" },
   ],
   formValue10: "",
-  contact_inf: "18",
+  contact_inf: "", // 실제 전송될 INFLUENCER_SEQ
+  contact_inf_display: "", // 화면에 표시될 이름
   order_link: "",
+  order_start_date: "",
+  order_end_date: "",
 });
+
+// 인플루언서 관련 변수
+const influencerModal = ref(false);
+const influencerList = ref([]);
 const apiUrl = ref("");
 
 apiUrl.value = import.meta.env.VITE_APP_API_URL;
@@ -400,6 +455,7 @@ const listLocated = () => {
   router.push({
     path: "/view/common/item",
   });
+  useDtStore.boardInfo.itemType  = itemType;
 };
 
 const fnPicFileUploadOpen = () => {
@@ -442,14 +498,96 @@ const fnUploadPicFileCheck = () => {
     imgTemp.value = tempImageUrl;
   }
 };
-const clearFile = () => {
-  form.value.formValue5 = null;
-};
-
 const fnDownloadFile = () => {
   window.location.href = `https://shopdeli.mycafe24.com/item/download/${zipInfo.value.file_path}`;
 }
 
+// 인플루언서 목록 조회
+const getInfluencerList = async () => {
+  try {
+    const params = {
+      vendorSeq: useAtStore.auth.seq,
+      status: 'APPROVED', // 승인된 인플루언서만
+      sortBy: 'latest',
+      page: 1,
+      size: 100, // 충분한 수량
+    };
+
+    //console.log('🔍 getInfluencerList 호출됨:', params);
+
+    const response = await useAxios().post('/api/vendor-influencer/requests', params);
+    //console.log('📥 API 응답:', response.data);
+    
+    if (response.data.success) {
+      const items = response.data.data.items || [];
+      //console.log('📋 받아온 인플루언서 목록:', items.length, items);
+      influencerList.value = items;
+    } else {
+      //console.error('❌ API 실패:', response.data.message);
+      influencerList.value = [];
+    }
+  } catch (error) {
+    //console.error('❌ 인플루언서 목록 조회 실패:', error);
+    influencerList.value = [];
+  }
+};
+
+// 인플루언서 선택 모달 열기
+const openInfluencerModal = async () => {
+  await getInfluencerList();
+  influencerModal.value = true;
+};
+
+// 인플루언서 선택 모달 닫기
+const closeInfluencerModal = () => {
+  influencerModal.value = false;
+};
+
+// 인플루언서 선택
+const selectInfluencer = (influencer) => {
+  // 화면에 표시할 이름
+  const displayName = influencer.INFLUENCER_NICKNAME 
+    ? `${influencer.INFLUENCER_NICKNAME} (${influencer.INFLUENCER_NAME})` 
+    : influencer.INFLUENCER_NAME;
+  
+  // 실제 전송할 SEQ 값과 표시용 이름 분리 저장
+  form.value.contact_inf = influencer.INFLUENCER_SEQ;
+  form.value.contact_inf_display = displayName;
+  
+  influencerModal.value = false;
+};
+
+// 인플루언서 이름 가져오기
+const getInfluencerNameBySeq = async (influencerSeq) => {
+  try {
+    if (!influencerSeq) return '';
+    
+    // 이미 로드된 목록에서 찾기
+    if (influencerList.value.length > 0) {
+      const influencer = influencerList.value.find(inf => inf.INFLUENCER_SEQ == influencerSeq);
+      if (influencer) {
+        return influencer.INFLUENCER_NICKNAME 
+          ? `${influencer.INFLUENCER_NICKNAME} (${influencer.INFLUENCER_NAME})` 
+          : influencer.INFLUENCER_NAME;
+      }
+    }
+    
+    // 목록에 없으면 API 호출해서 전체 목록 가져오기
+    await getInfluencerList();
+    const influencer = influencerList.value.find(inf => inf.INFLUENCER_SEQ == influencerSeq);
+    if (influencer) {
+      return influencer.INFLUENCER_NICKNAME 
+        ? `${influencer.INFLUENCER_NICKNAME} (${influencer.INFLUENCER_NAME})` 
+        : influencer.INFLUENCER_NAME;
+    }
+    
+    return `인플루언서 ID: ${influencerSeq}`;
+  } catch (error) {
+    //console.error('인플루언서 이름 조회 실패:', error);
+    return `인플루언서 ID: ${influencerSeq}`;
+  }
+};
+
 /*======================================================================
 |    작성 시퀀스
 | 1. 작성 컨펌
@@ -559,10 +697,10 @@ const fnInsert = async () => {
   formData.append('show_yn', form.value.formValue9);
   formData.append('add_info', form.value.formValue10);
   formData.append('order_link', form.value.order_link);
-  formData.append('order_start_date', form.value.order_start_date);
-  formData.append('order_end_date', form.value.order_end_date);
+  formData.append('order_start_date', dayjs(form.value.order_start_date).format('YYYY-MM-DD'));
+  formData.append('order_end_date', dayjs(form.value.order_end_date).format('YYYY-MM-DD'));
   formData.append('item_type', itemType);
-  formData.append('contact_inf', 18);
+  formData.append('contact_inf', form.value.contact_inf);
   // 벤더사의 COMPANY_NUMBER 사용
   const memberCompanyNumber = useAtStore.auth.companyNumber || "1";
   formData.append('company_number', memberCompanyNumber);
@@ -601,6 +739,10 @@ const fnUpdate = async () => {
   formData.append('status', form.value.formValue8);
   formData.append('show_yn', form.value.formValue9);
   formData.append('add_info', form.value.formValue10);
+  formData.append('order_link', form.value.order_link);
+  formData.append('order_start_date', dayjs(form.value.order_start_date).format('YYYY-MM-DD'));
+  formData.append('order_end_date', dayjs(form.value.order_end_date).format('YYYY-MM-DD'));
+  formData.append('contact_inf', form.value.contact_inf);
   // 벤더사의 COMPANY_NUMBER 사용
   const memberCompanyNumber = useAtStore.auth.companyNumber || "1";
   formData.append('company_number', memberCompanyNumber);
@@ -641,7 +783,7 @@ const fnDelete = () => {
   useAxios()
     .post(`/item/delete/${req.seq}`)
     .then((res) => {
-      //router.push("/view/common/item");
+      router.push("/view/common/item");
     })
     .catch((error) => {
     })
@@ -669,6 +811,18 @@ const fnDetail = () => {
       form.value.formValue8 = res.data.STATUS;
       form.value.formValue9 = res.data.SHOW_YN;
       form.value.formValue10 = res.data.ADD_INFO;
+      form.value.order_link = res.data.ORDER_LINK;
+      form.value.order_start_date = res.data.ORDER_START_DATE;
+      form.value.order_end_date = res.data.ORDER_END_DATE;
+      form.value.contact_inf = res.data.CONTACT_INF;
+      
+      // contact_inf가 SEQ 값이면 해당 인플루언서 이름을 표시용으로 설정
+      if (res.data.CONTACT_INF) {
+        getInfluencerNameBySeq(res.data.CONTACT_INF).then(name => {
+          form.value.contact_inf_display = name;
+        });
+      }
+
       //썸네일 파일이 있으면 넣어줌
       if(form.value.formValue5){
         imgTemp.value = `https://shopdeli.mycafe24.com/writable/uploads/item/thumb/${form.value.formValue5}`;
@@ -818,16 +972,45 @@ onMounted(() => {
 ************************************************************************/
 
 // 시작일이 변경될 때, 종료일이 시작일보다 이전이면 종료일을 시작일과 같게 설정
-watch(orderStartDate, (newStartDate) => {
-  if (newStartDate && orderEndDate.value && orderEndDate.value < newStartDate) {
-    orderEndDate.value = newStartDate;
+watch(() => form.value.order_start_date, (newStartDate) => {
+  if (newStartDate && form.value.order_end_date && form.value.order_end_date < newStartDate) {
+    form.value.order_end_date = newStartDate;
   }
 });
 
 // 종료일이 변경될 때, 종료일이 시작일보다 이전이면 시작일과 같게 설정
-watch(orderEndDate, (newEndDate) => {
-  if (newEndDate && orderStartDate.value && newEndDate < orderStartDate.value) {
-    orderEndDate.value = orderStartDate.value;
+watch(() => form.value.order_end_date, (newEndDate) => {
+  if (newEndDate && form.value.order_start_date && newEndDate < form.value.order_start_date) {
+    form.value.order_end_date = form.value.order_start_date;
   }
 });
+
 </script>
+
+<style scoped>
+.cursor-pointer {
+  cursor: pointer;
+}
+
+.cursor-pointer:hover {
+  background-color: #f5f5f5;
+}
+
+.order-link {
+  color: #1976d2;
+  text-decoration: none;
+  display: inline-flex;
+  align-items: center;
+  transition: color 0.2s;
+}
+
+.order-link:hover {
+  color: #1565c0;
+  text-decoration: underline;
+}
+
+.no-link {
+  color: #999;
+  font-style: italic;
+}
+</style>

+ 71 - 84
pages/view/common/item/index.vue

@@ -70,7 +70,7 @@
     </div>
 
     <div class="data--list--wrap">
-      <div class="btn--actions--wrap">
+      <!-- <div class="btn--actions--wrap">
         <div class="left--sections">
           <v-btn class="custom-btn bdrs--10" :class="itemType == 'E' ? 'btn-pink' : 'btn-white'" @click="itemType = 'E'"
             ><i class="ico"></i>개별 배송</v-btn
@@ -84,38 +84,48 @@
             ><i class="ico"></i>제품 등록</v-btn
           >
         </div>
-      </div>
+      </div> -->
       <div class="item--list--wrap">
-        <div class="no--data" v-if="itemList.length == 0">
-          등록된 제품이 없습니다.
-        </div>
-        <div class="item--list" v-if="itemList.length > 0">
-          <div v-for="(items, index) in paginatedItems" :key="index" class="item">
-            <div @click="toItemDetail(items.SEQ)" class="item-content">
-              <div class="item--img"><img v-if="items.THUMB_FILE" :src="`https://shopdeli.mycafe24.com/writable/uploads/item/thumb/${items.THUMB_FILE}`"></div>
-              <h3>{{ items.NAME }}</h3>
-              <p>공급가: {{ Number(items.PRICE1).toLocaleString() }}<br>판매가: {{ Number(items.PRICE1).toLocaleString() }}</p>
-              <span>등록일: {{ items.REGDATE.slice(0, 10) }}</span>
-              <span>업데이트 날짜: {{ items.UDPDATE.slice(0, 10) }}</span>
-              <div
-                v-if="items.STATUS == 1 || isRecentUpdate(items.UDPDATE)"
-                class="sold--out"
-                :class="{ 'blue--type': isRecentUpdate(items.UDPDATE) && items.STATUS != 1 }"
-              >
-                <span>
-                  {{ items.STATUS == 1 ? '품절' : '업데이트' }}
-                </span>
+        <div class="cs--list--wrap">
+          <div class="cs--header" v-if="memberType !== 'INFLUENCER'">
+            <h3>공동구매 등록</h3>
+            <v-btn class="custom-btn" @click="addLocated()">신규 등록</v-btn>
+          </div>
+          <div class="cs--header">
+            <h3>나의 공동구매</h3>
+          </div>
+          <div class="cs--list" v-if="itemList.length > 0">
+            <div v-for="(items, index) in paginatedItems" :key="index" class="">
+              <!-- <div v-if="itemType == 'E'" @click="toItemDetail(items.SEQ)" class="item-content">
+                <div class="item--img"><img v-if="items.THUMB_FILE" :src="`https://shopdeli.mycafe24.com/writable/uploads/item/thumb/${items.THUMB_FILE}`"></div>
+                <h3>{{ items.NAME }}</h3>
+                <p>공급가: {{ Number(items.PRICE1).toLocaleString() }}<br>판매가: {{ Number(items.PRICE2).toLocaleString() }}</p>
+                <span>등록일: {{ items.REGDATE.slice(0, 10) }}</span>
+                <span>업데이트 날짜: {{ items.UDPDATE.slice(0, 10) }}</span>
+                <div
+                  v-if="items.STATUS == 1 || isRecentUpdate(items.UDPDATE)"
+                  class="sold--out"
+                  :class="{ 'blue--type': isRecentUpdate(items.UDPDATE) && items.STATUS != 1 }"
+                >
+                  <span>
+                    {{ items.STATUS == 1 ? '품절' : '업데이트' }}
+                  </span>
+                </div>
+              </div> -->
+              <div v-if="itemType == 'G'" @click="toItemDetail(items.SEQ)" class="list">
+                <span class="list--seq">{{ items.SEQ }}</span>
+                <span class="list--writer">{{ items.COMPANY_NAME }}</span>
+                <h3 class="list--title">{{ items.NAME }}</h3>
+                <div class="list--circle list--ml" :class="[ items.STATUS == 0 ? 'status--on' : 'status--off' ]">
+                  {{ items.STATUS == 0 ? '진행중' : '마감' }}
+                </div>
+                <span class="list--date">{{ items.ORDER_START_DATE.slice(0, 10) }} ~ {{ items.ORDER_END_DATE.slice(0, 10) }}</span>
               </div>
             </div>
-            <div v-if="memberType === 'INFLUENCER'" class="item-actions">
-              <v-btn 
-                class="custom-btn btn-blue mini delivery-btn"
-                :disabled="items.STATUS == 1"
-                @click.stop="goToDeliveryDetail(items)"
-                :aria-label="`${items.NAME} 송장번호 등록`"
-              >
-                <i class="ico"></i>송장번호 등록
-              </v-btn>
+          </div>
+          <div class="cs--list" v-else>
+            <div class="no-data">
+              <h4>등록된 제품이 없습니다</h4>
             </div>
           </div>
         </div>
@@ -157,11 +167,10 @@ import dayjs from 'dayjs';
   /************************************************************************
 |    전역
  ************************************************************************/
-  const itemType = ref("E");
+  const itemType = ref("G");
   const memberType = useAtStore.auth.memberType;
   const searchModel = ref("");
   const selectedRange = ref('all');
-  const itemStartDate = ref("");
   const searchStartDate = ref("");
   const searchEndDate = ref("");
   const dateOptions = [
@@ -180,7 +189,8 @@ import dayjs from 'dayjs';
   const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
   const router = useRouter();
   const pageId = computed(() => {
-    return memberType === 'INFLUENCER' ? '제품 관리 (파트너십)' : '제품 관리 (자사)';
+    return '공동구매 관리';
+    //return memberType === 'INFLUENCER' ? '제품 관리 (파트너십)' : '제품 관리 (자사)';
   });
   const itemList = ref([]);
   const itemsPerPage = 5;
@@ -192,6 +202,14 @@ import dayjs from 'dayjs';
   /************************************************************************
 |    함수(METHODS)
 ************************************************************************/
+  const isClosedOrder = (dateStr) => {
+    const today = new Date();
+    const closedOrder = new Date(dateStr);
+    today.setHours(0, 0, 0, 0);
+    closedOrder.setHours(0, 0, 0, 0);
+    // 공동구매 기간이 지났으면 종료
+    return today < closedOrder;
+  }
 
   const isRecentUpdate = (dateStr) => {
     const today = new Date();
@@ -231,7 +249,7 @@ import dayjs from 'dayjs';
         selectedRange.value = '3m';
         break;
       case 'all':
-        searchStartDate.value = itemStartDate.value;
+        searchStartDate.value = "";
         searchEndDate.value = today.format('YYYY-MM-DD');
         selectedRange.value = 'all';
         break
@@ -259,29 +277,23 @@ import dayjs from 'dayjs';
   const itemListGet = async () => {
     let _req = {
       // Y : 노출, N : 비노출
-      SHOW_YN: "",
+      SHOW_YN: "Y",
       TYPE: itemType.value,
+      INF_SEQ: useAtStore.auth.seq,
+      MEMBER_TYPE: memberType,
+      MEMBER_SEQ: useAtStore.auth.seq,
     };
 
-    if (memberType === "INFLUENCER") {
-      // 인플루언서의 경우: 파트너십이 체결된 제품만 조회 + 노출된 제품만
-      _req.SHOW_YN = "Y";
-      _req.MEMBER_TYPE = "INFLUENCER";
-      _req.MEMBER_SEQ = useAtStore.auth.seq;
-    } else {
-      // 벤더사의 경우: 자사 제품만 조회
-      _req.MEMBER_TYPE = "VENDOR";
+    if(memberType === "VENDOR"){
       _req.COMPANY_NUMBER = useAtStore.auth.companyNumber || "1";
-      console.log('벤더사 제품 조회 - COMPANY_NUMBER:', _req.COMPANY_NUMBER);
     }
 
+    console.log(_req);
+
     await useAxios()
       .post("/item/list", _req)
       .then((res) => {
         itemList.value = res.data;
-        itemStartDate.value = res.data[res.data.length-1].UDPDATE;
-        searchStartDate.value = itemStartDate.value;
-        searchEndDate.value = dayjs();
       });
   };
 
@@ -289,9 +301,10 @@ import dayjs from 'dayjs';
     let _req = {
       filter: __FILTER,
       keyword: __KEYWORD,
-      startDate: searchStartDate.value,
-      endDate: searchEndDate.value,
-      showYN: ""
+      startDate: searchStartDate.value ? dayjs(searchStartDate.value).format('YYYY-MM-DD') : '',
+      endDate: searchEndDate.value ? dayjs(searchEndDate.value).format('YYYY-MM-DD') : '',
+      TYPE: itemType.value,
+      showYN: "Y"
     };
     
     if (memberType === "INFLUENCER") {
@@ -313,10 +326,12 @@ import dayjs from 'dayjs';
       .catch((error) => {});
   };
 
+
   const goToDeliveryDetail = (item) => {
     // 제품 정보를 스토어에 저장
     useDtStore.boardInfo.seq = item.SEQ;
     useDtStore.boardInfo.pageType = "D";
+    useDtStore.boardInfo.itemType = itemType.value;
     
     // 배송 관리 페이지로 이동
     router.push({
@@ -341,39 +356,11 @@ import dayjs from 'dayjs';
 
   
   onMounted(() => {
+    itemType.value = 'G'
     itemListGet();
-  });
-</script>
-
-<style scoped>
-.item {
-  position: relative;
-}
 
-.item-content {
-  cursor: pointer;
-  padding-bottom: 50px; /* 버튼 공간 확보 */
-}
-
-.item-actions {
-  position: absolute;
-  bottom: 10px;
-  left: 50%;
-  transform: translateX(-50%);
-  width: calc(100% - 20px);
-}
-
-.delivery-btn {
-  width: 100%;
-  margin-top: 8px;
-}
-
-.delivery-btn:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
-.delivery-btn .ico {
-  margin-right: 4px;
-}
-</style>
+    // 날짜 초기화
+    const today = dayjs();
+    searchEndDate.value = today.format('YYYY-MM-DD');
+  });
+</script>

+ 501 - 0
pages/view/common/mypage/index.vue

@@ -0,0 +1,501 @@
+<template>
+  <div class="mypage-container">
+    <!-- 헤더 섹션 -->
+    <div class="mypage-header">
+      <div class="header-bg"></div>
+      <div class="header-content">
+        <div class="profile-section">
+          <div class="profile-avatar">
+            <div class="avatar-placeholder">
+              <i class="mdi mdi-account"></i>
+            </div>
+          </div>
+          <div class="profile-info">
+            <h1 class="user-name">{{ useAtStore.auth.nickName || useAtStore.auth.companyName || '사용자' }}</h1>
+            <p class="user-type">{{ memberType === 'INFLUENCER' ? '인플루언서' : memberType === 'VENDOR' ? '벤더사' : '관리자' }}</p>
+            <div class="user-stats">
+              <div class="stat-item">
+                <span class="stat-number">{{ csList.length }}</span>
+                <span class="stat-label">문의 내역</span>
+              </div>
+              <div class="stat-item">
+                <span class="stat-number">{{ completedInquiries }}</span>
+                <span class="stat-label">답변 완료</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 대시보드 섹션 -->
+    <div class="dashboard-section">
+      <div class="dashboard-cards">
+        <!-- 빠른 액션 카드 -->
+        <div class="dashboard-card quick-actions">
+          <div class="card-header">
+            <h3>빠른 작업</h3>
+            <i class="mdi mdi-lightning-bolt"></i>
+          </div>
+          <div class="card-content">
+            <div class="action-buttons">
+              <v-btn class="action-btn" @click="addLocated()">
+                <i class="mdi mdi-plus-circle"></i>
+                <span>문의 등록</span>
+              </v-btn>
+              <v-btn class="action-btn" @click="goToCS()">
+                <i class="mdi mdi-headset"></i>
+                <span>고객센터</span>
+              </v-btn>
+              <v-btn class="action-btn" @click="goToProfile()">
+                <i class="mdi mdi-account-edit"></i>
+                <span>프로필 수정</span>
+              </v-btn>
+            </div>
+          </div>
+        </div>
+
+        <!-- 최근 문의 카드 -->
+        <div class="dashboard-card recent-inquiries">
+          <div class="card-header">
+            <h3>최근 문의 내역</h3>
+            <i class="mdi mdi-message-text"></i>
+          </div>
+          <div class="card-content">
+            <div class="inquiry-list">
+              <div v-if="recentInquiries.length > 0">
+                <div 
+                  v-for="item in recentInquiries" 
+                  :key="item.SEQ" 
+                  class="inquiry-item"
+                  @click="toItemDetail(item.SEQ)"
+                >
+                  <div class="inquiry-info">
+                    <h4>{{ item.TITLE }}</h4>
+                    <p>{{ formatDate(item.REGDATE) }}</p>
+                  </div>
+                  <div class="inquiry-status">
+                    <span :class="getStatusClass(item.STATUS)">
+                      {{ item.STATUS == '0' ? '답변대기' : '답변완료' }}
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <div v-else class="no-inquiries">
+                <i class="mdi mdi-message-outline"></i>
+                <p>등록된 문의가 없습니다</p>
+              </div>
+            </div>
+            <div class="view-all">
+              <v-btn variant="text" @click="goToCS()">전체 보기</v-btn>
+            </div>
+          </div>
+        </div>
+
+        <!-- 알림 카드 -->
+        <div class="dashboard-card notifications">
+          <div class="card-header">
+            <h3>알림</h3>
+            <i class="mdi mdi-bell"></i>
+          </div>
+          <div class="card-content">
+            <div class="notification-list">
+              <div class="notification-item">
+                <div class="notification-icon">
+                  <i class="mdi mdi-information"></i>
+                </div>
+                <div class="notification-content">
+                  <h4>서비스 업데이트</h4>
+                  <p>새로운 기능이 추가되었습니다!</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 문의 등록 팝업 -->
+    <v-dialog v-model="showInquiryModal" max-width="600px" persistent>
+      <v-card class="inquiry-modal">
+        <v-card-title class="modal-header">
+          <h3>문의 등록</h3>
+          <v-btn icon @click="closeModal" class="close-btn">
+            <v-icon>mdi-close</v-icon>
+          </v-btn>
+        </v-card-title>
+
+        <v-card-text class="modal-body">
+          <form @submit.prevent="submitInquiry">
+            <div class="form-group">
+              <label>문의 유형 <span class="required">*</span></label>
+              <v-select
+                v-model="inquiryForm.category"
+                :items="categoryOptions"
+                variant="outlined"
+                placeholder="문의 유형을 선택하세요"
+                class="custom-select"
+                :rules="[v => !!v || '문의 유형을 선택해주세요']"
+              ></v-select>
+            </div>
+
+            <div class="form-group">
+              <label>제목 <span class="required">*</span></label>
+              <v-text-field
+                v-model="inquiryForm.title"
+                variant="outlined"
+                placeholder="문의 제목을 입력하세요"
+                class="custom-input"
+                :rules="[v => !!v || '제목을 입력해주세요']"
+              ></v-text-field>
+            </div>
+
+            <div class="form-group">
+              <label>내용 <span class="required">*</span></label>
+              <v-textarea
+                v-model="inquiryForm.content"
+                variant="outlined"
+                placeholder="문의 내용을 상세히 입력해주세요"
+                rows="6"
+                class="custom-textarea"
+                :rules="[v => !!v || '내용을 입력해주세요']"
+              ></v-textarea>
+            </div>
+
+            <div class="form-group">
+              <label>첨부파일</label>
+              <v-file-input
+                v-model="inquiryForm.attachments"
+                variant="outlined"
+                placeholder="파일을 선택하세요"
+                hide-details=""
+                prepend-icon=""
+                append-inner-icon="mdi-paperclip"
+                class="custom-file-input mb--30"
+                accept="image/*,.pdf,.doc,.docx,.hwp"
+                multiple
+                show-size
+              ></v-file-input>
+              <p class="file-info">* 이미지, PDF, 문서 파일만 업로드 가능 (최대 10MB)</p>
+            </div>
+          </form>
+        </v-card-text>
+
+        <v-card-actions class="modal-footer">
+          <v-btn @click="closeModal" class="cancel-btn">취소</v-btn>
+          <v-btn @click="submitInquiry" class="submit-btn" :loading="isSubmitting">등록하기</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+  </div>
+</template>
+
+<script setup>
+import "@vuepic/vue-datepicker/dist/main.css";
+import dayjs from 'dayjs';
+  /************************************************************************
+|    레이아웃
+************************************************************************/
+  definePageMeta({
+    layout: "default",
+  });
+  /************************************************************************
+|   PROPS
+ ************************************************************************/
+  const props = defineProps({
+    propsData: {
+      type: Object,
+      default: () => {},
+    },
+  });
+  /************************************************************************
+|    스토어
+ ************************************************************************/
+  const useDtStore = useDetailStore();
+  const useAtStore = useAuthStore();
+  /************************************************************************
+|    전역
+ ************************************************************************/
+  const memberType = useAtStore.auth.memberType;
+  const searchModel = ref("");
+  const selectedRange = ref('all');
+  const searchStartDate = ref("");
+  const searchEndDate = ref("");
+  const dateOptions = [
+    { label: '오늘', value: 'today' },
+    { label: '7일', value: '7d' },
+    { label: '1개월', value: '1m' },
+    { label: '3개월', value: '3m' },
+    { label: '전체', value: 'all' },
+  ]
+  const datePickerFormat = "yyyy-MM-dd";
+  const filter = ref("");
+  const filderArr = ref([
+    { title: "전체", value: "" },
+    { title: "제목", value: "title" },
+    { title: "내용", value: "content" },
+    { title: "작성자", value: "writer" }
+  ]);
+  const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
+  const router = useRouter();
+  const pageId = computed(() => {
+    return '마이페이지';
+  });
+  const csList = ref([]);
+  
+  // 대시보드 관련 computed
+  const completedInquiries = computed(() => {
+    return csList.value.filter(item => item.STATUS === '1').length;
+  });
+  
+  const recentInquiries = computed(() => {
+    return csList.value.slice(0, 3); // 최근 3개만 표시
+  });
+
+  // 문의 등록 팝업 관련
+  const showInquiryModal = ref(false);
+  const isSubmitting = ref(false);
+  const inquiryForm = ref({
+    category: '',
+    title: '',
+    content: '',
+    attachments: []
+  });
+  const categoryOptions = ref([
+    { title: '기능문의', value: 'D' },
+    { title: '기타문의', value: 'E' }
+  ]);
+
+  /* eslint-disable */
+  /* prettier-ignore */
+
+  /************************************************************************
+|    함수(METHODS)
+************************************************************************/
+
+  const isRecentUpdate = (dateStr) => {
+    const today = new Date();
+    const updateDate = new Date(dateStr);
+    const diffDays = (today - updateDate) / (1000 * 60 * 60 * 24);
+    // 업데이트 날짜가 오늘 날짜 기준 최근 7일인지 확인
+    return diffDays <= 7;
+  }
+
+  const paginatedItems = computed(() => {
+    const start = (currentPage.value - 1) * itemsPerPage;
+    return csList.value.slice(start, start + itemsPerPage);
+  });
+
+  const setDateRange = (range) => {
+    const today = dayjs();
+
+    switch(range) {
+      case 'today' :
+        searchStartDate.value = today.format('YYYY-MM-DD');
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = 'today';
+        break;
+      case '7d':
+        searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = '7d';
+        break;
+      case '1m':
+        searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = '1m';
+        break;
+      case '3m':
+        searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = '3m';
+        break;
+      case 'all':
+        searchStartDate.value = "";
+        searchEndDate.value = today.format('YYYY-MM-DD');
+        selectedRange.value = 'all';
+        break
+    }
+  }
+
+  const addLocated = () => {
+    showInquiryModal.value = true;
+  };
+  
+  const goToCS = () => {
+    router.push('/view/common/cs');
+  };
+  
+  const goToProfile = () => {
+    $toast.info('프로필 수정 기능은 준비중입니다.');
+  };
+
+  const toItemDetail = (__EVENT) => {
+    router.push({
+      path: "/view/common/cs/detail",
+    });
+    useDtStore.boardInfo.seq = __EVENT;
+  };
+
+  const csListGet = async () => {
+    let _req = {
+      USER_SEQ : useAtStore.auth.seq,
+      keyword: '',
+      filter: '',
+      startDate: '',
+      endDate: ''
+    };
+    if(useAtStore.auth.seq == 2){
+      _req.USER_SEQ = 0;
+    }
+
+    await useAxios()
+      .post("/cs/list", _req)
+      .then((res) => {
+        csList.value = res.data;
+      });
+  };
+
+  const fnSearch = (__KEYWORD, __FILTER) => {
+    let _req = {
+      USER_SEQ: useAtStore.auth.seq,
+      filter: __FILTER,
+      keyword: __KEYWORD,
+      startDate: searchStartDate.value ? dayjs(searchStartDate.value).format('YYYY-MM-DD') : '',
+      endDate: searchEndDate.value ? dayjs(searchEndDate.value).format('YYYY-MM-DD') : ''
+    };
+
+    // 관리자인 경우 모든 문의 조회
+    if(useAtStore.auth.seq == 2){
+      _req.USER_SEQ = 0;
+    }
+
+    useAxios()
+      .post("/cs/search", _req)
+      .then((res) => {
+        csList.value = res.data;
+        currentPage.value = 1; // 검색 후 첫 페이지로 이동
+      })
+      .catch((error) => {
+        console.error('검색 실패:', error);
+        $toast.error('검색에 실패했습니다.');
+      });
+  };
+
+
+  const goToDeliveryDetail = (item) => {
+    // 제품 정보를 스토어에 저장
+    useDtStore.boardInfo.seq = item.SEQ;
+    useDtStore.boardInfo.pageType = "D";
+    
+    // 배송 관리 페이지로 이동
+    router.push({
+      path: "/view/common/deli/detail",
+      query: {
+        itemId: item.SEQ,
+        itemName: item.NAME,
+        price1: item.PRICE1,
+        price2: item.PRICE2 || item.PRICE1,
+        thumbFile: item.THUMB_FILE || ''
+      }
+    });
+  };
+
+  const getStatusClass = (status) => {
+    switch(status) {
+      case '0':
+        return 'status-waiting';
+      case '1':
+        return 'status-completed';
+    }
+  };
+
+  const formatDate = (dateStr) => {
+    if (!dateStr) return '';
+    const date = new Date(dateStr);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}.${month}.${day}`;
+  };
+
+  // 팝업 관련 함수들
+  const closeModal = () => {
+    showInquiryModal.value = false;
+    resetForm();
+  };
+
+  const resetForm = () => {
+    inquiryForm.value = {
+      category: '',
+      title: '',
+      content: '',
+      attachments: []
+    };
+  };
+
+  const submitInquiry = async () => {
+    // 폼 유효성 검사
+    if (!inquiryForm.value.category) {
+      $toast.error('문의 유형을 선택해주세요.');
+      return;
+    }
+    if (!inquiryForm.value.title) {
+      $toast.error('제목을 입력해주세요.');
+      return;
+    }
+    if (!inquiryForm.value.content) {
+      $toast.error('내용을 입력해주세요.');
+      return;
+    }
+
+    isSubmitting.value = true;
+    
+    try {
+      const formData = new FormData();
+      formData.append('USER_SEQ', useAtStore.auth.seq);
+      formData.append('CATEGORY', inquiryForm.value.category);
+      formData.append('TITLE', inquiryForm.value.title);
+      formData.append('CONTENT', inquiryForm.value.content);
+      
+      // 첨부파일 처리
+      if (inquiryForm.value.attachments && inquiryForm.value.attachments.length > 0) {
+        inquiryForm.value.attachments.forEach((file, index) => {
+          formData.append(`files[${index}]`, file);
+        });
+      }
+
+      await useAxios()
+        .post("/cs/reg", formData, {
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        })
+        .then((res) => {
+          if (res.data.success) {
+            $toast.success('문의가 성공적으로 등록되었습니다.');
+            closeModal();
+            csListGet(); // 목록 새로고침
+          } else {
+            $toast.error('문의 등록에 실패했습니다.');
+          }
+        });
+    } catch (error) {
+      $toast.error('문의 등록 중 오류가 발생했습니다.');
+      console.error('Error submitting inquiry:', error);
+    } finally {
+      isSubmitting.value = false;
+    }
+  };
+
+  /************************************************************************
+|    WATCH
+************************************************************************/
+  onMounted(() => {
+    csListGet();
+
+    // 날짜 초기화
+    const today = dayjs();
+    searchEndDate.value = today.format('YYYY-MM-DD');
+  });
+</script>

+ 1 - 2
pages/view/common/settle/index.vue

@@ -140,7 +140,6 @@ const pageId = ref("정산 관리");
 const pageIdSub = ref();
 const searchModel = ref("");
 const selectedRange = ref('all');
-const itemStartDate = ref("");
 const searchStartDate = ref("");
 const searchEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
@@ -262,7 +261,7 @@ const setDateRange = (range) => {
       selectedRange.value = '3m';
       break;
     case 'all':
-      searchStartDate.value = itemStartDate.value;
+      searchStartDate.value = "";
       searchEndDate.value = today.format('YYYY-MM-DD');
       selectedRange.value = 'all';
       break

+ 178 - 16
pages/view/common/settlement/index.vue

@@ -29,16 +29,7 @@
         </div>
       </div>
       <div class="search--inner">
-        <div class="form--cont--filter">
-          <v-select
-            v-model="settlementFilter"
-            :items="settlementOptions"
-            variant="outlined"
-            class="custom-select"
-            @update:modelValue="applySettlementFilter"
-          >
-          </v-select>
-        </div>
+        
         <div class="calendar-wrap ml--0">
           <div class="calendar">
             <VueDatePicker
@@ -59,6 +50,17 @@
               week-start="0"
             ></VueDatePicker>
           </div>
+          <div class="month--selector">
+            <v-btn
+              v-for="option in dateOptions"
+              :key="option.value"
+              :class="{ actv: selectedRange === option.value }"
+              @click="setDateRange(option.value)"
+              elevation="0"
+            >
+              {{ option.label }}
+            </v-btn>
+          </div>
         </div>
       </div>
       <v-btn
@@ -87,6 +89,26 @@
           </div>
         </div>
         <div class="right--sections">
+          <div class="item-type-filter">
+            <v-select
+              v-model="itemTypeFilter"
+              :items="itemTypeOptions"
+              variant="outlined"
+              class="custom-select mini"
+              @update:modelValue="applyItemTypeFilter"
+            >
+            </v-select>
+          </div>
+          <div class="form--cont--filter">
+          <v-select
+            v-model="settlementFilter"
+            :items="settlementOptions"
+            variant="outlined"
+            class="custom-select"
+            @update:modelValue="applySettlementFilter"
+          >
+          </v-select>
+        </div>
           <span class="total-count">총 {{ tblItems.length }}건</span>
         </div>
       </div>
@@ -138,14 +160,23 @@ const useAtStore = useAuthStore();
 const memberType = useAtStore.auth.memberType;
 const memberSeq = useAtStore.auth.seq;
 const searchModel = ref("");
+const selectedRange = ref('all');
 const searchStartDate = ref("");
 const searchEndDate = ref("");
 const datePickerFormat = "yyyy-MM-dd";
+const dateOptions = [
+  { label: '오늘', value: 'today' },
+  { label: '7일', value: '7d' },
+  { label: '1개월', value: '1m' },
+  { label: '3개월', value: '3m' },
+  { label: '전체', value: 'all' },
+]
 const filter = ref("");
 const filderArr = ref([
   { title: "전체", value: "" },
   { title: "제품명", value: "name" },
   { title: "구매자명", value: "buyer" },
+  { title: "인플루언서", value: "inf_name"}
 ]);
 const settlementFilter = ref("");
 const settlementOptions = ref([
@@ -153,6 +184,12 @@ const settlementOptions = ref([
   { title: "정산대기", value: "PENDING" },
   { title: "정산완료", value: "COMPLETED" },
 ]);
+const itemTypeFilter = ref("");
+const itemTypeOptions = ref([
+  { title: "전체", value: "" },
+  { title: "개별구매", value: "E" },
+  { title: "공동구매", value: "G" },
+]);
 const originalTblItems = ref([]);
 const { $toast, $log, $dayjs, $eventBus } = useNuxtApp();
 const router = useRouter();
@@ -185,6 +222,19 @@ const gridOptions = {
       sortable: false,
       width: 70,
     },
+    {
+      headerName: "구분",
+      field: "ITEM_TYPE",
+      width: 90,
+      cellRenderer: (params) => {
+        return params.value === 'E' ? '개별구매' : '공동구매';
+      },
+    },
+    {
+      headerName: "인플루언서",
+      field: "INF_NICK_NAME",
+      width: 120,
+    },
     {
       headerName: "제품명",
       field: "ITEM_NAME",
@@ -269,6 +319,38 @@ const gridOptions = {
   suppressPaginationPanel: true,
 };
 
+const setDateRange = (range) => {
+  const today = dayjs();
+
+  switch(range) {
+    case 'today' :
+      searchStartDate.value = today.format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'today';
+      break;
+    case '7d':
+      searchStartDate.value = today.subtract(7, 'day').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '7d';
+      break;
+    case '1m':
+      searchStartDate.value = today.subtract(1, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '1m';
+      break;
+    case '3m':
+      searchStartDate.value = today.subtract(3, 'month').format('YYYY-MM-DD');
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = '3m';
+      break;
+    case 'all':
+      searchStartDate.value = "";
+      searchEndDate.value = today.format('YYYY-MM-DD');
+      selectedRange.value = 'all';
+      break
+  }
+}
+
 const onGridReady = (__PARAMS) => {
   gridApi.value = __PARAMS.api;
 };
@@ -292,8 +374,9 @@ const getSettlementList = async () => {
   await useAxios()
     .post("/deli/settlement", _req)
     .then((res) => {
+      console.log(res.data)
       originalTblItems.value = res.data;
-      applySettlementFilter();
+      applyAllFilters();
       calculateStats();
     });
 };
@@ -308,16 +391,51 @@ const calculateStats = () => {
   };
 };
 
-const applySettlementFilter = () => {
+const applyAllFilters = () => {
   let filteredData = originalTblItems.value;
   
+  // 정산상태 필터 적용
   if (settlementFilter.value !== "") {
-    filteredData = originalTblItems.value.filter(item => {
+    filteredData = filteredData.filter(item => {
       const itemStatus = item.SETTLEMENT_STATUS || 'PENDING';
       return itemStatus === settlementFilter.value;
     });
   }
   
+  // 아이템 타입 필터 적용
+  if (itemTypeFilter.value !== "") {
+    console.log('아이템 타입 필터 적용:', itemTypeFilter.value);
+    console.log('필터 전 데이터 개수:', filteredData.length);
+    filteredData = filteredData.filter(item => {
+      console.log(`아이템: ${item.ITEM_NAME}, 타입: "${item.ITEM_TYPE}", 필터값: "${itemTypeFilter.value}", 매치: ${item.ITEM_TYPE === itemTypeFilter.value}`);
+      return item.ITEM_TYPE === itemTypeFilter.value;
+    });
+    console.log('필터 후 데이터 개수:', filteredData.length);
+  }
+  
+  // 날짜 범위 검색 적용 (배송완료일 기준)
+  if (searchStartDate.value || searchEndDate.value) {
+    filteredData = filteredData.filter(item => {
+      if (!item.DELIVERED_DATE) return false;
+      
+      const deliveredDate = dayjs(item.DELIVERED_DATE).format('YYYY-MM-DD');
+      
+      // 시작날짜와 끝날짜가 모두 있는 경우
+      if (searchStartDate.value && searchEndDate.value) {
+        const startDate = dayjs(searchStartDate.value).format('YYYY-MM-DD');
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate >= startDate && deliveredDate <= endDate;
+      }
+      // 끝날짜만 있는 경우
+      else if (searchEndDate.value) {
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate <= endDate;
+      }
+      
+      return true;
+    });
+  }
+  
   tblItems.value = filteredData;
   pageObj.value.totalCnt = tblItems.value.length;
   
@@ -327,6 +445,14 @@ const applySettlementFilter = () => {
   }
 };
 
+const applySettlementFilter = () => {
+  applyAllFilters();
+};
+
+const applyItemTypeFilter = () => {
+  applyAllFilters();
+};
+
 const fnSearch = (__KEYWORD, __FILTER) => {
   // 검색 로직 구현
   let filteredData = originalTblItems.value;
@@ -339,6 +465,13 @@ const fnSearch = (__KEYWORD, __FILTER) => {
     });
   }
   
+  // 아이템 타입 필터 적용
+  if (itemTypeFilter.value !== "") {
+    filteredData = filteredData.filter(item => {
+      return item.ITEM_TYPE === itemTypeFilter.value;
+    });
+  }
+  
   // 키워드 검색 적용
   if (__KEYWORD && __KEYWORD.trim() !== '') {
     filteredData = filteredData.filter(item => {
@@ -346,14 +479,40 @@ const fnSearch = (__KEYWORD, __FILTER) => {
         return item.ITEM_NAME && item.ITEM_NAME.toLowerCase().includes(__KEYWORD.toLowerCase());
       } else if (__FILTER === 'buyer') {
         return item.BUYER_NAME && item.BUYER_NAME.toLowerCase().includes(__KEYWORD.toLowerCase());
-      } else {
+      } else if (__FILTER === 'inf_name') {
+        return item.INF_NICK_NAME && item.INF_NICK_NAME.toLowerCase().includes(__KEYWORD.toLowerCase());
+      } {
         // 전체 검색
         return (item.ITEM_NAME && item.ITEM_NAME.toLowerCase().includes(__KEYWORD.toLowerCase())) ||
-               (item.BUYER_NAME && item.BUYER_NAME.toLowerCase().includes(__KEYWORD.toLowerCase()));
+               (item.BUYER_NAME && item.BUYER_NAME.toLowerCase().includes(__KEYWORD.toLowerCase())) ||
+               item.INF_NICK_NAME && item.INF_NICK_NAME.toLowerCase().includes(__KEYWORD.toLowerCase());
       }
     });
   }
   
+  // 날짜 범위 검색 적용 (배송완료일 기준)
+  if (searchStartDate.value || searchEndDate.value) {
+    filteredData = filteredData.filter(item => {
+      if (!item.DELIVERED_DATE) return false;
+      
+      const deliveredDate = dayjs(item.DELIVERED_DATE).format('YYYY-MM-DD');
+      
+      // 시작날짜와 끝날짜가 모두 있는 경우
+      if (searchStartDate.value && searchEndDate.value) {
+        const startDate = dayjs(searchStartDate.value).format('YYYY-MM-DD');
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate >= startDate && deliveredDate <= endDate;
+      }
+      // 끝날짜만 있는 경우
+      else if (searchEndDate.value) {
+        const endDate = dayjs(searchEndDate.value).format('YYYY-MM-DD');
+        return deliveredDate <= endDate;
+      }
+      
+      return true;
+    });
+  }
+  
   tblItems.value = filteredData;
   pageObj.value.totalCnt = tblItems.value.length;
   
@@ -367,7 +526,6 @@ onMounted(() => {
   
   // 날짜 초기화
   const today = dayjs();
-  searchStartDate.value = today.subtract(30, 'day').format('YYYY-MM-DD');
   searchEndDate.value = today.format('YYYY-MM-DD');
 });
 </script>
@@ -379,6 +537,10 @@ onMounted(() => {
   align-items: center;
 }
 
+.item-type-filter {
+  margin-left: 20px;
+}
+
 .summary-item {
   font-size: 14px;
   font-weight: 500;

+ 25 - 10
pages/view/vendor/dashboard/influencer-requests.vue

@@ -152,25 +152,25 @@
                 </div>
                 <div class="influencer--details">
                   <div class="influencer--header">
-                    <h4>{{ request.influencerNickname || request.influencerName }}</h4>
+                    <h4>{{ request.INFLUENCER_NICKNAME || request.INFLUENCER_NAME }}</h4>
                     <p class="influencer--category">
                       {{ getCategoryText(request.influencerCategory) }}
                     </p>
                   </div>
 
                   <div class="influencer--contact">
-                    <p v-if="request.influencerEmail" class="contact--item">
+                    <p v-if="request.INFLUENCER_EMAIL" class="contact--item">
                       <v-icon size="small">mdi-email</v-icon>
-                      {{ request.influencerEmail }}
+                      {{ request.INFLUENCER_EMAIL }}
                     </p>
-                    <p v-if="request.influencerPhone" class="contact--item">
+                    <p v-if="request.INFLUENCER_PHONE" class="contact--item">
                       <v-icon size="small">mdi-phone</v-icon>
-                      {{ request.influencerPhone }}
+                      {{ request.INFLUENCER_PHONE }}
                     </p>
-                    <p v-if="request.influencerRegion" class="contact--item">
+                    <!-- <p v-if="request.influencerRegion" class="contact--item">
                       <v-icon size="small">mdi-map-marker</v-icon>
                       {{ request.influencerRegion }}
-                    </p>
+                    </p> -->
                   </div>
 
                   <div class="influencer--meta">
@@ -514,8 +514,8 @@
 </template>
 
 <script setup>
-  import { ref, onMounted, computed } from "vue";
-  import { useRouter } from "vue-router";
+  import { computed, onMounted, ref } from "vue";
+import { useRouter } from "vue-router";
 
   /************************************************************************
   |    레이아웃
@@ -1046,10 +1046,22 @@
 
   .requests--grid {
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(400px, 1fr));
+    grid-template-columns: repeat(3, 1fr);
     gap: 20px;
     margin-bottom: 20px;
   }
+  
+  @media (max-width: 1200px) {
+    .requests--grid {
+      grid-template-columns: repeat(2, 1fr);
+    }
+  }
+  
+  @media (max-width: 768px) {
+    .requests--grid {
+      grid-template-columns: 1fr;
+    }
+  }
 
   .request--card {
     background: white;
@@ -1149,6 +1161,9 @@
   .request--card--body {
     margin-bottom: 16px;
   }
+  .request--card--body .reapply--notice .text-info {
+    font-size: 16px;
+  }
 
   .request--message,
   .request--conditions {