From bcaf69ede8b84cf357b355760701a2c110adfe0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Thu, 14 Nov 2019 16:47:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=9D=E9=A2=98=20=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 67 +---- src/i18n/zh-CN.js | 1 + src/views/modules/group/leaderboard.vue | 201 +++++++++++++ .../modules/group/topic-add-or-update.vue | 278 ------------------ src/views/modules/group/topic-close.vue | 67 +++++ src/views/modules/group/topic-detail.vue | 234 +++++++++++++++ src/views/modules/group/topic-list.vue | 237 +++++++++++++++ src/views/modules/group/topic.vue | 98 ++---- 8 files changed, 769 insertions(+), 414 deletions(-) create mode 100644 src/views/modules/group/leaderboard.vue delete mode 100644 src/views/modules/group/topic-add-or-update.vue create mode 100644 src/views/modules/group/topic-close.vue create mode 100644 src/views/modules/group/topic-detail.vue create mode 100644 src/views/modules/group/topic-list.vue diff --git a/package-lock.json b/package-lock.json index 42f427d9..42cf760e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2700,7 +2700,7 @@ }, "babel-runtime": { "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { @@ -5396,15 +5396,6 @@ "resolved": "http://r.cnpmjs.org/events/download/events-1.1.1.tgz", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" }, - "eventsource": { - "version": "0.1.6", - "resolved": "http://registry.npm.taobao.org/eventsource/download/eventsource-0.1.6.tgz", - "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", - "dev": true, - "requires": { - "original": ">=0.0.5" - } - }, "evp_bytestokey": { "version": "1.0.3", "resolved": "http://r.cnpmjs.org/evp_bytestokey/download/evp_bytestokey-1.0.3.tgz", @@ -10378,7 +10369,7 @@ }, "normalize-wheel": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz", "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=", "dev": true }, @@ -14308,40 +14299,6 @@ } } }, - "sockjs-client": { - "version": "1.0.0", - "resolved": "https://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.0.0.tgz?cache=0&sync_timestamp=1566505930428&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsockjs-client%2Fdownload%2Fsockjs-client-1.0.0.tgz", - "integrity": "sha1-r20tNASCcJveJ4kKC6gE39dl+Pk=", - "dev": true, - "requires": { - "debug": "^2.1.0", - "eventsource": "^0.1.3", - "faye-websocket": "~0.7.3", - "inherits": "^2.0.1", - "json3": "^3.3.2", - "url-parse": "^1.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "faye-websocket": { - "version": "0.7.3", - "resolved": "https://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.7.3.tgz", - "integrity": "sha1-zEB0x/Sk39A69U3WXDVLE1EyzhE=", - "dev": true, - "requires": { - "websocket-driver": ">=0.3.6" - } - } - } - }, "source-list-map": { "version": "2.0.0", "resolved": "http://r.cnpmjs.org/source-list-map/download/source-list-map-2.0.0.tgz", @@ -14603,7 +14560,7 @@ }, "stompjs": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/stompjs/-/stompjs-2.3.3.tgz", + "resolved": "https://registry.npm.taobao.org/stompjs/download/stompjs-2.3.3.tgz", "integrity": "sha1-NBeKx7uO4pTMXVVK2LUPf1RZ/Y4=", "dev": true, "requires": { @@ -15530,8 +15487,8 @@ }, "typedarray-to-buffer": { "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "resolved": "https://registry.npm.taobao.org/typedarray-to-buffer/download/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha1-qX7nqf9CaRufeD/xvFES/j/KkIA=", "dev": true, "optional": true, "requires": { @@ -16712,8 +16669,8 @@ }, "websocket": { "version": "1.0.30", - "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.30.tgz", - "integrity": "sha512-aO6klgaTdSMkhfl5VVJzD5fm+Srhh5jLYbS15+OiI1sN6h/RU/XW6WN9J1uVIpUKNmsTvT3Hs35XAFjn9NMfOw==", + "resolved": "https://registry.npm.taobao.org/websocket/download/websocket-1.0.30.tgz", + "integrity": "sha1-kdO9AMPUPpFvDPli+PjEUbsLI3M=", "dev": true, "optional": true, "requires": { @@ -16725,8 +16682,8 @@ "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "dev": true, "optional": true, "requires": { @@ -16735,8 +16692,8 @@ }, "nan": { "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", + "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz", + "integrity": "sha1-eBj3IgJ7JFmobwKV1DTR/CM2xSw=", "dev": true, "optional": true } @@ -16844,7 +16801,7 @@ }, "yaeti": { "version": "0.0.6", - "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", + "resolved": "https://registry.npm.taobao.org/yaeti/download/yaeti-0.0.6.tgz", "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=", "dev": true, "optional": true diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index c82e7535..3e89585d 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -25,6 +25,7 @@ t.look = '查看' t.ban = '禁言' t.liftTheBan = '解禁' t.disband = '解散' +t.close = '关闭' t.prompt = {} t.prompt.title = '提示' diff --git a/src/views/modules/group/leaderboard.vue b/src/views/modules/group/leaderboard.vue new file mode 100644 index 00000000..39bdc670 --- /dev/null +++ b/src/views/modules/group/leaderboard.vue @@ -0,0 +1,201 @@ + + + diff --git a/src/views/modules/group/topic-add-or-update.vue b/src/views/modules/group/topic-add-or-update.vue deleted file mode 100644 index d485e56c..00000000 --- a/src/views/modules/group/topic-add-or-update.vue +++ /dev/null @@ -1,278 +0,0 @@ - - - diff --git a/src/views/modules/group/topic-close.vue b/src/views/modules/group/topic-close.vue new file mode 100644 index 00000000..52fba6ad --- /dev/null +++ b/src/views/modules/group/topic-close.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/views/modules/group/topic-detail.vue b/src/views/modules/group/topic-detail.vue new file mode 100644 index 00000000..758af279 --- /dev/null +++ b/src/views/modules/group/topic-detail.vue @@ -0,0 +1,234 @@ + + + + + + + diff --git a/src/views/modules/group/topic-list.vue b/src/views/modules/group/topic-list.vue new file mode 100644 index 00000000..23a38f8b --- /dev/null +++ b/src/views/modules/group/topic-list.vue @@ -0,0 +1,237 @@ + + + diff --git a/src/views/modules/group/topic.vue b/src/views/modules/group/topic.vue index 80ae767a..f7ab6d14 100644 --- a/src/views/modules/group/topic.vue +++ b/src/views/modules/group/topic.vue @@ -1,94 +1,30 @@ + + From ae80d4cfa3d15add5ec0e77545e397f7d8c41cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Thu, 14 Nov 2019 17:04:46 +0800 Subject: [PATCH 2/5] no message --- src/views/modules/group/leaderboard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/group/leaderboard.vue b/src/views/modules/group/leaderboard.vue index 39bdc670..2123c99d 100644 --- a/src/views/modules/group/leaderboard.vue +++ b/src/views/modules/group/leaderboard.vue @@ -52,7 +52,7 @@ - Date: Fri, 15 Nov 2019 15:52:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/events/issue-change-list.vue | 2 +- src/views/modules/events/issue-close-list.vue | 2 +- src/views/modules/events/issue-process-list.vue | 2 +- src/views/modules/events/issue-reject-list.vue | 2 +- src/views/modules/events/issue-review-list.vue | 2 +- src/views/modules/events/item-close-list.vue | 2 +- src/views/modules/events/item-deal-list.vue | 2 +- src/views/modules/events/item-end-list.vue | 2 +- src/views/modules/group/topic-detail.vue | 14 ++++++++++++-- src/views/modules/group/topic-list.vue | 8 ++------ 10 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/views/modules/events/issue-change-list.vue b/src/views/modules/events/issue-change-list.vue index 48703b2e..ef7c497d 100644 --- a/src/views/modules/events/issue-change-list.vue +++ b/src/views/modules/events/issue-change-list.vue @@ -78,7 +78,7 @@ label="议题内容" header-align="center" width="330" - align="center"> + align="left"> + align="left"> + align="left"> + align="left"> + align="left"> + align="left"> + align="left"> + align="left"> { this.$refs['dataForm'].resetFields() if (this.dataForm.id) { this.getInfo() + this.getCommentList() } }) }, diff --git a/src/views/modules/group/topic-list.vue b/src/views/modules/group/topic-list.vue index 23a38f8b..193e9c94 100644 --- a/src/views/modules/group/topic-list.vue +++ b/src/views/modules/group/topic-list.vue @@ -119,7 +119,6 @@ export default { getDataListIsPage: true }, closeVisible: false, - detailVisible: false, dataForm: { id: '', streetId: '', @@ -179,11 +178,8 @@ export default { }) }, look (id) { - this.detailVisible = true - this.$nextTick(() => { - this.$refs.detail.dataForm.id = id - this.$refs.detail.init() - }) + this.$parent.selectComponent = 'TopicDetail' + this.$router.push({ path: '/group-topic', query: { id: id } }) }, getGroupList () { this.$http.get('/group/group/groupList').then(({ data: res }) => { From b2c996423e655de1f71009c1c0b2a1647deb4acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Fri, 15 Nov 2019 16:37:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/group/topic-close.vue | 2 +- src/views/modules/group/topic-detail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/group/topic-close.vue b/src/views/modules/group/topic-close.vue index 52fba6ad..87c05567 100644 --- a/src/views/modules/group/topic-close.vue +++ b/src/views/modules/group/topic-close.vue @@ -46,7 +46,7 @@ export default { if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/group/topic/close', this.dataForm).then(({ data: res }) => { + this.$http['post']('/group/topic/close', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/group/topic-detail.vue b/src/views/modules/group/topic-detail.vue index cb3ba5b3..b16deaf5 100644 --- a/src/views/modules/group/topic-detail.vue +++ b/src/views/modules/group/topic-detail.vue @@ -21,7 +21,7 @@
{{dataForm.groupName}}
 -
{{dataForm.nickName}}
+
{{dataForm.nickname}}
 点击查看评论 From 299c72df9dce84804ce65adadf6f7d2dd19e86ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Sat, 16 Nov 2019 11:09:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/group/group-approve.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/group/group-approve.vue b/src/views/modules/group/group-approve.vue index 78f1b993..7f0873ee 100644 --- a/src/views/modules/group/group-approve.vue +++ b/src/views/modules/group/group-approve.vue @@ -47,21 +47,21 @@ export default { createdTime: '', groupIntroduction: '', nickname: '', - state: '5', + state: '10', processingOpinions: '' }, options: [{ value: '10', - label: '审核通过' + label: '通过' }, { value: '5', - label: '审核拒绝' + label: '拒绝' }] } }, watch: { 'dataForm.state': function (val) { - if (val === '5') { + if (val === '10') { this.adviceVisible = false } else { this.adviceVisible = true