Merge pull request #50 from Comsenz/master

v2.1.201126
Comsenz · Nov 26, 2020 · 3cdafea · 3cdafea
2 parents 8bf7c0f + 19538e4
commit 3cdafea
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/app/Api/Controller/Posts/ListPostsController.php b/app/Api/Controller/Posts/ListPostsController.php
@@ -216,7 +216,14 @@ private function getCache($params, $filter, $document)
 
     private function canCache($params)
     {
+        //pc端倒序不允许使用缓存
+        if($params['sort'] == '-createdAt'){
+            return false;
+        }
         if (isset($params['filter'])) {
+            if(!isset($params['filter']['isComment'])){
+                return false;
+            }
             if (strtolower($params['filter']['isComment']) == 'yes') {
                 return false;
             }

diff --git a/app/Commands/Question/CreateQuestionAnswer.php b/app/Commands/Question/CreateQuestionAnswer.php
@@ -95,7 +95,7 @@ public function handle(EventDispatcher $events, Censor $censor, Question $questi
         // check
         $content = $censor->checkText(Arr::get($this->data, 'attributes.content'));
         if (count($censor->wordMod) > 0) {
-            throw new CensorNotPassedException('content_banned', $censor->wordMod);
+            throw new CensorNotPassedException('content_banned_show_words', $censor->wordMod);
         }
 
         $question->content = $content;

diff --git a/resources/frame/src/admin/controllers/site/cont/contModeration/contReviewCon.js b/resources/frame/src/admin/controllers/site/cont/contModeration/contReviewCon.js
@@ -291,9 +291,9 @@ export default {
       window.open(routeData.href, '_blank');
     },
 
-    editClick(id){
+    editClick(id,typeId){
       let routeData = this.$router.resolve({
-        path: `/thread/post?type=1&operating=edit&threadId=${id}`
+        path: `/thread/post?type=${typeId}&operating=edit&threadId=${id}`
       });
       window.open(routeData.href, '_blank');
     },

diff --git a/resources/frame/src/admin/view/site/cont/contModeration/contReviewView.vue b/resources/frame/src/admin/view/site/cont/contModeration/contReviewView.vue
@@ -260,7 +260,7 @@
               v-if="items.threadVideo && items.threadVideo._data.status == 2"
             >转码失败</el-button>
             <el-button type="text" @click="viewClick(items._data.id)">查看</el-button>
-            <el-button type="text" @click="editClick(items._data.id)">编辑</el-button>
+            <el-button type="text" @click="editClick(items._data.id,items._data.type)">编辑</el-button>
           </div>
         </div>
       </ContArrange>