소스 검색

🎨 修改细节问题

快乐的梦鱼 1 개월 전
부모
커밋
6bab8fa2f5
4개의 변경된 파일26개의 추가작업 그리고 12개의 파일을 삭제
  1. 5 2
      src/api/CommonContent.ts
  2. 3 1
      src/pages/article/correct.vue
  3. 17 8
      src/pages/parts/ArticleCorrect.vue
  4. 1 1
      src/pages/parts/LikeFooter.vue

+ 5 - 2
src/api/CommonContent.ts

@@ -242,6 +242,9 @@ export class GetContentDetailItem extends DataModel<GetContentDetailItem> {
       inheritorsList: { clientSide: 'array', clientSideChildDataModel: GetContentDetailItem },
       otherLevel: { clientSide: 'array', clientSideChildDataModel: GetContentDetailItem },
     }
+    this._nameMapperServer = {
+      'column_name': 'mainBodyColumnName',
+    };
     this._convertKeyType = (key, direction) => {
       if (key.endsWith('Time'))
         return {
@@ -333,8 +336,7 @@ export class FeedBackItem extends DataModel<FeedBackItem> {
     this.setNameMapperCase('Camel', 'Snake');
     this._convertTable = {};
     this._afterSolveClient = (data) => {
-      data.page_url = `${this.modelName}/${data.mainBodyColumnName}/${data.title}\n` + 
-        `URL: { modelId: ${data.modelId}, mainBodyColumnId: ${data.mainBodyColumnId}, contentId: ${data.contentId} }`;
+      data.page_url = `${this.page}?modelId=${data.modelId}&mainBodyColumnId=${data.mainBodyColumnId}&contentId=${data.contentId}`;
     }
   }
 
@@ -345,6 +347,7 @@ export class FeedBackItem extends DataModel<FeedBackItem> {
   
   contentId = 0;
   title = '';
+  page = '';
   modelId = 0;
   modelName = '';
   mainBodyColumnId = 0;

+ 3 - 1
src/pages/article/correct.vue

@@ -48,7 +48,7 @@ import type { UploaderFieldProps } from '@/components/form/UploaderField.vue';
 import ProvideVar from '@/components/theme/ProvideVar.vue';
 import NavBar from '@/components/nav/NavBar.vue';
 import StatusBarSpace from '@/components/layout/space/StatusBarSpace.vue';
-import { alert, toast } from '@/components/utils/DialogAction';
+import { alert, toast } from '@/components/dialog/CommonRoot';
 
 const loading = ref(false);
 
@@ -146,6 +146,7 @@ const formDefine : IDynamicFormOptions = {
 const { querys } = useLoadQuerys({
   contentId: 0,
   title: '',
+  page: '',
   modelId: 0,
   modelName: '',
   mainBodyColumnId: 0,
@@ -169,6 +170,7 @@ async function submit() {
     formModel.value.modelName = querys.value.modelName;
     formModel.value.mainBodyColumnId = querys.value.mainBodyColumnId;
     formModel.value.mainBodyColumnName = querys.value.mainBodyColumnName;
+    formModel.value.page = querys.value.page;
     await CommonContent.feedBack(formModel.value as FeedBackItem);
     await alert({
       title: '提交成功',

+ 17 - 8
src/pages/parts/ArticleCorrect.vue

@@ -1,12 +1,17 @@
 <template>
-  <Button icon="comment" text="内容纠错" @click="navTo('/pages/article/correct', {
-    contentId: content.id,
-    title: content.title,
-    modelId: content.modelId,
-    modelName: content.modelName,
-    mainBodyColumnId: content.mainBodyColumnId,
-    mainBodyColumnName: content.mainBodyColumnName,
-  })" />
+  <Button 
+    icon="comment" 
+    text="内容纠错" 
+    @click="navTo('/pages/article/correct', {
+      contentId: content.id,
+      title: content.title,
+      modelId: content.modelId,
+      modelName: content.modelName,
+      mainBodyColumnId: content.mainBodyColumnId,
+      mainBodyColumnName: content.mainBodyColumnName,
+      page: getCurrentPageUrl(),
+    })" 
+  />
 </template>
 
 <script setup lang="ts">
@@ -22,4 +27,8 @@ defineProps({
   },
 })
 
+function getCurrentPageUrl() {
+  const currentPages = getCurrentPages();
+  return currentPages[currentPages.length - 1].route || '';
+}
 </script>

+ 1 - 1
src/pages/parts/LikeFooter.vue

@@ -1,5 +1,5 @@
 <template>
-  <FlexCol position="fixed" :bottom="0" :left="0" :right="0" backgroundColor="#f5ebe0" :padding="[20,20,0,20]">
+  <FlexCol position="fixed" :bottom="0" :left="0" :right="0" backgroundColor="#f5ebe0" :zIndex="1000" :padding="[20,20,0,20]">
     <FlexRow justify="space-between">
       <FlexRow align="center">
         <slot name="left" />