Merge remote-tracking branch 'origin/master'

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>

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

@@ -43,11 +43,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.homeDisplay" placeholder="请选择是否未登录可看" size="small" class="normalInput" :disabled="secondFromDisabled">
+                <el-select v-model="form.homeDisplay" 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>