Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/views/attachments/_attachment.json.jbuilder

@@ -15,3 +15,4 @@ json.created_on attachment.created_on
 json.content_type attachment.content_type
 json.is_pdf attachment.is_pdf?
 json.url attachment.is_pdf? ? download_url(attachment,disposition:"inline") : download_url(attachment)
+json.play_url absolute_path(local_path(attachment))

public/react/src/modules/user/usersInfo/video/InfosVideo.css

@@ -60,7 +60,7 @@
     padding: 9px 8px;
 
     background: #fff;
-    border-radius: 0px 0px 12px 12px;
+    border-radius:12px;
 }
 .videoItem .square-main .title{
     max-width: 256px;
@@ -141,4 +141,5 @@
 
 .videoItem:hover{
     box-shadow:0px 4px 10px 0px rgba(3,7,45,0.1);
+    border-radius:12px;
 }

public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js

@@ -67,11 +67,11 @@ function VideoInReviewItem (props) {
                 </div>
                 <div className="df buttonRow">
                     {/* 2019-09-01 10:00:22 */}
-                    {vv===0?"":<span className={"dianjilianicon"}>
-                         <Tooltip title="播放次数" placement="bottom">
+                    <span className={"dianjilianicon"}>
+                         {vv===0?"":<Tooltip title="播放次数" placement="bottom">
                              <i className={`icon-dianjiliang iconfont dianjilianicon`}></i>
-                         </Tooltip>  {vv}
-                    </span>}
+                         </Tooltip> } {vv===0?"":vv}
+                    </span>
                     { isReview != true && <div>
                         <Tooltip title="编辑" placement="bottom">
                             <i className="icon-bianji1 iconfont" onClick={() => onEditVideo(props)}