Merge branch 'master' of https://gitee.com/wjl2008_admin/tougao_web into zy-edit

src/components/page/articleListEditor_A.vue

@@ -2491,13 +2491,13 @@ export default {
         // 修改标记
         saveRemark() {
             console.log('this.remark at line 2212:', this.remark);
-            const mergedText = this.remark.contentList
-                .filter((item) => item.text && item.text.trim() !== '') // 过滤掉空或全空格项
-                .map((item) => {
-                    const text = item.text.trim();
-                    return text.endsWith('。') ? text : text + '。';
-                })
-                .join('');
+            var mergedText = this.remark.content
+                // .filter((item) => item.text && item.text.trim() !== '') // 过滤掉空或全空格项
+                // .map((item) => {
+                //     const text = item.text.trim();
+                //     return text.endsWith('。') ? text : text + '。';
+                // })
+                // .join('');
 
             console.log('拼接结果：', mergedText);
 

src/components/page/articleListEditor_E.vue

@@ -773,7 +773,7 @@ export default {
             this.$api
                 .post('api/Publish/getAllStages', this.queryType)
                 .then((res) => {
-                    this.stageList = res.data.stages;
+                    this.stageList = res.data.stages.reverse();
                     this.getDate();
                 })
                 .catch((err) => {

src/components/page/per_text.vue

@@ -92,8 +92,8 @@
                     </el-card>
 
                     <el-card class="box-card" v-if="this.add_apply == 0">
-                        <common-review-article></common-review-article>
-                        <!-- <el-form :model="questionform" :rules="rules" ref="question" label-width="300px" label-position="top">
+                        <!-- <common-review-article></common-review-article> -->
+                       <el-form :model="questionform" :rules="rules" ref="question" label-width="300px" label-position="top">
                             <el-divider content-position="center">REFEREE'S ASSESSMENT</el-divider>
                             <el-row :gutter="24">
                                 <el-col :span="24">
@@ -345,7 +345,7 @@
                                     <el-button type="primary" @click="questionSubmit">submit</el-button>
                                 </el-form-item>
                             </el-collapse>
-                        </el-form> -->
+                        </el-form>
                     </el-card>
                 </el-col>
             </el-row>