zyp

.env.prod-zsjk

@@ -9,7 +9,7 @@ VUE_APP_ICP_RECORD =京ICP备2024062307号
 # ICP网站访问地址
 VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
-VUE_APP_LOG_URL =@/assets/logo/yzt.jpg
+VUE_APP_LOG_URL =@/assets/logo/zsjk.jpg
 # 存储桶配置
 VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
 # 存储桶配置
@@ -17,7 +17,7 @@ VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
 # 存储桶配置
 VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
 # 存储桶配置
-VUE_APP_OBS_BUCKET = zsjk-hw079058881	
+VUE_APP_OBS_BUCKET = zsjk-hw079058881
 # 存储桶配置
 VUE_APP_COS_BUCKET = zsjk-1323137866
 # 存储桶配置
@@ -28,7 +28,7 @@ VUE_APP_VIDEO_LINE_1 = https://zsjktcpv.ylrzcloud.com
 VUE_APP_VIDEO_LINE_2 = https://zsjkobs.ylrztop.com
 
 # 开发环境配置
-ENV = 'development'
+ENV = 'production'
 
 # FS管理系统/开发环境
 VUE_APP_BASE_API = '/prod-api'

src/components/VideoUpload/index.vue

@@ -2,49 +2,49 @@
   <div>
     <el-form-item label="视频上传">
       <div class="upload_video" id="upload_video">
-        <el-upload
-          class="upload-demo"
-          ref="upload"
-          action="#"
-          :http-request="uploadVideoToTxPcdn"
-          accept=".mp4"
-          :limit="1"
-          :on-remove="handleRemove"
-          :on-change="handleChange"
-          :auto-upload="false"
-          :key="uploadKey"
-        >
-          <el-button slot="trigger" size="small" type="primary" >选取视频</el-button>
-          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">点击上传</el-button>
+<!--        <el-upload-->
+<!--          class="upload-demo"-->
+<!--          ref="upload"-->
+<!--          action="#"-->
+<!--          :http-request="uploadVideoToTxPcdn"-->
+<!--          accept=".mp4"-->
+<!--          :limit="1"-->
+<!--          :on-remove="handleRemove"-->
+<!--          :on-change="handleChange"-->
+<!--          :auto-upload="false"-->
+<!--          :key="uploadKey"-->
+<!--        >-->
+<!--          <el-button slot="trigger" size="small" type="primary" >选取视频</el-button>-->
+<!--          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">点击上传</el-button>-->
           <!-- 仅当showControl为true时显示视频库选取按钮 -->
-          <el-button v-if="showControl" style="margin-left: 10px;" size="small" type="success" @click="openVideoLibrary">视频库选取</el-button>
+          <el-button v-if="showControl" size="small" type="success" @click="openVideoLibrary">视频库选取</el-button>
           <!-- 线路一 -->
-          <div class="progress-container">
-            <span class="progress-label">线路一</span>
-            <el-progress
-              style="margin-top: 5px;"
-              class="progress"
-              :text-inside="true"
-              :stroke-width="18"
-              :percentage="txProgress"
-              status="success">
-            </el-progress>
-          </div>
+<!--          <div class="progress-container">-->
+<!--            <span class="progress-label">线路一</span>-->
+<!--            <el-progress-->
+<!--              style="margin-top: 5px;"-->
+<!--              class="progress"-->
+<!--              :text-inside="true"-->
+<!--              :stroke-width="18"-->
+<!--              :percentage="txProgress"-->
+<!--              status="success">-->
+<!--            </el-progress>-->
+<!--          </div>-->
 
-          <!-- 线路二 -->
-          <div class="progress-container">
-            <span class="progress-label">线路二</span>
-            <el-progress
-              style="margin-top: 5px;"
-              class="progress"
-              :text-inside="true"
-              :stroke-width="18"
-              :percentage="hwProgress"
-              status="success">
-            </el-progress>
-          </div>
-          <div slot="tip" class="el-upload__tip">只能上传mp4文件，且不超过500M</div>
-        </el-upload>
+<!--          &lt;!&ndash; 线路二 &ndash;&gt;-->
+<!--          <div class="progress-container">-->
+<!--            <span class="progress-label">线路二</span>-->
+<!--            <el-progress-->
+<!--              style="margin-top: 5px;"-->
+<!--              class="progress"-->
+<!--              :text-inside="true"-->
+<!--              :stroke-width="18"-->
+<!--              :percentage="hwProgress"-->
+<!--              status="success">-->
+<!--            </el-progress>-->
+<!--          </div>-->
+<!--          <div slot="tip" class="el-upload__tip">只能上传mp4文件，且不超过500M</div>-->
+<!--        </el-upload>-->
       </div>
     </el-form-item>
     <el-form-item label="视频播放">
@@ -54,13 +54,13 @@
       <div v-if="fileSize">文件大小(MB): {{ (fileSize / (1024 * 1024)).toFixed(2) }} MB</div>
     </el-form-item>
     <!-- 仅当showControl为true时显示播放线路选择器 -->
-    <el-form-item v-if="showControl" label="播放线路">
-      <el-radio-group v-model="localUploadType">
-        <el-radio :label="1" >线路一</el-radio>
-        <el-radio :label="2" >线路二</el-radio>
-        <!--        <el-radio :label="3" >线路三</el-radio>-->
-      </el-radio-group>
-    </el-form-item>
+<!--    <el-form-item v-if="showControl" label="播放线路">-->
+<!--      <el-radio-group v-model="localUploadType">-->
+<!--        <el-radio :label="1" >线路一</el-radio>-->
+<!--        <el-radio :label="2" >线路二</el-radio>-->
+<!--        &lt;!&ndash;        <el-radio :label="3" >线路三</el-radio>&ndash;&gt;-->
+<!--      </el-radio-group>-->
+<!--    </el-form-item>-->
 
     <!-- 视频库选择对话框 -->
     <el-dialog title="视频库选择" :visible.sync="libraryOpen" width="900px" append-to-body>
@@ -200,6 +200,14 @@ export default {
       type: Number,
       default: 0,
     },
+    isTranscode: {
+      type: Number,
+      default: null,
+    },
+    transcodeFileKey: {
+      type: String,
+      default: "",
+    },
 
     // 使用一个变量控制显示，默认为true显示所有控制项
     showControl: {
@@ -232,6 +240,7 @@ export default {
       libraryList: [],
       selectedVideo: null,
       libraryQueryParams: {
+        isTranscode:1,
         pageNum: 1,
         pageSize: 10,
         resourceName: null,
@@ -428,6 +437,8 @@ export default {
       this.$emit("update:fileKey", this.selectedVideo.fileKey);
       this.$emit("update:uploadType", this.selectedVideo.uploadType);
       this.$emit("video-duration", this.selectedVideo.duration);
+      this.$emit("update:isTranscode", this.selectedVideo.isTranscode);
+      this.$emit("update:transcodeFileKey", this.selectedVideo.transcodeFileKey);
 
       // 设置预览URL
       this.$emit("update:videoUrl", this.selectedVideo.videoUrl);

src/views/components/course/userCourseCatalogDetails.vue

@@ -196,6 +196,8 @@
           :line_3.sync="form.lineThree"
           :thumbnail.sync="form.thumbnail"
           :uploadType.sync="form.uploadType"
+          :isTranscode.sync="form.isTranscode"
+          :transcodeFileKey.sync="form.transcodeFileKey"
           @video-duration="handleVideoDuration"
           @change="handleVideoChange"
           @selectProjects="handleSelectProjects"
@@ -594,7 +596,7 @@ export default {
     handleQuestionBankDelete(row){
       this.form.questionBankList.splice(this.form.questionBankList.findIndex(item => item.id === row.id), 1)
     },
-    handleVideoChange(){
+       handleVideoChange(){
       if(this.form.uploadType==1){
         this.videoUrl = this.form.lineOne;
       }else if(this.form.uploadType==2){
@@ -715,6 +717,8 @@ export default {
         questionBankId:null,
         questionBankList:[],
         redPacketMoney:0,
+        isTranscode:0,
+        transcodeFileKey:null
       };
       this.videoURL = '';
       this.progress=0;
@@ -804,13 +808,13 @@ export default {
             });
             return
           }
-          if(this.form.uploadType==null){
-            this.$message({
-              message: '请选择播放线路！',
-              type: 'warning'
-            });
-            return
-          }
+          // if(this.form.uploadType==null){
+          //   this.$message({
+          //     message: '请选择播放线路！',
+          //     type: 'warning'
+          //   });
+          //   return
+          // }
           if (this.form.questionBankList!==null){
             this.form.questionBankId = this.form.questionBankList.map(item => item.id).join(',');
           }

src/views/system/config/config.vue

@@ -475,8 +475,8 @@
           <el-form-item v-if="form9.type=='hf'" label="商户号" prop="huifuId">
               <el-input  v-model="form9.huifuId" label="商户号"></el-input>
           </el-form-item>
-          <el-form-item v-if="form9.type=='hf'" label="服务商私钥" prop="hfRsaPrivateKey">
-              <el-input  v-model="form9.hfRsaPrivateKey" label="服务商私钥"></el-input>
+          <el-form-item v-if="form9.type=='hf'" label="商户私钥" prop="hfRsaPrivateKey">
+              <el-input  v-model="form9.hfRsaPrivateKey" label="商户私钥"></el-input>
           </el-form-item>
           <el-form-item v-if="form9.type=='hf'" label="汇付公钥" prop="hfRsaPublicKey">
               <el-input  v-model="form9.hfRsaPublicKey" label="汇付公钥"></el-input>