注册界面第一版

src/dashoo.cn/backend/api/business/register/oilcorporateinfo.go

@@ -0,0 +1,67 @@
+package register
+
+import (
+	"time"
+)
+
+type OilCorporateInfo struct {
+	Id               int       `xorm:"not null pk autoincr INT(10)"`
+	UserId           int       `xorm:"comment('供方用户表主键') not null INT(10)"`
+	SupplierName     string    `xorm:"comment('企业名称') VARCHAR(255)"`
+	OilCertificateNo string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
+	Grade            string    `xorm:"comment('级别') VARCHAR(2)"`
+	MgrUnit          string    `xorm:"comment('管理单位') VARCHAR(50)"`
+	OperType         string    `xorm:"comment('经营方式') CHAR(1)"`
+	Country          string    `xorm:"comment('国家') VARCHAR(20)"`
+	CommercialNo     string    `xorm:"comment('工商注册号') VARCHAR(50)"`
+	OrganCode        string    `xorm:"comment('组织机构代码') VARCHAR(50)"`
+	CountryTaxNo     string    `xorm:"comment('税务登记证国税编号') VARCHAR(50)"`
+	LocalTaxNo       string    `xorm:"comment('税务登记证地税编号') VARCHAR(50)"`
+	Address          string    `xorm:"comment('公司地址') VARCHAR(200)"`
+	DetailAddress    string    `xorm:"comment('详细地址') VARCHAR(500)"`
+	Province         string    `xorm:"comment('省直辖市') VARCHAR(20)"`
+	City             string    `xorm:"comment('地市区县') VARCHAR(20)"`
+	Street           string    `xorm:"comment('街道') VARCHAR(20)"`
+	HouseNo          string    `xorm:"comment('门牌号') VARCHAR(10)"`
+	ZipCode          string    `xorm:"comment('邮编') VARCHAR(20)"`
+	BusinessScope    string    `xorm:"comment('营业范围') TEXT"`
+	LegalPerson      string    `xorm:"comment('法定代表人姓名') VARCHAR(20)"`
+	CategoryCode     string    `xorm:"comment('行业类别代码') VARCHAR(10)"`
+	CategoryName     string    `xorm:"comment('行业类别名称') VARCHAR(20)"`
+	RegCapital       float32   `xorm:"default 0 comment('注册资本') FLOAT"`
+	Currency         string    `xorm:"comment('币种') VARCHAR(10)"`
+	ContactName      string    `xorm:"comment('联系人姓名') VARCHAR(20)"`
+	CompanyType      string    `xorm:"comment('公司类型') VARCHAR(20)"`
+	SetupTime        time.Time `xorm:"comment('成立时间') Date"`
+	DepositBank      string    `xorm:"comment('开户银行') VARCHAR(50)"`
+	BankAccount      string    `xorm:"comment('银行账号') VARCHAR(50)"`
+	EMail            string    `xorm:"comment('电子邮箱') VARCHAR(50)"`
+	BankCreditRating string    `xorm:"comment('银行信用等级') VARCHAR(10)"`
+	Mobile           string    `xorm:"comment('移动电话') VARCHAR(20)"`
+	Telphone         string    `xorm:"comment('固定电话') VARCHAR(20)"`
+	Fax              string    `xorm:"comment('传真') VARCHAR(20)"`
+	CompanyTel       string    `xorm:"comment('公司电话') VARCHAR(20)"`
+	QQ               string    `xorm:"comment('QQ号码') VARCHAR(20)"`
+	CompanyUrl       string    `xorm:"comment('公司网址') VARCHAR(20)"`
+	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete         int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	LinkAddress      string    `xorm:"comment('通信地址-单位地址') VARCHAR(500)"`
+	LinkProvince     string    `xorm:"comment('通信地址-省直辖市') VARCHAR(20)"`
+	LinkCity         string    `xorm:"comment('通信地址-地市区县') VARCHAR(20)"`
+	LinkStreet       string    `xorm:"comment('通信地址-街道') VARCHAR(20)"`
+	LinkHouseNo      string    `xorm:"comment('通信地址-门牌号') VARCHAR(10)"`
+	LinkZipCode      string    `xorm:"comment('通信地址-邮编') VARCHAR(20)"`
+	HseTraining      string    `xorm:"comment('是否需要进行HSE审查培训') VARCHAR(2)"`
+	CreateOn         time.Time `xorm:"DATETIME"`
+	CreateUserId     int       `xorm:"INT(10)"`
+	CreateBy         string    `xorm:"VARCHAR(50)"`
+	ModifiedOn       time.Time `xorm:"DATETIME"`
+	ModifiedUserId   int       `xorm:"INT(10)"`
+	ModifiedBy       string    `xorm:"VARCHAR(50)"`
+}
+
+type SomeUserInfo struct {
+	UserName string //账号/Email
+	Realname string //用户名
+	UserPass string //密码
+}

src/dashoo.cn/backend/api/business/register/oilcorporateinfoService.go

@@ -0,0 +1,16 @@
+package register
+
+import (
+	. "dashoo.cn/backend/api/mydb"
+	"github.com/go-xorm/xorm"
+)
+
+type OilCorporateInfoService struct {
+	MyServiceBase
+}
+
+func GetOilCorporateInfoService(xormEngine *xorm.Engine) *OilCorporateInfoService {
+	s := new(OilCorporateInfoService)
+	s.DBE = xormEngine
+	return s
+}

src/dashoo.cn/backend/api/business/register/oilcorporateinfoSession.go

@@ -0,0 +1,16 @@
+package register
+
+import (
+	. "dashoo.cn/backend/api/mydb"
+	"github.com/go-xorm/xorm"
+)
+
+type OilCorporateInfoSession struct {
+	MySessionBase
+}
+
+func GetOilCorporateInfoSession(session *xorm.Session) *OilCorporateInfoSession {
+	s := new(OilCorporateInfoSession)
+	s.Session = session
+	return s
+}

src/dashoo.cn/backend/api/controllers/base.go

@@ -274,7 +274,7 @@ func (this *BaseController) Prepare() {
 		"/api/webinterface/preparelist", "/api/webinterface/prepareinfo",
 		"/api/sampletest_v/sampletest", "/api/sampletest_v/getpass", "/api/sampletest_v/editpass/",
 		"/api/sampletest_v/donorsdetail", "/api/sampletest_v/testdetail", "/api/uploads/samplesinput", "/api/doctemplate_onlyoffice/callback", "/api/doctemplate_onlyoffice/viewcallback", "/api/limsupload/usersignimg",
-		"/api/uploads/samplestypeimg", "/api/workflow/historyimg/", "/api/document/getdocumentnameandtime", "/api/annualaudit/auditcallback", "/api/suppliercert/auditcallback"}
+		"/api/uploads/samplestypeimg", "/api/workflow/historyimg/", "/api/document/getdocumentnameandtime", "/api/annualaudit/auditcallback", "/api/suppliercert/auditcallback", "/api/register/addentity"}
 	for _, v := range urls {
 		fmt.Println("**this.Ctx.Input.URL()**", this.Ctx.Input.URL())
 		if this.Ctx.Input.URL() == v {

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -0,0 +1,100 @@
+package register
+
+import (
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"dashoo.cn/backend/api/business/register"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business2/userRole"
+	"dashoo.cn/utils"
+)
+
+type OilCorporateInfoController struct {
+	BaseController
+}
+
+// @Title 注册
+// @Description 新增公司以及用户信息
+// @Success	200	{object} controllers.Request
+// @router /addentity [post]
+func (this *OilCorporateInfoController) AddEntity() {
+
+	var model register.OilCorporateInfo
+	var userInfo register.SomeUserInfo
+	var errinfo ErrorDataInfo
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	json.Unmarshal(jsonBlob, &userInfo)
+
+	//注册用户Base_User
+	var userentity userRole.Base_User
+	userentity.Username = userInfo.UserName
+	userentity.Realname = userInfo.Realname
+	userentity.Roleid = 10000120 //企业用户
+	userentity.Companyid = 0
+	userentity.IsCompanyUser = 1
+	userentity.Departmentid = "100000171"
+	userentity.Departmentname = "供方企业"
+
+	//处理密码
+	pwd, key, errrk := utils.TripleDesEncrypt(userInfo.UserPass)
+	if errrk != nil {
+		errinfo.Message = "密码格式不对！" + utils.AlertProcess(errrk.Error())
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	userentity.Userpassword = pwd
+	userentity.Publickey = key
+	userentity.Auditstatus = 1
+	userentity.AccCode = "s5OVE"
+
+	userSvc := userRole.GetUserService(utils.DBE)
+	err := userSvc.AddUser(&userentity)
+
+	fmt.Println("****注册----userentity****", userentity)
+
+	if err == nil {
+		//开始添加公司信息
+		model.UserId = userentity.Id
+		model.CreateOn = time.Now()
+		model.CreateBy = userentity.Realname
+		model.CreateUserId = userentity.Id
+
+		fmt.Println("****账号注册成功----model.UserId****", model.UserId)
+
+		svc := register.GetOilCorporateInfoService(utils.DBE)
+		_, err2 := svc.InsertEntityBytbl("OilCorporateInfo", &model)
+
+		fmt.Println("****公司信息----model****", model)
+
+		if err2 == nil {
+			errinfo.Message = "注册成功！"
+			errinfo.Code = 0
+			errinfo.Item = model.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "注册失败！" + utils.AlertProcess(err.Error())
+
+			//根据Id删除已注册的账号信息
+			_ = userSvc.Delete(userentity.Id)
+
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+
+	} else {
+		errinfo.Message = "账户注册失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+}

src/dashoo.cn/backend/api/routers/router.go

@@ -8,7 +8,7 @@ import (
 	"dashoo.cn/backend/api/controllers/casbin"
 	"dashoo.cn/backend/api/controllers/document"
 	"dashoo.cn/backend/api/controllers/oilsupplier"
-
+	"dashoo.cn/backend/api/controllers/register"
 	//	"dashoo.cn/backend/api/controllers/equipment"
 	//	"dashoo.cn/backend/api/controllers/instrument"
 	"dashoo.cn/backend/api/controllers/logs"
@@ -328,6 +328,12 @@ func init() {
 				&oilsupplier.InfoChangeController{},
 			),
 		),
+		//注册
+		beego.NSNamespace("/register",
+			beego.NSInclude(
+				&register.OilCorporateInfoController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -562,17 +562,17 @@
             required: true,
             message: '请选择省市区',
             trigger: 'change'
-          }, ],
+          }],
           LinkAddress: [{
             required: true,
             message: '请输入通信地址',
             trigger: 'change'
-          }, ],
+          }],
           realname: [{
             required: true,
             message: '用户名',
             trigger: 'blur'
-          }]
+          }],
         },
       }
     },

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -1,485 +1,653 @@
 <template>
-  <div class="login container">
-    <img class="logo" src="~/assets/img/title_gongfang.png">
-    <el-row class="login-row" type="flex" justify="center">
-      <el-col :xs="{span: 14, offset: 5}" :sm="{span: 10, offset: 7}">
-        <el-card style="height: 600px">         
-          <el-radio-group v-model="radio" style="margin-left: 37%">
-            <el-radio-button label="区域公司注册"></el-radio-button>
-            <el-radio-button label="客服代表注册"></el-radio-button>
-          </el-radio-group>
-          <el-form ref="ruleForm2" :model="ruleForm2" :rules="rules2" class="demo-ruleForm" style="margin-left: 25%"> 
-            <div v-if=" radio=='区域公司注册'">
-              <div style="overflow-x: auto; overflow-y: auto; height: 500px; width:1050px; margin-left: 8px">
-                <h4 style="color: black;width: 800px">企业信息</h4>
-                <el-form-item label="公司名称" required style="width: 46%" prop="companyname">
-                  <el-input v-model="ruleForm2.companyname"  :placeholder="$t('signup.userplaceholder')"></el-input>
+  <div style="width: 100%; overflow-y: auto; background-color: white" >
+    <sticky class-name="sub-navbar2">
+      <div class="top-wrapper">
+        <div style="margin-top: 5px; float: left;">
+          <router-link to="/">
+            <img src="../assets/img/title_gongfang.png" style="height:35px;" />
+          </router-link>
+        </div>
+      </div>
+    </sticky>
+
+    <div style="background-color: white">
+      <div class="top-wrapper">
+        <el-menu  :default-active="activeIndex" @select="handleSelect" mode="horizontal">
+          <el-menu-item index="1">
+            <span>供方企业注册</span>
+          </el-menu-item>
+          <!-- <el-menu-item index="2">
+            <span>客服代表注册</span>
+          </el-menu-item> -->
+        </el-menu>
+      </div>
+      
+      <el-card class="box-card">
+        <div class="components-container home-wrapper" style="background-color: white" v-if="activeIndex==1">
+          <el-form label-width="135px" ref="formData" :model="formData" :rules="rulesform" size="mini">
+            <el-row>
+              <el-col :span="10">
+                <el-form-item label="公司名称" style="width: 100%" prop="SupplierName">
+                  <el-input v-model="formData.SupplierName"  placeholder="请输入公司名称"></el-input>
                 </el-form-item>
-                <el-form-item label="公司所在地"  required style="width: 46%" prop="homeaddress"><br>
+              </el-col>
+              <el-col :span="14">
+                <el-form-item label="公司所在地" style="width: 100%" prop="Address">
                   <el-cascader
                     expand-trigger="hover"
                     :options="countryoptions"
                     :props="countryprops"
                     change-on-select
-                    v-model="ruleForm2.homeaddress"
+                    v-model="formData.Address"
                     style="width: 100%">
-                  </el-cascader>          
-                </el-form-item>          
-                <el-form-item label="详细地址"  required style="width: 46%" prop="detailaddress">
-                  <el-input v-model="ruleForm2.detailaddress"  :placeholder="$t('signup.Detailedaddressplaceholder')"></el-input>           
-                </el-form-item>             
-                <el-form-item label="固定电话"  required style="width: 46%" prop="mobile">
-                  <el-input v-model="ruleForm2.mobile"  :placeholder="$t('signup.telephoneplaceholder')"></el-input>
-                </el-form-item>                         
-                <el-form-item label="社会统一机构代码证件号" required style="width: 46%" prop="number">
-                  <el-input v-model="ruleForm2.number"  :placeholder="$t('signup.numberplaceholder')"></el-input>
+                  </el-cascader>
                 </el-form-item>
-                <h4 style="color: black;width: 800px">登录账户信息</h4>
-                <el-form-item label="手机号码"  required style="width: 46%" prop="telephone">
-                  <el-input v-model="ruleForm2.telephone" :placeholder="$t('signup.phoneplaceholder')" maxlength = 11 ></el-input>
-                </el-form-item>              
-                <el-form-item label="设置密码" required style="width: 46%" prop="pass" >
-                  <el-input type="password" v-model="ruleForm2.pass"  auto-complete="off" :placeholder="$t('signup.passwordplaceholder')"></el-input>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="详细地址" style="width: 100%" prop="DetailAddress">
+                  <el-input v-model="formData.DetailAddress"  placeholder="请输入详细地址"></el-input>           
                 </el-form-item>
-                <el-form-item label="确认密码" required style="width: 46%" prop="checkPass" >
-                  <el-input type="password" v-model="ruleForm2.checkPass" auto-complete="off" :placeholder="$t('signup.ConfirmPassplaceholder')"></el-input>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="中石油供应商证书号"   label-width="150px" style="width: 100%" prop="OilCertificateNo">
+                  <el-input v-model="formData.OilCertificateNo"  placeholder="中石油供应商证书号"></el-input>           
                 </el-form-item>
-                <h4 style="color: black;width: 800px">企业联系人信息</h4>        
-                <el-form-item label="姓名" required style="width: 46%" prop="realname">
-                  <el-input v-model="ruleForm2.realname" :placeholder="$t('signup.nameplaceholder')"></el-input>          
-                </el-form-item>           
-                <el-form-item label="手机号码" required style="width: 46%" prop="phone">
-                  <el-input v-model="ruleForm2.phone" :placeholder="$t('signup.phoneplaceholder')"></el-input>          
-                </el-form-item>             
-                <el-form-item label="邮箱" required style="width: 46%" prop="mail">
-                  <el-input v-model="ruleForm2.mail" :placeholder="$t('signup.mailplaceholder')"></el-input>           
-                </el-form-item>             
-                <el-form-item label="区域授权码" prop="acccode" required style="width: 46%" >
-                  <el-input v-model="ruleForm2.acccode" :placeholder="$t('signup.codeplaceholder')"></el-input>           
-                </el-form-item>            
-                <el-form-item label="验证码" prop="phonenumber" required style="width: 46%">    
-                </el-form-item>            
-                <el-form-item label="短信验证码" prop="phonenumber" required style="width: 46%">           
-                </el-form-item>              
-                <el-checkbox v-model="checked" style="margin-left: 80px">阅读并同意</el-checkbox>
-                <router-link to= "#">《麦吉轮用户注册协议》</router-link>
-                <router-link to= "#">《隐私政策》</router-link><br>        
-                <el-row style="margin-top: 10px; margin-bottom: 20px">
-                  <el-button type="primary" @click="register" style="width: 46%">立即注册</el-button>         
-                </el-row>
-              </div>
-            </div>
-          </el-form>
-          <el-form ref="ruleForm2" :model="ruleForm2" :rules="rules2" class="demo-ruleForm" style="margin-left: 25%"> 
-            <div v-if=" radio=='客服代表注册'">
-              <div style="overflow-x: auto; overflow-y: auto; height: 500px; width:1050px; margin-left: 8px">
-                <el-form-item label="手机号"  required style="width: 46%"  prop="telephone1">
-                  <el-input v-model="ruleForm2.telephone1" :placeholder="$t('signup.phoneplaceholder')"  maxlength= 11 ></el-input>
-                </el-form-item>             
-                <el-form-item label="设置密码" required style="width: 46%" prop="password">
-                  <el-input type="password" v-model="ruleForm2.password" auto-complete="off" :placeholder="$t('signup.passwordplaceholder')"></el-input>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="工商注册号"  label-width="100px" style="width: 100%" prop="CommercialNo">
+                  <el-input v-model="formData.CommercialNo"  placeholder="工商注册号"></el-input>           
                 </el-form-item>
-                <el-form-item label="确认密码"  required style="width: 46%" prop="checkPass1">
-                  <el-input type="password" v-model="ruleForm2.checkPass1" auto-complete="off" :placeholder="$t('signup.ConfirmPassplaceholder')"></el-input>
-                </el-form-item>            
-                <el-form-item label="客服代表授权码" required style="width: 46%" prop="acccode1">
-                  <el-input v-model="ruleForm2.acccode1" :placeholder="$t('signup.Customercodeplaceholder')"></el-input>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="组织机构代码"   style="width: 100%" prop="OrganCode">
+                  <el-input v-model="formData.OrganCode"  placeholder="组织机构代码"></el-input>           
                 </el-form-item>
-                <el-form-item label="公司所在地" prop="homeaddress1" required style="width: 46%"><br>
-                  <el-cascader
-                    expand-trigger="hover"
-                    :options="countryoptions"
-                    :props="countryprops"
-                    change-on-select
-                    v-model="ruleForm2.homeaddress1"
-                    style="width: 100%">
-                  </el-cascader> 
-                </el-form-item>                       
-                <el-form-item label="验证码" prop="telep" required style="width: 46%">
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="税务登记证国税号"   style="width: 100%" prop="CountryTaxNo">
+                  <el-input v-model="formData.CountryTaxNo"  placeholder="税务登记证国税号"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="税务登记证地税号"   style="width: 100%" prop="LocalTaxNo">
+                  <el-input v-model="formData.LocalTaxNo"  placeholder="税务登记证地税号"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="营业范围"  style="width: 100%" prop="BusinessScope">
+                  <el-input v-model="formData.BusinessScope" placeholder="请输入营业范围" type="textarea" autosize></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="法定代表人姓名"   style="width: 100%" prop="LegalPerson">
+                  <el-input v-model="formData.LegalPerson"  placeholder="法定代表人姓名"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="行业类别代码"   style="width: 100%" prop="CategoryCode">
+                  <el-input v-model="formData.CategoryCode"  placeholder="行业类别代码"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="行业类别名称"   style="width: 100%" prop="CategoryName">
+                  <el-input v-model="formData.CategoryName"  placeholder="行业类别名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="注册资本"   style="width: 100%" prop="RegCapital" >
+                  <el-input type="number" v-model="formData.RegCapital" :min="1" placeholder="请输入注册资本">
+                    <template slot="append">万元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="联系人姓名"   style="width: 100%" prop="ContactName">
+                  <el-input v-model="formData.ContactName"  placeholder="联系人姓名"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="公司类型"   style="width: 100%" prop="CompanyType">
+                  <el-input v-model="formData.CompanyType"  placeholder="请输入公司类型"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="开户银行"   style="width: 100%" prop="DepositBank">
+                  <el-input v-model="formData.DepositBank"  placeholder="请输入开户银行"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="银行账号"   style="width: 100%" prop="BankAccount">
+                  <el-input v-model="formData.BankAccount"  placeholder="请输入银行账号"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="成立时间"   style="width: 100%" prop="SetupTime">
+                  <el-date-picker v-model="formData.SetupTime" type="date" format="yyyy 年 MM 月 dd 日"
+                                  value-format="yyyy-MM-dd" placeholder="请选择成立时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电子邮箱"   style="width: 100%" prop="EMail" >
+                  <el-input v-model="formData.EMail" placeholder="请输入电子邮箱"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="银行信用等级"   style="width: 100%" prop="BankCreditRating">
+                  <el-input v-model="formData.BankCreditRating"  placeholder="请输入银行信用等级"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="公司电话"   style="width: 100%" prop="CompanyTel">
+                  <el-input v-model="formData.CompanyTel"  placeholder="请输入公司电话"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="公司网址"   style="width: 100%" prop="CompanyUrl">
+                  <el-input v-model="formData.CompanyUrl"  placeholder="请输入公司网址"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="移动电话"   style="width: 100%" prop="Mobile">
+                  <el-input v-model="formData.Mobile"  placeholder="请输入移动电话"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="固定电话"   style="width: 100%" prop="Telphone">
+                  <el-input v-model="formData.Telphone"  placeholder="请输入固定电话"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真"   style="width: 100%" prop="fax">
+                  <el-input v-model="formData.fax"  placeholder="请输入传真"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="QQ号码"   style="width: 100%" prop="QQ">
+                  <el-input v-model="formData.QQ"  placeholder="请输入QQ号码"></el-input>           
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="备注"  style="width: 100%" prop="Remark">
+                  <el-input v-model="formData.Remark" placeholder="请输入备注" type="textarea" autosize></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="账号/Email"   style="width: 100%" prop="UserName">
+                  <el-input v-model="formData.UserName" placeholder="请输入账号"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="用户名"   style="width: 100%" prop="Realname">
+                  <el-input v-model="formData.Realname" placeholder="请输入用户名"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">              
+                <el-form-item label="密码"  style="width: 100%" prop="pass" >
+                  <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="确认密码"  style="width: 100%" prop="checkPass" >
+                  <el-input type="password" v-model="formData.UserPass2" auto-complete="off" placeholder="请输入确认密码"></el-input>
+                </el-form-item>
+              </el-col>
+              <!-- <el-form-item label="验证码" prop="telep"  style="width: 100%">
                 </el-form-item>                           
-                <el-form-item label="短信验证码" prop="phober" required style="width: 46%">
+                <el-form-item label="短信验证码" prop="phober"  style="width: 100%">
                 </el-form-item>             
                 <el-checkbox v-model="checked1" style="margin-left: 80px">阅读并同意</el-checkbox>
-                <router-link to="#">《麦吉轮用户注册协议》</router-link><router-link to="#">《隐私政策》</router-link>
-                <el-row style="margin-top: 10px; margin-bottom: 20px">
-                  <el-button type="primary" @click="register2" style="width: 46%">立即注册</el-button>         
-                </el-row>
-              </div>
-            </div>
+              <router-link to="#">《麦吉轮用户注册协议》</router-link><router-link to="#">《隐私政策》</router-link> -->
+            </el-row>
+            <el-row style="margin-left: 40%; margin-top: 10px; margin-bottom: 20px;">
+              <el-button type="primary" @click="register" style="width: 30%">立即注册</el-button>
+            </el-row>
+
           </el-form>
-        </el-card>
-      </el-col>
-    </el-row>
+        </div>
+      </el-card>
+
+      <!-- <div class="components-container home-wrapper" style="background-color: white" v-if="activeIndex==2">    
+      </div> -->
+
+    </div>
+
+    <div>
+      <footer class="login-footer1">
+        <div class="foot-wrapper" style="height: 30px; background-color: transparent; color:#A9A9A9; padding-top: 10px; text-align: right">
+          ©大港油田信息中心 版权所有
+        </div>
+      </footer>
+    </div>
+
   </div>
 </template>
+
 <script>
   import Vue from 'vue'
-  import axios from 'axios'
-  import debounce from '@/utils/debounce'
   import Component from 'class-component'
-  @Component
-  export default class Signup extends Vue {
-    countryoptions = []
-    asyncData({ req, params }) {
-      return axios.get('http://restapi.amap.com/v3/config/district?key=13f54664eb5a883195604db09d3fba5c&subdistrict=3')
-        .then((res) => {
-          let countstr = JSON.stringify(res.data.districts[0].districts)
-          countstr = countstr.replace(/\,\"districts\"\:\[\]/g,'')
-          return { countryoptions: JSON.parse(countstr) }
-        })
-      // thisinitdata()
-    }
-    captchaSvg = ''
-    // keepPwd = false
-    logging = false
-    layout () {
-      return 'empty'
-    }
-    register () {
-      if (this.ruleForm2.companyname === '') {
-        this.$alert('请填写公司名称！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.homeaddress === '') {
-        this.$alert('请填写公司地址！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.detailaddress === '') {
-        this.$alert('请填写公司详细地址！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.mobile === '') {
-        this.$alert('请填写固定电话！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.number === '') {
-        this.$alert('请填写社会统一机构代码证件号！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.telephone === '') {
-        this.$alert('请填写登录信息手机号！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      
-      if (this.ruleForm2.pass === '') {
-        this.$alert('请填写密码！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.checkPass === '') {
-        this.$alert('请确认密码！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.realname === '') {
-        this.$alert('请填写姓名！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.phone === '') {
-        this.$alert('请填写企业联系人手机号码！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.mail === '') {
-        this.$alert('请填写邮箱！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.acccode === '') {
-        this.$alert('请填写区域授权码！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.checked === '') {
-        this.$alert('你是否同意注册协议！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      let re = /^[1][3456789]\d{9}$/
-      if (!re.test(this.ruleForm2.telephone)) {
-        this.$alert('请填写正确的手机号！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      let re1 = /^[1][3456789]\d{9}$/
-      if (!re.test(this.ruleForm2.phone)) {
-        this.$alert('请填写正确的手机号！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-
-      let params = {
-        companyname: this.ruleForm2.companyname,
-        password : this.ruleForm2.pass,
-        acccode : this.ruleForm2.acccode,
-        telephone: this.ruleForm2.telephone,
-        email: this.ruleForm2.mail,
-        homeaddress: this.ruleForm2.homeaddress[0]+ this.ruleForm2.homeaddress[1]+ this.ruleForm2.homeaddress[2],
-        detailaddress: this.ruleForm2.detailaddress,
-        mobile: this.ruleForm2.mobile,
-        realname: this.ruleForm2.realname
-      }
-
-      let _this = this
-      this.$axios.put('/users/companyregistemanage', params )
-      .then(function (response) {
-        if (response.data.code === 0) {
-        
-          _this.$alert(response.data.message, '提示', {
-            confirmButtonText: '确定',
-          })
-        } else {
-
-          _this.$alert(response.data.message, '提示', {
-            confirmButtonText: '确定',
-          })
-        }
-      })
-      .catch(function (error) {
-        console.log(error)
-      })
-
-    }
-    register2 () {
-      if (this.ruleForm2.telephone1 === '') {
-        this.$alert('请填写手机号！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.password === '') {
-        this.$alert('请设置密码！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.checkPass1 === '') {
-        this.$alert('请确认密码！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.acccode1 === '') {
-        this.$alert('请填写客服代表授权码！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.ruleForm2.homeaddress1 === '') {
-        this.$alert('请填写公司所在地！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      if (this.checked1 === '') {
-        this.$alert('你是否同意注册协议！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      let re = /^[1][3456789]\d{9}$/
-      if (!re.test(this.ruleForm2.telephone1)) {
-        this.$alert('请填写正确的手机号！', '提示', {
-          confirmButtonText: '确定',
-        })
-        return
-      }
-      let params = {  
-        telephone: this.ruleForm2.telephone1,
-        password : this.ruleForm2.password,
-        acccode : this.ruleForm2.acccode1,
-        homeaddress:  this.ruleForm2.homeaddress1[0]+ this.ruleForm2.homeaddress1[1]+ this.ruleForm2.homeaddress1[2]
-      }
-      let _this = this
-      this.$axios.put('/users/customerregistemanage', params )
-      .then(function (response) {
-        if (response.data.code === 0) {
-          _this.$alert(response.data.message, '提示', {
-            confirmButtonText: '确定',
-          })
-        } else {
-          _this.$alert(response.data.message, '提示', {
-            confirmButtonText: '确定',
-          })
-        }
-      })
-      .catch(function (error) {
-        console.log(error)
-      })
-    }
+  import Sticky from '@/components/Sticky'
+  import axios from 'axios'
+  @Component({
     data () {
-      var validatePass2 = (rule, value, callback) => {
-        // if (value === '') {
-        //   callback(new Error('请再次输入密码'));
-        // } else 
-        if (value !== this.ruleForm2.pass) {
-          callback(new Error('两次输入密码不一致!'));
+      var checkPass2 = (rule, value, callback) => {
+        if (value != this.formData.UserPass2) {
+          callback(new Error('两次输入密码不一致，请重新输入!'));
         } else {
           callback();
         }
-      }
+      };
+      var checkEmail = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请输入邮箱地址'))
+        } else {
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的邮箱地址'))
+          } else {
+            callback()
+          }
+        }
+      };
       return {
-        ruleForm2: {
-          pass: '',
-          checkPass: '',
-          checkPass1: '',
-          age: '',
-          companyname: '',
-          realname: '',
-          detailaddress: '',
-          mobile: '',
-          number: '',
-          telephone: '',
-          telephone1: '',
-          password: '',
-          name: '',
-          phone: '',
-          mail:'',
-          acccode:'',
-          acccode1:'',
-          homeaddress1:'',
-          homeaddress:''
+        activeIndex: '1',
+
+        countryprops: {
+          value: 'name',
+          label: 'name',
+          children: 'districts'
+        },
+
+        formData: {
+          Id: '', //int
+          UserId: '', //int
+          UserName: '', //账号/Email
+          Realname: '', //用户名
+          UserPass: '',
+          UserPass2: '',
+          SupplierName: '',
+          OilCertificateNo: '',
+          Grade: '',
+          MgrUnit: '',
+          OperType: '',
+          Country: '',
+          CommercialNo: '',
+          OrganCode: '',
+          CountryTaxNo: '',
+          LocalTaxNo: '',
+          Address: '',
+          DetailAddress: '',
+          Province: '',
+          City: '',
+          Street: '',
+          HouseNo: '',
+          ZipCode: '',
+          BusinessScope: '',
+          LegalPerson: '',
+          CategoryCode: '',
+          CategoryName: '',
+          RegCapital: 0, //float32
+          Currency: '',
+          ContactName: '',
+          CompanyType: '',
+          SetupTime: '', //time
+          DepositBank: '',
+          BankAccount: '',
+          EMail: '',
+          BankCreditRating: '',
+          Mobile: '',
+          Telphone: '',
+          Fax: '',
+          CompanyTel: '',
+          QQ: '',
+          CompanyUrl: '',
+          Remark: '',
+          IsDelete: 0, //删除状态，0正常，1已删除
+          LinkAddress: '',
+          LinkProvince: '',
+          LinkCity: '',
+          LinkStreet: '',
+          LinkHouseNo: '',
+          LinkZipCode: '',
+          HseTraining: ''
         },
-        rules2: {
-          checkPass: [
-            { required: true, message: '请确认密码', trigger: 'blur' }
+
+        rulesform: {
+          SupplierName: [
+            { required: true, message: '请输入公司名称', trigger: 'blur' }
           ],
-          checkPass1: [
-            { required: true, message: '请确认密码', trigger: 'blur' }
+          Address: [
+            { required: true, message: '请输入公司所在地', trigger: 'blur' }
           ],
-          pass: [
-            { required: true, message: '请设置密码', trigger: 'blur' }
+          DetailAddress: [
+            { required: true, message: '请输入公司详细地址', trigger: 'blur' }
           ],
-            realname: [
-            { required: true, message: '请输入姓名', trigger: 'blur' }
+          OilCertificateNo: [
+            { required: true, message: '请输入中石油供应商证书号', trigger: 'blur' }
           ],
-          companyname: [
-            { required: true, message: '请输入公司名称', trigger: 'blur' }
+          CommercialNo: [
+            { required: true, message: '请输入工商注册号', trigger: 'blur' }
           ],
-          detailaddress: [
-            { required: true, message: '请输入详细地址', trigger: 'blur' }
+          OrganCode: [
+            { required: true, message: '请输入组织机构代码', trigger: 'blur' }
           ],
-          mobile: [
-            { required: true, message: '请输入电话号码', trigger: 'blur' }
+          CountryTaxNo: [
+            { required: true, message: '请输入税务登记证国税编号', trigger: 'blur' }
           ],
-          number: [
-            { required: true, message: '请输入统一证件代码号', trigger: 'blur' }
+          LocalTaxNo: [
+            { required: true, message: '请输入税务登记证地税编号', trigger: 'blur' }
           ],
-          telephone: [
-            { required: true, message: '请输入手机号码', trigger: 'blur' }
+          BusinessScope: [
+            { required: true, message: '请输入营业范围', trigger: 'blur' }
           ],
-          telephone1: [
-            { required: true, message: '请输入手机号码', trigger: 'blur' }
+          LegalPerson: [
+            { required: true, message: '请输入法定代表人姓名', trigger: 'blur' }
           ],
-          password: [
-            { required: true, message: '请输入密码', trigger: 'blur' }
+          CategoryCode: [
+            { required: true, message: '请输入行业类别代码', trigger: 'blur' }
           ],
-          name:  [
-            { required: true, message: '请输入姓名', trigger: 'blur' }
+          CategoryName: [
+            { required: true, message: '请输入行业类别名称', trigger: 'blur' }
           ],
-          phone: [
-            { required: true, message: '请输入手机号', trigger: 'blur' }
+          RegCapital: [
+            { required: true, message: '请输入注册资本', trigger: 'blur' }
           ],
-          mail: [
-            { required: true, message: '请输入邮箱', trigger: 'blur' }
+          ContactName: [
+            { required: true, message: '请输入联系人姓名', trigger: 'blur' }
           ],
-          acccode: [
-            { required: true, message: '请输入区域授权码', trigger: 'blur' }
+          CompanyType: [
+            { required: true, message: '请输入公司类型', trigger: 'blur' }
           ],
-          acccode1: [
-            { required: true, message: '请输入区域授权码', trigger: 'blur' }
+          DepositBank: [
+            { required: true, message: '请输入开户银行', trigger: 'blur' }
           ],
-          homeaddress: [
-            { required: true, message: '请输入地址', trigger: 'blur' }
+          BankAccount: [
+            { required: true, message: '请输入银行账号', trigger: 'blur' }
           ],
-        },
-        companyname:'',
-        homeaddress:'',
-        detailaddress:'',
-        mobile:'',
-        Customercode:'',
-        name:'',
-        acccode:'',
-        Companyname:'',
-        Detailedaddress:'',
-        telephone:'',
-        number:'',
-        mail:'',
-        code:'',
-        phone:'',
-        phonenumber:'',
-        password:'',
-        ConfirmPass:'',
-        checked:'',
-        checked1:'',
-        change:'',
-        countryprops: {
-          value: 'name',
-          label: 'name',
-          children: 'districts'
-        },
-        selectedOptions: [],
-        selectedOptions2: [],
-        radio: '区域公司注册'
+          SetupTime: [
+            { required: true, message: '请输入成立时间', trigger: 'blur' }
+          ],
+          EMail: [{
+            required: true,
+            validator: this.checkEmail,
+            trigger: 'change'
+          }],
+          BankCreditRating: [
+            { required: true, message: '请输入银行信用等级', trigger: 'blur' }
+          ],
+          CompanyTel: [
+            { required: true, message: '请输入公司电话', trigger: 'blur' }
+          ],
+          CompanyUrl: [
+            { required: true, message: '请输入公司网址', trigger: 'blur' }
+          ],
+          Mobile: [
+            { required: true, message: '请输入移动电话', trigger: 'blur' }
+          ],
+          Telphone: [
+            { required: true, message: '请输入固定电话', trigger: 'blur' }
+          ],
+          fax: [
+            { required: true, message: '请输入传真', trigger: 'blur' }
+          ],
+          // QQ: [
+          //   { required: true, message: '请输入QQ号码', trigger: 'blur' }
+          // ],
+          UserName: [
+            { required: true, message: '请输入账号', trigger: 'blur' }
+          ],
+          Realname: [
+            { required: true, message: '请输入用户名', trigger: 'blur' }
+          ],
+          UserPass: [
+            { required: true, message: '请输入密码', trigger: 'blur' }
+          ],
+          UserPass2: [
+            { required: true, validator: this.checkPass2, trigger: 'change' }
+          ],
+        }
+      }
+    },
+
+    created () {
+      
+    },
+    components: {
+      Sticky
+    },
+    methods: {
+      //注册
+      register () {
+        let _this = this
+
+        console.log("****_this.formData*****",_this.formData)
+
+        _this.$axios.post('/register/addentity', _this.formData)
+          .then(function (response) {
+            if (response.data.code === 0) {
+              _this.$alert(response.data.message, '提示', {
+                confirmButtonText: '确定',
+              })
+            } else {
+              _this.$alert(response.data.message, '提示', {
+                confirmButtonText: '确定',
+              })
+            }
+          })
+          .catch(function (error) {
+            console.log(error)
+          })
+      },
+
+      //格式化时间
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+      handleSelect (key, keyPath) {
+        this.activeIndex = key
       }
     }
+
+  })
+  export default class Register extends Vue {
+    layout() {
+      return 'empty'
+    }
+    countryoptions = []
+    asyncData({ req, params }) {
+      return axios.get('http://restapi.amap.com/v3/config/district?key=13f54664eb5a883195604db09d3fba5c&subdistrict=3')
+        .then((res) => {
+          let countstr = JSON.stringify(res.data.districts[0].districts)
+          countstr = countstr.replace(/\,\"districts\"\:\[\]/g,'')
+          return { countryoptions: JSON.parse(countstr) }
+        })
+    }
   }
+
 </script>
 
-<style scoped lang="scss">
-.login {
-  background: url(~/assets/img/login-bg.jpeg) no-repeat center center fixed;
-  background-size: cover;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  img.logo {
-    position: fixed;
-    top: 12px;
-    left: 20px;
+<style lang="scss" scoped>
+  @import '../assets/styles/base/variables';
+
+  // .components-container div {
+  //   margin-top: 20px;
+  // }
+
+  .top-wrapper {
+    margin: 0px auto;
+    width: 1004px;
+    /*text-align: right;
+    alignment: right;*/
+    flex-direction: row;
   }
-  .login-row {
-    height: 100%;
+  .home-wrapper{
+    margin:0px auto;
+    width: 1004px;
+    flex-direction: column;
+    margin-bottom: 45px;
+  }
+
+  .foot-wrapper{
+    margin:0px auto;
+    width: 1004px;
+    display: flex;
+    alignment: center;
+    align-items: center;
     flex-direction: column;
   }
-}
-.el-card {
-  background-color: rgba(255, 255, 255, 0.5);
-  .el-form {
-    margin-top: 4%;
-    margin-bottom: 4%;
-    .captcha {
-      background-color: rgba(255, 255, 255, 0.5);
-      max-height: 36px;
-      cursor: pointer;
+
+  .back-width1 {
+    background-color: #2F79F6;
+    margin: 0px auto;
+    left: 0;
+    right: 0;
+    top: 20px;
+    width: 1004px;
+  }
+
+
+  .login-footer1 {
+    position: fixed;
+    background-color: #34393D;
+    font-size: 10px;
+    clear: both;
+    display: block;
+    text-align: center;
+    margin: 0px auto;
+    bottom: 0px;
+    width: 100%;
+  }
+
+  .time {
+    font-size: 13px;
+    color: #999;
+  }
+
+  .bottom {
+    margin-top: 13px;
+    line-height: 12px;
+  }
+
+  .button {
+    padding: 0;
+    float: right;
+  }
+
+  .image {
+    width: 100%;
+    display: block;
+  }
+
+  .clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+
+  .clearfix:after {
+    clear: both
+  }
+
+  .back-width {
+    background-color: #CBD1D1; /*#2F79F6*/
+    position: fixed;
+    margin: auto;
+    left: 0;
+    right: 0;
+    top: 130px;
+    width: 100%;
+    height: 550px;
+    margin-bottom: 40px;
+  }
+
+  .login-body {
+
+    background: url("../assets/img/gflogin.jpg") no-repeat left 50%;
+    font-family: 'Open Sans', sans-serif;
+    background-color: #2469E8;
+    background-size: cover;
+
+    /*background-size: cover;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;*/
+    /*min-height: 1050px;*/
+
+    position: absolute;
+
+    margin: auto;
+    left: -400px;
+    right: 0;
+    bottom: 0;
+    width: 800px;
+    height: 550px;
+    /*
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;*/
+  }
+
+  .login {
+    /*flex: 1;
+    width: 100%;*/
+    position: relative;
+    max-width: 22rem;
+    top: 60px;
+    left: 850px;
+    font-size: 0.875rem;
+    opacity: 0.9;
+
+    &-header {
+      margin-bottom: 1rem;
+
+      .brand {
+        margin: 4.5rem 0 3.5rem;
+        text-align: center;
+        letter-spacing: 0.125rem;
+
+        a {
+          margin: 0;
+          color: $brand-color;
+          font: 300 3rem sans-serif;
+
+          &:hover {
+            color: $brand-hover-color;
+            text-shadow: 0 0 1rem $brand-hover-color;
+          }
+        }
+      }
     }
-    .login-btn {
-      width: 100%;
+
+    &-form {
+      /*margin-bottom: 2.5rem;
+      padding: 1.875rem 1.25rem;
+      background: $login-form-background;*/
+      color: $login-form-color;
+
+      /*.heading {
+        margin: 0 0 1rem;
+        font-weight: 400;
+        font-size: 1.5rem;
+      }*/
+
+      .el-button {
+        margin-top: 0.5rem;
+        width: 100%;
+      }
     }
+
+
   }
-}
 </style>
+