From 3ad763d600e55f6ee37c36a476d337da470b1793 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 2 Nov 2019 11:20:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../javascripts/admins/subjects/index.js | 18 ++++++++++++------
.../admins/subjects/shared/_list.html.erb | 12 ++++++++++--
app/views/subjects/right_banner.json.jbuilder | 1 +
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/app/assets/javascripts/admins/subjects/index.js b/app/assets/javascripts/admins/subjects/index.js
index 93621544e..52d179f1f 100644
--- a/app/assets/javascripts/admins/subjects/index.js
+++ b/app/assets/javascripts/admins/subjects/index.js
@@ -41,12 +41,18 @@ $(document).on('turbolinks:load', function () {
// 上传图片
$('.modal.admin-upload-file-modal').on('upload:success', function (e, data) {
- var $imageElement = $('.subject-image-' + data.source_id);
- $imageElement.attr('src', data.url);
- $imageElement.show();
- $imageElement.next().html('重新上传');
- })
-
+ if(data.suffix == '_qrcode'){
+ var $imageElement = $('.subject-weapp-image-' + data.source_id);
+ $imageElement.attr('src', data.url);
+ $imageElement.show();
+ $imageElement.next().html('重新上传');
+ } else {
+ var $imageElement = $('.subject-image-' + data.source_id);
+ $imageElement.attr('src', data.url);
+ $imageElement.show();
+ $imageElement.next().html('重新上传');
+ }
+ });
// 定义状态切换监听事件
var defineStatusChangeFunc = function (doElement, undoElement, url, callback) {
$('.subject-list-container').on('click', doElement, function () {
diff --git a/app/views/admins/subjects/shared/_list.html.erb b/app/views/admins/subjects/shared/_list.html.erb
index 431ad317a..d9a194b21 100644
--- a/app/views/admins/subjects/shared/_list.html.erb
+++ b/app/views/admins/subjects/shared/_list.html.erb
@@ -7,12 +7,13 @@
<th width="8%">技术体系</th>
<th width="8%">等级体系</th>
<th width="8%">封面</th>
+ <th width="8%">二维码图片</th>
<th width="7%">创建者</th>
<th width="10%">单位</th>
- <th width="8%">开课人数</th>
+ <th width="6%">开课人数</th>
<th width="10%"><%= sort_tag('创建时间', name: 'created_at', path: admins_subjects_path) %></th>
<th width="7%">状态</th>
- <th width="15%">操作</th>
+ <th width="9%">操作</th>
</tr>
</thead>
<tbody>
@@ -33,6 +34,13 @@
<%= image_tag(image_exists ? Util::FileManage.source_disk_file_url(subject) : '', height: 40, class: "w-100 preview-image subject-image-#{subject.id}", style: image_exists ? '' : 'display:none') %>
<%= javascript_void_link image_exists ? '重新上传' : '上传图片', class: 'action upload-image-action', data: { source_id: subject.id, source_type: 'Subject', toggle: 'modal', target: '.admin-upload-file-modal' } %>
</td>
+ <td class="subject-setting-qrcode-image">
+ <% codeImageExists = Util::FileManage.exists?(subject, '_qrcode') %>
+ <% imageUrl = codeImageExists ? Util::FileManage.source_disk_file_url(subject, '_qrcode') : '' %>
+ <%= image_tag(imageUrl, width: 60, height: 40, class: "preview-image subject-weapp-image-#{subject.id}", data: { toggle: 'tooltip', title: '点击预览' }, style: codeImageExists ? '' : 'display:none') %>
+ <%= raw '<br/>' if codeImageExists %>
+ <%= javascript_void_link codeImageExists ? '重新上传' : '上传图片', class: 'action upload-subject-qrcode-image-action', data: { source_id: subject.id, source_type: 'Subject', suffix: '_qrcode', toggle: 'modal', target: '.admin-upload-file-modal' } %>
+ </td>
<td><%= subject.user.real_name %></td>
<td><%= subject.user.school_name %></td>
<td><%= subject.student_count %></td>
diff --git a/app/views/subjects/right_banner.json.jbuilder b/app/views/subjects/right_banner.json.jbuilder
index a289ad0a9..da8161a98 100644
--- a/app/views/subjects/right_banner.json.jbuilder
+++ b/app/views/subjects/right_banner.json.jbuilder
@@ -1,3 +1,4 @@
+json.qrcode_img Util::FileManage.exists?(@subject, '_qrcode') ? Util::FileManage.source_disk_file_url(@subject, '_qrcode') : nil
json.members @members do |member|
json.partial! 'subject_member', locals: { user: member.user }
From be0dabc7ecd85b38f73c1ee1a2764836af46c52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 2 Nov 2019 14:36:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/paths/PathDetail/PathDetailIndex.js | 13 +++++++++----
public/react/src/modules/paths/ShixunPaths.css | 9 +++++++++
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index f66539c99..cb2b6bdf1 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -86,7 +86,8 @@ class PathDetailIndex extends Component{
pathtopskey:1,
dataquerys:{},
MenuItemsindex:1,
- MenuItemsindextype:0
+ MenuItemsindextype:0,
+ qrcode_img:null
}
this.onDragEnd = this.onDragEnd.bind(this);
@@ -250,7 +251,7 @@ class PathDetailIndex extends Component{
}
this.setState({
- // detailInfoList:result.data,
+ qrcode_img:result.data.qrcode_img,
tags:result.data.tags,
progress:result.data.progress,
members:result.data.members,
@@ -472,7 +473,7 @@ class PathDetailIndex extends Component{
progress,
members,
tags,
- courses,
+ qrcode_img,
MenuItemsindex,
MenuItemsindextype
} = this.state
@@ -538,9 +539,13 @@ class PathDetailIndex extends Component{
></DetailCards>
</div>
<div className="with35 fr pl20">
+ {qrcode_img===null?"":<div className="edu-back-white newmustlearn mb10">
+ <img src={getImageUrl(`${qrcode_img}`)} />
+ <div className="font-16 color181818">优惠报名，扫码入群</div>
+ </div>}
<div className="edu-back-white mustlearn mb10">
<p className="clearfix mb30">
- <span className="font-16">课程须知</span>
+ <span className="font-16 ">课程须知</span>
{/*{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?*/}
{/*<Tooltip placement="bottom" title={"编辑"}>*/}
{/*<Link to={"/paths/"+this.props.match.params.pathId+"/edit#learning_notes"} className="fr mtf5">*/}
diff --git a/public/react/src/modules/paths/ShixunPaths.css b/public/react/src/modules/paths/ShixunPaths.css
index 0f7ad114e..d770470d6 100644
--- a/public/react/src/modules/paths/ShixunPaths.css
+++ b/public/react/src/modules/paths/ShixunPaths.css
@@ -258,4 +258,13 @@
}
.ml37{
margin-left: 37px;
+}
+
+.newmustlearn {
+ padding: 34px 25px;
+ text-align: center;
+}
+
+.color181818{
+ color: #181818;
}
\ No newline at end of file