Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/task_banks_controller.rb

@@ -35,7 +35,7 @@ class TaskBanksController < ApplicationController
   def gtask_bank_params
     tip_exception("name参数不能为空") if params[:gtask_bank][:name].blank?
     tip_exception("description参数不能为空") if params[:gtask_bank][:description].blank?
-    if @bank.homework_type == 3
+    if @bank.task_type == 2
       tip_exception("base_on_project参数不能为空") if params[:gtask_bank][:base_on_project].nil?
       tip_exception("min_num参数不能为空") if params[:gtask_bank][:min_num].blank?
       tip_exception("max_num参数不能为空") if params[:gtask_bank][:max_num].blank?

db/migrate/20190906111746_gtopic_bank_is_public.rb

@@ -0,0 +1,5 @@
+class GtopicBankIsPublic < ActiveRecord::Migration[5.2]
+  def change
+    GtopicBank.where(is_public: nil).update_all(is_public: 0)
+  end
+end

public/react/src/App.js

@@ -324,7 +324,7 @@ class App extends Component {
 						title: 'EduCoder',
 						desc: '创新源于实践',
 						link: currentUrl,
-						imgUrl: currentUrl + '/images/educoder/index/subject/subject15.jpg'
+						imgUrl: (currentUrl.endsWith('/') ? currentUrl : currentUrl + '/') + 'images/educoder/index/subject/subject15.jpg'
 					};
 			
 					wx.onMenuShareAppMessage(shareData);//分享给好友

public/react/src/modules/courses/css/Courses.css

@@ -1221,7 +1221,7 @@ samp {
   }
   
   /* 毕设任务 */
-  .graduationTaskMenu a{
+  .graduationTaskMenu>a{
       display: block;
       position: relative;
       line-height: 72px;
@@ -1229,7 +1229,7 @@ samp {
       margin-right: 30px;
       float: left;
   }
-  .graduationTaskMenu a.active:after{
+  .graduationTaskMenu>a.active:after{
       position: absolute;
       left: 0px;
       height: 2px;
@@ -1239,7 +1239,7 @@ samp {
       bottom: 0px;
       font-weight:400;
   }
-  .graduationTaskMenu a.active{
+  .graduationTaskMenu>a.active{
       color: #4CACFF!important;
   }