修改姓名

controllers/org_controller.go

@@ -5,6 +5,7 @@ import (
 	"SSO/models"
 	"SSO/service"
 	"SSO/utils"
+	"fmt"
 	"time"
 
 	"github.com/astaxie/beego"
@@ -124,6 +125,7 @@ func (this *OrgController) CreateSubmit() {
 	openCDM, _ := this.GetBool("open_cdm")
 	openSCRM, _ := this.GetBool("open_scrm")
 	openMall, _ := this.GetBool("open_mall")
+	user_name := this.GetString("user_name")
 	if len(name) == 0 || len(shortName) == 0 || len(contactName) == 0 || len(address) == 0 || province <= 0 || city <= 0 || district <= 0 || category <= 0 || (!openXT && !openCDM && !openSCRM && !openMall) {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		this.ServeJSON()
@@ -172,7 +174,9 @@ func (this *OrgController) CreateSubmit() {
 		ModifyTime:      time.Now().Unix(),
 	}
 
-	createErr := service.CreateOrg(&org, adminUser.Mobile, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
+	fmt.Print("user_name ------------------------------------------------------------------", user_name)
+
+	createErr := service.CreateOrg(&org, user_name, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
 	if createErr != nil {
 		utils.ErrorLog("mobile=%v的超级管理员创建机构失败：%v", adminUser.Mobile, createErr)
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)

models/org_models.go

@@ -88,3 +88,28 @@ type OrgGallery struct {
 func (OrgGallery) TableName() string {
 	return "sgj_user_org_gallery"
 }
+
+type SgjUserAdminRole struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message       string `gorm:"column:message" json:"message" form:"message"`
+	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+}
+
+func (SgjUserAdminRole) TableName() string {
+	return "sgj_user_admin_role"
+}

routers/router.go

@@ -41,7 +41,7 @@ func init() {
 	beego.Router("/getcode", &controllers.CodeController{}, "*:Post")
 	beego.Router("/getregistcode", &controllers.CodeController{}, "*:RegistCode")
 
-	beego.Router("/org/create", &controllers.OrgController{}, "get:Create")
+	beego.Router("/org/create", &controllers.OrgController{}, "get:c")
 	beego.Router("/org/create/submit", &controllers.OrgController{}, "post:CreateSubmit")
 	beego.Router("/org/admin/apps", &controllers.OrgController{}, "get:ViewApps")
 	beego.Router("/org/app/create", &controllers.OrgController{}, "get:CreateApp")

service/org_service.go

@@ -86,6 +86,12 @@ func CreateOrg(org *models.Org, mobile string, openXT bool, openCDM bool, openSC
 	return nil
 }
 
+func GetLastName(creator int64) (models.Org, error) {
+	org := models.Org{}
+	err := readUserDb.Model(&org).Where("creator = ? and status = 1").Last(&org).Error
+	return org, err
+}
+
 func GetOrgWithAdminUserID(adminUserID int) (*models.Org, error) {
 	var org models.Org
 	err := readUserDb.Where("creator = ? AND status <> 0", adminUserID).First(&org).Error

static/js/create_org.js

@@ -1,6 +1,6 @@
 $(function() {
     $("#open_3").attr("checked", "checked");
-    
+
     $("#province_select").change(function() {
         $("#city_select option").remove();
         $("#district_select option").remove();
@@ -36,7 +36,7 @@ $(function() {
     });
 
     $("#city_select").change(function() {
-        
+
         $("#district_select option").remove();
         $("#district_select").append("<option value='0'>区/县</option>");
         var city = $("#city_select option:selected").val();
@@ -154,6 +154,7 @@ $(function() {
             open_cdm: open_cdm,
             open_scrm: open_scrm,
             open_mall: open_mall,
+            user_name:$("#user_name").val()
         }
         postRequest("/org/create/submit", postData, doSuccess, doFail);
 
@@ -203,4 +204,4 @@ function checkInfoFull() {
 
 function doFail(res) {
     serverErrorMsg(res);
-}
+}

static/js/create_org_old.js

@@ -128,7 +128,7 @@ $(function() {
     }
 
     $("#province_select").change(function() {
-        
+
         $("#city_select option").remove();
         $("#district_select option").remove();
         $("#city_select").append("<option value='0'>市</option>");
@@ -163,7 +163,7 @@ $(function() {
     });
 
     $("#city_select").change(function() {
-        
+
         $("#district_select option").remove();
         $("#district_select").append("<option value='0'>区/县</option>");
         var city = $("#city_select option:selected").val();
@@ -247,7 +247,7 @@ $(function() {
         }
 
         var ills = new Array();
-        $("input[name='ill_checkbox']:checkbox:checked").each(function(){ 
+        $("input[name='ill_checkbox']:checkbox:checked").each(function(){
             ills.push($(this).val());
         });
         var illstr = ills.join(",");
@@ -273,6 +273,7 @@ $(function() {
             business_time: $("#org_business_time").val(),
             business_state: $("input[name='org_business_state']:checked").val(),
             org_pics: picsStr,
+            user_name:$("#user_name").val()
         }
         postRequest("/org/create/submit", postData, doSuccess, doFail);
 
@@ -293,7 +294,7 @@ $(function() {
             var wname = $(this).attr('data-name');
             business_week.push({ "id": wid, "name": wname });
         });
-  
+
         if (business_week.length == 0) {
             $("#org_business_week").val('');
         } else if (business_week.length == 1) {
@@ -311,7 +312,7 @@ $(function() {
                     break;
                 }
             }
-  
+
             if (btrue) {
                 var week_show = business_week[0]["name"] + ' — ' + business_week[lastindex]["name"];
                 $("#org_business_week").val(week_show);
@@ -327,7 +328,7 @@ $(function() {
             }
         }
     });
-  
+
     $('input[name=time_checkbox_s], input[name=time_checkbox_x]').change(function () {
         if ($("input[name='time_checkbox_s']:checked").length == 0 || $("input[name='time_checkbox_x']:checked").length == 0) {
             return;
@@ -414,7 +415,7 @@ function checkInfoFull(ue) {
         return "请填写地址";
     }
     var selectIll = false;
-    $("input[name='ill_checkbox']:checkbox:checked").each(function(){ 
+    $("input[name='ill_checkbox']:checkbox:checked").each(function(){
         selectIll = true;
         return false;
     });
@@ -434,4 +435,4 @@ function checkInfoFull(ue) {
 
 function doFail(res) {
     serverErrorMsg(res);
-}
+}

static/js/login_by_code.js

@@ -6,7 +6,7 @@ $(function() {
 
     //获取验证码
     $("#get_code").click(function() {
-        
+
         var phone = $("#phone").val();
         var aespass = $('#aespass').val();
 
@@ -18,13 +18,13 @@ $(function() {
             phone: phone,
             aespass: aespass,
         }
-        $("#get_code").attr("disabled", true);
+        $("#get_code").attr("disabled", false);
         changeNum(60);
 
         postRequest("/getcode", postData, doSuccess, doFail);
 
         function doSuccess(res) {
-            
+
             if (res.state == 0) {
                 serverErrorMsg(res);
                 return;
@@ -35,7 +35,7 @@ $(function() {
 
     //确定
     $("#submit").click(function() {
-        
+
         var code = $("#code").val();
         if (code != null && code != undefined && code != "") {
             var mobile = $("#phone").val();
@@ -48,7 +48,7 @@ $(function() {
                     returnurl: $("#return_url").val(),
                     app_type: $("#app_type").val(),
                 }
-                
+
                 setCookie("login_mobile", mobile);
 
                 postRequest("/login/code/submit", postData, doSuccess, doFail);
@@ -109,7 +109,7 @@ function setCookie(name,value){
 
 function getCookie(name){
     var arr = document.cookie.match(new RegExp("(^| )" + name + "=([^;]*)(;|$)"));
-    if (arr != null) 
-        return unescape(arr[2]); 
+    if (arr != null)
+        return unescape(arr[2]);
     return null;
-}
+}

static/js/register.js

@@ -1,7 +1,7 @@
 $(function() {
     //获取验证码
     $("#get_code").click(function() {
-        
+
         var phone = $("#phone").val();
         var aespass = $('#aespass').val();
 
@@ -14,15 +14,17 @@ $(function() {
             aespass: aespass,
         }
         $("#get_code").attr("disabled", true);
-        changeNum(60);
+
 
         postRequest("/getregistcode", postData, doSuccess, doFail);
 
         function doSuccess(res) {
-            
-            if (res.state == 0) {
-                serverErrorMsg(res);
-                return;
+            if (res.state == 1) {
+               changeNum(60);
+
+            }else{
+              serverErrorMsg(res);
+              return;
             }
             layer.msg(res.data.msg);
         }
@@ -113,7 +115,7 @@ function changeNum(num) {
             changeNum(num);
         } else {
             $('#get_code').html("发送验证码");
-            $("#get_code").attr("disabled", false);
+            $("#get_code").attr("disabled", true);
         }
     }, 1000);
-}
+}

views/home/manage_app.html

@@ -19,7 +19,7 @@
         <div class="head white-bg clearfix">
             <div class="logo fl">
                 <a href="/">
-                    <img src="/static/images/logo.png" alt="" />
+                    <img src="/static/images/logo5.png" alt="" />
                     <!-- <span>酷医</span> -->
                 </a>
             </div>
@@ -226,4 +226,4 @@
     </script> -->
 </body>
 
-</html>
+</html>

views/home/register.html

@@ -12,7 +12,7 @@
     <link href="/static/font-awesome/css/font-awesome.css?v=4.3.0" rel="stylesheet">
     <link href="/static/css/style.css?v=2.4.2" rel="stylesheet">
     <link href="/static/iconfont/iconfont.css" rel="stylesheet">
-    
+
 </head>
 
 <body>
@@ -59,7 +59,7 @@
     <script src="/static/js/layer.js"></script>
     <script src="/static/js/md5.js"></script>
     <script src="/static/js/common.js"></script>
-    <script src="/static/js/register.js?v=0.1.0"></script>
+    <script src="/static/js/register.js?v=0.2.0"></script>
 </body>
 
-</html>
+</html>

views/new_main/create_org.html

@@ -12,7 +12,7 @@
     <link href="/static/font-awesome/css/font-awesome.css?v=4.3.0" rel="stylesheet" />
     <link href="/static/css/old_style.css?v=1.0.0" rel="stylesheet">
     <link href="/static/iconfont/iconfont.css?v=4.0.0" rel="stylesheet">
-    
+
 </head>
 
 <body>
@@ -20,10 +20,10 @@
         <div class="head white-bg clearfix">
             <div class="logo fl">
                 <a href="/">
-                    <img src="/static/images/logo.png" alt="" />
+                    <img src="/static/images/logo5.png" alt="" />
                 </a>
             </div>
-            
+
             <div class="TheUser fr ">
                 <div class="userData fl">
                     <img src="{{.avatar}}" alt="头像" />
@@ -40,6 +40,10 @@
             <h2 class="stewardMsg_tit">机构信息</h2>
             <div class="steward_content">
                 <p class="tips">请正确填写以下信息，后续可在账号设置中修改</p>
+                <div class="cell clearfix">
+                  <label class="cell_tit fl">您的姓名</label>
+                  <input id="user_name" type="text" class="cell_input" maxlength="10" />
+                </div>
                 <div class="cell clearfix">
                     <label class="cell_tit fl">机构名称</label>
                     <input id="org_name" type="text" class="cell_input" maxlength="50" />
@@ -48,6 +52,7 @@
                     <label class="cell_tit fl">机构简称</label>
                     <input id="org_short_name" type="text" class="cell_input" maxlength="50" />
                 </div> -->
+
                 <div class="cell clearfix">
                     <label class="cell_tit fl">机构类型</label>
                     <div class="city fl">
@@ -144,4 +149,4 @@
     <script src="/static/js/create_org.js?v=0.2.6"></script>
 </body>
 
-</html>
+</html>

views/new_main/register.html

@@ -15,7 +15,7 @@
             <div class="eis-login-bg" id="login-bgImg" style="background-image: url(/static/images/login_bg02.jpg);">
             </div>
             <div class="eis-login-right">
-                <div class="eis-login-form  eis-login-center"> 
+                <div class="eis-login-form  eis-login-center">
                     <div class="eis-logo"><p>注册账户</p></div>
                     <div class="eis-login-info">
                         <div class="eis-form" style="display:block;">
@@ -31,7 +31,7 @@
                                     <input name="password" type="password" id="password" autocomplete="off" placeholder="密码" class="eis-form-control">
                                 </div>
                             </div>
-                            
+
                             <div class="eis-login-button" id="forget_panel">
                                 <input name="submit" type="button" id="submit" style="letter-spacing: 0px;" class="submit" value="即刻开始">
                             </div>
@@ -61,4 +61,4 @@
     <script src="/static/js/common.js"></script>
     <script src="/static/js/register.js?v=0.1.2"></script>
 </body>
-</html>
+</html>