diff --git a/src/App.vue b/src/App.vue
index 9d4dd1bf..d86e49f6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -79,17 +79,22 @@ div {
word-break: break-all;
}
-.scrollbar {
+.scrollbar,.ant-table-body,.vxe-table--body-wrapper {
&::-webkit-scrollbar {
- width: 5px;
- height: 8px;
+ width: 6px;
+ height: 6px;
background-color: #ffffff;
}
&::-webkit-scrollbar-thumb {
- background-color: #e2e5e6;
+ background-color: #D8D8D8;
+ border-radius: 10px;
}
}
+.ant-table-hide-scrollbar {
+ padding-right: 6px !important;
+ overflow-y: hidden !important;
+}
@media screen and (min-width: 600px) {
html,
body {
diff --git a/src/Layouts/BaseLayout.vue b/src/Layouts/BaseLayout.vue
index 41ce5e16..6ccf08ae 100644
--- a/src/Layouts/BaseLayout.vue
+++ b/src/Layouts/BaseLayout.vue
@@ -475,7 +475,7 @@ onMounted(() => {
// width: 88px;
height: 32px;
line-height: 18px;
- border-radius: 6px;
+ border-radius: 4px;
}
.share-button {
margin-left: 10px;
diff --git a/src/api/template-market.js b/src/api/template-market.js
index ca2affa2..8621853a 100644
--- a/src/api/template-market.js
+++ b/src/api/template-market.js
@@ -1,6 +1,6 @@
import request from '@/utils/request'
-// 保存问卷模版
+// 保存问卷模板
export function saveTemplate(sn, data) {
return request({
url: `/console/surveys/${sn}/templates`,
@@ -59,7 +59,7 @@ export function moveSurvey(data) {
});
}
-/* 移动模版分组 */
+/* 移动模板分组 */
export function moveTemplate(sn, id) {
return request({
method: "PATCH",
@@ -80,7 +80,7 @@ export function getTemplateList(params) {
});
}
-/* 模版重命名 */
+/* 模板重命名 */
export function renameTemplate(sn, data) {
return request({
method: 'patch',
@@ -89,7 +89,7 @@ export function renameTemplate(sn, data) {
})
}
-/* 删除模版 */
+/* 删除模板 */
export function delTemplate(sn) {
return request({
diff --git a/src/components/LeftMenuBar.vue b/src/components/LeftMenuBar.vue
index b08ea773..22f86218 100644
--- a/src/components/LeftMenuBar.vue
+++ b/src/components/LeftMenuBar.vue
@@ -243,6 +243,7 @@ function menusStatusToFalsefather(menus) {
&-main {
width: 220px;
height: 48px;
+ padding-bottom: 4px;
cursor: pointer;
display: flex;
align-items: center;
diff --git a/src/components/Pagination.vue b/src/components/Pagination.vue
index 47e42873..e708362f 100644
--- a/src/components/Pagination.vue
+++ b/src/components/Pagination.vue
@@ -28,7 +28,7 @@ function getPagination() {
defaultPageSize: 10,
pageSize: 10,
pageSizeOptions: ["10", "20", "30"],
- showQuickJumper: true,
+ // showQuickJumper: true,
showSizeChanger: true,
showTotal: (total) => `共 ${total} 条`,
total: 0,
@@ -86,8 +86,11 @@ export default {
diff --git a/src/font/demo_index.html b/src/font/demo_index.html
index fa054356..5ac11e47 100644
--- a/src/font/demo_index.html
+++ b/src/font/demo_index.html
@@ -54,6 +54,36 @@
+ -
+
+
下拉
+ 
+
+
+ -
+
+
电脑
+ 
+
+
+ -
+
+
手机
+ 
+
+
+ -
+
+
展开1
+ 
+
+
+ -
+
+
收起
+ 
+
+
-
文件 (1)
@@ -2922,9 +2952,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1669789588035') format('woff2'),
- url('iconfont.woff?t=1669789588035') format('woff'),
- url('iconfont.ttf?t=1669789588035') format('truetype');
+ src: url('iconfont.woff2?t=1670306788389') format('woff2'),
+ url('iconfont.woff?t=1670306788389') format('woff'),
+ url('iconfont.ttf?t=1670306788389') format('truetype');
}
第二步:定义使用 iconfont 的样式
@@ -2950,6 +2980,51 @@
+ -
+
+
+ 下拉
+
+ .icon-xiala1
+
+
+
+ -
+
+
+ 电脑
+
+ .icon-diannao1
+
+
+
+ -
+
+
+ 手机
+
+ .icon-shouji1
+
+
+
+ -
+
+
+ 展开1
+
+ .icon-zhankai11
+
+
+
+ -
+
+
+ 收起
+
+ .icon-shouqi3
+
+
+
-
@@ -7252,6 +7327,46 @@
+ -
+
+
下拉
+ #icon-xiala1
+
+
+ -
+
+
电脑
+ #icon-diannao1
+
+
+ -
+
+
手机
+ #icon-shouji1
+
+
+ -
+
+
展开1
+ #icon-zhankai11
+
+
+ -
+
+
收起
+ #icon-shouqi3
+
+
-