xuqiang 4 lat temu
rodzic
commit
365a408b3e

+ 9 - 5
src/main/vue/src/components/CoordinateSelect.vue

@@ -35,7 +35,9 @@
             <i class="el-icon-plus"></i>
         </div>
 
-        <el-button class="close-btn" @click="closeMap" type="danger" icon="el-icon-close" circle></el-button>
+        <div class="address-btn">
+            <el-button class="close-btn" @click="closeMap" type="danger" icon="el-icon-close" circle></el-button>
+        </div>
     </div>
 </template>
 <script>
@@ -266,9 +268,11 @@ export default {
     position: relative;
 }
 
-.close-btn {
-    position: absolute;
-    right: -10px;
-    top: -10px;
+.address-btn {
+    .close-btn {
+        position: absolute;
+        right: 7px;
+        top: 8px;
+    }
 }
 </style>

+ 12 - 3
src/main/vue/src/styles/app.less

@@ -172,7 +172,7 @@ li {
 }
 .el-range-separator{
     color: #ffffff !important;
-    line-height: 29px !important;
+    // line-height: 29px !important;
 }
 .el-tree-node__content:hover {
     background: #080C27 !important;
@@ -223,10 +223,16 @@ li {
      background-color: transparent !important;
     //  background: rgba(255, 255, 255, 0.12) !important;
 }
+.el-form-item__label{
+    color: #fff !important;
+}
 .el-input-number__increase{
      background-color: transparent !important;
     //  background: rgba(255, 255, 255, 0.12) !important;
 }
+.el-textarea .el-input__count{
+    background: #242744 !important;
+}
 .filter-btn{
     min-width: 80px;
     height: 36px;
@@ -385,8 +391,11 @@ li {
          }
      }
  }
+//  .el-range-separator{
+//      margin-bottom: 2px !important;
+//  }
  .menu1 {
-    min-width: 220px;
+    min-width: 240px;
     height: 36px;
     border-radius: 18px;
     border: 1px solid #ffffff;
@@ -396,7 +405,7 @@ li {
     }
      .el-radio-button__inner {
          background-color: transparent;
-         width: 60px;
+         width: 65px;
          height: 36px;
          line-height: 18px;
          border: 0;

+ 8 - 2
src/main/vue/src/views/sale/CustomerEdit.vue

@@ -108,7 +108,7 @@
                     </el-input>
                 </div>
                 <div class="map">
-                    <el-button type="text" @click="mapDialogVisible = !mapDialogVisible"
+                    <el-button class="address-btn" type="text" @click="mapDialogVisible = !mapDialogVisible"
                         >点击打开地图选择地址</el-button
                     >
 
@@ -493,4 +493,10 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.address-btn {
+    width: 200px;
+    height: 30px;
+    margin: 10px 0;
+}
+</style>

+ 2 - 2
src/test/java/com/izouma/zhumj/repo/RoomFeeRepoTest.java

@@ -13,7 +13,7 @@ public class RoomFeeRepoTest extends ZhumjApplicationTests {
 
     @Test
     public void findRoomFeeRecord() {
-        Page<FeeRecordResult> page = roomFeeRepo.findRoomFeeRecord(15304L, PageRequest.of(0, 10));
-        System.out.println(page);
+//        Page<FeeRecordResult> page = roomFeeRepo.findRoomFeeRecord(15304L, PageRequest.of(0, 10));
+//        System.out.println(page);
     }
 }