diff --git a/components.d.ts b/components.d.ts index e176946..a50d18f 100644 --- a/components.d.ts +++ b/components.d.ts @@ -2,7 +2,7 @@ // @ts-nocheck // Generated by unplugin-vue-components // Read more: https://github.com/vuejs/core/pull/3399 -export {}; +export {} /* prettier-ignore */ declare module 'vue' { @@ -32,6 +32,7 @@ declare module 'vue' { VanGrid: typeof import('vant/es')['Grid'] VanGridItem: typeof import('vant/es')['GridItem'] VanIcon: typeof import('vant/es')['Icon'] + VanList: typeof import('vant/es')['List'] VanNavBar: typeof import('vant/es')['NavBar'] VanPicker: typeof import('vant/es')['Picker'] VanPopup: typeof import('vant/es')['Popup'] diff --git a/src/api/home/index.js b/src/api/home/index.js index f8f6aa3..0dd135f 100644 --- a/src/api/home/index.js +++ b/src/api/home/index.js @@ -22,6 +22,20 @@ export function getSurveysPage(params) { params }); } +// 复制问卷 +export function copySurveys(sn) { + return request({ + url: `/console/surveys/${sn}`, + method: 'post' + }); +} +// 复制问卷 +export function deleteSurveys(sn) { + return request({ + url: `/console/surveys/${sn}`, + method: 'delete' + }); +} export function getListScene(params) { return request({ url: 'console/h5_scene', @@ -51,3 +65,11 @@ export function deleteTemplate(sn) { method: 'delete' }); } +// 保存为模板 +export function saveTemplates(sn, data) { + return request({ + url: `/console/surveys/${sn}/templates`, + method: 'post', + data + }); +} diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss index 23c4789..ef453cc 100644 --- a/src/assets/css/base.scss +++ b/src/assets/css/base.scss @@ -1,6 +1,6 @@ /* color palette from */ :root { - --primary-color: rgb(111, 185, 55); + --primary-color: #71b73c; --vt-c-white: #fff; --vt-c-white-soft: #f8f8f8; --vt-c-white-mute: #f2f2f2; @@ -16,6 +16,9 @@ --vt-c-text-light-2: rgba(60, 60, 60, 0.66); --vt-c-text-dark-1: var(--vt-c-white); --vt-c-text-dark-2: rgba(235, 235, 235, 0.64); + --van-picker-confirm-action-color: var(--primary-color); + --van-calendar-range-edge-background: var(--primary-color); + --van-cascader-active-color: var(--primary-color); --status-bar-height: 20px; } @@ -29,6 +32,7 @@ --color-heading: var(--vt-c-text-light-1); --color-text: var(--vt-c-text-light-1); --section-gap: 160px; + --el-select-input-focus-border-color: var(--primary-color); } @media (prefers-color-scheme: dark) { diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index e401a75..0ce87ce 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -1,9 +1,20 @@ +// main.scss + +/* eslint-disable */ @import 'theme'; + +/* eslint-disable */ @import 'base'; -@import '../../fonts/iconfont.css'; -@import '../../fonts/moblie/iconfont.css'; + +/* eslint-disable */ @import 'public'; +/* eslint-disable */ +@import '../../fonts/iconfont.css'; + +/* eslint-disable */ +@import '../../fonts/moblie/iconfont.css'; + a, .green { padding: 3px; diff --git a/src/assets/css/public.scss b/src/assets/css/public.scss index af802ea..2e8d309 100644 --- a/src/assets/css/public.scss +++ b/src/assets/css/public.scss @@ -1,3 +1,4 @@ +// public.scss .van-nav-bar { z-index: 999; padding-top: calc(var(--status-bar-height) + 15px) !important; @@ -13,6 +14,7 @@ .van-popup--bottom.van-popup--round { border-radius: 10px 10px 0 0 !important; + background: #f2f2f2; } .van-radio-group { @@ -88,7 +90,7 @@ bottom: -2px; box-sizing: border-box; width: 100%; - border-bottom: 0.0267rem solid #ebedf0; + border-bottom: 0.0267rem solid #fff; pointer-events: none; transform: scaleY(0.5); } @@ -115,6 +117,11 @@ color: $theme-color; } +.van-dialog__confirm, +.van-dialog__confirm:active { + color: $theme-color; +} + .round-group { overflow: hidden; margin: 13px 10px; @@ -125,3 +132,98 @@ border-color: $theme-color; background-color: $theme-color; } + +.van-grid-item__content { + padding: 8px 10px; + border-radius: 10px; +} + +.yl-select { + position: relative; + overflow: hidden; + max-width: 95vw; +} + +.el-select__wrapper::after { + content: '\e65b'; + position: absolute; + top: 5px; + right: 10px; + font-size: 10px; +} + +.el-select__suffix { + display: none; +} + +// 自定义下拉箭头样式 +.el-select__caret { + color: $theme-color; // 修改箭头颜色 + font-size: 18px; // 修改箭头大小 + transform: rotate(0deg); // 修改箭头旋转角度（默认是0度，展开时会旋转180度） +} + +.el-cascader__tags .el-tag { + background: $theme-color; + color: #fff; +} + +.el-tag .el-tag__close { + color: #fff; +} + +.el-cascader-node.in-active-path, +.el-cascader-node.is-active, +.el-cascader-node.is-selectable.in-checked-path { + color: $theme-color; +} + +.el-checkbox__inner:hover { + border-color: $theme-color; +} + +.el-checkbox__input.is-checked .el-checkbox__inner, +.el-checkbox__input.is-indeterminate .el-checkbox__inner { + border-color: $theme-color; + background: $theme-color; +} + +.el-input, +.el-input__wrapper { + background: #fafbfc; +} + +.el-select__caret.is-reverse { + transform: rotate(180deg); // 展开时旋转180度 +} + +.el-select { + border: none; +} + +.el-select__wrapper { + background: #fafbfc; +} + +.el-select-dropdown__item.is-selected { + color: $theme-color; +} + +input { + outline-color: transparent; +} +.el-input__wrapper, +.el-select__wrapper { + box-shadow: none; +} + +.el-cascader .el-input.is-focus .el-input__wrapper, +.el-input__wrapper.is-focus, +.el-select__wrapper.is-focused, +.el-cascader:not(.is-disabled):hover .el-input__wrapper { + box-shadow: 0 0 0 0.0267rem $theme-color inset; + + &::after { + color: $theme-color; + } +} diff --git a/src/assets/img/publish/edit.png b/src/assets/img/publish/edit.png new file mode 100644 index 0000000..7135c4e Binary files /dev/null and b/src/assets/img/publish/edit.png differ diff --git a/src/assets/img/publish/end.png b/src/assets/img/publish/end.png new file mode 100644 index 0000000..4da6e51 Binary files /dev/null and b/src/assets/img/publish/end.png differ diff --git a/src/assets/img/publish/publish.png b/src/assets/img/publish/publish.png new file mode 100644 index 0000000..c9d6a54 Binary files /dev/null and b/src/assets/img/publish/publish.png differ diff --git a/src/components/YLSelect.vue b/src/components/YLSelect.vue index d15c9a9..a477355 100644 --- a/src/components/YLSelect.vue +++ b/src/components/YLSelect.vue @@ -1,7 +1,7 @@ -
- 添加逻辑 +
+ 添加逻辑
diff --git a/src/views/Design/components/Questions/MartrixQuestion.vue b/src/views/Design/components/Questions/MartrixQuestion.vue index 537389c..aec2c9c 100644 --- a/src/views/Design/components/Questions/MartrixQuestion.vue +++ b/src/views/Design/components/Questions/MartrixQuestion.vue @@ -1,38 +1,38 @@ - + diff --git a/src/views/Design/components/Questions/MatrixQuestion.vue b/src/views/Design/components/Questions/MatrixQuestion.vue index be7534f..e9b0ccc 100644 --- a/src/views/Design/components/Questions/MatrixQuestion.vue +++ b/src/views/Design/components/Questions/MatrixQuestion.vue @@ -1,123 +1,127 @@