gemercheung před 2 roky
rodič
revize
cb3757ed3e
6 změnil soubory, kde provedl 36 přidání a 4 odebrání
  1. 1 0
      package.json
  2. 6 0
      pnpm-lock.yaml
  3. 1 0
      src/main.ts
  4. 24 0
      src/style.css
  5. 4 3
      src/views/room/edit-room/index.vue
  6. 0 1
      src/views/room/list.vue

+ 1 - 0
package.json

@@ -25,6 +25,7 @@
     "axios": "^0.27.2",
     "dayjs": "^1.11.6",
     "less": "^4.1.3",
+    "normalize.css": "^8.0.1",
     "pinia": "^2.0.22",
     "sass": "^1.54.9",
     "vue": "^3.2.37",

+ 6 - 0
pnpm-lock.yaml

@@ -18,6 +18,7 @@ specifiers:
   less: ^4.1.3
   lint-staged: ^13.0.3
   minimist: ^1.2.6
+  normalize.css: ^8.0.1
   pinia: ^2.0.22
   prettier: ^2.7.1
   sass: ^1.54.9
@@ -38,6 +39,7 @@ dependencies:
   axios: 0.27.2
   dayjs: 1.11.6
   less: 4.1.3
+  normalize.css: 8.0.1
   pinia: 2.0.23_l7r24p6nevbtlimqmqcwa3ouhu
   sass: 1.55.0
   vue: 3.2.41
@@ -1859,6 +1861,10 @@ packages:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
 
+  /normalize.css/8.0.1:
+    resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==}
+    dev: false
+
   /npm-run-path/5.1.0:
     resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}

+ 1 - 0
src/main.ts

@@ -1,4 +1,5 @@
 import { createApp } from 'vue'
+import 'normalize.css'
 import '@/assets/iconfont/iconfont.css'
 import 'ant-design-vue/lib/message/style/index.less'
 import './style.css'

+ 24 - 0
src/style.css

@@ -1,3 +1,27 @@
+::-webkit-scrollbar {
+  width: 14px;
+  height: 18px;
+}
+
+::-webkit-scrollbar-thumb {
+  height: 6px;
+  border: 4px solid rgba(0, 0, 0, 0);
+  background-clip: padding-box;
+  background-color: rgba(0, 0, 0, 0, 0.2);
+  -webkit-border-radius: 7px;
+  -webkit-box-shadow: inset -1px -1px 0px rgba(0, 0, 0, 0.05),
+    inset 1px 1px 0px rgba(0, 0, 0, 0.05);
+}
+
+::-webkit-scrollbar-button {
+  display: none;
+  width: 0;
+  height: 0;
+}
+
+::-webkit-scrollbar-corner {
+  background-color: transparent;
+}
 #app {
   height: 100%;
 }

+ 4 - 3
src/views/room/edit-room/index.vue

@@ -5,7 +5,8 @@
     :after-close="onCancel"
     width="912px"
     :style="{
-      top: '10px'
+      top: '10px',
+      minWidth: '820px'
     }"
     @cancel="visible = false"
   >
@@ -81,9 +82,9 @@
             show-count
           />
         </a-form-item>
-        <h4>场景</h4>
+        <h4>选择场景</h4>
         <a-form-item
-          label="选择场景"
+          label="添加场景"
           class="select-scene"
           name="scenes"
           style="margin-bottom: 2px"

+ 0 - 1
src/views/room/list.vue

@@ -75,7 +75,6 @@ import Share from './modal/share.vue'
 import MiniSync from './modal/mini-sync.vue'
 import DataList from '@/components/data-list/index.vue'
 
-
 import type { Room } from '@/store'
 import { fetchRoomDetail } from '@/api'