From d4ee2884763b3dfe6744980c598df7e07e7f7234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 17 Jul 2019 15:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A1=88=E4=BE=8B=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/libraries/_form.html.erb       |  16 ++++--
 public/images/educoder/unite.png         | Bin 0 -> 169 bytes
 public/react/src/modules/tpm/SiderBar.js |  70 +++++++++++++----------
 public/stylesheets/educoder/edu-main.css |  19 +++++-
 4 files changed, 66 insertions(+), 39 deletions(-)
 create mode 100755 public/images/educoder/unite.png

diff --git a/app/views/libraries/_form.html.erb b/app/views/libraries/_form.html.erb
index 4e27d52a..36d09bed 100644
--- a/app/views/libraries/_form.html.erb
+++ b/app/views/libraries/_form.html.erb
@@ -64,11 +64,14 @@
 
           <div class="clearfix lineheight35">
             <% cover_exists = @library.cover_id.present? %>
-            <span class="upload_Titles">封面图</span> <span class="color-grey-c">（上传尺寸：120*90 px）</span>
+            <div><span class="upload_Titles">封面图</span> <span class="color-grey-c">（上传尺寸：120*90 px）</span></div>
+            <div class="surfacePlot ml25">
+                <img src="/images/educoder/unite.png" class="marginuploading"/>
+            </div>
             <% if cover_exists %>
               <%= image_tag(named_attachment_path(@library.cover.id, @library.cover.filename), :class => "w120 h90 ml5 shixun_image_show") %>
             <% else %>
-              <img src="" class="w80 h80 ml5 shixun_image_show none" id="shixun_image_show_<%= @library.id %>"/>
+              <img src="" class="ml5 shixun_image_show ml50 none" width="150px" height="150px" id="shixun_image_show_<%= @library.id %>"/>
             <% end %>
             <%= file_field_tag 'library[cover_id]',
                                :id => "upload_img_#{@library.id}",
@@ -85,10 +88,11 @@
                                    :upload_path => uploads_path(:format => 'js',:project =>nil),
                                    :description_placeholder => nil ,# l(:label_optional_description)
                                } %>
-            <a href="javascript:void(0);" id="object_upload_img_<%= @library.id %>" class="mr10" onclick="$('#upload_img_<%= @library.id %>').click();">
-              <%= cover_exists ? "重新上传" : "上传图片" %>
-            </a>
-
+            <div>
+              <a href="javascript:void(0);" id="object_upload_img_<%= @library.id %>" class="<%= cover_exists ? "mr10 ml60" : "mr10 ml60 decoration4CACFF" %>" onclick="$('#upload_img_<%= @library.id %>').click();">
+                <%= cover_exists ? "重新上传" : "上传图片" %>
+              </a>
+            </div>
           </div>
         </div>
         <div class="padding30 bor-top-greyE">
diff --git a/public/images/educoder/unite.png b/public/images/educoder/unite.png
new file mode 100755
index 0000000000000000000000000000000000000000..8ebb4984d5e247d50f38837c36a5c89693cbf342
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB3OrpLLn7SYPCv-$pvZIdjltde
z1$>LuAIjUgY^dnE-k#gZXzF%&)vBGRQ_}8C*>h`;w6%b2V~dIli^g?DPC>>~r5;W$
z4WGi=_Z?mFvD-$5!{B$43csp~;{ViozAbUGDmOjfIk<Q_2`Mp6d40j#iMwNB-&I%L
RQaPaA44$rjF6*2UngI00I=}z`

literal 0
HcmV?d00001

diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index 1710752d..71e33695 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -17,37 +17,45 @@ class SiderBar extends Component {
 
     render() {
         return (
-            <div className="-task-sidebar">
-                <div className="gotop" style={{"display":"none"}} tooltips="返回顶部">
-                    <a href="javascript:void(0)" className="inline">
-                        <i class="iconfont icon-shangjiantou color-white fl mt7"></i>
-                    </a>
-                </div>
-
-                <div className="feedback" tooltips="意见反馈">
-                    <a target="_blank" className="color_white inline" href="/help?index=6">
-                        <i className="iconfont icon-yijianfankui color-white font-22 fl mt7"></i>
-                    </a>
-                </div>
-
-                <div className="scan pr">
-                    <span className="inline"><i className="iconfont icon-erweima color-white font-22 fl mt7"></i></span>
-                    <div className="scan_ewm">
-                        <div className="pr padding10">
-                            <img src={getImageUrl('/images/edu_user/EWM.jpg')} style={{"widht":"158px","height":"158px"}} />
-                            <p className="mb0 mt8">微信扫一扫</p>
-                            <p className="mb0">关注公众号</p>
-                            <span className="trangle_right"></span>
-                        </div>
-                    </div>
-                </div>
-                <div className="consult" tooltips="在线咨询">
-                    <a target="_blank" className="color_white inline" href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd">
-                        <i className="iconfont icon-qqzaixianzixun color-white font-22 fl mt7"></i>
-                    </a>
-                </div>
-
-            </div>
+					<div>
+
+						<div className="-task-sidebar">
+							<div className="gotop" style={{"display": "none"}} tooltips="返回顶部">
+								<a href="javascript:void(0)" className="inline">
+									<i className="iconfont icon-shangjiantou color-white fl mt7"></i>
+								</a>
+							</div>
+
+							<div className="feedback" tooltips="意见反馈">
+								<a target="_blank" className="color_white inline" href="/help?index=6">
+									<i className="iconfont icon-yijianfankui color-white font-22 fl mt7"></i>
+								</a>
+							</div>
+
+							<div className="scan pr">
+								<span className="inline"><i className="iconfont icon-erweima color-white font-22 fl mt7"></i></span>
+								<div className="scan_ewm">
+									<div className="pr padding10">
+										<img src={getImageUrl('/images/edu_user/EWM.jpg')} style={{"widht": "158px", "height": "158px"}}/>
+										<p className="mb0 mt8">微信扫一扫</p>
+										<p className="mb0">关注公众号</p>
+										<span className="trangle_right"></span>
+									</div>
+								</div>
+							</div>
+							<div className="consult" tooltips="在线咨询">
+								<a target="_blank" className="color_white inline"
+									 href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd">
+									<i className="iconfont icon-qqzaixianzixun color-white font-22 fl mt7"></i>
+								</a>
+							</div>
+						</div>
+
+						<div className="-task-sidebars" style={{right: "240px"}}>
+							<img src={getImageUrl("/images/educoder/competition/lvmeng.png")}  width="150px" height="150px" />
+						</div>
+
+					</div>
             );
     }
 }
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 0e21cf82..05cea010 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -1188,14 +1188,13 @@ html>body #ajax-indicator { position: fixed; }
 
 .upload_Titles{
     position: relative;
-    margin-right: 30px;
     float: left;
     line-height: 35px;
     font-size: 16px;
     width: 50px;
 }
 
-.lineheight34{
+.lineheight35{
     line-height: 35px;
 }
 
@@ -1204,4 +1203,20 @@ html>body #ajax-indicator { position: fixed; }
 }
 .h90{
     width:90px;
+}
+
+.decoration4CACFF{
+    color: #4CACFF !important;
+    border-bottom: 1px solid #4CACFF;
+}
+
+.surfacePlot{
+    width:120px;
+    height:90px;
+    background:rgba(250,250,250,1);
+    border:1px solid rgba(221,221,221,1);
+}
+
+.marginuploading{
+    margin: 27px 42px;
 }
\ No newline at end of file