diff --git a/template/admin/README.md b/template/admin/README.md
index 7d90d11b3..b86a6365a 100644
--- a/template/admin/README.md
+++ b/template/admin/README.md
@@ -270,7 +270,7 @@ $ cd admin
$ npm install
# 启动项目(本地开发环境)
-$ npm run serve
+$ npm run dev
# 打包项目
$ npm run build
diff --git a/template/admin/package-lock.json b/template/admin/package-lock.json
index 6bd513c96..278581df5 100644
--- a/template/admin/package-lock.json
+++ b/template/admin/package-lock.json
@@ -19560,6 +19560,14 @@
"resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-4.1.1.tgz",
"integrity": "sha512-50um10t6N+lJaORkpwSi1wWuMmBI1sgFc9Znsi5oUykw2cO5DzLaBHcO2JNX21R+Ue4TGoIJDhhxjBHtkFrTEQ=="
},
+ "vue-clipboard2": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
+ "integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
+ "requires": {
+ "clipboard": "^2.0.0"
+ }
+ },
"vue-codemirror": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/vue-codemirror/-/vue-codemirror-4.0.6.tgz",
diff --git a/template/admin/package.json b/template/admin/package.json
index 97da5b0b7..7b5aaebe8 100644
--- a/template/admin/package.json
+++ b/template/admin/package.json
@@ -56,6 +56,7 @@
"view-design": "^4.7.0",
"vue": "^2.5.10",
"vue-awesome-swiper": "^4.1.1",
+ "vue-clipboard2": "^0.3.3",
"vue-codemirror": "^4.0.6",
"vue-happy-scroll": "^2.1.1",
"vue-i18n": "^7.8.0",
diff --git a/template/admin/src/components/main/main.less b/template/admin/src/components/main/main.less
index 2dd1a6716..527215fd8 100644
--- a/template/admin/src/components/main/main.less
+++ b/template/admin/src/components/main/main.less
@@ -28,7 +28,7 @@
}
.tag-nav-wrapper {
padding: 0;
- height: 40px;
+ height: 42px;
background: #f0f0f0;
}
.content-wrapper {
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_page_ueditor.vue b/template/admin/src/components/mobileConfigRightDiy/c_page_ueditor.vue
index 802c45827..086e294f1 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_page_ueditor.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_page_ueditor.vue
@@ -29,7 +29,9 @@ export default {
created() {
this.defaults = this.configObj;
this.configData = this.configObj[this.configNme];
- this.content = this.configData.val;
+ this.$nextTick((e) => {
+ this.content = this.configData.val;
+ });
},
watch: {
configObj: {
diff --git a/template/admin/src/main.js b/template/admin/src/main.js
index 751ec5dd2..5990faa85 100644
--- a/template/admin/src/main.js
+++ b/template/admin/src/main.js
@@ -66,7 +66,11 @@ import timeOptions from '@/libs/timeOptions';
import scroll from '@/libs/loading';
import * as tools from '@/libs/tools';
import VueTreeList from 'vue-tree-list';
+// 复制到粘贴板插件
+import VueClipboard from 'vue-clipboard2'
+VueClipboard.config.copyText = true
+Vue.use(VueClipboard)
Vue.use(VueTreeList);
// 版本升级
import upgrade from '@/components/upGrade/index.vue';
diff --git a/template/admin/src/pages/setting/devise/diyIndex.vue b/template/admin/src/pages/setting/devise/diyIndex.vue
index e5cc41891..112fbcd9f 100644
--- a/template/admin/src/pages/setting/devise/diyIndex.vue
+++ b/template/admin/src/pages/setting/devise/diyIndex.vue
@@ -82,13 +82,7 @@
例如:{{ item.example }}
-
+
@@ -348,7 +342,7 @@ export default {
};
this.$nextTick(() => {
this.$store.commit('mobildConfig/FOOTER', {
- title: '是否自定义',
+ title: '专题页是否显示',
name: imgList,
});
this.arraySort();
@@ -387,8 +381,14 @@ export default {
if (e.relatedContext.element.name == 'nav_bar') return false;
return true;
},
- onCopy() {
- this.$Message.success('复制成功');
+ onCopy(copyData) {
+ this.$copyText(copyData)
+ .then((message) => {
+ this.$Message.success('复制成功');
+ })
+ .catch((err) => {
+ this.$Message.error('复制失败');
+ });
},
onError() {
this.$Message.error('复制失败');
diff --git a/template/admin/src/pages/setting/devise/index.vue b/template/admin/src/pages/setting/devise/index.vue
index 5dcc09c5d..c3ddc6b66 100644
--- a/template/admin/src/pages/setting/devise/index.vue
+++ b/template/admin/src/pages/setting/devise/index.vue
@@ -61,13 +61,7 @@
例如:{{ item.example }}
-
+
@@ -328,8 +322,14 @@ export default {
if (e.relatedContext.element.name == 'nav_bar') return false;
return true;
},
- onCopy() {
- this.$Message.success('复制成功');
+ onCopy(copyData) {
+ this.$copyText(copyData)
+ .then((message) => {
+ this.$Message.success('复制成功');
+ })
+ .catch((err) => {
+ this.$Message.error('复制失败');
+ });
},
onError() {
this.$Message.error('复制失败');
diff --git a/template/admin/src/pages/setting/devise/links.vue b/template/admin/src/pages/setting/devise/links.vue
index 479d359dc..68de94fb7 100644
--- a/template/admin/src/pages/setting/devise/links.vue
+++ b/template/admin/src/pages/setting/devise/links.vue
@@ -5,7 +5,7 @@
地址:{{ item.url }}
参数:
-
{{ key + '=' + val }}&
@@ -14,7 +14,7 @@
- 复制
+ 复制
@@ -57,9 +57,15 @@ export default {
});
},
methods: {
- // onCopy () {
- // this.$Message.success('复制成功');
- // },
+ onCopy(copyData) {
+ this.$copyText(copyData)
+ .then((message) => {
+ this.$Message.success('复制成功');
+ })
+ .catch((err) => {
+ this.$Message.error('复制失败');
+ });
+ },
// onError () {
// this.$Message.error('复制成功');
// }
diff --git a/template/admin/src/pages/setting/devisePage/links.vue b/template/admin/src/pages/setting/devisePage/links.vue
index e4b9ed242..ec0c04e48 100644
--- a/template/admin/src/pages/setting/devisePage/links.vue
+++ b/template/admin/src/pages/setting/devisePage/links.vue
@@ -13,7 +13,7 @@
- 复制
+ 复制
@@ -61,9 +61,15 @@ export default {
this.clipboard.destroy();
},
methods: {
- // onCopy () {
- // this.$Message.success('复制成功');
- // },
+ onCopy(copyData) {
+ this.$copyText(copyData)
+ .then((message) => {
+ this.$Message.success('复制成功');
+ })
+ .catch((err) => {
+ this.$Message.error('复制失败');
+ });
+ },
// onError () {
// this.$Message.error('复制成功');
// }
diff --git a/template/admin/src/pages/setting/multiLanguage/list.vue b/template/admin/src/pages/setting/multiLanguage/list.vue
index 49ee0d79a..6663a3330 100644
--- a/template/admin/src/pages/setting/multiLanguage/list.vue
+++ b/template/admin/src/pages/setting/multiLanguage/list.vue
@@ -21,6 +21,12 @@
+
+
+ {{row.language_name}}
+ 默认
+
+
-
@@ -441,6 +450,7 @@ export default {
border-radius: 4px;
overflow: hidden;
}
+
.scollhide {
width: 100%;
height: 100%;
@@ -449,6 +459,7 @@ export default {
padding: 10px 0 10px 0;
box-sizing: border-box;
}
+
.content {
font-size: 12px;
}
@@ -471,21 +482,25 @@ export default {
position: relative;
padding-top: 10px;
}
+
.icons-item .ivu-icon {
font-size: 16px;
}
+
.search-rule {
display: flex;
align-items: center;
padding: 10px;
background-color: #f2f2f2;
}
+
.rule {
display: flex;
flex-wrap: wrap;
max-height: 700px;
overflow: scroll;
}
+
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
.rule::-webkit-scrollbar {
width: 10px;
@@ -504,6 +519,7 @@ export default {
border-radius: 4px;
background-color: #555;
}
+
.rule-list {
background-color: #f2f2f2;
width: 32%;
@@ -514,19 +530,24 @@ export default {
cursor: pointer;
transition: all 0.1s;
}
+
.rule-list:hover {
background-color: #c5d1dd;
}
+
.rule-list div {
white-space: nowrap;
}
+
.select-rule {
background-color: #c5d1dd;
}
+
.add {
display: flex;
align-items: center;
}
+
.df {
display: flex;
justify-content: center;
diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue
index 722dd04e7..82a19ab90 100644
--- a/template/admin/src/pages/setting/systemMenus/index.vue
+++ b/template/admin/src/pages/setting/systemMenus/index.vue
@@ -210,10 +210,11 @@ export default {
method: 'DELETE',
ids: '',
};
+
this.$modalSure(delfromData)
.then((res) => {
this.$Message.success(res.msg);
- // this.getData();
+ this.getData();
this.$store.dispatch('menus/getMenusNavList');
})
.catch((res) => {
diff --git a/template/admin/src/pages/setting/systemOutInterface/index.vue b/template/admin/src/pages/setting/systemOutInterface/index.vue
index fc2262f2b..a2027756d 100644
--- a/template/admin/src/pages/setting/systemOutInterface/index.vue
+++ b/template/admin/src/pages/setting/systemOutInterface/index.vue
@@ -892,7 +892,7 @@ export default {
.main-btn {}
.card-tree{
width: 270px;
- height: calc(100vh - 290px);
+ height: calc(100vh - 190px);
overflow-y: scroll;
}
>>> .tree {
@@ -981,7 +981,7 @@ export default {
}
.right-card {
flex: 1;
- height: calc(100vh - 290px);
+ max-height: calc(100vh - 190px);
overflow-y: scroll;
}
@@ -1034,7 +1034,7 @@ export default {
display: flex;
align-items: center;
justify-content: center;
- min-height: 600px;
+ min-height: 800px;
.box:hover {
border: 1px solid pink;
diff --git a/template/admin/src/pages/setting/verifyOrder/index.vue b/template/admin/src/pages/setting/verifyOrder/index.vue
index 3c1475597..7939cc20a 100644
--- a/template/admin/src/pages/setting/verifyOrder/index.vue
+++ b/template/admin/src/pages/setting/verifyOrder/index.vue
@@ -1,7 +1,7 @@
-
-
-
-
diff --git a/template/admin/src/pages/system/file/index.vue b/template/admin/src/pages/system/file/index.vue
index 25447ef13..e9a088fba 100644
--- a/template/admin/src/pages/system/file/index.vue
+++ b/template/admin/src/pages/system/file/index.vue
@@ -19,19 +19,22 @@ export default {
};
},
mounted() {
- let winwidth = this.$refs.picBox.clientWidth;
- if (winwidth < 1018) {
- this.pageLimit = 12;
- } else if (winwidth < 1185) {
- this.pageLimit = 21;
- } else if (winwidth < 1327) {
- this.pageLimit = 24;
- } else if (winwidth < 1475) {
- this.pageLimit = 27;
- } else if (winwidth > 1483) {
- this.pageLimit = 40;
- }
+ console.log(this.$refs.picBox.clientWidth);
+
this.$nextTick(() => {
+ let winwidth = this.$refs.picBox.clientWidth;
+ console.log(winwidth);
+ if (winwidth < 1018) {
+ this.pageLimit = 18;
+ } else if (winwidth < 1185) {
+ this.pageLimit = 18;
+ } else if (winwidth < 1222) {
+ this.pageLimit = 24;
+ } else if (winwidth < 1327) {
+ this.pageLimit = 32;
+ } else if (winwidth > 1483) {
+ this.pageLimit = 40;
+ }
this.uploadShow = true;
});
},
@@ -41,6 +44,10 @@ export default {