Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/course/userCourse/public.vue

.env.prod-kyt

@@ -1,7 +1,7 @@
 # 页面标题
 VUE_APP_TITLE =互联网医院管理系统
 # 首页菜单标题
-VUE_APP_TITLE_INDEX =互联网医院管理系统
+VUE_APP_TITLE_INDEX =宽益堂管理系统
 # 公司名称
 VUE_APP_COMPANY_NAME =重庆云联融智科技有限公司
 # ICP备案号
@@ -9,7 +9,7 @@ VUE_APP_ICP_RECORD =渝ICP备2024031984号-1
 # ICP网站访问地址
 VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
-VUE_APP_LOG_URL =@/assets/logo/ylrz.png
+VUE_APP_LOG_URL =@/assets/logo/kyt.jpg
 # 存储桶配置
 VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
 # 存储桶配置

src/views/course/userCourse/public.vue

@@ -270,7 +270,7 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="8">
-            <el-form-item label="关联达人" prop="talentId">
+            <el-form-item label="关联达人">
               <el-select v-model="form.talentId" remote filterable clearable reserve-keyword
                          placeholder="输入手机号搜索" :remote-method="talentMethod">
                 <el-option
@@ -548,6 +548,9 @@ export default {
         imgUrl: [
           {required: true, message: "封面图片不能为空", trigger: "blur"}
         ],
+        // talentId: [
+        //   {required: true, message: "关联达人不能为空", trigger: "blur"}
+        // ],
         isTui: [
           {required: true, message: "是否推荐不能为空", trigger: "blur"}
         ],

src/views/course/userVideo/index.vue

@@ -236,7 +236,7 @@
         <el-form-item label="视频描述" prop="description">
           <el-input v-model="form.description" type="textarea" :rows="2"  placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="关联达人" prop="talentId" >
+        <el-form-item label="关联达人" >
           <el-select v-model="form.talentId" remote filterable reserve-keyword placeholder="输入手机号搜索" :remote-method="talentMethod" clearable >
             <el-option
               v-for="item in talentList"
@@ -543,9 +543,9 @@ export default {
         title: [
           { required: true, message: "短视频标题不能为空", trigger: "blur" }
         ],
-        talentId: [
-          { required: true, message: "关联达人不能为空", trigger: "change" }
-        ],
+        // talentId: [
+        //   { required: true, message: "关联达人不能为空", trigger: "change" }
+        // ],
         thumbnail: [
           { required: true, message: "请上传视频封面", trigger: "blur" }
         ]