From dc3a42fd605302d0da5f68a61a303d7de022512f Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 26 Nov 2019 14:51:41 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=8E=B7=E5=A5=96=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=A4?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/competition_prize_users/index.xlsx.axlsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/admins/competition_prize_users/index.xlsx.axlsx b/app/views/admins/competition_prize_users/index.xlsx.axlsx index 63e23a214..c7760446d 100644 --- a/app/views/admins/competition_prize_users/index.xlsx.axlsx +++ b/app/views/admins/competition_prize_users/index.xlsx.axlsx @@ -3,7 +3,7 @@ wb = xlsx_package.workbook wb.styles do |s| blue_cell = s.add_style :bg_color => "FAEBDC", :sz => 10,:height => 25,:b => true, :border => { :style => :thin, :color =>"000000" },:alignment => {wrap_text: true,:horizontal => :center,:vertical => :center} wb.add_worksheet(name: "#{@competition.name}证书审批列表") do |sheet| - sheet.add_row %w(序号 排名 奖项 战队ID 战队名称 姓名 职业 学号 学校名称 学院名称 地区 实名认证 职业认证 手机号码 队长 签领/开户行及银行卡号 审批时间 审批人), :height => 25,:style => blue_cell + sheet.add_row %w(序号 排名 奖项 战队ID 战队名称 姓名 性别 职业 学号 学校名称 学院名称 地区 实名认证 职业认证 手机号码 队长 身份证号 签领/开户行及银行卡号 审批时间 审批人), :height => 25,:style => blue_cell @all_prize_users.each_with_index do |prize_user, index| user = prize_user.user @@ -14,6 +14,7 @@ wb.styles do |s| prize_user.competition_team_id, prize_user.competition_team.name, user.real_name, + user.gender == 1 ? "女" : "男", user.identity, user.student_id, user.school_name, @@ -23,6 +24,7 @@ wb.styles do |s| user.pro_status, user.phone, prize_user.leader? ? "是" : "-", + user.ID_number, [prize_user.extra&.[]('bank'), prize_user.extra&.[]('second_bank'), prize_user.extra&.[]('card_no')].compact.join('/'), prize_user.approved_at&.strftime('%Y-%m-%d %H:%M'), prize_user.approver&.real_name From 479fb63c3c9a14a4421f2564f1e81c2a4d6509a2 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 26 Nov 2019 14:56:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=8E=B7=E5=A5=96=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=A4?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/competition_prize_users/index.xlsx.axlsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admins/competition_prize_users/index.xlsx.axlsx b/app/views/admins/competition_prize_users/index.xlsx.axlsx index c7760446d..0284484dc 100644 --- a/app/views/admins/competition_prize_users/index.xlsx.axlsx +++ b/app/views/admins/competition_prize_users/index.xlsx.axlsx @@ -16,15 +16,15 @@ wb.styles do |s| user.real_name, user.gender == 1 ? "女" : "男", user.identity, - user.student_id, + user.student_id.present? ? (user.student_id.to_s + "\t") : "--", user.school_name, user.department_name, user.location, user.auth_status, user.pro_status, - user.phone, + user.phone.present? ? (user.phone.to_s + "\t") : "--", prize_user.leader? ? "是" : "-", - user.ID_number, + user.ID_number.present? ? (user.ID_number.to_s + "\t") : "--", [prize_user.extra&.[]('bank'), prize_user.extra&.[]('second_bank'), prize_user.extra&.[]('card_no')].compact.join('/'), prize_user.approved_at&.strftime('%Y-%m-%d %H:%M'), prize_user.approver&.real_name From f34fc80a632e1be44365bb5f04cbadc77b75c48c Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 26 Nov 2019 15:34:05 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/helps_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/helps_controller.rb b/app/controllers/helps_controller.rb index 9aefb5129..a32aba62f 100644 --- a/app/controllers/helps_controller.rb +++ b/app/controllers/helps_controller.rb @@ -25,7 +25,14 @@ class HelpsController < ApplicationController end def feedback - content = "

[#{params[:question_kind]}]

问题页面网址：#{params[:url]}

#{params[:description]}" + if params[:url].blank? + content = "

[#{params[:question_kind]}]

#{params[:description]}" + params[:attachment_ids].each do |attachment_id| + content += "![](/api/attachments/#{attachment_id})↵" + end + else + content = "

[#{params[:question_kind]}]

问题页面网址：#{params[:url]}

#{params[:description]}" + end ActiveRecord::Base.transaction do attr = { sender_id: User.current.id, receiver_id: 1, content: content, send_time: Time.now } From 086804688ef78bff1764c9f73af9e47293ca5159 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 26 Nov 2019 15:54:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/helps_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/helps_controller.rb b/app/controllers/helps_controller.rb index a32aba62f..8d58663f6 100644 --- a/app/controllers/helps_controller.rb +++ b/app/controllers/helps_controller.rb @@ -27,8 +27,10 @@ class HelpsController < ApplicationController def feedback if params[:url].blank? content = "

[#{params[:question_kind]}]

#{params[:description]}" - params[:attachment_ids].each do |attachment_id| - content += "![](/api/attachments/#{attachment_id})↵" + if params[:attachment_ids] + params[:attachment_ids].each do |attachment_id| + content += "![](/api/attachments/#{attachment_id})↵" + end end else content = "

[#{params[:question_kind]}]

问题页面网址：#{params[:url]}

#{params[:description]}" From 286fc11d8789ab443fd5b439058a8c3814cc393f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 26 Nov 2019 16:05:29 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=98=B6=E6=AE=B5-=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E8=AE=AD=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/paths/PathDetail/Addshixuns.js | 73 ++++++++++++++++++ .../paths/PathDetail/DetailCardsEditAndAdd.js | 72 ++++++++++++++++- .../PathDetail/DetailCardsEditAndEdit.js | 77 ++++++++++++++++--- public/react/src/modules/tpm/NewFooter.js | 4 + public/react/src/modules/tpm/NewHeader.js | 4 +- 5 files changed, 214 insertions(+), 16 deletions(-) create mode 100644 public/react/src/modules/paths/PathDetail/Addshixuns.js diff --git a/public/react/src/modules/paths/PathDetail/Addshixuns.js b/public/react/src/modules/paths/PathDetail/Addshixuns.js new file mode 100644 index 000000000..df6f0751e --- /dev/null +++ b/public/react/src/modules/paths/PathDetail/Addshixuns.js @@ -0,0 +1,73 @@ +import React, { Component } from 'react'; +import {getImageUrl} from 'educoder'; +import {Modal,Input} from 'antd'; +class Addshixuns extends Component { + constructor(props) { + super(props); + this.state = { + shixunname:undefined, + } + } + + handleChange=(e)=>{ + this.setState({ + shixunname:e.target.value, + }) + } + + modalCancel=()=>{ + this.setState({ + shixunname:undefined, + }) + this.props.modalCancel() + } + + modalSave=()=>{ + let {shixunname}=this.state; + this.props.Setaddshixuns(shixunname); + this.props.modalCancel(); + } + + render() { + + return( + + {this.props.Addshixunstype===true?:""} + +
+

+ 实训名称： + + +

+
+ 取消 + 确定 +
+ +
+ + + ) + } +} + +export default Addshixuns; \ No newline at end of file diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js index 159c40475..595a10cc4 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js @@ -3,6 +3,7 @@ import {getImageUrl} from 'educoder'; import {Modal,Input,Checkbox,Tooltip,Spin,notification} from "antd"; import { DragDropContext , Draggable, Droppable} from 'react-beautiful-dnd'; import Modals from '../../modals/Modals'; +import Addshixuns from './Addshixuns'; import '../ShixunPaths.css'; import axios from 'axios'; import NewShixunModel from '../../courses/coursesPublic/NewShixunModel'; @@ -52,7 +53,8 @@ class DetailCardsEditAndAdd extends Component{ Modalsbottomval:"", ChooseShixunListshixun_list:undefined, stage_nametype:false, - descriptiontype:false + descriptiontype:false, + Addshixunstype:false } this.onDragEnd = this.onDragEnd.bind(this); } @@ -113,9 +115,12 @@ class DetailCardsEditAndAdd extends Component{ for(var z=0; z{ + this.setState({ + Addshixunstype:true, + }) + } + + Getaddshixuns=(value)=>{ + let { + shixuns_listeditlist, + shixuns_listedit, + } = this.state + let newshixuns_listedit=shixuns_listedit; + let list=shixuns_listeditlist + let url='/paths/add_shixun_to_stage.json'; + axios.post(url,{ + name:value + }).then((response) => { + if(response){ + if(response.data){ + newshixuns_listedit.push(response.data); + list.push(response.data.shixun_id); + this.setState({ + shixuns_listedit:newshixuns_listedit, + shixuns_listeditlist:list, + patheditarry:[], + selectShixun:false, + page:1, + }) + } + } + }).catch((error) => { + console.log(error) + }); + } + render(){ let {selectShixun, @@ -340,6 +381,22 @@ class DetailCardsEditAndAdd extends Component{ > + {this.state.Addshixunstype===true?this.Getaddshixuns(value)} + {...this.props} + {...this.state} + />:""} + + { editPanel &&
@@ -371,13 +428,20 @@ class DetailCardsEditAndAdd extends Component{
描述不能超多最大限制300个字符
-

- +

+ this.AddShixunBox()} className="fl defalutGreyBorder color-grey-6 ml37"> 选用实训项目 选择下面实训后，可以通过拖拽进行排序调整

+

+ this.Addshixuns()} className="fl defalutGreyBorder color-grey-6 ml37"> + + 添加实训项目 + 您只需输入实训名称即可完成实训项目的添加，进入实训详情后可进行具体配置操作 +

+ {selectShixun===true? { this.props.idsum===this.props.keys&&this.props.pathCardsedittype===true?
@@ -381,13 +428,21 @@ class DetailCardsEditAndEdit extends Component{ >
描述不能超多最大限制300个字符
-

+ +

选用实训项目 选择下面实训后，可以通过拖拽进行排序调整

+

+ + 添加实训项目 + + 您只需输入实训名称即可完成实训项目的添加，进入实训详情后可进行具体配置操作 +

+ {selectShixun===true? diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 551ab2b0e..32051575b 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -1284,7 +1284,9 @@ submittojoinclass=(value)=>{
    - {this.props.current_user&&this.props.current_user.user_identity==="学生"?"":coursestypes===true?"":
  • this.getUser("/courses/new")}>{this.props.user&&this.props.user.main_site===false?"新建课堂":"新建翻转课堂"}
    • } + {this.props.current_user&&this.props.current_user.user_identity==="学生"?"":coursestypes===false? +
  • this.getUser("/courses/new")}>{this.props.user&&this.props.user.main_site===false?"新建课堂":"新建翻转课堂"}
    • :"" + } {shixuntype===true?"":
  • this.getUser("/shixuns/new")}>新建实训项目
    • } {this.props.Headertop===undefined?"": pathstype===true?"":this.props.user&&this.props.user.main_site===true||this.props.user&&this.props.user.admin===true?
  • this.getUser("/paths/new")} >新建实践课程
    • :"" From dd1a1dab00170edaf83811b90be7f17c481f935f Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 26 Nov 2019 16:09:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/libs/wechat/weapp.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/libs/wechat/weapp.rb b/app/libs/wechat/weapp.rb index 9684206cd..ca356b28d 100644 --- a/app/libs/wechat/weapp.rb +++ b/app/libs/wechat/weapp.rb @@ -31,7 +31,9 @@ class Wechat::Weapp cipher.padding = 0 cipher.key = session_key cipher.iv = iv + Rails.logger.info("[Weapp] encrypted_data: #{encrypted_data}") data = cipher.update(encrypted_data) << cipher.final + Rails.logger.info("[Weapp] data: #{data}") result = JSON.parse(data[0...-data.last.ord]) raise Wechat::Error.new(-1, '解密错误') if result.dig('watermark', 'appid') != appid