diff --git a/app/controllers/item_baskets_controller.rb b/app/controllers/item_baskets_controller.rb index dc5367378..03355189d 100644 --- a/app/controllers/item_baskets_controller.rb +++ b/app/controllers/item_baskets_controller.rb @@ -12,13 +12,7 @@ class ItemBasketsController < ApplicationController end def basket_list - @single_questions_count = current_user.item_baskets.where(item_type: "SINGLE").count - @multiple_questions_count = current_user.item_baskets.where(item_type: "MULTIPLE").count - @judgement_questions_count = current_user.item_baskets.where(item_type: "JUDGMENT").count - @completion_questions_count = current_user.item_baskets.where(item_type: "COMPLETION").count - @subjective_questions_count = current_user.item_baskets.where(item_type: "SUBJECTIVE").count - @practical_questions_count = current_user.item_baskets.where(item_type: "PRACTICAL").count - @program_questions_count = current_user.item_baskets.where(item_type: "PROGRAM").count + @basket_count = current_user.item_baskets.group(:item_type).count end def create diff --git a/app/views/item_baskets/basket_list.json.jbuilder b/app/views/item_baskets/basket_list.json.jbuilder index 11db844ab..4cb0d5592 100644 --- a/app/views/item_baskets/basket_list.json.jbuilder +++ b/app/views/item_baskets/basket_list.json.jbuilder @@ -1,7 +1,7 @@ -json.single_questions_count @single_questions_count -json.multiple_questions_count @multiple_questions_count -json.judgement_questions_count @judgement_questions_count -json.completion_questions_count @completion_questions_count -json.subjective_questions_count @subjective_questions_count -json.practical_questions_count @practical_questions_count -json.program_questions_count @program_questions_count +json.single_questions_count @basket_count&.fetch("SINGLE", 0) +json.multiple_questions_count @basket_count&.fetch("MULTIPLE", 0) +json.judgement_questions_count @basket_count&.fetch("JUDGMENT", 0) +json.completion_questions_count @basket_count&.fetch("COMPLETION", 0) +json.subjective_questions_count @basket_count&.fetch("SUBJECTIVE", 0) +json.practical_questions_count @basket_count&.fetch("PRACTICAL", 0) +json.program_questions_count @basket_count&.fetch("PROGRAM", 0) \ No newline at end of file diff --git a/lib/tasks/zip_pack.rake b/lib/tasks/zip_pack.rake index 06598d56e..2f11cfe5a 100644 --- a/lib/tasks/zip_pack.rake +++ b/lib/tasks/zip_pack.rake @@ -30,7 +30,7 @@ namespace :zip_pack do folders << new_folder end - puts "下载路径: #{folders.join(",")}" + puts "下载路径: #{folders.join(",")}" end end diff --git a/public/react/src/modules/wxcode/index.js b/public/react/src/modules/wxcode/index.js index 15f3673b7..3040480f1 100644 --- a/public/react/src/modules/wxcode/index.js +++ b/public/react/src/modules/wxcode/index.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2020-01-15 09:56:34 * @LastEditors : tangjiang - * @LastEditTime : 2020-01-17 10:19:51 + * @LastEditTime : 2020-01-17 11:48:21 */ import './index.scss'; import React, {useState, useEffect, useRef} from 'react'; @@ -12,7 +12,7 @@ import MonacoEditor from '@monaco-editor/react'; import { Input, Icon } from 'antd'; import { connect } from 'react-redux'; import actions from '../../redux/actions'; -import cookie from 'react-cookies'; +import cookie from 'react-cookies' const { TextArea } = Input; const App = (props) => { @@ -41,13 +41,15 @@ const App = (props) => { // 获取路径参数 const _params = window.location.search; if (_params) { - let _cookie = ''; let _search = _params.split('?')[1]; - if(_search.split('=')) { - _cookie = _search.split('=')[1]; - cookie.save('_educoder_session', _cookie); - } - console.log(_cookie); + _search.split('&').forEach(item => { + console.log(item); + const _arr = item.split('='); + cookie.save(_arr[0], _arr[1], { + path: '/', + domain: '.educoder.net' + }); + }); } const [isActive, setIsActive] = useState(-1); // const [isVisible, setIsVisible] = useState(false);