diff --git a/package.json b/package.json index 47f13848..d4b7586e 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "dependencies": { "@jx3box/jx3box-bmap": "^0.1.13", "@jx3box/jx3box-comment-ui": "^1.9.9", - "@jx3box/jx3box-common": "^8.4.8", - "@jx3box/jx3box-common-ui": "^9.0.5", + "@jx3box/jx3box-common": "^8.5.2", + "@jx3box/jx3box-common-ui": "^9.0.9", "@jx3box/jx3box-data": "^3.7.0", "@jx3box/jx3box-editor": "^2.2.16", "axios": "^0.21.1", diff --git a/src/views/Index.vue b/src/views/Index.vue index aff86918..67e3ad35 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -25,6 +25,7 @@ + @@ -73,6 +74,7 @@ import {getDesignLog} from "@/service/design"; import DesignTask from "@jx3box/jx3box-common-ui/src/bread/DesignTask.vue"; import bus from "@/utils/bus"; import User from "@jx3box/jx3box-common/js/user"; +import versionBy from "@jx3box/jx3box-common-ui/src/filters/versionBy.vue" export default { name: "Index", props: [], @@ -93,6 +95,7 @@ export default { client: this.$store.state.client, //版本选择 search: "", //搜索字串 topic: "", //专题 + is_wujie: 0, showDesignTask: false, currentPost: {}, @@ -115,6 +118,7 @@ export default { mark: this.mark, client: this.client, topic: this.topic, + is_wujie: this.is_wujie, }; }, // 分页相关参数 @@ -228,6 +232,11 @@ export default { filterMeta: function (o) { this.replaceRoute({ [o["type"]]: o["val"], page: 1 }); }, + filterIsWujie: function (o) { + const val = o["val"]; + + this.is_wujie = val; + }, // 条件过滤(不附加路由) filterImperceptibly: function (o) { this[o["type"]] = o["val"]; @@ -282,16 +291,25 @@ export default { this.loadData(); }, }, + is_wujie() { + this.page = 1; + this.replaceRoute({ page: 1 }) + } }, mounted: function () { bus.on("design-task", (post) => { this.currentPost = post; this.showDesignTask = true; }); + + if (this.client !== "origin") { + this.is_wujie = this.isPhone ? 1 : 0; + } }, components: { listItem, DesignTask, + versionBy }, };