From 22da03a1e068405957f5d8cc99a533a108ae85cd Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 13 Sep 2016 13:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B3=A8=E5=86=8C=E5=90=8E?=
 =?UTF-8?q?=E8=B7=B3=E5=85=A5=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=BF=9B=E5=85=A5=E5=88=AB=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=A0=E5=A7=93=E5=90=8D=E5=88=99=E8=B7=B3=E5=85=A5?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb        | 29 ++++++++++++++------
 public/assets/wechat/edit_userinfo.html      |  8 +++++-
 public/javascripts/wechat/controllers/reg.js |  3 +-
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 0c6eb0910..cd911bcd6 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -456,18 +456,29 @@ class WechatsController < ActionController::Base
 
         session[:wechat_openid] = open_id
         if params[:code]
-          # if params[:state].match("review_class_member") || params[:state].match("review_project_member")
+          if !(params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message")
+            uw = user_binded?(open_id)
+            if uw
+              user = uw.user
+              lastname = user.lastname
+            end
+          end
+
+          if lastname && lastname == ""
+            @path = '/edit_userinfo'
+          else
             @path = params[:state].split('/')[0]
             useridstr = params[:state].split('/')[1]
-          # end
-          if useridstr
-            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&#{useridstr}" and return
-          elsif params[:id]
-            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
-          else
-            redirect_to "/wechat/user_activities##{@path}" and return
+
+            if useridstr
+              redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&#{useridstr}" and return
+            elsif params[:id]
+              redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
+            else
+              redirect_to "/wechat/user_activities##{@path}" and return
+            end
+            # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
           end
-          # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
         end
       end
       render 'wechats/user_activities', layout: nil
diff --git a/public/assets/wechat/edit_userinfo.html b/public/assets/wechat/edit_userinfo.html
index e299b8feb..f4178fee4 100644
--- a/public/assets/wechat/edit_userinfo.html
+++ b/public/assets/wechat/edit_userinfo.html
@@ -11,7 +11,7 @@
 
     <form name="regFrm" novalidate>
 
-        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">姓名</span><input class="new-class-input ml25" ng-model="lastname" placeholder="请输入您的姓名全称" maxlength="30" /></div>
+        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">姓名</span><input class="new-class-input ml25" ng-model="lastname" placeholder="请输入您的真实姓名" maxlength="30" /></div>
         <div class="course-list-row f13 c-grey3 mt10" style="height:auto;">
             <div class="mt5" style="line-height:20px">
                 <span class="ml15 c-grey3">性别</span>
@@ -33,6 +33,12 @@
                 <span class="f12 c-red fl ml15" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
             </div>
         </div>
+        <div ng-show="lastname == '' " class="f12 c-grey6 mt10 ml15">
+            <span class="f13 c-grey3">提示</span>
+            <ul class="mb15 mt5 ml10 new-tip">
+                <li><span class="project-intro-dot">•</span>您尚未完善您的基本资料，完善后可使用更多功能</li>
+            </ul>
+        </div>
         <div class="bottom-tab-wrap mt10">
             <a ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
             <a ng-click="confirm(regFrm)" ng-class="[{'btn-disabled':!regFrm.$valid} ]" class="weixin-tab link-blue2 border-top">确定</a>
diff --git a/public/javascripts/wechat/controllers/reg.js b/public/javascripts/wechat/controllers/reg.js
index 1247cd931..34ced26d5 100644
--- a/public/javascripts/wechat/controllers/reg.js
+++ b/public/javascripts/wechat/controllers/reg.js
@@ -36,7 +36,8 @@ app.controller('RegController', ['$scope', '$http', '$location', 'alertService',
                     vm.successDialog.showMessage("提示","注册且绑定微信成功", function(){
 //                        $location.path("/activities");
 //                        window.WeixinJSBridge.call('closeWindow');
-                        wx.closeWindow();
+//                        wx.closeWindow();
+                        $location.path("/edit_userinfo");
                     });
                 }
             }, function (response) {