Merge branch 'develop' into dev_aliyun

app/controllers/games_controller.rb

@@ -55,7 +55,7 @@ class GamesController < ApplicationController
 
     # 选择题和编程题公共部分
     @base_date = {st: @st, discusses_count: discusses_count, game_count: game_count, myshixun: @myshixun,
-                  challenge: game_challenge.attributes.except("answer"), game: @game.try(:attributes), shixun: @shixun.try(:attributes),
+                  challenge: game_challenge.attributes.except("answer"), game: @game.try(:attributes), shixun: @shixun.attributes.except("vnc", "vnc_evaluate"),
                   record_onsume_time: record_onsume_time, prev_game: prev_game, next_game: next_game,
                   praise_count: praise_count, user_praise: user_praise, time_limit: time_limit,
                   tomcat_url: edu_setting('cloud_tomcat_php'), is_teacher: is_teacher,

app/models/open_users/wechat.rb

@@ -4,6 +4,6 @@ class OpenUsers::Wechat < OpenUser
   end
 
   def en_type
-    'qq'
+    'wechat'
   end
 end

public/react/src/modules/user/AccountPage.js

@@ -104,17 +104,18 @@ class AccountPage extends Component {
               <AccountNav {...this.props} {...common}></AccountNav>
               <div className="basicFormWrap">
                 <Switch {...this.props}>
+									<Route  path="/account/profile/edit"
+													render={
+														(props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
+													}
+									></Route>
+
                   <Route  path="/account/profile"
                           render={
                             (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
                           }
                   ></Route>
-                  <Route  path="/account/profile/edit"
-                          render={
-                            (props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
-                          }
-                  ></Route>
-
+									
                   <Route  path="/account/certification"
                           render={
                             (props) => (<AccountCertification {...this.props} {...props} {...this.state} {...common} />)