Merge branch 'iteration-20240411'

src/views/site-management/site-settings.module.less

@@ -66,25 +66,6 @@
     margin-right: 4px;
   }
 
-  .address {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    color: var(--k-gray-1);
-
-    .overhide {
-      max-width: 120px;
-    }
-
-    .iconEdit {
-      font-size: 16px;
-      margin-left: 4px;
-    }
-
-    .red {
-      color: #FF5A56;
-    }
-  }
 
   .iconTeacher {
     width: 48px;
@@ -134,4 +115,47 @@
       }
     }
   }
+}
+
+.addressShow {
+  padding: 8px 10px;
+  margin: 0 12px 12px;
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  color: #333333;
+  background: #f8f9fc;
+  border-radius: 6px;
+
+  // .iconAddress {
+  //   width: 12px;
+  //   height: 12px;
+  //   margin-right: 6px;
+  //   flex-shrink: 0;
+  // }
+
+  // p {
+  //   flex: 1 auto;
+  // }
+
+  .address {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    color: var(--k-gray-1);
+
+    .overhide {
+      max-width: 100%;
+    }
+
+    .iconEdit {
+      font-size: 16px;
+      margin-left: 4px;
+    }
+
+    .red {
+      color: #FF5A56;
+    }
+  }
 }

src/views/site-management/site-settings.tsx

@@ -168,23 +168,23 @@ export default defineComponent({
                             <img src={iconMusic} class={styles.iconMusic} />
                             <p class={styles.overhide}>{item.musicGroupName}</p>
                           </div>
-                        ),
-                        default: () => (
-                          <div
-                            class={styles.address}
-                            onClick={() => onEdit(item)}>
-                            <p
-                              class={[
-                                styles.overhide,
-                                item.teachingPoint ? '' : styles.red
-                              ]}>
-                              {item.teachingPoint || '未设置场地'}
-                            </p>
-                            <Icon name={iconEdit} class={styles.iconEdit} />
-                          </div>
                         )
                       }}
                     </Cell>
+                    <div class={styles.addressShow}>
+                      <div
+                        class={styles.address}
+                        onClick={() => onEdit(item)}>
+                        <p
+                          class={[
+                            styles.overhide,
+                            item.teachingPoint ? '' : styles.red
+                          ]}>
+                          <span style={{ color: ' var(--k-gray-1)' }}>场地名称：</span>{item.teachingPoint || '未设置场地'}
+                        </p>
+                        <Icon name={iconEdit} class={styles.iconEdit} />
+                      </div>
+                    </div>
                     <Cell center class={styles.username}>
                       {{
                         icon: () => (