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 @@ 技术体系 等级体系 封面 + 二维码图片 创建者 单位 - 开课人数 + 开课人数 <%= sort_tag('创建时间', name: 'created_at', path: admins_subjects_path) %> 状态 - 操作 + 操作 @@ -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' } %> + + <% 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 '
' 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' } %> + <%= subject.user.real_name %> <%= subject.user.school_name %> <%= subject.student_count %> 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 } 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{ >
+ {qrcode_img===null?"":
+ +
优惠报名,扫码入群
+
}

- 课程须知 + 课程须知 {/*{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?*/} {/**/} {/**/} 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