配合手机端增加文章、流水、留言相关接口
diff --git a/frontend/src/assets/icon/iconfont.css b/frontend/src/assets/icon/iconfont.css
new file mode 100644
index 0000000..63c387c
--- /dev/null
+++ b/frontend/src/assets/icon/iconfont.css
@@ -0,0 +1,21 @@
+@font-face {font-family: "iconfont";
+ src: url('iconfont.eot?t=1599460043694'); /* IE9 */
+ src: url('iconfont.eot?t=1599460043694#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALYAAsAAAAABngAAAKLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gRYBNgIkAwgLBgAEIAWEbQc4G8QFERWMR7KfB7bzlEZQCL2C9ItjsqG9Uhwb3Pfg+Xe/7L4kM00zBVbEtKyIUW33eEa3mhUAOpR/a7oO9xgTobokw7LVtJ35704vTRnncRqlEBIhaYAAgrFtRVV11SfuHf8F9EFaDyjHtTdN6gLq4kAKaG+MIivGhKVh7AKX8BgCOBLlk/bO/jFYDNYqAWT+nFlTsLkQBsOyFsFfc9Agh/Fh1R51H4tD4fflJ1EWFD6NVTdiZsd0mr8stvP0Zm+z8b6F3fM5AHYMNJAPDMiY2tQgGmGsxqUMqdhXtcCXxZ7nW5C9GhH201mVIQDEQ9E9iV3JrWYVwG2NJB00jPovQNLX7X10FKdCxT19vMePe/SoJ08cOXHsaOzj93/60pMPkpaVdG3LHj7UHRPXdXZe939V9s0c7P2VuS53zZ3Dm2W7ujecuXH8+lvPVtUXsq9cS7qa+TAu9Ebsdb7fVDQD4K3WTzQhgMCd6Vv+xeH1f+3MAPBy3e974RJvtUEvAuzu3QK/Sdyzy+hSy6yMKq7tV6SfvsHhAA/si/JmrC72nnKCJXaEJ4iE1KexMykMZPLhI0A5/Fi4TXDybI4HRGMuWTCQ6w0gInyghLkNLcKXMMwPPnH+8IvIhTOu6AsDMqtUG2MqWED2giqnXjtWUVH1Cc3UppyVhpwb8lhFIfSCYnaDPfIcW8a7iUQ0aKYO1uA5bFuCganGXLxSZJj7vq57k5dTZyltGEoJVACZF1DJkZ72BwtV+vwJMiatFLd01IRvEBtV44OQJ+hBbFR9r457eWV0Z0SE0IDGSAeswTzUahEw1M+roZzwlCMSgznf7qX7qrz1Nd3XHQIcS6+yJ2jCXmI5VbFbnGZpH1oWAAA=') format('woff2'),
+ url('iconfont.woff?t=1599460043694') format('woff'),
+ url('iconfont.ttf?t=1599460043694') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+ url('iconfont.svg?t=1599460043694#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.iconchehui_huaban1:before {
+ content: "\e670";
+}
+
diff --git a/frontend/src/assets/icon/iconfont.eot b/frontend/src/assets/icon/iconfont.eot
new file mode 100644
index 0000000..761f4e7
--- /dev/null
+++ b/frontend/src/assets/icon/iconfont.eot
Binary files differ
diff --git a/frontend/src/assets/icon/iconfont.js b/frontend/src/assets/icon/iconfont.js
new file mode 100644
index 0000000..b8807a3
--- /dev/null
+++ b/frontend/src/assets/icon/iconfont.js
@@ -0,0 +1 @@
+!function(e){var t,n,o,i,d,c,a,s='<svg><symbol id="iconchehui_huaban1" viewBox="0 0 1024 1024"><path d="M502.70473274 78.69756672a458.32815083 458.32815083 0 0 0-260.98248816 81.51233893v-143.00410282h-71.50205226v275.99791896h277.42796114v-71.50205223H277.47326987a393.26128489 393.26128489 0 1 1 225.23146287 715.02051752A394.69132538 394.69132538 0 0 1 126.60394192 655.00410283a36.46604637 36.46604637 0 0 0-43.61625211-22.16563492 35.75102528 35.75102528 0 0 0-23.59567704 44.33127151 464.76333549 464.76333549 0 1 0 444.74276211-598.4721727z" ></path></symbol></svg>',l=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss");if(l&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(e){console&&console.log(e)}}function r(){c||(c=!0,i())}n=function(){var e,t,n,o,i,d=document.createElement("div");d.innerHTML=s,s=null,(e=d.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",t=e,(n=document.body).firstChild?(o=t,(i=n.firstChild).parentNode.insertBefore(o,i)):n.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(n,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),n()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=n,d=e.document,c=!1,(a=function(){try{d.documentElement.doScroll("left")}catch(e){return void setTimeout(a,50)}r()})(),d.onreadystatechange=function(){"complete"==d.readyState&&(d.onreadystatechange=null,r())})}(window);
\ No newline at end of file
diff --git a/frontend/src/assets/icon/iconfont.json b/frontend/src/assets/icon/iconfont.json
new file mode 100644
index 0000000..f41db51
--- /dev/null
+++ b/frontend/src/assets/icon/iconfont.json
@@ -0,0 +1,16 @@
+{
+ "id": "2050059",
+ "name": "dali-portal",
+ "font_family": "iconfont",
+ "css_prefix_text": "icon",
+ "description": "",
+ "glyphs": [
+ {
+ "icon_id": "14421605",
+ "name": "撤回操作",
+ "font_class": "chehui_huaban1",
+ "unicode": "e670",
+ "unicode_decimal": 58992
+ }
+ ]
+}
diff --git a/frontend/src/assets/icon/iconfont.svg b/frontend/src/assets/icon/iconfont.svg
new file mode 100644
index 0000000..dc74a2d
--- /dev/null
+++ b/frontend/src/assets/icon/iconfont.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+ <font-face
+ font-family="iconfont"
+ font-weight="500"
+ font-stretch="normal"
+ units-per-em="1024"
+ ascent="896"
+ descent="-128"
+ />
+ <missing-glyph />
+
+ <glyph glyph-name="chehui_huaban1" unicode="" d="M502.70473274 817.3024332800001a458.32815083 458.32815083 0 0 1-260.98248816-81.51233893v143.00410282h-71.50205226v-275.99791896h277.42796114v71.50205223H277.47326987a393.26128489 393.26128489 0 1 0 225.23146287-715.02051752A394.69132538 394.69132538 0 0 0 126.60394192 240.99589717000003a36.46604637 36.46604637 0 0 1-43.61625211 22.16563492 35.75102528 35.75102528 0 0 1-23.59567704-44.33127151 464.76333549 464.76333549 0 1 1 444.74276211 598.4721727z" horiz-adv-x="1024" />
+
+
+
+
+ </font>
+</defs></svg>
diff --git a/frontend/src/assets/icon/iconfont.ttf b/frontend/src/assets/icon/iconfont.ttf
new file mode 100644
index 0000000..a2735b0
--- /dev/null
+++ b/frontend/src/assets/icon/iconfont.ttf
Binary files differ
diff --git a/frontend/src/assets/icon/iconfont.woff b/frontend/src/assets/icon/iconfont.woff
new file mode 100644
index 0000000..b9afbd5
--- /dev/null
+++ b/frontend/src/assets/icon/iconfont.woff
Binary files differ
diff --git a/frontend/src/assets/icon/iconfont.woff2 b/frontend/src/assets/icon/iconfont.woff2
new file mode 100644
index 0000000..5a34691
--- /dev/null
+++ b/frontend/src/assets/icon/iconfont.woff2
Binary files differ
diff --git a/frontend/src/components/Tinymce/index.vue b/frontend/src/components/Tinymce/index.vue
index 7a9877f..68ef381 100644
--- a/frontend/src/components/Tinymce/index.vue
+++ b/frontend/src/components/Tinymce/index.vue
@@ -1,5 +1,5 @@
<template>
- <div :class="{fullscreen:fullscreen}" class="tinymce-container" :style="{width:containerWidth}">
+ <div :class="{fullscreen:fullscreen}" class="tinymce-container" style="width:600px">
<textarea :id="tinymceId" class="tinymce-textarea" />
<div class="editor-custom-btn-container">
<editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK" />
diff --git a/frontend/src/main.js b/frontend/src/main.js
index e750af9..b9225cf 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -20,6 +20,8 @@
import * as filters from './filters' // global filters
+import './assets/icon/iconfont.css' // iconfont
+
/**
* If you don't want to use mock-server
* you want to use MockJs for mock api
diff --git a/frontend/src/views/article/components/ArticleDetail.vue b/frontend/src/views/article/components/ArticleDetail.vue
index ec84f4b..9496019 100644
--- a/frontend/src/views/article/components/ArticleDetail.vue
+++ b/frontend/src/views/article/components/ArticleDetail.vue
@@ -267,6 +267,8 @@
showClose: true,
duration: 1000
})
+ this.$store.dispatch('tagsView/delView', this.$route)
+ this.$router.go(-1)
}).catch(error => {
this.$message({
message: error.msg || '请求异常',
diff --git a/frontend/src/views/article/list.vue b/frontend/src/views/article/list.vue
index 5fb208d..084f69e 100644
--- a/frontend/src/views/article/list.vue
+++ b/frontend/src/views/article/list.vue
@@ -107,7 +107,7 @@
/>
</template>
</el-table-column>
- <el-table-column width="120px" label="操作" align="center">
+ <el-table-column width="160px" label="操作" align="center">
<template slot-scope="{row}">
<el-tooltip v-if="row.status==='save'" class="item" effect="dark" content="编辑" placement="bottom">
<router-link :to="'/article/edit/'+row.articleno">
@@ -123,6 +123,11 @@
<el-tooltip class="item" effect="dark" content="删除" placement="bottom">
<el-button type="primary" icon="el-icon-delete" circle size="mini" @click="deleteArticle(row)" />
</el-tooltip>
+ <!-- <el-tooltip v-if="row.status!=='save' && row.status!=='released'" class="item" effect="dark" content="撤回" placement="bottom">
+ <el-button type="primary" size="mini" circle>
+ <i class="iconfont iconchehui_huaban1" style="font-size:12px" />
+ </el-button>
+ </el-tooltip> -->
</template>
</el-table-column>
</el-table>
diff --git a/frontend/src/views/feedback/index.vue b/frontend/src/views/feedback/index.vue
index 125e87f..868b6dc 100644
--- a/frontend/src/views/feedback/index.vue
+++ b/frontend/src/views/feedback/index.vue
@@ -8,10 +8,10 @@
style="width: 350px;margin-right:50px"
class="filter-item"
/>
- <div class="filter-item" style="margin-right:15px">留言内容</div>
+ <div class="filter-item" style="margin-right:15px">留言标题</div>
<el-input
- v-model="formData.content"
- placeholder="留言关键字"
+ v-model="formData.title"
+ placeholder="留言标题"
style="width: 300px;margin-right:50px"
class="filter-item"
/>
@@ -68,9 +68,9 @@
<span>{{ row.username }}</span>
</template>
</el-table-column>
- <el-table-column label="留言内容" align="center">
+ <el-table-column label="留言标题" align="center">
<template slot-scope="{row}">
- <span>{{ row.content }}</span>
+ <span>{{ row.title }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" width="100">
@@ -249,7 +249,7 @@
queryDate: null,
formData: {
username: '',
- content: '',
+ title: '',
replystatus: '',
startdate: '',
enddate: '',
@@ -336,7 +336,7 @@
},
clearFilter() {
this.formData.username = ''
- this.formData.content = ''
+ this.formData.title = ''
this.formData.replystatus = ''
this.queryDate = null
},
