Merge remote-tracking branch 'origin/master'

src/views/contentManagement/newsInformation/index.vue

@@ -703,7 +703,7 @@ export default {
         query: {
           unitId: this.queryParams.unitId,
           isOperation: '1',
-          title: '新增新闻'
+          title: '新增文章'
         }
       })
     },
@@ -715,7 +715,7 @@ export default {
         query: {
           isOperation: '2',
           bussinessId: row.businessId,
-          title: ' 编辑新闻 '
+          title: ' 编辑文章 '
         }
       })
     },
@@ -753,7 +753,7 @@ export default {
         query: {
           isOperation: '3',
           bussinessId: row.businessId,
-          title: ' 查看新闻 '
+          title: ' 查看文章 '
         }
       })
     },

src/views/contentManagement/newsInformation/info/index.vue

@@ -43,11 +43,11 @@
             <el-col :span="12">
               <!--              是否推荐-->
               <el-form-item
-                label="是否为推荐新闻:"
+                label="文章未登录可见:"
                 prop="isRecommended"
-                :rules="{ required: !(controls.isOperation === '3'), message: '请选择是否推荐新闻', trigger: 'change' }"
+                :rules="{ required: !(controls.isOperation === '3'), message: '请选择文章未登录可见', trigger: 'change' }"
               >
-                <el-select v-model="form.isRecommended" placeholder="请选择是否推荐新闻" size="small" class="normalInput" :disabled="secondFromDisabled">
+                <el-select v-model="form.isRecommended" placeholder="请选择文章未登录可见" size="small" class="normalInput" :disabled="secondFromDisabled">
                   <el-option v-for="item in isList" :key="item.value" :label="item.label" :value="item.value" />
 
                 </el-select>
@@ -56,11 +56,11 @@
             <el-col :span="12">
               <!--              是否置顶-->
               <el-form-item
-                label="是否为置顶新闻:"
+                label="文章置顶:"
                 prop="isTop"
-                :rules="{ required: !(controls.isOperation === '3'), message: '请选择是否置顶新闻', trigger: 'change' }"
+                :rules="{ required: !(controls.isOperation === '3'), message: '请选择是否文章置顶', trigger: 'change' }"
               >
-                <el-select v-model="form.isTop" placeholder="请选择是否置顶新闻" size="small" class="normalInput" :disabled="secondFromDisabled">
+                <el-select v-model="form.isTop" placeholder="请选择是否文章置顶" size="small" class="normalInput" :disabled="secondFromDisabled">
                   <el-option v-for="item in isList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>

src/views/contentManagement/videoInformation/info/index.vue

@@ -56,11 +56,11 @@
             <el-col :span="12">
               <!--              是否推荐-->
               <el-form-item
-                label="是否推荐视频:"
+                label="是否置顶:"
                 prop="homeDisplay"
-                :rules="{ required: !(controls.isOperation === '3'), message: '请选择是否推荐视频', trigger: 'change' }"
+                :rules="{ required: !(controls.isOperation === '3'), message: '请选择是否置顶', trigger: 'change' }"
               >
-                <el-select v-model="form.flag" placeholder="请选择是否推荐视频" size="small" class="normalInput" :disabled="secondFromDisabled">
+                <el-select v-model="form.flag" placeholder="请选择是否置顶" size="small" class="normalInput" :disabled="secondFromDisabled">
                   <el-option v-for="item in flagList" :key="item.value" :label="item.label" :value="item.value" />
 
                 </el-select>