- {{$t(`￥`)}}
-
- {{storeCombination.people + $t(`人拼`)}}
-
-
-
-
@@ -715,6 +711,7 @@ export default {
methodColor: '#fff',
apiType: 'adminapi',
paramsId: 0,
+ winLoading: false,
};
},
watch: {
@@ -737,9 +734,22 @@ export default {
},
apiType(newVal) {
if (newVal) {
+ this.winLoading = true;
this.getInterfaceList('one');
}
},
+ isEdit(newVal) {
+ if (newVal) {
+ this.formValidate.response_example.map((e) => {
+ e.data = JSON.stringify(e.data);
+ });
+ console.log(this.formValidate.response_example, 'this.formValidate.response_example');
+ } else {
+ this.formValidate.response_example.map((e) => {
+ e.data = JSON.parse(e.data);
+ });
+ }
+ },
},
computed: {
...mapState('media', ['isMobile']),
@@ -825,8 +835,10 @@ export default {
this.treeData = new Tree({});
this.formValidate = {};
}
+ this.winLoading = false;
})
.catch((err) => {
+ this.winLoading = false;
this.$message.error(err.msg);
});
} catch (error) {
@@ -859,15 +871,20 @@ export default {
} else if (!this.formValidate.path) {
return this.$message.warning('请输入路由地址');
}
- this.formValidate.request = await this.$refs.xTable.getTableData().tableData;
+ this.formValidate.request = await this.$refs.bodyTable.getTableData().tableData;
this.formValidate.response = await this.$refs.resTable.getTableData().tableData;
this.formValidate.error_code = await this.$refs.codeTable.getTableData().tableData;
+ this.formValidate.header = await this.$refs.headTable.getTableData().tableData;
+ this.formValidate.query = await this.$refs.xTable.getTableData().tableData;
this.formValidate.apiType = this.apiType;
+ this.formValidate.response_example.map((e) => {
+ e.data = JSON.parse(e.data);
+ });
await routeSave(this.formValidate)
.then((res) => {
- this.isEdit = false;
this.$message.success(res.msg);
this.getRoteData(this.paramsId);
+ this.isEdit = false;
})
.catch((err) => {
this.$message.error(err.msg);
@@ -1160,6 +1177,9 @@ export default {
.reset {
margin-left: 10px;
}
+.b-r-1{
+ border-right: 1px solid #f2f2f2;
+}
.card-tree {
background: #fff;
height: 72px;
@@ -1187,6 +1207,9 @@ export default {
.main {
width: 100%;
display: flex;
+ padding-bottom: 16px;
+ background: #fff;
+ border-radius: 6px;
.main-btn {
display:flex;
position: sticky;
@@ -1200,7 +1223,7 @@ export default {
}
.card-tree{
width: 290px;
- height: calc(100vh - 115px);
+ height: calc(100vh - 205px);
overflow-y: scroll;
}
::v-deep .tree {
@@ -1232,7 +1255,7 @@ export default {
padding: 3px 7px 3px 0;
}
.node{
- padding:3px 2px 3px 0px;
+ // padding:3px 2px 3px 0px;
}
.open {
// background-color: #fff1ef;
@@ -1277,7 +1300,7 @@ export default {
}
}
::v-deep .vtl-node-main{
- padding:0;
+ padding: 3px 0;
}
::v-deep .line1 {
display: table-caption;
@@ -1289,10 +1312,16 @@ export default {
::v-deep .ivu-form-item{
margin-bottom: 10px;
}
- .right-card {
+ .right-card{
flex: 1;
- max-height: calc(100vh - 115px);
- overflow-y: scroll;
+ ::v-deep .el-card__body {
+ max-height: calc(100vh - 205px);
+ overflow-y: scroll;
+ padding-bottom: 16px;
+ }
+ ::v-deep .el-form-item--small.el-form-item{
+ margin-bottom: 6px;
+ }
}
.data {
diff --git a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue
index 89009b826..046eee13d 100644
--- a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue
+++ b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue
@@ -676,7 +676,7 @@ export default {
height: 28px !important;
line-height: 28px !important;
}
-::v-deep.el-input-group__prepend div.el-select .el-input--small .el-input__icon {
+::v-deep .el-input-group__prepend div.el-select .el-input--small .el-input__icon {
line-height: 28px;
}
diff --git a/template/admin/src/pages/system/codeGeneration/list.vue b/template/admin/src/pages/system/codeGeneration/list.vue
index 51a6a5946..25c298b07 100644
--- a/template/admin/src/pages/system/codeGeneration/list.vue
+++ b/template/admin/src/pages/system/codeGeneration/list.vue
@@ -590,7 +590,7 @@ export default {
color: #f00;
}
-::v-deep body .ivu-select-dropdown .ivu-dropdown-transfer {
+::v-deepbody .ivu-select-dropdown .ivu-dropdown-transfer {
background: red !important;
}
diff --git a/template/admin/src/pages/system/group/components/groupFrom.vue b/template/admin/src/pages/system/group/components/groupFrom.vue
index 1fe2379a6..c20a4e39e 100644
--- a/template/admin/src/pages/system/group/components/groupFrom.vue
+++ b/template/admin/src/pages/system/group/components/groupFrom.vue
@@ -174,7 +174,7 @@ export default {
value: '',
},
param: {
- placeholder: '参数方式例如:\n1=>白色\n2=>红色\n3=>黑色',
+ placeholder: '参数方式例如:\n1=白色\n2=红色\n3=黑色',
value: '',
},
});
diff --git a/template/admin/src/pages/system/group/pc.vue b/template/admin/src/pages/system/group/pc.vue
index 146d2cbdf..0e05587d5 100644
--- a/template/admin/src/pages/system/group/pc.vue
+++ b/template/admin/src/pages/system/group/pc.vue
@@ -834,11 +834,11 @@ export default {
margin-bottom: 10px;
}
-::v-deep.ivu-form-item-content {
+::v-deep .ivu-form-item-content {
margin-left: 0px !important;
}
-::v-deep.i-layout-page-header {
+::v-deep .i-layout-page-header {
display: flex;
align-items: center;
justify-content: space-between;
diff --git a/template/admin/src/pages/system/group/visualization.vue b/template/admin/src/pages/system/group/visualization.vue
index edb7682f2..f824eca3b 100644
--- a/template/admin/src/pages/system/group/visualization.vue
+++ b/template/admin/src/pages/system/group/visualization.vue
@@ -1030,7 +1030,7 @@ export default {
display: none;
}
-::v-deep.ivu-form-item-content {
+::v-deep .ivu-form-item-content {
margin-left: 0px !important;
}
@@ -1783,14 +1783,14 @@ export default {
// width 80px!important
}
-::v-deep.ivu-page-header {
+::v-deep .ivu-page-header {
border-bottom: unset;
position: fixed;
z-index: 9;
width: 100%;
}
-::v-deep.i-layout-page-header {
+::v-deep .i-layout-page-header {
display: flex;
align-items: center;
justify-content: space-between;
diff --git a/template/admin/src/pages/system/maintain/systemFile/components/codemirror.vue b/template/admin/src/pages/system/maintain/systemFile/components/codemirror.vue
index 576b1628a..407805924 100644
--- a/template/admin/src/pages/system/maintain/systemFile/components/codemirror.vue
+++ b/template/admin/src/pages/system/maintain/systemFile/components/codemirror.vue
@@ -146,6 +146,6 @@ export default {
};
diff --git a/template/admin/src/pages/system/maintain/systemFile/opendir.vue b/template/admin/src/pages/system/maintain/systemFile/opendir.vue
index 1a0e9d345..f581fc1cf 100644
--- a/template/admin/src/pages/system/maintain/systemFile/opendir.vue
+++ b/template/admin/src/pages/system/maintain/systemFile/opendir.vue
@@ -63,6 +63,7 @@
:custom-class="className"
:close-on-click-modal="false"
width="80%"
+ top="5vh"
@close="editModalChange"
append-to-body
:title="editorIndex[indexEditor].title"
@@ -77,9 +78,10 @@
/>
- 新增分类
- 同步
-
+
+
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
+
+ {{ slotProps.model.method }}
+
+
+
+
+ 新增分类
+ 同步
+
-
+
+
+
+ 新增接口
+ 编辑分类名
+ 删除
+
+
+
+
+
+
-
-
-
+ {{ slotProps.model.name }}
- {{ slotProps.model.name }}
-
-
-
-
-
-
- 新增接口
- 编辑分类名
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
- {{ slotProps.model.method }}
+
+
+
+
+
-
+
-
+
-
+
- {{ formValidate.name }}
-
-
- 调试
- {{
- isEdit ? '取消' : '编辑'
- }}
- 保存
-
+
+
+
+
+
+
+
+
+
+ {{
+ formValidate.method || ''
+ }}
+
+
+
+
+
+
+
+
+ {{ formValidate.type ? '是' : '否' }}
+
+
+
+
+
+
+ {{ formValidate.path || '' }}
+
+
+ {{ formValidate.file_path || '' }}
+
+
+ {{ formValidate.action || '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.type || '' }}
-
-
-
-
-
-
-
-
-
-
-
- 插入
- 删除
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 插入
+ 删除
+
+
+
- 添加参数
-
-
-
-
-
-
-
-
-
-
- {{ row.type || '' }}
-
-
-
-
-
-
-
-
-
-
- 插入
- 删除
-
-
-
- 添加参数
-
-
-
-
-
-
-
-
-
-
-
-
- {{ row.type || '' }}
+ 添加参数
+
+
+
+
+
+
+
+
+
+
+ {{ row.type || '' }}
+
+
+
+
+
+
+
+
+
+
+ 插入
+ 删除
+
+
+
+ 添加参数
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.type || '' }}
-
-
-
-
-
-
-
-
-
-
-
- 插入
- 删除
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 插入
+ 删除
+
+
+
- 添加参数
-
-
-
-
-
-
-
-
-
-
-
- {{ row.type || '' }}
-
-
-
+
+
+
+
+
+
+
+ {{ row.type || '' }}
+
+
+
-
-
-
-
-
- 插入
- 删除
-
-
-
- 添加参数
-
-
-
-
-
-
-
-
-
- {{ item.name || '' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
- 添加参数
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+ 添加参数
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
- {{
- formValidate.method || ''
- }}
-
-
-
-
-
-
-
-
- {{ formValidate.type ? '是' : '否' }}
-
-
-
-
-
-
- {{ formValidate.path || '' }}
-
-
- {{ formValidate.file_path || '' }}
-
-
- {{ formValidate.action || '' }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ row.type || '' }}
+
+
+ {{ formValidate.name }}
- 接口信息
- 调用方式
-
+ 调试
+ {{
+ isEdit ? '取消' : '编辑'
+ }}
+ 保存
+
+ 接口信息
+ 调用方式
+ 调用示例
-
-
- 保存
- 刷新
-
+
@@ -900,22 +902,22 @@ export default {
.file-left {
padding-left: 10px;
- ::v-deep.ivu-icon-ios-arrow-forward {
+ ::v-deep .ivu-icon-ios-arrow-forward {
font-size: 18px !important;
}
color: #cccccc;
- ::v-deep.ivu-icon-ios-folder-outline {
+ ::v-deep .ivu-icon-ios-folder-outline {
font-size: 14px !important;
}
- ::v-deep.ivu-icon-ios-document-outline {
+ ::v-deep .ivu-icon-ios-document-outline {
font-size: 18px !important;
}
}
-::v-deep.ivu-icon-md-folder {
+::v-deep .ivu-icon-md-folder {
font-size: 18px !important;
color: #d6ab34 !important;
}
@@ -996,7 +998,7 @@ export default {
}
-::v-deep.CodeMirror {
+::v-deep .CodeMirror {
height: 70vh !important;
}
@@ -1005,8 +1007,7 @@ export default {
align-items: flex-start;
justify-content: space-between;
position: relative;
- height: 95%;
- min-height: 600px;
+ min-height: calc(100% - 35px);
overflow: hidden;
}
@@ -1015,9 +1016,10 @@ export default {
position: absolute;
top: 58px;
left: 0;
- height: 90%;
+ height: calc(100% - 58px);
+
// height: 100%;
- // min-height: 600px;
+ // min-height: calc(100% - 35px);
width: 25%;
max-width: 250px;
overflow: auto;
@@ -1027,11 +1029,10 @@ export default {
.file-fix {
flex: 1;
max-width: 250px;
- height: 76vh;
- min-height: 600px;
+ min-height: calc(100% - 35px);
// bottom: 0px;
// overflow: auto;
- min-height: 600px;
+ min-height: calc(100% - 35px);
background-color: #292929;
}
}
@@ -1043,17 +1044,15 @@ export default {
// left: 25%;
flex: 3;
overflow: hidden;
- min-height: 600px;
+ min-height: calc(100% - 35px);
height: 100%;
}
}
-::v-deep.el-dialog__body {
+::v-deep .el-dialog__body {
padding: 0 !important;
-}
-
-::v-deep.el-dialog__body {
- background-color: #292929;
+ height: 80vh;
+ max-height: 80vh;
}
.diy-button {
@@ -1133,9 +1132,11 @@ export default {
text-align: center;
background-color: #2f2f2f;
}
-
+ .top-button{
+ background-color: #292929;
+ }
.show-info {
- background-color: #383838;
+ background-color: #292929;
color: #FFF;
width: 25%;
max-width: 250px;
@@ -1165,7 +1166,7 @@ export default {
}
}
-body ::v-deep.ivu-select-dropdown {
+body ::v-deep .ivu-select-dropdown {
background: #fff;
}
@@ -1174,7 +1175,7 @@ body ::v-deep.ivu-select-dropdown {
overflow: hidden;
}
- ::v-deep.ivu-tree-title {
+ ::v-deep .ivu-tree-title {
width: 90%;
max-width: 250px;
padding: 0;
@@ -1182,15 +1183,15 @@ body ::v-deep.ivu-select-dropdown {
}
}
-::v-deep.ivu-tree-children {
+::v-deep .ivu-tree-children {
.ivu-tree-title:hover {
background-color: #2f2f2f !important;
}
}
-::v-deep.el-tabs__item{
+::v-deep .el-tabs__item{
background-color: #fff;
}
-::v-deep.el-tree{
+::v-deep .el-tree{
background-color: #292929 !important;
}
.file-box {
@@ -1231,7 +1232,7 @@ body ::v-deep.ivu-select-dropdown {
}
// 自定义方法缩小
-::v-deep.diy-fullscreen {
+::v-deep .diy-fullscreen {
overflow: hidden;
.ivu-modal {
@@ -1269,7 +1270,7 @@ body ::v-deep.ivu-select-dropdown {
}
}
-::v-deep.ivu-modal {
+::v-deep .ivu-modal {
top: 70px;
}
@@ -1309,7 +1310,7 @@ body ::v-deep.ivu-select-dropdown {
}
// 选项卡头部
-::v-deep.ivu-tabs.ivu-tabs-card > .ivu-tabs-bar .ivu-tabs-nav-container {
+::v-deep .ivu-tabs.ivu-tabs-card > .ivu-tabs-bar .ivu-tabs-nav-container {
background-color: #333;
}
diff --git a/template/admin/src/pages/user/grade/agreement/index.vue b/template/admin/src/pages/user/grade/agreement/index.vue
index 29702b600..8eb87fb0c 100644
--- a/template/admin/src/pages/user/grade/agreement/index.vue
+++ b/template/admin/src/pages/user/grade/agreement/index.vue
@@ -83,7 +83,7 @@ export default {
diff --git a/template/admin/src/pages/user/list/handle/userDetails.vue b/template/admin/src/pages/user/list/handle/userDetails.vue
index e770240df..11abc3849 100644
--- a/template/admin/src/pages/user/list/handle/userDetails.vue
+++ b/template/admin/src/pages/user/list/handle/userDetails.vue
@@ -356,18 +356,18 @@ export default {
height: 100%;
}
}
-::v-deep.el-drawer__body {
- padding: 20px 0;
+::v-deep .el-drawer__body {
+ padding: 20px 0 !important;
}
-::v-deep.el-tabs--border-card > .el-tabs__content {
+::v-deep .el-tabs--border-card > .el-tabs__content {
padding: 0 35px;
}
-::v-deep.el-tabs--border-card > .el-tabs__header,
-::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item:active {
+::v-deep .el-tabs--border-card > .el-tabs__header,
+::v-deep .el-tabs--border-card > .el-tabs__header .el-tabs__item:active {
border: none;
height: 40px;
}
-::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
+::v-deep .el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
border: none;
border-top: 2px solid var(--prev-color-primary);
font-size: 13px;
@@ -375,10 +375,10 @@ export default {
color: #303133;
line-height: 16px;
}
-::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item {
+::v-deep .el-tabs--border-card > .el-tabs__header .el-tabs__item {
border: none;
}
-::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item {
+::v-deep .el-tabs--border-card > .el-tabs__header .el-tabs__item {
margin-top: 0;
transition: none;
height: 40px !important;
@@ -389,13 +389,13 @@ export default {
color: #303133;
line-height: 16px;
}
-::v-deep.el-tabs--border-card {
+::v-deep .el-tabs--border-card {
border: none;
box-shadow: none;
}
.head {
position: relative;
- padding: 0 35px;
+ padding: 0 15px;
.edit-btn {
position: absolute;
right: 10px;
diff --git a/template/admin/src/pages/user/list/index.vue b/template/admin/src/pages/user/list/index.vue
index 5966f07c9..38d525a87 100644
--- a/template/admin/src/pages/user/list/index.vue
+++ b/template/admin/src/pages/user/list/index.vue
@@ -16,9 +16,14 @@
@@ -690,7 +695,11 @@ export default {
this.$message.warning('请选择要设置分组的用户');
} else {
let uids = { uids: this.ids };
- this.$modalForm(userSetGroup(uids)).then(() => this.getList());
+ this.$modalForm(userSetGroup(uids)).then(() => {
+ this.ids = [];
+ this.selectedIds = [];
+ this.getList();
+ });
}
},
// 批量设置标签；
@@ -967,6 +976,10 @@ export default {
this.selectionList = [];
this.getList();
},
+ handleClose(tag) {
+ this.selectDataLabel.splice(this.selectDataLabel.indexOf(tag), 1);
+ this.userSearchs()
+ },
// 搜索
userSearchs() {
this.userFrom.page = 1;
@@ -1221,7 +1234,7 @@ img {
.search-form {
display: flex;
justify-content: space-between;
- .search-form-box{
+ .search-form-box {
display: flex;
flex-wrap: wrap;
flex: 1;
diff --git a/template/admin/src/router/modules/system.js b/template/admin/src/router/modules/system.js
index 502dd41e7..3c8e8b1ed 100644
--- a/template/admin/src/router/modules/system.js
+++ b/template/admin/src/router/modules/system.js
@@ -60,7 +60,7 @@ export default {
name: `${pre}backend_routing`,
meta: {
auth: ['system-config-backend-routing'],
- title: '路由权限',
+ title: '接口管理',
},
component: () => import('@/pages/system/backendRouting/index'),
},
diff --git a/template/admin/src/styles/common.scss b/template/admin/src/styles/common.scss
index f1f5cbdde..1389568d6 100644
--- a/template/admin/src/styles/common.scss
+++ b/template/admin/src/styles/common.scss
@@ -3,6 +3,7 @@ body,
html {
height: 100%;
}
+
//body{
// background-color: @background-color-base;
// font-size: 14px;
@@ -14,9 +15,11 @@ html {
&::-webkit-scrollbar {
width: 0;
}
+
&::-webkit-scrollbar-track {
background-color: transparent;
}
+
&::-webkit-scrollbar-thumb {
background: #e8eaec;
}
@@ -28,9 +31,11 @@ html {
&::-webkit-scrollbar {
width: 6px;
}
+
&::-webkit-scrollbar-track {
background-color: transparent;
}
+
&::-webkit-scrollbar-thumb {
background: #808695;
border-radius: 4px;
@@ -42,9 +47,11 @@ html {
&::-webkit-scrollbar {
width: 0;
}
+
&::-webkit-scrollbar-track {
background-color: transparent;
}
+
&::-webkit-scrollbar-thumb {
background: #e8eaec;
}
@@ -55,9 +62,11 @@ html {
&::-webkit-scrollbar {
width: 6px;
}
+
&::-webkit-scrollbar-track {
background-color: transparent;
}
+
&::-webkit-scrollbar-thumb {
background: #808695;
border-radius: 4px;
@@ -69,12 +78,22 @@ html {
.ivu-table th {
background-color: #fff;
}
+
.ivu-table-wrapper,
.ivu-table tr:last-child td {
border: none;
}
+
.ivu-table:before,
.ivu-table:after {
display: none;
}
}
+
+.w-80 {
+ width: 80px;
+}
+
+.w-100 {
+ width: 100px;
+}
\ No newline at end of file
diff --git a/template/admin/src/theme/app.scss b/template/admin/src/theme/app.scss
index 44aa2c392..622c799a4 100644
--- a/template/admin/src/theme/app.scss
+++ b/template/admin/src/theme/app.scss
@@ -186,7 +186,7 @@ body,
.h100 {
height: 100% !important;
- min-height: calc(100vh - 185px);
+ min-height: calc(100vh - 186px);
}
.h101 {
diff --git a/template/admin/src/theme/element.scss b/template/admin/src/theme/element.scss
index 256eccb53..bda2e2082 100644
--- a/template/admin/src/theme/element.scss
+++ b/template/admin/src/theme/element.scss
@@ -5,17 +5,23 @@
position: relative;
height: 100%;
}
+
.el-scrollbar__wrap {
overflow: auto !important;
overflow-x: hidden !important;
- max-height: 100%; /*防止页面切换时，滚动条高度不变的问题（滚动条高度非滚动条滚动高度）*/
+ max-height: 100%;
+ /*防止页面切换时，滚动条高度不变的问题（滚动条高度非滚动条滚动高度）*/
}
+
.el-select-dropdown .el-scrollbar__wrap {
overflow-x: scroll !important;
}
+
.el-select-dropdown__wrap {
- max-height: 274px !important; /*修复Select 选择器高度问题*/
+ max-height: 274px !important;
+ /*修复Select 选择器高度问题*/
}
+
.el-autocomplete-suggestion__wrap {
max-height: 280px !important;
}
@@ -27,27 +33,32 @@
padding: 9px 15px !important;
border-radius: 4px;
}
-.el-button.is-loading {
-}
-.el-button + .el-button {
+
+.el-button.is-loading {}
+
+.el-button+.el-button {
margin-left: 14px !important;
}
+
// 第三方字体图标大小
.el-button i.iconfont,
.el-button i.fa {
font-size: 14px !important;
margin-right: 5px;
}
+
.el-button--medium i.iconfont,
.el-button--medium i.fa {
font-size: 14px !important;
margin-right: 5px;
}
+
.el-button--small i.iconfont,
.el-button--small i.fa {
font-size: 12px !important;
margin-right: 5px;
}
+
.el-button--mini i.iconfont,
.el-button--mini i.fa {
font-size: 12px !important;
@@ -84,10 +95,12 @@
color: #303133;
line-height: 14px !important;
}
+
.el-dialog__headerbtn {
position: initial !important;
}
-.el-dialog__body > img {
+
+.el-dialog__body>img {
// max-width: 600px;
max-height: 600px;
}
@@ -97,9 +110,11 @@
.el-alert--warning.is-light {
// border: 1px solid rgba(230, 162, 60, 0.3) !important;
}
+
.el-alert--success.is-light {
// border: 1px solid rgba(103, 194, 58, 0.3) !important;
}
+
// .el-alert--info.is-light {
// color: #f7ba1e;
// background-color: #fef8e8;
@@ -126,28 +141,33 @@
/* 下拉选择器/时间选择器滚动条
------------------------------- */
-.el-table__body tr.current-row > td.el-table__cell,
+.el-table__body tr.current-row>td.el-table__cell,
.vxe-table--render-default .vxe-body--row.row--current {
background-color: #f5f7fa !important;
}
+
.hover-row .el-select-dropdown .el-scrollbar__wrap,
.el-picker-panel .el-scrollbar__wrap {
overflow-x: scroll !important;
}
+
.el-table--enable-row-transition .el-table__body td {
// display: flex;
// align-items: center;
height: 50px;
}
+
.vxe-table--body-wrapper .vxe-cell {
min-height: 24px;
}
+
/* NavMenu 导航菜单
------------------------------- */
// 默认样式修改
.el-menu {
border-right: none !important;
}
+
.el-menu-item,
.el-submenu__title {
height: 50px !important;
@@ -155,29 +175,34 @@
color: var(--prev-bg-menuBarColor) !important;
transition: none !important;
}
+
// horizontal 水平方向时
-.el-menu--horizontal > .el-menu-item.is-active,
-.el-menu--horizontal > .el-submenu.is-active .el-submenu__title {
+.el-menu--horizontal>.el-menu-item.is-active,
+.el-menu--horizontal>.el-submenu.is-active .el-submenu__title {
border-bottom: 3px solid !important;
border-bottom-color: var(--prev-color-primary) !important;
// color: var(--prev-color-primary) !important;
}
+
.el-menu--horizontal .el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal .el-menu-item:not(.is-disabled):hover,
-.el-menu--horizontal > .el-submenu:focus .el-submenu__title,
-.el-menu--horizontal > .el-submenu:hover .el-submenu__title,
+.el-menu--horizontal>.el-submenu:focus .el-submenu__title,
+.el-menu--horizontal>.el-submenu:hover .el-submenu__title,
.el-menu--horizontal .el-menu .el-menu-item.is-active,
-.el-menu--horizontal .el-menu .el-submenu.is-active > .el-submenu__title {
+.el-menu--horizontal .el-menu .el-submenu.is-active>.el-submenu__title {
color: var(--prev-MenuActiveColor) !important;
}
+
.el-menu.el-menu--horizontal {
border-bottom: none !important;
}
-.el-menu--horizontal > .el-menu-item,
-.el-menu--horizontal > .el-submenu .el-submenu__title {
+
+.el-menu--horizontal>.el-menu-item,
+.el-menu--horizontal>.el-submenu .el-submenu__title {
padding: 0 14px;
color: var(--prev-bg-topBarColor) !important;
}
+
// 外部链接时
.el-menu-item a,
.el-menu-item a:hover,
@@ -188,26 +213,32 @@
margin-right: 8px;
margin-left: 5px;
}
+
.el-menu-item a {
width: 86%;
display: inline-block;
}
+
// 默认 hover 时
.el-menu-item:hover,
.el-submenu__title:hover {
color: var(--prev-MenuActiveColor) !important;
background-color: var(--prev-bg-menu-hover-ba-color) !important;
+
i {
color: var(--prev-MenuActiveColor) !important;
}
}
+
// 鼠标 hover 时颜色
.el-menu-hover-bg-color {
background-color: var(--prev-bg-menu-hover-ba-color) !important;
}
+
// 高亮时
.el-menu-item.is-active {
color: var(--prev-MenuActiveColor) !important;
+
// background-color: var(--prev-bg-menu-hover-ba-color) !important;
.el-submenu__title i {
color: var(--prev-MenuActiveColor) !important;
@@ -219,6 +250,7 @@
.el-sub-menu:not(.is-opened):hover .el-sub-menu__title {
@extend .el-menu-hover-bg-color;
}
+
.el-menu-item:hover {
@extend .el-menu-hover-bg-color;
}
@@ -232,31 +264,39 @@
color: #ffffff !important;
}
}
+
.columns-round {
.el-menu-item {
margin: 5px 5px 0px 5px;
border-radius: 5px;
}
+
.el-submenu {
border-radius: 5px;
+
.el-submenu__title {
margin: 5px 5px;
}
+
.el-submenu__title:hover {
border-radius: 5px;
}
}
+
.el-submenu .el-menu-item {
min-width: min-content !important;
width: 94%;
}
+
.el-submenu .el-menu-item {
padding: 0 30px !important;
}
+
.el-submenu .el-submenu {
.el-submenu__title {
padding-left: 30px !important;
}
+
.el-menu-item {
padding-left: 40px !important;
}
@@ -269,24 +309,29 @@
// @extend .el-active-extend;
// }
}
+
// 菜单收起时且是a链接
.is-dark a {
color: #ffffff !important;
text-decoration: none;
}
+
// 菜单收起时鼠标经过背景颜色/字体颜色
.el-menu--vertical {
background: var(--prev-bg-menuBar) !important;
}
+
.el-menu--horizontal {
.el-menu {
background: var(--prev-bg-topBar) !important;
}
+
.el-menu-item,
.el-submenu__title {
color: var(--prev-bg-topBarColor) !important;
}
}
+
// 第三方图标字体间距/大小设置
.el-menu-item .iconfont,
.el-submenu .iconfont,
@@ -299,11 +344,13 @@
width: 24px;
text-align: center;
}
+
// element plus 本身字体图标
.el-submenu [class^='el-icon-'],
.el-menu-item [class^='el-icon-'] {
font-size: 14px !important;
}
+
// 去掉离开浏览器时，菜单的默认高亮
.el-menu-item:focus {
// background-color: transparent !important;
@@ -324,33 +371,46 @@
.el-tooltip__popper .popper__arrow::after {
color: #f2f2f2 !important;
}
+
.el-tooltip__popper .popper__arrow {
border-bottom-color: #f2f2f2 !important;
}
+
// 下拉菜单
.el-dropdown {
font-size: 12px !important;
}
+
.el-dropdown-link {
cursor: pointer;
color: var(--prev-color-primary);
}
+
.el-icon-arrow-down {
font-size: 12px;
}
+
.el-message {
min-width: 100px !important;
padding-right: 25px !important;
}
+
.el-message-box {
position: absolute;
top: 20%;
left: 50%;
-webkit-transform: translate(-50%);
transform: translate(-50%);
+
}
+
+.el-message-box__wrapper {
+ overflow-y: auto;
+}
+
.el-notification__content {
color: var(--prev-color-text-regular);
+
p {
word-break: break-all;
}
@@ -362,6 +422,7 @@
input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
}
+
input::-webkit-outer-spin-button {
-webkit-appearance: none !important;
}
@@ -371,6 +432,7 @@ input::-webkit-outer-spin-button {
color: var(--prev-color-text-white) !important;
background: var(--prev-color-primary) !important;
border-color: var(--prev-color-primary) !important;
+
&:hover,
&:focus {
color: var(--prev-color-text-white);
@@ -380,10 +442,10 @@ input::-webkit-outer-spin-button {
}
// loading
-.vxe-loading > .vxe-loading--chunk {
+.vxe-loading>.vxe-loading--chunk {
color: var(--prev-color-primary) !important;
}
.el-form-item--small .el-form-item__label {
word-break: break-word;
-}
+}
\ No newline at end of file
diff --git a/template/admin/src/theme/variables.scss b/template/admin/src/theme/variables.scss
index fae93c07a..2990d3b9d 100644
--- a/template/admin/src/theme/variables.scss
+++ b/template/admin/src/theme/variables.scss
@@ -277,10 +277,7 @@
.el-range-editor.is-active:hover {
border: none;
}
- .el-select .el-input.is-focus .el-input__inner,
- .el-select .el-input__inner:focus {
- border: 1px solid var(--prev-border-color-base);
- }
+
.el-input-group__prepend .el-select .el-input--suffix .el-input__inner::placeholder,
.el-cascader .el-input .el-icon-arrow-down,
.el-select .el-input .el-select__caret {
diff --git a/template/uni-app/components/payment/index.vue b/template/uni-app/components/payment/index.vue
index 12685dae4..a07813538 100644
--- a/template/uni-app/components/payment/index.vue
+++ b/template/uni-app/components/payment/index.vue
@@ -1,558 +1,549 @@
-
-
-
-
- {{$t(`选择付款方式`)}}
-
-
-
- {{item.name}}
-
- {{item.title}} {{$t(`￥`)}}{{ item.number }}
-
- {{item.title}}
-
-
-
- {{$t(`支付`)}}{{$t(`￥`)}}{{totalPrice}}
- {{$t(`去付款`)}}
-
-
-
-
-
-
-
-
+
+
+
+
+ {{$t(`选择付款方式`)}}
+
+
+
+ {{item.name}}
+
+ {{item.title}} {{$t(`￥`)}}{{ item.number }}
+
+ {{item.title}}
+
+
+
+ {{$t(`支付`)}}{{$t(`￥`)}}{{totalPrice}}
+ {{$t(`去付款`)}}
+
+
+
+
+
+
+
+
diff --git a/template/uni-app/config/app.js b/template/uni-app/config/app.js
index 99d270da0..7f79ce95c 100644
--- a/template/uni-app/config/app.js
+++ b/template/uni-app/config/app.js
@@ -13,7 +13,7 @@ module.exports = {
// 后台版本号
- SYSTEM_VERSION: 521,
+ SYSTEM_VERSION: 522,
// 以下配置在不做二开的前提下,不需要做任何的修改
HEADER: {
diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json
index b0619ec65..de27973a6 100644
--- a/template/uni-app/manifest.json
+++ b/template/uni-app/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "CRMEB标准版-v5.2.1",
+ "name" : "CRMEB标准版-v5.2.2",
"appid" : "__UNI__A3F1ED4",
"description" : "CRMEB标准版",
"versionName" : "5.2.1",
diff --git a/template/uni-app/pages.json b/template/uni-app/pages.json
index 2c6a6f1c1..663134b44 100644
--- a/template/uni-app/pages.json
+++ b/template/uni-app/pages.json
@@ -488,7 +488,7 @@
{
"path": "user_info/index",
"style": {
- "navigationBarTitleText": "个人资料",
+ "navigationBarTitleText": "设置",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
diff --git a/template/uni-app/pages/activity/goods_bargain/index.vue b/template/uni-app/pages/activity/goods_bargain/index.vue
index 63ae8b9de..a8633ca89 100644
--- a/template/uni-app/pages/activity/goods_bargain/index.vue
+++ b/template/uni-app/pages/activity/goods_bargain/index.vue
@@ -1,335 +1,335 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title || ''}}
- {{$t(`最低`)}} : {{$t(`￥`)}}{{item.min_price}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/activity/goods_combination_status/index.vue b/template/uni-app/pages/activity/goods_combination_status/index.vue
index 9e6a54fe5..1ade4354a 100644
--- a/template/uni-app/pages/activity/goods_combination_status/index.vue
+++ b/template/uni-app/pages/activity/goods_combination_status/index.vue
@@ -1,1001 +1,1003 @@
-
-
-
-
-
- {{$t(`￥`)}}
-
-
- {{$t(`支付剩余时间`)}}：
-
-
-
-
- {{$t(`支付方式`)}}
-
-
-
-
- {{$t(item.name)}}
-
- {{$t(item.title)}} {{$t(`￥`)}}{{ item.number }}
-
- {{$t(item.title)}}
-
-
-
-
-
- {{$t(`确认支付`)}}
- {{$t(`暂不支付`)}}
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/goods/goods_search/index.vue b/template/uni-app/pages/goods/goods_search/index.vue
index 3dd269733..5faf9183a 100644
--- a/template/uni-app/pages/goods/goods_search/index.vue
+++ b/template/uni-app/pages/goods/goods_search/index.vue
@@ -1,348 +1,348 @@
-
-
-
-
-
-
-
- {{$t(`搜索`)}}
-
-
-
- {{$t(`搜索历史`)}}
-
-
-
- {{item.keyword}}
-
-
-
- {{$t(`热门搜索`)}}
-
-
- {{item.val}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/goods_cate/goods_cate.vue b/template/uni-app/pages/goods_cate/goods_cate.vue
index 5b5dc9015..6f92326b4 100644
--- a/template/uni-app/pages/goods_cate/goods_cate.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate.vue
@@ -83,7 +83,7 @@ export default {
this.$refs.classThree.tempArr = [];
this.$refs.classThree.loadend = false;
this.$refs.classThree.page = 1;
- this.$refs.classThree.productslist();
+ // this.$refs.classThree.productslist();
}
// this.$refs.classThree.getAllCategory()
}
diff --git a/template/uni-app/pages/goods_cate/goods_cate3.vue b/template/uni-app/pages/goods_cate/goods_cate3.vue
index 4412d87b0..5f148b78a 100644
--- a/template/uni-app/pages/goods_cate/goods_cate3.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate3.vue
@@ -697,7 +697,7 @@ export default {
closeTap() {
this.iSlong = true;
},
- getAllCategory: function (type) {
+ getAllCategory(type) {
let that = this;
if (type || !uni.getStorageSync('CAT3_DATA')) {
getCategoryList().then((res) => {
diff --git a/template/uni-app/pages/goods_details/index.vue b/template/uni-app/pages/goods_details/index.vue
index fc9c956f7..d7c7e5246 100644
--- a/template/uni-app/pages/goods_details/index.vue
+++ b/template/uni-app/pages/goods_details/index.vue
@@ -4,11 +4,10 @@
-
+
- {{ item }}
+ {{ item }}
@@ -43,8 +42,8 @@
+
@@ -69,12 +68,12 @@
- {{storeInfo.limit_type == 1 ? $t(`单次限购`) : $t(`永久限购`)}}{{storeInfo.limit_num}}{{$t(storeInfo.unit_name)}}
- |
+ {{storeInfo.limit_type == 1 ? $t(`单次限购`) : $t(`永久限购`)}}{{storeInfo.limit_num}}{{$t(storeInfo.unit_name)}}
+ |
{{$t(`起购`)}}{{ storeInfo.min_qty + storeInfo.unit_name }}
-
+
{{$t(`划线价`)}} : {{$t(`￥`)}}{{storeInfo.ot_price || 0}}
{{$t(`库存`)}} : {{storeInfo.stock || 0}}
@@ -96,8 +95,7 @@
{{$t(`预售活动时间`)}}：
-
+
赠送 {{storeInfo.give_integral}} 积分
-->
-
+
{{$t(`优惠券`)}}：
@@ -168,8 +166,7 @@
-
+
{{attrTxt}}：
@@ -182,8 +179,8 @@
-
+
{{$t(`共`)}}{{ skuArr.length }} {{$t(`种规格可选`)}}
@@ -220,8 +217,7 @@
:style="'height:' + clientHeight + 'px'">
-
+
-
@@ -344,21 +338,20 @@
-->
-
+
+ :unitName="storeInfo.unit_name" @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum"
+ @attrVal="attrVal" @iptCartNum="iptCartNum" id="product-window" :is_vip="is_vip" @getImg="showImg"
+ :is_virtual="storeInfo.is_virtual">
+ @ChangCoupons="ChangCoupons" @ChangCouponsUseState="ChangCouponsUseState" @tabCouponType="tabCouponType">
@@ -375,8 +368,7 @@
-
目录: {{ navItem.pathname }}
@@ -130,7 +132,7 @@
:icon="value.icon"
v-if="value.tab"
>
-
+
- {{
- item.label_name
- }}
+ {{ item.label_name }}
选择用户关联标签
-
-
-
-
-
-
-
-
-
- {{$t(`微信好友`)}}
-
-
- {{$t(`微信朋友圈`)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/activity/presell_details/index.vue b/template/uni-app/pages/activity/presell_details/index.vue
index df6e85312..813554865 100644
--- a/template/uni-app/pages/activity/presell_details/index.vue
+++ b/template/uni-app/pages/activity/presell_details/index.vue
@@ -33,7 +33,7 @@
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t(`剩余`)}}
-
-
- {{$t(`恭喜您拼团成功`)}}
- {{$t(`还差`)}}{{ count }}{{$t(`人，拼团失败`)}}
- {{$t(`拼团中，还差`)}}{{ count }}{{$t(`人拼团成功`)}}
-
- ![]()
- {{$t(`团长`)}}
-
-
-
-
- ![]()
-
-
-
-
-
- {{ iShidden ? $t(`收起`) : $t(`查看更多`) }}
-
-
-
-
- {{$t(`邀请好友参团`)}}
-
- {{$t(`我要参团`)}}
-
- {{$t(`再次开团`)}}
-
-
- {{$t(`取消开团`)}}
-
-
- {{$t(`查看订单信息`)}}
-
-
-
-
-
-
- {{$t(`大家都在拼`)}}
-
- {{$t(`更多拼团`)}}
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
+
{{$t(`复制口令`)}}
@@ -422,8 +414,8 @@
-
-
-
- {{$t(`点击“立即关注”即可关注公众号`)}}
-
- {{$t(`立即关注`)}}
-
-
-
-
- ![]()
-
-
-
-
-
- {{$t(`点击`)}}“
-
-
-
-
-
-
-
-
-
-
- {{$t(`暂无商品，去看点别的吧`)}}
-
-
-
-
-
+
+
+
+ {{$t(`点击“立即关注”即可关注公众号`)}}
+
+ {{$t(`立即关注`)}}
+
+
+
+
+ ![]()
+
+
+
+
+
+ {{$t(`点击`)}}“
+
+
+
+
+
+
+
+
+
+
+ {{$t(`暂无商品，去看点别的吧`)}}
+
+
+
+
+ {{ site_config.record_No }}
- {{ site_config.network_security }}
-
-
-
- {{$t(`服务协议与隐私政策`)}}
-
- {{$t(`请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。`)}}
- {{$t(`你可以阅读`)}} -{{$t(`《服务协议与隐私政策》`)}}
- {{$t(`了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。`)}}
-
-
- {{$t(`我同意`)}}
- {{$t(`残忍拒绝`)}}
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/points_mall/integral_goods_details.vue b/template/uni-app/pages/points_mall/integral_goods_details.vue
index 89d3c2441..d0e02c5dd 100644
--- a/template/uni-app/pages/points_mall/integral_goods_details.vue
+++ b/template/uni-app/pages/points_mall/integral_goods_details.vue
@@ -58,15 +58,14 @@
{{ $t(`最多可兑换`)}}: {{storeInfo.num}}{{$t(storeInfo.unit_name)}}
- {{$t(`划线价`)}}：{{ storeInfo.product_price }}
+ {{$t(`划线价`)}}：{{ storeInfo.product_price }}
{{$t(`限量`)}}:
{{ storeInfo.quota_show }}
{{$t(`已兑换`)}}：{{ storeInfo.sales }}
-
+
@@ -81,8 +80,8 @@
-
+
{{$t(`共`)}}{{ skuArr.length }}{{$t(`种规格可选`)}}
@@ -1184,4 +1183,8 @@
flex-wrap: nowrap;
width: 130rpx;
}
-
+
+ .delete-line {
+ text-decoration: line-through;
+ }
+
\ No newline at end of file
diff --git a/template/uni-app/pages/users/login/index.vue b/template/uni-app/pages/users/login/index.vue
index 51498dfba..a48f79cd4 100644
--- a/template/uni-app/pages/users/login/index.vue
+++ b/template/uni-app/pages/users/login/index.vue
@@ -1,848 +1,848 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t(`登录`)}}
- {{$t(`登录`)}}
-
-
- {{$t(`快速登录`)}}
- {{$t(`账号登录`)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t(`《用户协议》`)}}
- {{$t(`与`)}}{{$t(`《隐私协议》`)}}
-
-
-
-
- {{copyRight}}
- © 2014-2023
- www.crmeb.com
-
-
-
-
-
-
-
+
diff --git a/template/uni-app/pages/users/payment_on_behalf/index.vue b/template/uni-app/pages/users/payment_on_behalf/index.vue
index 849455ca2..89d556e0d 100644
--- a/template/uni-app/pages/users/payment_on_behalf/index.vue
+++ b/template/uni-app/pages/users/payment_on_behalf/index.vue
@@ -1,473 +1,458 @@
-
-
-
-
-
-
-
- {{$t(`代付订单创建成功，发给好友帮你付款吧~`)}}
-
-
-
-
-
-
-
-
-
- {{resData.paid && !resData.type && resData.pay_uid === $store.state.app.uid ? resData.pay_nickname : resData.nickname}}
-
-
- {{$t(`帮我付一下这件商品了，谢谢~`)}}
-
-
- {{$t(`已经有人替我代付，谢谢啦~`)}}
-
-
- {{$t(`谢谢你帮我支付，么么哒~`)}}
-
-
- {{$t(`我已为你代付成功，商家正在努力发货中~`)}}
-
-
-
-
-
- {{$t(`好友代付成功，商家正在努力发货中~`)}}
-
-
-
- {{$t(`代付金额`)}}
-
-
- {{$t(`￥`)}}
- {{resData.pay_price || 0}}
-
-
-
-
- {{$t(`发送给微信好友`)}}
-
-
-
-
- {{$t(`发送给微信好友`)}}
-
-
-
-
-
-
-
-
-
-
- {{$t(`如果订单申请退款，已支付金额将原路退还给您`)}}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/users/user_info/index.vue b/template/uni-app/pages/users/user_info/index.vue
index 4c1b53f91..eefa80143 100644
--- a/template/uni-app/pages/users/user_info/index.vue
+++ b/template/uni-app/pages/users/user_info/index.vue
@@ -1,718 +1,730 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t(`你可以阅读`)}} -
{{$t(`其他方式登录`)}}
- -