Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/weapps/base_controller.rb

@@ -0,0 +1,34 @@
+class Weapps::BaseController < ApplicationController
+
+  private
+
+  def require_wechat_login!
+    return if session_unionid.present?
+
+    render_error('请先进行微信授权')
+  end
+
+  def weapp_session_key
+    Wechat::Weapp.session_key(session_openid)
+  end
+
+  def set_weapp_session_key(session_key)
+    Wechat::Weapp.write_session_key(session_openid, session_key)
+  end
+
+  def session_openid
+    session[:openid]
+  end
+
+  def set_session_openid(openid)
+    session[:openid] = openid
+  end
+
+  def session_unionid
+    session[:unionid]
+  end
+
+  def set_session_unionid(unionid)
+    session[:unionid] = unionid
+  end
+end

app/controllers/weapps/code_sessions_controller.rb

@@ -0,0 +1,24 @@
+class Weapps::CodeSessionsController < Weapps::BaseController
+  def create
+    return render_error('code不能为空') if params[:code].blank?
+
+    result = Wechat::Weapp.jscode2session(params[:code])
+
+    set_session_openid(result['openid'])
+    set_weapp_session_key(result['session_key']) # weapp session_key写入缓存 后续解密需要
+
+    # 已授权，绑定过账号
+    open_user = OpenUser::Wechat.find_by(uid: result['unionid'])
+    if open_user.present? && open_user.user
+      set_session_unionid(result['unionid'])
+      successful_authentication(open_user.user)
+    else
+      # 新用户
+      user_info = Wechat::Weapp.decrypt(result['session_key'], params[:encrypted_data], params[:iv])
+
+      set_session_unionid(user_info['unionId'])
+    end
+
+    render_ok(openid: result['openid'])
+  end
+end

app/controllers/weapps/homes_controller.rb

@@ -0,0 +1,12 @@
+class Weapps::HomesController < Weapps::BaseController
+  def show
+    # banner图
+    @images = PortalImage.where(status: true).order(position: :asc)
+
+    # 热门实训
+    @shixuns = Shixun.where(homepage_show: true).includes(:tag_repertoires, :challenges).limit(4)
+
+    # 热门实践课程
+    @subjects = Subject.where(homepage_show: true).includes(:shixuns, :repertoire).limit(4)
+  end
+end

app/controllers/weapps/registers_controller.rb

@@ -0,0 +1,63 @@
+class Weapps::RegistersController < Weapps::BaseController
+  before_action :require_wechat_login!
+
+  def create
+    # 查询验证码是否正确;type只可能是1或者8
+    type = phone_mail_type(params[:login].strip)
+    code = params[:code].strip
+
+    if type == 1
+      uid_logger("start register by phone:  type is #{type}")
+      pre = 'p'
+      email = nil
+      phone = params[:login]
+      verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 1).last
+    else
+      uid_logger("start register by email:  type is #{type}")
+      pre = 'm'
+      email = params[:login]
+      phone = nil
+      verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
+    end
+    uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
+    # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
+    # todo 上线前请删除万能验证码"513231"
+    unless code == "513231" && request.subdomain == "test-newweb"
+      return render_error('验证码不正确') if verifi_code.try(:code) != code.strip
+      return render_error('验证码已失效') if !verifi_code&.effective?
+    end
+
+    login = User.generate_login(pre)
+    @user = User.new(admin: false, login: login, mail: email, phone: phone, type: 'User')
+    @user.password = params[:password]
+    # 现在因为是验证码，所以在注册的时候就可以激活
+    @user.activate
+    # 必须要用save操作，密码的保存是在users中
+    ActiveRecord::Base.transaction do
+      @user.save!
+      UserExtension.create!(user_id: @user.id)
+      # 绑定微信号
+      OpenUsers::Wechat.create!(user: @user, uid: session_unionid)
+
+      # 注册完成，手机号或邮箱想可以奖励500金币
+      RewardGradeService.call(
+        @user,
+        container_id: @user.id,
+        container_type: pre == 'p' ? 'Phone' : 'Mail',
+        score: 500
+      )
+    end
+    successful_authentication(@user)
+    session[:user_id] = @user.id
+
+    render_ok
+  end
+
+  private
+
+  # 1 手机类型；0 邮箱类型
+  # 注意新版的login是自动名生成的
+  def phone_mail_type value
+    value =~ /^1\d{10}$/ ? 1 : 0
+  end
+end

app/controllers/weapps/sessions_controller.rb

@@ -0,0 +1,24 @@
+class Weapps::SessionsController < Weapps::BaseController
+  before_action :require_wechat_login!
+
+  def create
+    return render_error('重复登录') if current_user.present? && current_user.logged?
+
+    user = User.try_to_login(params[:login], params[:password])
+
+    return render_error('错误的账号或密码') if user.blank?
+    return render_error('违反平台使用规范，账号已被锁定') if user.locked?
+    return render_error('错误的账号或密码') unless user.check_password?(params[:password].to_s)
+
+    if user.wechat_open_user && user.wechat_open_user.uid != session_unionid
+      render_error('该账号已被其它微信号绑定')
+      return
+    end
+
+    # 绑定微信号
+    OpenUsers::Wechat.create!(user: user, uid: session_unionid) if user.wechat_open_user.blank?
+
+    successful_authentication(user)
+    render_ok
+  end
+end

app/controllers/weapps/verifies_controller.rb

@@ -0,0 +1,8 @@
+class Weapps::VerifiesController < Weapps::BaseController
+  before_action :require_wechat_login!
+
+  def create
+    valid = Wechat::Weapp.verify?(session_openid, params[:verify_string], params[:signature])
+    render_ok(valid: valid)
+  end
+end

app/libs/hot_search_keyword.rb

@@ -0,0 +1,22 @@
+class HotSearchKeyword
+  class << self
+    def add(keyword)
+      return if keyword.blank?
+      Rails.cache.data.zincrby(redis_key, 1, keyword)
+    end
+
+    def hot(limit = 5)
+      Rails.cache.data.zrevrange(redis_key, 0, limit - 1)
+    end
+
+    def available?
+      Rails.cache.is_a?(ActiveSupport::Cache::RedisStore)
+    end
+
+    private
+
+    def redis_key
+      'educoder:es:hot_keyword'
+    end
+  end
+end

app/libs/wechat/weapp.rb

@@ -1,4 +1,4 @@
-class Wechat::App
+class Wechat::Weapp
   class << self
     attr_accessor :appid, :secret
 
@@ -7,5 +7,41 @@ class Wechat::App
     def client
       @_client ||= Wechat::Client.new(appid, secret)
     end
+
+    def session_key(openid)
+      Rails.cache.read(session_key_cache_key(openid))
+    end
+
+    def write_session_key(openid, session_key)
+      Rails.cache.write(session_key_cache_key(openid), session_key)
+    end
+
+    def verify?(openid, str, signature)
+      session_key = session_key(openid)
+      Digest::SHA1.hexdigest("#{str}#{session_key}") == signature
+    end
+
+    def decrypt(session_key, encrypted_data, iv)
+      session_key = Base64.decode64(session_key)
+      encrypted_data = Base64.decode64(encrypted_data)
+      iv = Base64.decode64(iv)
+
+      cipher = OpenSSL::Cipher::AES.new(128, :CBC)
+      cipher.decrypt
+      cipher.padding = 0
+      cipher.key = session_key
+      cipher.iv  = iv
+      data = cipher.update(encrypted_data) << cipher.final
+      result = JSON.parse(data[0...-data.last.ord])
+
+      raise Wechat::Error, '解密错误' if result.dig('watermark', 'appid') != appid
+      result
+    end
+
+    private
+
+    def session_key_cache_key(openid)
+      "weapp:#{appid}:#{openid}:session_key"
+    end
   end
 end

app/services/create_bind_user_service.rb

@@ -17,7 +17,7 @@ class CreateBindUserService < ApplicationService
 
     bind_user = User.try_to_login(params[:username], params[:password])
     raise Error, '用户名或者密码错误' if bind_user.blank?
-    raise Error, '该账号已被绑定' if bind_user.bind_open_user?(params[:type].to_s)
+    raise Error, '该账号已被其他微信号绑定，请更换其他账号进行绑定' if bind_user.bind_open_user?(params[:type].to_s)
 
     ActiveRecord::Base.transaction do
       open_user.user_id = bind_user.id

app/views/weapps/homes/show.json.jbuilder

@@ -0,0 +1,14 @@
+json.images do
+  json.array! @images do |image|
+    json.path image.link
+    json.image_url Util::FileManage.source_disk_file_url(image)
+  end
+end
+
+json.shixuns do
+  json.partial! 'shixuns/shixun', locals: { shixuns: @shixuns }
+end
+
+json.subjects do
+  json.partial! 'subjects/subject', locals: { subjects: @subjects }
+end

config/configuration.yml.example

@@ -18,6 +18,9 @@ defaults: &defaults
   wechat:
     appid: 'test'
     secret: 'test'
+  weapp:
+    appid: 'test'
+    secret: 'test'
 
 development:
   <<: *defaults

config/initializers/wechat_init.rb

@@ -1,9 +1,12 @@
 wechat_config = {}
+weapp_config = {}
 
 begin
   config = Rails.application.config_for(:configuration)
   wechat_config = config['wechat']
+  weapp_config = config['weapp']
   raise 'wechat config missing' if wechat_config.blank?
+  raise 'weapp config missing' if weapp_config.blank?
 rescue => ex
   raise ex if Rails.env.production?
 
@@ -12,5 +15,10 @@ rescue => ex
   wechat_config = {}
 end
 
+# 网站应用
 Wechat::OfficialAccount.appid  = wechat_config['appid']
 Wechat::OfficialAccount.secret = wechat_config['secret']
+
+# 小程序
+Wechat::Weapp.appid  = weapp_config['appid']
+Wechat::Weapp.secret = weapp_config['secret']

config/routes.rb

@@ -829,6 +829,14 @@ Rails.application.routes.draw do
     get '/auth/qq/callback', to: 'oauth/qq#create'
     get '/auth/wechat/callback', to: 'oauth/wechat#create'
     resource :bind_user, only: [:create]
+
+    namespace :weapps do
+      resource :home, only: [:show]
+      resource :session, only: [:create]
+      resource :register, only: [:create]
+      resource :code_session, only: [:create]
+      resource :verify, only: [:create]
+    end
   end
 
   namespace :admins do

public/react/src/modules/courses/Resource/index.js

@@ -28,7 +28,7 @@ class Fileslists extends Component{
       pagesize: 15,
       tagname:undefined,
       search:undefined,
-      sort:undefined,
+      sort:"desc",
       sorttype:"created_on",
       coursesecondcategoryid:undefined,
       filesId:undefined,
@@ -49,16 +49,19 @@ class Fileslists extends Component{
 			checkBoxValues:[],
 			checkAllValue:false
     })
+
     if(this.props.match.params.main_id){
-      this.seactall();
       this.setState({
          child:false,
+				 sort:"desc"
 			})
+			this.seactall(undefined,"desc");
     }else if(this.props.match.params.Id){
-      this.seactall(parseInt(this.props.match.params.Id),1)
 			this.setState({
 				child:true,
+				sort:"desc"
 			})
+			this.seactall(parseInt(this.props.match.params.Id),"desc")
     }
     this.updadatalist();
 		on('updateNavSuccess', this.updateNavSuccess)
@@ -66,13 +69,14 @@ class Fileslists extends Component{
   }
 
 	updateNavSuccess=()=>{
+  	let{sort}=this.state;
 		this.setState({
 			isSpin:true
 		})
 		if(this.props.match.params.main_id){
-			this.seactall();
+			this.seactall(undefined,sort);
 		}else if(this.props.match.params.Id){
-			this.seactall(parseInt(this.props.match.params.Id),1)
+			this.seactall(parseInt(this.props.match.params.Id),sort)
 		}
 	}
   componentDidUpdate = (prevProps) => {
@@ -85,8 +89,9 @@ class Fileslists extends Component{
       if(this.props.match.params.main_id!=undefined){
 				this.setState({
 					child:false,
+					sort:"desc"
 				})
-        this.seactall();
+        this.seactall(undefined,"desc");
       }
     }
     if(prevProps.match.params.Id != this.props.match.params.Id){
@@ -98,8 +103,9 @@ class Fileslists extends Component{
       if(this.props.match.params.Id!=undefined){
 				this.setState({
 					child:true,
+					sort:"desc"
 				})
-        this.seactall(parseInt(this.props.match.params.Id),1)
+        this.seactall(parseInt(this.props.match.params.Id),"desc")
       }
     }
   }
@@ -138,29 +144,42 @@ class Fileslists extends Component{
 
   }
   updatafiled=()=>{
+		let{sort}=this.state;
 		if(this.props.match.params.main_id){
-			this.seactall();
+			this.seactall(undefined,sort);
 		}else if(this.props.match.params.Id){
-			this.seactall(parseInt(this.props.match.params.Id),1)
+			this.seactall(parseInt(this.props.match.params.Id),sort)
 		}
 	}
-  seactall=(coursesecondcategoryid,type)=>{
+  seactall=(coursesecondcategoryid,sort)=>{
 
     this.setState({
       coursesecondcategoryid:coursesecondcategoryid,
       isSpin:true
     })
 
-    let{pagesize,page,tagname,searchValue,sort,sorttype}=this.state;
+    let{pagesize,page,tagname,searchValue,sorttype}=this.state;
     this.getfileslist(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
   }
 
   onSortTypeChange=(sorttype)=>{
-    let{pagesize,page,tagname,searchValue,sort,coursesecondcategoryid}=this.state;
-    this.setState({
-      sorttype:sorttype
-    })
-    this.getfileslist(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
+    let{pagesize,page,tagname,searchValue,sort,coursesecondcategoryid,}=this.state;
+    let newsort="desc";
+    if(sort==="desc"){
+			this.setState({
+				sorttype:sorttype,
+				sort:"asc"
+			})
+			newsort="asc"
+		}else{
+			this.setState({
+				sorttype:sorttype,
+				sort:"desc"
+			})
+			newsort="desc"
+		}
+
+    this.getfileslist(pagesize,page,tagname,searchValue,newsort,sorttype,coursesecondcategoryid);
   }
 
   getfileslist=(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid)=>{
@@ -176,7 +195,7 @@ class Fileslists extends Component{
         page:page,
         tag_name:tagname,
         search:searchValue,
-        sort:sort,
+        sort:sort==="desc"?0:1,
         sort_type:sorttype,
         course_second_category_id:id
       }
@@ -353,7 +372,7 @@ class Fileslists extends Component{
       Modalstype:false,
     })
 
-    let {checkBoxValues} = this.state;
+    let {checkBoxValues,sort} = this.state;
 
     const cid = this.props.match.params.coursesId;
     let url="/files/bulk_public.json";
@@ -363,7 +382,7 @@ class Fileslists extends Component{
     })
         .then((response) => {
           if (response.data.status == 0) {
-            this.seactall();
+   				  this.updatafiled()
             //:response.data.message
             this.props.showNotification("更新成功");
             this.setState({
@@ -680,7 +699,8 @@ class Fileslists extends Component{
       shixunmodal,
       course_is_public,
 			filesId,
-			child
+			child,
+			sort
     } = this.state;
     let category_id= this.props.match.params.category_id;
 
@@ -753,7 +773,7 @@ class Fileslists extends Component{
               patheditarry={this.state.patheditarry}
               coursesecondcategoryid={this.state.coursesecondcategoryid}
               hidecouseShixunModal={this.hidecouseShixunModal}
-              setupdate={(id)=>this.seactall(id)}
+              setupdate={(id)=>this.seactall(id,sort)}
               attachmentId={this.state.coursesecondcategoryid}
           />:""}
 
@@ -768,7 +788,7 @@ class Fileslists extends Component{
               Savesname={"确认"}
               Cancel={this.Cancelvisible}
               categoryid={category_id}
-              setupdate={(id)=>this.seactall(id)}
+              setupdate={(id)=>this.seactall(id,sort)}
               has_course_groups={this.state.has_course_groups}
               attachmentId={this.state.coursesecondcategoryid}
           />:""}
@@ -779,7 +799,7 @@ class Fileslists extends Component{
               Settingtype={Settingtype}
               discussMessageid={discussMessageid}
               course_id={this.props.match.params.coursesId}
-              setupdate={(id)=>this.seactall(id)}
+              setupdate={(id)=>this.seactall(id,sort)}
               Cancel={this.Cancelvisible}
               has_course_groups={this.state.has_course_groups}
 							attachmentId={this.state.coursesecondcategoryid}
@@ -896,16 +916,24 @@ class Fileslists extends Component{
 
 
                   </li>:""}
-
-                  {this.props.isAdmin()||this.props.isStudent()? <li className="drop_down">
-                    {sorttype === 'created_on' ? '更新时间排序':sorttype === 'downloads' ?'下载次数排序':'引用次数排序'}
-                    <i className="iconfont icon-xiajiantou font-12 ml2"></i>
-                    <ul className="drop_down_normal" style={{width:'130px'}}>
-                      {/*className={sorttype === 'created_on'?"none":""}  className={sorttype === 'quotes'?"none":""}  className={sorttype === 'downloads'?"none":""} */}
-                      <li style={{width:'130px'}} onClick={() => this.onSortTypeChange('created_on')}>更新时间排序</li>
-                      <li style={{width:'130px'}} onClick={() => this.onSortTypeChange('downloads')}>下载次数排序</li>
-                      {/*<li style={{width:'130px'}} onClick={() => this.onSortTypeChange('quotes')}>引用次数排序</li>*/}
-                    </ul>
+									<style>
+										{
+											`
+											 .fiilssort{
+											     position: absolute;
+    											 top: -10px;
+											 }
+											`
+										}
+									</style>
+                  {this.props.isAdmin()||this.props.isStudent()? <li className="drop_down" onClick={() => this.onSortTypeChange('created_on')}>
+										更新时间
+										<sapn className="relativef ml5"style={{"top":"2px"}} >
+											<i className={sort==="asc"?
+												"iconfont icon-sanjiaoxing-up font-12  color-blue fiilssort" :"iconfont icon-sanjiaoxing-up font-12 fiilssort"}></i>
+											<i className={sort==="desc"?
+												"iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue":"iconfont icon-sanjiaoxing-down font-12 yslbottomsj"}></i>
+										</sapn>
                   </li>:""}
                 </div>
               </div>

public/react/src/modules/courses/busyWork/CommonWorkSetting.js

@@ -1128,7 +1128,9 @@ class CommonWorkSetting extends Component{
 
             {<div className={"publicTimeTip color-red ml30"}>{publicTimeTip}</div>}
             </React.Fragment> : 
-              adaptered_group_settings && !!adaptered_group_settings.length && <PollDetailTabForthRules 
+              adaptered_group_settings && !!adaptered_group_settings.length && <PollDetailTabForthRules
+								{...this.props}
+								{...this.state}
                 ref="pollDetailTabForthRules"
                 rules={rules}
                 course_group={adaptered_group_settings}

public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js

@@ -61,7 +61,8 @@ class Titlesearchsection extends Component{
 
           <p className="clearfix padding30 bor-bottom-greyE">
             <p style={{height: '20px'}}>
-              <span className="font-18 fl color-dark-21 filesnameslist" title={title}>{title}</span>
+            {/* title={title} */}
+              <span className="font-18 fl color-dark-21 filesnameslist" >{title}</span>
               <li className="fr font-16">
                 { firstRowRight }
               </li>

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -248,8 +248,8 @@ class CoursesBanner extends Component {
             }
             }
         if (i ===5) {
-            s = "复制将在后台执行,作业、资源、试卷都将复制到新课堂平台";
-            ss = "将为你创建一个新的同名课堂，请问是否继续？";
+            s = "复制”功能将会为您创建一个新的课堂旧课堂的作业、资源、试卷";
+            ss = "都将被复制到新的课堂里面请问是否继续？？";
             this.showActionPoll(i,s,ss)
         }
 

public/react/src/modules/courses/exercise/Exercisesetting.js

@@ -350,6 +350,7 @@ class Exercisesetting extends Component{
 
 
             this.commitSetting((result)=>{
+            	console.log(result)
                 if(result.status==200){
                     this.props.showNotification(`${result.data.message}`);
                     this.getSettingInfo();
@@ -369,6 +370,7 @@ class Exercisesetting extends Component{
 			}
 
 			this.commitSetting((result)=>{
+				console.log(result)
 				if(result.status==200){
 					this.props.showNotification(`${result.data.message}`);
 					this.cancelEdit();
@@ -702,7 +704,9 @@ class Exercisesetting extends Component{
                                         </div>
                                         :
                                         <PollDetailTabForthRules
-																					ref="pollDetailTabForthRules"
+																					{...this.props}
+																					{...this.state}
+																				  	ref="pollDetailTabForthRules"
                                             rules={rules}
                                             type={"Exercise"}
                                             course_group={course_group}

public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

@@ -257,6 +257,15 @@ class Testpapersettinghomepage extends Component{
 				if(tab[0]==="0"){
         this.child.Teacherliststudentlist();
 				}
+				if(tab[0]==="1"){
+					this.child.Teacherliststudentlist();
+				}
+				if(tab[0]==="2"){
+					this.child.Teacherliststudentlist();
+				}
+				if(tab[0]==="3"){
+					this.child.getSettingInfo();
+				}
 			}catch (e) {
 
 			}

public/react/src/modules/courses/members/studentsList.js

@@ -710,7 +710,7 @@ class studentsList extends Component{
           title={isParent ? (pageType == TYPE_STUDENTS ? "全部学生" : "学生列表"): 
             <React.Fragment>
               <span>
-                <Tooltip title="返回">
+                <Tooltip title="返回至分班列表">
                   <i className="icon-zuojiantou iconfont font-14" onClick={() => { this.props.history.push(`/courses/${courseId}/course_groups`)}}
                     style={{color: '#212121', verticalAlign: 'initial', marginRight: '14px' }}
                   ></i>

public/react/src/modules/courses/poll/PollDetailIndex.js

@@ -49,6 +49,24 @@ class PollDetailIndex extends Component{
 		}).catch((error)=>{
 			console.log(error);
 		})
+
+		let{tab}=this.state;
+		try {
+			if(tab[0]==="0"){
+				this.child.Teacherliststudentlist();
+			}
+			if(tab[0]==="1"){
+				this.child.Teacherliststudentlist();
+			}
+			if(tab[0]==="2"){
+				this.child.Teacherliststudentlist();
+			}
+			if(tab[0]==="3"){
+				this.child.getSettingInfo();
+			}
+		}catch (e) {
+
+		}
 	}
 
 	componentDidMount(){
@@ -110,6 +128,7 @@ class PollDetailIndex extends Component{
 			DownloadMessageval:undefined
 		})
 	}
+	bindRef = ref => { this.child = ref };
 	render(){
 		let {tab,pollDetail,user_permission,polls_status}=this.state;
 		const { current_user } = this.props;
@@ -235,7 +254,7 @@ class PollDetailIndex extends Component{
 						}
 						{
 							//设置
-							parseInt(tab[0])==3 && <PollTabForth {...this.props} {...this.state} user_permission={user_permission} getPollInfo={this.getPollInfo}></PollTabForth>
+							parseInt(tab[0])==3 && <PollTabForth {...this.props} {...this.state} triggerRef={this.bindRef} user_permission={user_permission} getPollInfo={this.getPollInfo}></PollTabForth>
 						}
 
 					</div>

public/react/src/modules/courses/poll/PollDetailTabForth.js

@@ -90,6 +90,11 @@ class PollDetailTabForth extends Component{
 		if(this.props.isAdmin() === false){
 			this.cancelEdit()
 		}
+		try {
+			this.props.triggerRef(this);
+		}catch (e) {
+
+		}
 	}
 	componentDidUpdate = (prevProps) => {
 		if(prevProps.pollDetail!= this.props.pollDetail){
@@ -610,6 +615,8 @@ class PollDetailTabForth extends Component{
 										</div>
 										:
 										<PollDetailTabForthRules
+											{...this.props}
+											{...this.state}
 											ref="pollDetailTabForthRules"
 											rules={rules}
 											course_group={course_group}

public/react/src/modules/courses/poll/PollDetailTabForthRules.js

@@ -342,7 +342,7 @@ class PollDetailTabForthRules extends Component{
 	}
   render(){
     let {rules,course_group,flagPageEdit}=this.state
-   console.log(rules)
+		let isAdmin=this.props.isAdmin();
     return(
       <div className="bor-top-greyE pt20">
         <p className="clearfix mb10">
@@ -350,6 +350,12 @@ class PollDetailTabForthRules extends Component{
           <span className="fl pr20 color-grey-c with25">(学生收到{this.props.moduleName || (this.props.type==="Exercise"?"试卷":"问卷")}的时间)</span>
           <span className="fl color-grey-c">({this.props.moduleName == '作业' ? '学生“按时”提交作品的时间截点' : '学生可以答题的时间截点'})</span>
         </p>
+        {/* item宽度超长 */}
+        <style>{`
+          .setInfo .ant-select-selection--multiple .ant-select-selection__choice__content {
+            max-width: 300px;
+          }
+        `}</style>
         
         {
           rules && rules.length > 0 && rules.map((rule,r)=>{
@@ -383,28 +389,29 @@ class PollDetailTabForthRules extends Component{
                       `.ant-select{
                             min-width:200px,
                             min-heigth:200px
-                      }`
+                      }
+                      `
                     }
                   </style>
-                  <Select 
-                    placeholder="请选择分班名称" 
-                    className={rule.class_flag && rule.class_flag!=""?"noticeTip setInfo":"setInfo" }
-                    mode="multiple"
-                    filterOption={(input, option) =>
-                      option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                    }
-                    value={rule.course_group_id}
-                    onChange={(value,option)=>this.changeClasses(value,option,r)}
-                    disabled={ rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.p_timeflag == true ? true : !flagPageEdit}
-                  > 
-                  {
-                    courseGroup && courseGroup.length > 0 && courseGroup.map((team,t)=>{
-                      return(
-                        <Option value={team.course_group_id} key={t} style={{display:`${team.course_choosed==0 ? "" : "none"}`}}>{team.course_group_name}</Option>
-                      )
-                    })
-                  }
-                  </Select>
+										<Select
+											placeholder="请选择分班名称"
+											className={rule.class_flag && rule.class_flag!=""?"noticeTip setInfo":"setInfo" }
+											mode="multiple"
+											filterOption={(input, option) =>
+												option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+											}
+											value={rule.course_group_id}
+											onChange={(value,option)=>this.changeClasses(value,option,r)}
+											disabled={rule.p_timeflag===undefined?moment(rule.publish_time,dataformat) <= moment()?true:!flagPageEdit: rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.p_timeflag == true ? true : !flagPageEdit}
+										>
+										{
+											courseGroup && courseGroup.length > 0 && courseGroup.map((team,t)=>{
+												return(
+													<Option value={team.course_group_id} key={t} style={{display:`${team.course_choosed==0 ? "" : "none"}`}}>{team.course_group_name}</Option>
+												)
+											})
+										}
+										</Select>
                   <p className="color-orange-tip lineh-25 clearfix" style={{height:"25px"}}>
                     {
                       rule.class_flag && rule.class_flag!=""?<span className="fl color-red">{rule.class_flag}</span>:""
@@ -413,7 +420,9 @@ class PollDetailTabForthRules extends Component{
                 </div>
               </div>
               <div className="fl pr20 with25 yskspickersy">
-                <Tooltip placement="bottom" title={rule.e_timeflag ? this.props.isAdmin()?"发布时间已过，不能再修改":"":""}>
+                <Tooltip placement="bottom" title={
+									rule.p_timeflag===undefined?moment(rule.publish_time,dataformat) <= moment()?isAdmin===true?"发布时间已过，不能再修改":"":"": rule.e_timeflag ===undefined?rule.publish_time===null?"":!flagPageEdit:rule.p_timeflag == true ? isAdmin===true?"发布时间已过，不能再修改":"" : ""
+                }>
                   <span>
                     <DatePicker
                       showToday={false}
@@ -427,7 +436,7 @@ class PollDetailTabForthRules extends Component{
                       format="YYYY-MM-DD HH:mm"
                       disabledTime={disabledDateTime}
 											disabledDate={disabledDate}
-                      disabled={ rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.p_timeflag == true ? true : !flagPageEdit}
+                      disabled={ rule.p_timeflag===undefined?moment(rule.publish_time,dataformat) <= moment()?true:!flagPageEdit: rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.p_timeflag == true ? true : !flagPageEdit}
                       style={{"height":"42px",width:'100%'}}
                     ></DatePicker>
                   </span>

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -2261,6 +2261,8 @@ class Trainingjobsetting extends Component {
                                             className="ml40"
                                         >
                                             <PollDetailTabForthRules
+																								{...this.props}
+																								{...this.state}
                                                 rules={rules}
                                                 moduleName={"作业"}
                                                 course_group={rulest}

public/react/src/modules/login/LoginDialog.css

@@ -109,7 +109,7 @@
     right: -27px;
     z-index: 100000;
 }
-#logincloseIcon{
+.logincloseIcon{
     position: absolute;
     top: -100px;
     right: -27px;

public/react/src/modules/tpm/NewHeader.js

@@ -913,7 +913,7 @@ submittojoinclass=(value)=>{
 														 strbool=false
 													 }
 												 }
-                       console.log(item.hidden);
+                       // console.log(item.hidden);
 											return(
 												<li key={key}  onClick={()=>this.headtypesonClick(item.link,true)} className={`${headtypes===undefined?'pr':headtypes===item.link?'pr active':'pr'}`}  style={item.hidden==false?{display: 'block'}:{display: 'none'}}>
 													{