diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNewFrom.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNewFrom.js
index a015b96cf..24336c356 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNewFrom.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNewFrom.js
@@ -5,9 +5,7 @@ import {
 } from 'antd';
 import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
 import axios from 'axios'
-import {getUrl} from 'educoder';
-
-import { City } from 'educoder'
+import { City , getUploadActionUrl , appendFileSizeToUploadFileAll } from 'educoder';
 
 const NAME_COUNT=60;
 class GraduateTopicNewForm extends Component{
@@ -80,15 +78,21 @@ class GraduateTopicNewForm extends Component{
   
   // 附件相关 START
   handleChange = (info) => {
-    let fileList = info.fileList;
-    this.setState({ fileList });
+    if (info.file.status === 'done' || info.file.status === 'uploading') {
+      let contentFileList = info.fileList;
+      // this.setState({ fileList: appendFileSizeToUploadFileAll(contentFileList)});
+      // let list = appendFileSizeToUploadFileAll(contentFileList);
+      // let arr = list.map(item=>{
+      //   return ( item.response && item.response.id )
+      // })
+      this.setState({ 
+        fileList:contentFileList 
+      });
+    }
   }
   onAttachmentRemove = (file) => {
-    confirm({
-      title: '确定要删除这个附件吗?',
-      okText: '确定',
-      cancelText: '取消',
-      // content: 'Some descriptions',
+    this.props.confirm({
+      content: '确定要删除这个附件吗?',
       onOk: () => {
         this.deleteAttachment(file)
       },
@@ -102,28 +106,26 @@ class GraduateTopicNewForm extends Component{
     console.log(file);
     let id=file.response ==undefined ? file.id : file.response.id
     const url = `/attachments/${id}.json`
-    axios.delete(url, {
-    })
-      .then((response) => {
-        if (response.data) {
-          const { status } = response.data;
-          if (status == 0) {
-            console.log('--- success')
-            
-            this.setState((state) => {
-              const index = state.fileList.indexOf(file);
-              const newFileList = state.fileList.slice();
-              newFileList.splice(index, 1);
-              return {
-                fileList: newFileList,
-              };
-            });
-          }
+    axios.delete(url).then((response) => {
+      if (response.data) {
+        const { status } = response.data;
+        if (status == 0) {
+          console.log('--- success')
+          
+          this.setState((state) => {
+            const index = state.fileList.indexOf(file);
+            const newFileList = state.fileList.slice();
+            newFileList.splice(index, 1);
+            return {
+              fileList: newFileList,
+            };
+          });
         }
-      })
-      .catch(function (error) {
-        console.log(error);
-      });
+      }
+    })
+    .catch(function (error) {
+      console.log(error);
+    });
   }
 
   changeTopicName=(e)=>{
@@ -205,20 +207,20 @@ class GraduateTopicNewForm extends Component{
       width: 600,
       fileList,
       multiple: true,
-      // https://github.com/ant-design/ant-design/issues/15505
-      // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-      // showUploadList: false,
-      action:  `${getUrl()}/api/attachments.json`,
+      action:  `${getUploadActionUrl()}`,
       onChange: this.handleChange,
       onRemove: this.onAttachmentRemove,
       beforeUpload: (file) => {
-        console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
+          //message.error('文件大小必须小于150MB!');
+          this.props.define({
+            title:'提示', 
+            content:"该文件无法上传。超过文件大小限制(150MB),建议上传到百度云等其它共享工具里，然后再txt文档里给出链接以及共享密码并上传"
+          })
+          return isLt150M;
         }
-        return isLt150M;
-      },
+      }
     };
     let { topicId , teacherName }=this.props;
     return(
diff --git a/public/react/src/modules/courses/poll/PollDetailTabThird.js b/public/react/src/modules/courses/poll/PollDetailTabThird.js
index 47fcaf52f..564deb1ca 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabThird.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabThird.js
@@ -35,104 +35,102 @@ class PollDetailTabThird extends Component{
   render(){
     let {pollDetail}=this.state;
     return(
-      <div>
+      <div className="edu-back-white">
         {
           pollDetail && pollDetail.poll.polls_description && 
-          <p style={{backgroundColor:"#F2F9FF",whiteSpace:"pre-wrap"}} className="color-blue pt15 pb15 pl30 pr30">{ pollDetail.poll.polls_description }</p>
+          <p style={{whiteSpace:"pre-wrap"}} className="color-grey-9 padding20-30 edu-back-white">{ pollDetail.poll.polls_description }</p>
         }
-        <div className="edu-back-white">
-          <p className="padding20-30 clearfix bor-bottom-greyE edu-txt-left">
-						{ pollDetail && pollDetail.question_types.q_counts===0 ? "" :
-              <span className="color-grey-3">
-                {
-                  pollDetail && pollDetail.question_types.q_counts > 0 &&
-                  <span>合计{pollDetail.question_types.q_counts}题：</span>
-                }
+        <p className="padding20-30 clearfix edu-txt-left" style={{background:'#FAFAFA'}}>
+          { pollDetail && pollDetail.question_types.q_counts===0 ? "" :
+            <span className="color-grey-3">
+              {
+                pollDetail && pollDetail.question_types.q_counts > 0 &&
+                <span>合计{pollDetail.question_types.q_counts}题：</span>
+              }
+              {
+                pollDetail && pollDetail.question_types.q_singles > 0 &&
+                <span className="mr15 color-grey-9">单选题{pollDetail.question_types.q_singles}题</span>
+              }
+              {
+                pollDetail && pollDetail.question_types.q_doubles > 0 &&
+                <span className="mr15 color-grey-9">多选题{pollDetail.question_types.q_doubles}题</span>
+              }
+              {
+                pollDetail && pollDetail.question_types.q_mains > 0 &&
+                <span className="color-grey-9">主观题{pollDetail.question_types.q_mains}题</span>
+              }
+            </span>
+          }
+        </p>
+
+        {
+          pollDetail && pollDetail.questions.map((item,key)=>{
+            return(
+              <div className="previewList">
+                <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
+                  <span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span>
+                  { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> }
+                  { item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ? 
+                    <span className="color-grey-9 font-14 fl mt2">
+                      {
+                        item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
+                        "可选"+item.question.min_choices+"-"+item.question.max_choices+"项"
+                      }
+                    </span>:""
+                  }
+                </p>
+                <li className="pl30 pr30 pb15">{item.question.question_title}</li>
                 {
-                  pollDetail && pollDetail.question_types.q_singles > 0 &&
-                  <span className="mr15 color-grey-9">单选题{pollDetail.question_types.q_singles}题</span>
+                  // 单选题
+                  item.question.question_type==1 &&
+                  <Radio.Group className="answerList" disabled>
+                    {
+                      item.question.answers.map((index,k)=>{
+                        return(
+                          <li className="df">
+                            <Radio className="fl" value={index.answer_id}></Radio>
+                            <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
+                            {
+                              index.answer_text=="其他" ? <p className="textLine"></p>:""
+                            }
+                            
+                          </li>
+                        )
+                      })
+                    }
+                  </Radio.Group>
                 }
                 {
-                  pollDetail && pollDetail.question_types.q_doubles > 0 &&
-                  <span className="mr15 color-grey-9">多选题{pollDetail.question_types.q_doubles}题</span>
+                  // 多选题
+                  item.question.question_type==2 &&
+                  <Checkbox.Group className="answerList" disabled>
+                    {
+                      item.question.answers.map((index,k)=>{
+                        return(
+                          <li className="df" key={k}>
+                            <Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox>
+                            <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
+                            {
+                              index.answer_text=="其他" ? <p className="textLine"></p>:""
+                            }
+                          </li>
+                        )
+                      })
+                    }
+                  </Checkbox.Group>
                 }
                 {
-                  pollDetail && pollDetail.question_types.q_mains > 0 &&
-                  <span className="color-grey-9">主观题{pollDetail.question_types.q_mains}题</span>
+                  // 主观题
+                  item.question.question_type == 3 &&
+                  <div className="mt10 pl30 pr30 pb20">
+                    <textarea placeholder="在此填入答案" readOnly className="winput-100-130"></textarea>
+                  </div>
                 }
-              </span>
-            }
-          </p>
-
-          {
-            pollDetail && pollDetail.questions.map((item,key)=>{
-              return(
-                <div className="previewList">
-                  <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
-                    <span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span>
-                    { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> }
-                    { item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ? 
-                      <span className="color-grey-9 font-14 fl mt2">
-                        {
-                          item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
-                          "可选"+item.question.min_choices+"-"+item.question.max_choices+"项"
-                        }
-                      </span>:""
-                    }
-                  </p>
-                  <li className="pl30 pr30 pb15">{item.question.question_title}</li>
-                  {
-                    // 单选题
-                    item.question.question_type==1 &&
-                    <Radio.Group className="answerList" disabled>
-                      {
-                        item.question.answers.map((index,k)=>{
-                          return(
-                            <li className="df">
-                              <Radio className="fl" value={index.answer_id}></Radio>
-                              <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
-                              {
-                                index.answer_text=="其他" ? <p className="textLine"></p>:""
-                              }
-                              
-                            </li>
-                          )
-                        })
-                      }
-                    </Radio.Group>
-                  }
-                  {
-                    // 多选题
-                    item.question.question_type==2 &&
-                    <Checkbox.Group className="answerList" disabled>
-                      {
-                        item.question.answers.map((index,k)=>{
-                          return(
-                            <li className="df" key={k}>
-                              <Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox>
-                              <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
-                              {
-                                index.answer_text=="其他" ? <p className="textLine"></p>:""
-                              }
-                            </li>
-                          )
-                        })
-                      }
-                    </Checkbox.Group>
-                  }
-                  {
-                    // 主观题
-                    item.question.question_type == 3 &&
-                    <div className="mt10 pl30 pr30 pb20">
-                      <textarea placeholder="在此填入答案" readOnly className="winput-100-130"></textarea>
-                    </div>
-                  }
-                  
-                </div>
-              )
-            })
-          }
-        </div>
+                
+              </div>
+            )
+          })
+        }
       </div>
     )
   }
diff --git a/public/react/src/modules/courses/poll/pollStyle.css b/public/react/src/modules/courses/poll/pollStyle.css
index a486101cd..023229f92 100644
--- a/public/react/src/modules/courses/poll/pollStyle.css
+++ b/public/react/src/modules/courses/poll/pollStyle.css
@@ -185,7 +185,7 @@
   width: 100%;
 }
 .answerList li:hover{
-  background: #F8F8F8;
+  background: #F0F8FF;
 }
 textarea:read-only{
   background: #f3f3f3;