From 09af5bf1ecd86fed4259cd37c31a6d03cd2cdc61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 6 Feb 2020 18:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/common/UrlTool.js            |  6 ++++-
 public/react/src/common/educoder.js           |  2 +-
 .../modules/courses/Resource/Fileslistitem.js | 25 ++++++++++---------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js
index e56e3f1b8..27be52c43 100644
--- a/public/react/src/common/UrlTool.js
+++ b/public/react/src/common/UrlTool.js
@@ -100,6 +100,10 @@ export function Railsgettimes() {
 	railsgettimess(`${getUrl()}/api/main/first_stamp.json`);
 	// railsgettimess(`https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp`);
 }
+export function getmyUrl(geturl) {
+
+	return `${getUrl()}${geturl}`;
+}
 
 export function getUploadActionUrl(path, goTest) {
 	Railsgettimes()
@@ -180,4 +184,4 @@ export function publicSearchs(Placeholder,onSearch,onInputs,onChanges,loadings)
 		loading={loadings||false}
 		allowClear={true}
 	></Search>)
-}
\ No newline at end of file
+}
diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js
index ded33c43a..2cb074a6a 100644
--- a/public/react/src/common/educoder.js
+++ b/public/react/src/common/educoder.js
@@ -2,7 +2,7 @@
 
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
-export { getImageUrl as getImageUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
+export { getImageUrl as getImageUrl,getmyUrl as getmyUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
 	, getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
 	, getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode ,getupload_git_file as getupload_git_file} from                './UrlTool';
 
diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 2015eac52..348303116 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { WordsBtn,ActionBtn,getUrl } from 'educoder';
+import { WordsBtn,ActionBtn,getmyUrl } from 'educoder';
 import {Tooltip,message,Input, Button} from 'antd';
 import {Link} from 'react-router-dom';
 import axios from 'axios'
@@ -16,7 +16,7 @@ class Fileslistitem extends Component{
 		super(props);
 		this.state = {
 			videoModalObj:false,
-			file_url:getUrl(),
+			file_url:null,
 		}
 	}
 	setVisible=(bool)=>{
@@ -60,7 +60,7 @@ class Fileslistitem extends Component{
 				if(list.content_type==="video/mp4"){
 					this.setState({
 						videoModalObj:true,
-						file_url:getUrl()+list.url+'?file_name='+list.title,
+						file_url:getmyUrl(list.url+'?file_name='+list.title),
 					})
 					return
 				}else{
@@ -92,7 +92,7 @@ class Fileslistitem extends Component{
 						if(list.content_type==="video/mp4"){
 							this.setState({
 								videoModalObj:true,
-								file_url:getUrl()+list.url+'?file_name='+list.title,
+								file_url:getmyUrl(list.url+'?file_name='+list.title),
 							})
 							return
 						}else{
@@ -128,7 +128,7 @@ class Fileslistitem extends Component{
 	Clicktobroadcastthevideo=(bool,url)=>{
 			this.setState({
 									videoModalObj:bool,
-									file_url:getUrl()+url,
+									file_url:getmyUrl(url),
 		})
 	}
 
@@ -215,7 +215,8 @@ class Fileslistitem extends Component{
 		const { checkBox,
 			discussMessage,index
 		} = this.props;
-
+		console.log("Fileslistitem");
+		console.log(file_url);
 		return(
 			<div className="graduateTopicList boardsList">
 				{
@@ -231,12 +232,12 @@ class Fileslistitem extends Component{
 								src={file_url} controls="true" controlslist="nodownload">
 								您的浏览器不支持 video 标签。
 							</video>
-							<div className="df copyLine">
-								<Input value={file_url}
-											 className="dark"
-								></Input>
-								<ActionBtn className="copybtn" data-clipboard-text={file_url} onClick={() =>this.copyurls()}>复制视频地址</ActionBtn>
-							</div>
+							{/*<div className="df copyLine">*/}
+							{/*	<Input value={file_url}*/}
+							{/*				 className="dark"*/}
+							{/*	></Input>*/}
+							{/*	<ActionBtn className="copybtn" data-clipboard-text={file_url} onClick={() =>this.copyurls()}>复制视频地址</ActionBtn>*/}
+							{/*</div>*/}
 						</HeadlessModal>
 
 						:""