diff --git a/public/template/001/img/search/background.png b/public/template/001/img/search/background.png
deleted file mode 100644
index 62ad48f..0000000
Binary files a/public/template/001/img/search/background.png and /dev/null differ
diff --git a/public/template/001/img/search/logo-small.png b/public/template/001/img/search/logo-small.png
index 1d158cd..b3433a3 100644
Binary files a/public/template/001/img/search/logo-small.png and b/public/template/001/img/search/logo-small.png differ
diff --git a/public/template/001/img/search/logo.png b/public/template/001/img/search/logo.png
deleted file mode 100644
index 8eeb82c..0000000
Binary files a/public/template/001/img/search/logo.png and /dev/null differ
diff --git a/public/template/001/img/search/logo2x.png b/public/template/001/img/search/logo2x.png
deleted file mode 100644
index 48ed6ea..0000000
Binary files a/public/template/001/img/search/logo2x.png and /dev/null differ
diff --git a/public/template/001/img/互联网大会/banner-bg.png b/public/template/001/img/互联网大会/banner-bg.png
index 65ac4a0..d7ad521 100644
Binary files a/public/template/001/img/互联网大会/banner-bg.png and b/public/template/001/img/互联网大会/banner-bg.png differ
diff --git a/public/template/001/img/互联网大会/top-banner.jpg b/public/template/001/img/互联网大会/top-banner.jpg
index ef7680f..d9aa8aa 100644
Binary files a/public/template/001/img/互联网大会/top-banner.jpg and b/public/template/001/img/互联网大会/top-banner.jpg differ
diff --git a/public/template/001/img/公共服务/banner-bg.png b/public/template/001/img/公共服务/banner-bg.png
index c179750..2927bf7 100644
Binary files a/public/template/001/img/公共服务/banner-bg.png and b/public/template/001/img/公共服务/banner-bg.png differ
diff --git a/public/template/001/img/关于联盟/banner-bg.png b/public/template/001/img/关于联盟/banner-bg.png
index 2a23796..cdbbb0f 100644
Binary files a/public/template/001/img/关于联盟/banner-bg.png and b/public/template/001/img/关于联盟/banner-bg.png differ
diff --git a/public/template/001/img/联盟动态/banner-bg.png b/public/template/001/img/联盟动态/banner-bg.png
index 0671abe..ac1ad95 100644
Binary files a/public/template/001/img/联盟动态/banner-bg.png and b/public/template/001/img/联盟动态/banner-bg.png differ
diff --git a/public/template/001/img/联盟成果/banner-bg.png b/public/template/001/img/联盟成果/banner-bg.png
index 460df5d..38263ce 100644
Binary files a/public/template/001/img/联盟成果/banner-bg.png and b/public/template/001/img/联盟成果/banner-bg.png differ
diff --git a/public/template/001/img/联盟成果/top-banner.jpg b/public/template/001/img/联盟成果/top-banner.jpg
index 9a4c542..c3305a7 100644
Binary files a/public/template/001/img/联盟成果/top-banner.jpg and b/public/template/001/img/联盟成果/top-banner.jpg differ
diff --git a/public/template/001/img/行业资讯/banner-bg.png b/public/template/001/img/行业资讯/banner-bg.png
index b2643a9..a8350bd 100644
Binary files a/public/template/001/img/行业资讯/banner-bg.png and b/public/template/001/img/行业资讯/banner-bg.png differ
diff --git a/public/template/001/img/转型升级论坛/banner-bg.png b/public/template/001/img/转型升级论坛/banner-bg.png
index 10ef97e..3a66ba5 100644
Binary files a/public/template/001/img/转型升级论坛/banner-bg.png and b/public/template/001/img/转型升级论坛/banner-bg.png differ
diff --git a/public/template/001/img/转型升级论坛/top-banner.jpg b/public/template/001/img/转型升级论坛/top-banner.jpg
index 1f478d6..3a7926e 100644
Binary files a/public/template/001/img/转型升级论坛/top-banner.jpg and b/public/template/001/img/转型升级论坛/top-banner.jpg differ
diff --git a/public/template/001/styles/index.scss b/public/template/001/styles/index.scss
index 17553d9..ce742cd 100644
--- a/public/template/001/styles/index.scss
+++ b/public/template/001/styles/index.scss
@@ -179,6 +179,12 @@ a:hover {
 .color-white {
     color: #fff;
 }
+.color-grey {
+    color: grey;
+}
+.color-blue {
+    color: #337ab7;
+}
 .color-black {
     color: #000000;
 }
diff --git a/src/assets/home/1/chengyuan.png b/src/assets/home/1/chengyuan.png
deleted file mode 100644
index abeb752..0000000
Binary files a/src/assets/home/1/chengyuan.png and /dev/null differ
diff --git a/src/assets/home/1/data-platform-s.png b/src/assets/home/1/data-platform-s.png
deleted file mode 100644
index 512bc40..0000000
Binary files a/src/assets/home/1/data-platform-s.png and /dev/null differ
diff --git a/src/assets/home/1/ewm.png b/src/assets/home/1/ewm.png
deleted file mode 100644
index 7d13b73..0000000
Binary files a/src/assets/home/1/ewm.png and /dev/null differ
diff --git a/src/assets/home/1/fuwupingtai.png b/src/assets/home/1/fuwupingtai.png
deleted file mode 100644
index 8fc4b06..0000000
Binary files a/src/assets/home/1/fuwupingtai.png and /dev/null differ
diff --git a/src/assets/home/1/gengduo.png b/src/assets/home/1/gengduo.png
deleted file mode 100644
index 7e10419..0000000
Binary files a/src/assets/home/1/gengduo.png and /dev/null differ
diff --git a/src/assets/home/1/gongyehulianwangzhuanqu.png b/src/assets/home/1/gongyehulianwangzhuanqu.png
deleted file mode 100644
index 1b20ee9..0000000
Binary files a/src/assets/home/1/gongyehulianwangzhuanqu.png and /dev/null differ
diff --git a/src/assets/home/1/jiaru.png b/src/assets/home/1/jiaru.png
deleted file mode 100644
index b2acc1e..0000000
Binary files a/src/assets/home/1/jiaru.png and /dev/null differ
diff --git a/src/assets/home/1/pinggu.png b/src/assets/home/1/pinggu.png
deleted file mode 100644
index 7703a4f..0000000
Binary files a/src/assets/home/1/pinggu.png and /dev/null differ
diff --git a/src/assets/home/1/tt.png b/src/assets/home/1/tt.png
deleted file mode 100644
index 18a0073..0000000
Binary files a/src/assets/home/1/tt.png and /dev/null differ
diff --git a/src/assets/home/1/x.png b/src/assets/home/1/x.png
deleted file mode 100644
index 5079a42..0000000
Binary files a/src/assets/home/1/x.png and /dev/null differ
diff --git a/src/assets/home/1/zhangcheng.png b/src/assets/home/1/zhangcheng.png
deleted file mode 100644
index 6e2f1e8..0000000
Binary files a/src/assets/home/1/zhangcheng.png and /dev/null differ
diff --git a/src/assets/home/1/ziyuanchi.png b/src/assets/home/1/ziyuanchi.png
deleted file mode 100644
index 54450c6..0000000
Binary files a/src/assets/home/1/ziyuanchi.png and /dev/null differ
diff --git a/src/assets/home/1/zuzhijiagou.png b/src/assets/home/1/zuzhijiagou.png
deleted file mode 100644
index 8fc4b06..0000000
Binary files a/src/assets/home/1/zuzhijiagou.png and /dev/null differ
diff --git a/src/assets/home/1/底1.png b/src/assets/home/1/底1.png
deleted file mode 100644
index bd96e37..0000000
Binary files a/src/assets/home/1/底1.png and /dev/null differ
diff --git a/src/assets/home/1/搜索 拷贝 2.png b/src/assets/home/1/搜索 拷贝 2.png
deleted file mode 100644
index 55f904c..0000000
Binary files a/src/assets/home/1/搜索 拷贝 2.png and /dev/null differ
diff --git a/src/assets/home/about-bg.png b/src/assets/home/about-bg.png
index 149ced9..895f122 100644
Binary files a/src/assets/home/about-bg.png and b/src/assets/home/about-bg.png differ
diff --git a/src/assets/home/benchmark-eg.png b/src/assets/home/benchmark-eg.png
index aaa1b47..b84ce9b 100644
Binary files a/src/assets/home/benchmark-eg.png and b/src/assets/home/benchmark-eg.png differ
diff --git a/src/assets/home/data-platform-s.png b/src/assets/home/data-platform-s.png
index 512bc40..84bd2a2 100644
Binary files a/src/assets/home/data-platform-s.png and b/src/assets/home/data-platform-s.png differ
diff --git a/src/assets/home/dongtai.png b/src/assets/home/dongtai.png
index 6405394..1871be2 100644
Binary files a/src/assets/home/dongtai.png and b/src/assets/home/dongtai.png differ
diff --git a/src/assets/home/electronicMeetings-eg.png b/src/assets/home/electronicMeetings-eg.png
index 23d468d..090eace 100644
Binary files a/src/assets/home/electronicMeetings-eg.png and b/src/assets/home/electronicMeetings-eg.png differ
diff --git a/src/assets/home/ewm.png b/src/assets/home/ewm.png
index ba69e4e..e3a4cf2 100644
Binary files a/src/assets/home/ewm.png and b/src/assets/home/ewm.png differ
diff --git a/src/assets/home/example-eg.png b/src/assets/home/example-eg.png
index 5598024..4389561 100644
Binary files a/src/assets/home/example-eg.png and b/src/assets/home/example-eg.png differ
diff --git a/src/assets/home/forum-bg.jpg b/src/assets/home/forum-bg.jpg
deleted file mode 100644
index cfa6ea4..0000000
Binary files a/src/assets/home/forum-bg.jpg and /dev/null differ
diff --git a/src/assets/home/forum-bg.png b/src/assets/home/forum-bg.png
new file mode 100644
index 0000000..d988fa6
Binary files /dev/null and b/src/assets/home/forum-bg.png differ
diff --git a/src/assets/home/fruit01.jpg b/src/assets/home/fruit01.jpg
deleted file mode 100644
index 22119e4..0000000
Binary files a/src/assets/home/fruit01.jpg and /dev/null differ
diff --git a/src/assets/home/fruit01.png b/src/assets/home/fruit01.png
new file mode 100644
index 0000000..c5c7d74
Binary files /dev/null and b/src/assets/home/fruit01.png differ
diff --git a/src/assets/home/fruit02.jpg b/src/assets/home/fruit02.jpg
deleted file mode 100644
index 1b10a0c..0000000
Binary files a/src/assets/home/fruit02.jpg and /dev/null differ
diff --git a/src/assets/home/fruit02.png b/src/assets/home/fruit02.png
new file mode 100644
index 0000000..eb4ce70
Binary files /dev/null and b/src/assets/home/fruit02.png differ
diff --git a/src/assets/home/fruit03.jpg b/src/assets/home/fruit03.jpg
deleted file mode 100644
index d4f9e3c..0000000
Binary files a/src/assets/home/fruit03.jpg and /dev/null differ
diff --git a/src/assets/home/fruit03.png b/src/assets/home/fruit03.png
new file mode 100644
index 0000000..ecc9119
Binary files /dev/null and b/src/assets/home/fruit03.png differ
diff --git a/src/assets/home/fruit04.jpg b/src/assets/home/fruit04.jpg
deleted file mode 100644
index 9dafafd..0000000
Binary files a/src/assets/home/fruit04.jpg and /dev/null differ
diff --git a/src/assets/home/fruit04.png b/src/assets/home/fruit04.png
new file mode 100644
index 0000000..a4b1796
Binary files /dev/null and b/src/assets/home/fruit04.png differ
diff --git a/src/assets/home/fuwupingtai.png b/src/assets/home/fuwupingtai.png
index 8fc4b06..291e937 100644
Binary files a/src/assets/home/fuwupingtai.png and b/src/assets/home/fuwupingtai.png differ
diff --git a/src/assets/home/gengduo.png b/src/assets/home/gengduo.png
index 7e10419..650cd65 100644
Binary files a/src/assets/home/gengduo.png and b/src/assets/home/gengduo.png differ
diff --git a/src/assets/home/gongyehulianwangzhuanqu.png b/src/assets/home/gongyehulianwangzhuanqu.png
index 1b20ee9..f981c49 100644
Binary files a/src/assets/home/gongyehulianwangzhuanqu.png and b/src/assets/home/gongyehulianwangzhuanqu.png differ
diff --git a/src/assets/home/meeting-bg.jpg b/src/assets/home/meeting-bg.jpg
deleted file mode 100644
index 31d4064..0000000
Binary files a/src/assets/home/meeting-bg.jpg and /dev/null differ
diff --git a/src/assets/home/meeting-bg.png b/src/assets/home/meeting-bg.png
new file mode 100644
index 0000000..d7a2ea6
Binary files /dev/null and b/src/assets/home/meeting-bg.png differ
diff --git a/src/assets/home/pinggu.png b/src/assets/home/pinggu.png
index 7703a4f..0d7f185 100644
Binary files a/src/assets/home/pinggu.png and b/src/assets/home/pinggu.png differ
diff --git a/src/assets/home/tt.png b/src/assets/home/tt.png
deleted file mode 100644
index 18a0073..0000000
Binary files a/src/assets/home/tt.png and /dev/null differ
diff --git a/src/assets/home/whitepaper-eg.png b/src/assets/home/whitepaper-eg.png
index 667425a..7e53ffa 100644
Binary files a/src/assets/home/whitepaper-eg.png and b/src/assets/home/whitepaper-eg.png differ
diff --git a/src/assets/home/zixun.png b/src/assets/home/zixun.png
index 4e3365d..83992f5 100644
Binary files a/src/assets/home/zixun.png and b/src/assets/home/zixun.png differ
diff --git a/src/assets/home/ziyuanchi.png b/src/assets/home/ziyuanchi.png
index 54450c6..13e1453 100644
Binary files a/src/assets/home/ziyuanchi.png and b/src/assets/home/ziyuanchi.png differ
diff --git a/src/assets/public/platform-1.jpg b/src/assets/public/platform-1.jpg
index 5ceebcb..490f7dd 100644
Binary files a/src/assets/public/platform-1.jpg and b/src/assets/public/platform-1.jpg differ
diff --git a/src/assets/public/platform-2.jpg b/src/assets/public/platform-2.jpg
index 46732a6..21faff7 100644
Binary files a/src/assets/public/platform-2.jpg and b/src/assets/public/platform-2.jpg differ
diff --git a/src/assets/public/platform-3.jpg b/src/assets/public/platform-3.jpg
index cbe037a..df249a8 100644
Binary files a/src/assets/public/platform-3.jpg and b/src/assets/public/platform-3.jpg differ
diff --git a/src/assets/public/platform-logo.png b/src/assets/public/platform-logo.png
index fa367ea..0d82235 100644
Binary files a/src/assets/public/platform-logo.png and b/src/assets/public/platform-logo.png differ
diff --git a/src/store/index.js b/src/store/index.js
index 7b1b045..47a02eb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -58,15 +58,15 @@ export default new Vuex.Store({
         //登出
         LogOut({commit, state}) {
             return new Promise((resolve, reject) => {
-                logout().then(() => {
+                // logout().then(() => {
                 commit('SET_TOKEN', '');
                 commit('SET_NAME', "")
                 removeToken();
                 removeName()
                 resolve();
-                }).catch(error => {
-                    reject(error);
-                });
+                // }).catch(error => {
+                //     reject(error);
+                // });
             });
         },
     },
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index ee190d9..45572bf 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -29,7 +29,7 @@
                     </div>
                     <div class="other-box">
                         <router-link :to="{name:'register'}">
-                            <div class="button" style="background:#004471;"><i class="el-icon-user"></i>加入联盟</div>
+                            <div class="button font-weight-bold font-size-24" style="background:#004471;"><i class="el-icon-user-solid "></i>&nbsp;加入联盟</div>
                         </router-link>
                     </div>
                     <!-- <div class="other-box flex-box">
@@ -317,7 +317,7 @@ export default {
                 height: 55px;
                 line-height: 55px;
                 text-align: center;
-                font-size: 20px;
+                // font-size: 20px;
                 &:nth-child(1) {
                     background:#065889;
                 }
@@ -439,11 +439,11 @@ export default {
         }
     }
     .meeting-bg {
-        background: url('../../assets/home/meeting-bg.jpg') no-repeat;
+        background: url('../../assets/home/meeting-bg.png') no-repeat;
         background-size: 100% 100%;
     }
     .forum-bg {
-        background: url('../../assets/home/forum-bg.jpg') no-repeat;
+        background: url('../../assets/home/forum-bg.png') no-repeat;
         background-size: 100% 100%;
     }
 }
@@ -489,19 +489,19 @@ export default {
         height: 100%;
     }
     .fruit01-bg {
-        background: url('../../assets/home/fruit01.jpg') no-repeat;
+        background: url('../../assets/home/fruit01.png') no-repeat;
         background-size: 100% 100%;
     }
     .fruit02-bg {
-        background: url('../../assets/home/fruit02.jpg') no-repeat;
+        background: url('../../assets/home/fruit02.png') no-repeat;
         background-size: 100% 100%;
     }
     .fruit03-bg {
-        background: url('../../assets/home/fruit03.jpg') no-repeat;
+        background: url('../../assets/home/fruit03.png') no-repeat;
         background-size: 100% 100%;
     }
     .fruit04-bg {
-        background: url('../../assets/home/fruit04.jpg') no-repeat;
+        background: url('../../assets/home/fruit04.png') no-repeat;
         background-size: 100% 100%;
     }
 }
diff --git a/src/views/login/register - old.vue b/src/views/login/register - old.vue
new file mode 100644
index 0000000..a324d26
--- /dev/null
+++ b/src/views/login/register - old.vue	
@@ -0,0 +1,639 @@
+<template>
+    <div class="app-container">
+        <div class="app-main">
+            <p class="font-size-24 font-weight-bold line-height-2em">加入联盟</p>
+            <el-divider></el-divider>
+            <el-form :model="form" :rules="rules" ref="userInfo" class="el-form-new">
+                <el-row>
+                    <p class="tab-title">登录信息</p>
+                    <el-col :span="11" >
+                        <el-form-item label="用户名：" :label-width="formLabelWidth" prop="account">
+                            <el-input v-model="form.account" auto-complete="new-password" size="small" placeholder="请输入用户名"></el-input>
+                        </el-form-item>
+                        <el-form-item label="密码：" :label-width="formLabelWidth" prop="password">
+                            <el-input type="password" v-model="form.password" auto-complete="new-password" size="small"  placeholder="请输入密码"></el-input>
+                        </el-form-item>
+                        <el-form-item :label-width="formLabelWidth">
+                            <check-password-strong :sValue="form.password"></check-password-strong>
+                        </el-form-item>
+                        <el-form-item label="确认密码：" :label-width="formLabelWidth" prop="confirmPassword">
+                            <el-input type="password" v-model="form.confirmPassword" autocomplete="off" size="small"  placeholder="请再次输入密码"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="2"  style="height:1px;"></el-col>
+                    <el-col :span="11">
+                        <el-form-item label="姓名：" :label-width="formLabelWidth" prop="name">
+                            <el-input v-model="form.name" autocomplete="off" size="small" placeholder="请输入姓名"></el-input>
+                        </el-form-item>
+                        <el-form-item label="邮箱：" :label-width="formLabelWidth" prop="email">
+                            <el-input v-model="form.email" autocomplete="off" size="small" placeholder="请输入邮箱"></el-input>
+                        </el-form-item>
+                        <el-form-item label="手机号：" :label-width="formLabelWidth" prop="phone" ref="phone">
+                            <el-input v-model.number="form.phone" autocomplete="off" minlength="11" maxlength="11" size="small" placeholder="请输入手机号"></el-input>
+                        </el-form-item>
+                        <el-form-item label="验证码：" :label-width="formLabelWidth" prop="verificationCode">
+                            <el-input v-model="form.verificationCode" autocomplete="off" minlength="4" maxlength="4" size="small" style="width:180px;" placeholder="请输入验证码"></el-input>
+                            <img id="codePic" :src="codeSrc" alt="点击刷新" class="code-pic" @click="refreshCode"/>
+                            <img :src="_getImage('login','refresh.png')" alt="点击刷新" class="code-refresh" @click="refreshCode" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                
+                <el-row>
+                    <p class="tab-title">企业信息</p>
+                    <el-col :span="11">
+                      <el-form-item label="企业名称：" :label-width="formLabelWidth" prop="companyRegisterVo.name">
+                          <el-input v-model="form.companyRegisterVo.name" autocomplete="off" placeholder="请输入企业名称"></el-input>
+                      </el-form-item>
+                      <el-form-item label="企业类型：" :label-width="formLabelWidth" prop="companyRegisterVo.typeId">
+                          <!-- 企业类型的下拉菜单 -->
+                          <el-select v-model="form.companyRegisterVo.typeId" placeholder="请选择企业类型">
+                          <el-option label="政府机关" :value="1"></el-option>
+                          <el-option label="研究机构" :value="2"></el-option>
+                          <el-option label="社会团体" :value="3"></el-option>
+                          <el-option label="企事业单位" :value="4"></el-option>
+                          </el-select>
+                      </el-form-item>
+                      <el-form-item label="统一社会信用代码：" :label-width="formLabelWidth" prop="companyRegisterVo.code">
+                          <el-input v-model="form.companyRegisterVo.code" autocomplete="off" placeholder="请输入统一社会信用代码"></el-input>
+                      </el-form-item>
+                      <el-form-item label="法人证件类型：" :label-width="formLabelWidth" prop="companyRegisterVo.ceId">
+                          <!-- 法人证件类型的下拉菜单 -->
+                          <el-select v-model="form.companyRegisterVo.ceId" placeholder="请选择法人证件类型">
+                          <el-option label="中国居民身份证" :value="1"></el-option>
+                          <el-option label="港澳居民往来内地通行证" :value="2"></el-option>
+                          <el-option label="台湾居民往来大陆通行证" :value="3"></el-option>
+                          <el-option label="外国人永久居留身份证" :value="4"></el-option>
+                          <el-option label="港澳台居民居住证" :value="5"></el-option>
+                          <el-option label="护照" :value="6"></el-option>
+                          </el-select>
+                      </el-form-item>
+                      <el-form-item label="法人证件号码：" :label-width="formLabelWidth" prop="companyRegisterVo.enCeNumber">
+                          <el-input v-model="form.companyRegisterVo.enCeNumber" autocomplete="off" placeholder="请输入法人证件号码"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="2" style="height:1px;"></el-col>
+                    <el-col :span="11">
+                      <el-form-item label="所属行业：" :label-width="formLabelWidth" prop="companyRegisterVo.inBigId">
+                          <!-- 行业大类的下拉菜单 -->
+                          <el-select
+                              v-model="form.companyRegisterVo.inBigId"
+                              placeholder="行业大类"
+                              style="width:calc(50% - 10px);margin-right: 20px;"
+                              @change="changeSmallIndustry(true)"
+                          >
+                          <el-option
+                              v-for="(item,index) in bigIndustryType"
+                              :key="index"
+                              :label="item.name"
+                              :value="item.value"
+                          ></el-option>
+                          </el-select>
+                          <!-- 行业小类的下拉菜单 -->
+                          <el-select
+                              v-model="form.companyRegisterVo.inSmallId"
+                              placeholder="行业小类"
+                              style="width:calc(50% - 10px);"
+                          >
+                          <el-option
+                              v-for="(item,index) in smallIndustryType"
+                              :key="index"
+                              :label="item.name"
+                              :value="item.value"
+                          ></el-option>
+                          </el-select>
+                      </el-form-item>
+                      <el-form-item label="法人姓名：" :label-width="formLabelWidth" prop="companyRegisterVo.enLegalName">
+                          <el-input v-model="form.companyRegisterVo.enLegalName" autocomplete="off" placeholder="请输入法人姓名"></el-input>
+                      </el-form-item>
+                      <el-form-item label="法人证件：" :label-width="formLabelWidth" prop="companyRegisterVo.enCeAddressZ">
+                          <div class="flex-box">
+                          <el-upload
+                              class="avatar-uploader flex-1"
+                              :action="upload_file"
+                              :headers="upload_headers"
+                              :data="upload_data"
+                              :show-file-list="false"
+                              :on-success="handlePhotoSuccess"
+                              :before-upload="beforeAvatarUpload"
+                          >
+                              <img v-if="photoUrl" :src="photoUrl" class="avatar"/>
+                              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                          </el-upload>
+                          <el-upload
+                              class="avatar-uploader flex-1"
+                              :action="upload_file"
+                              :headers="upload_headers"
+                              :data="upload_data"
+                              :show-file-list="false"
+                              :on-success="handleReverseSuccess"
+                              :before-upload="beforeAvatarUpload"
+                          >
+                              <img v-if="reversePhotoUrl" :src="reversePhotoUrl" class="avatar"/>
+                              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                          </el-upload>
+                          </div>
+                          <el-form-item label-width="150px" prop="companyRegisterVo.enCeAddressF"></el-form-item>
+                      </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                    <el-form-item label="企业简介：" :label-width="formLabelWidth" prop="companyRegisterVo.enIntroduction">
+                        <!-- <el-input v-model="form.enIntroduction" autocomplete="off"></el-input> -->
+                        <el-input type="textarea" v-model="form.companyRegisterVo.enIntroduction" placeholder="请输入企业简介"></el-input>
+                    </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="11">
+                    <el-form-item label="组织/单位注册所在地：" :label-width="formLabelWidth" prop="companyRegisterVo.areaId">
+                        <!-- <v-distpicker @selected="onSelected" class="my-distpicker"></v-distpicker> -->
+                        <el-select
+                            v-model="form.companyRegisterVo.provinceId"
+                            placeholder="省"
+                            style="width:calc(33.3% - 7px);margin-right:10px;"
+                            @change="changeArea(form.companyRegisterVo.provinceId,1,true)"
+                        >
+                        <el-option
+                            v-for="(item,index) in provinces"
+                            :key="index"
+                            :label="item.name"
+                            :value="parseInt(item.value)"
+                        ></el-option>
+                        </el-select>
+                        <el-select
+                            v-model="form.companyRegisterVo.cityId"
+                            placeholder="市"
+                            style="width:calc(33.3% - 7px);margin-right:10px;"
+                            @change="changeArea(form.companyRegisterVo.cityId,2,true)"
+                        >
+                        <el-option
+                            v-for="(item,index) in citys"
+                            :key="index"
+                            :label="item.name"
+                            :value="parseInt(item.value)"
+                        ></el-option>
+                        </el-select>
+                        <el-select v-model="form.companyRegisterVo.areaId" placeholder="区" style="width:calc(33.3% - 7px);">
+                        <el-option
+                            v-for="(item,index) in areas"
+                            :key="index"
+                            :label="item.name"
+                            :value="parseInt(item.value)"
+                        ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="联系人姓名：" :label-width="formLabelWidth" prop="companyRegisterVo.conName">
+                        <el-input v-model="form.companyRegisterVo.conName" autocomplete="off" placeholder="请输入联系人姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系人电话：" :label-width="formLabelWidth" prop="companyRegisterVo.phone">
+                        <el-input v-model="form.companyRegisterVo.phone" autocomplete="off" minlength="11" maxlength="11" placeholder="请输入联系人电话"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系人邮箱：" :label-width="formLabelWidth" prop="companyRegisterVo.email">
+                        <el-input v-model="form.companyRegisterVo.email" autocomplete="off" placeholder="请输入联系人邮箱"></el-input>
+                    </el-form-item>
+                    </el-col>
+                    <el-col :span="2" style="height:1px;"></el-col>
+                    <el-col :span="11">
+                    <el-form-item label="注册详细地址：" :label-width="formLabelWidth" prop="companyRegisterVo.enDetAddress">
+                        <el-input v-model="form.companyRegisterVo.enDetAddress" autocomplete="off" placeholder="请输入注册详细地址"></el-input>
+                    </el-form-item>
+                    <el-form-item label="官方网址：" :label-width="formLabelWidth" prop="companyRegisterVo.enOffWeb">
+                        <el-input v-model="form.companyRegisterVo.enOffWeb" autocomplete="off" placeholder="请输入官方网址"></el-input>
+                    </el-form-item>
+                    <el-form-item label="组织/单位营业执照：" :label-width="formLabelWidth" prop="companyRegisterVo.enOpeAddress">
+                        <div class="flex-box">
+                        <el-upload
+                            class="avatar-uploader"
+                            :action="upload_file"
+                            :headers="upload_headers"
+                            :data="upload_data"
+                            :show-file-list="false"
+                            :on-success="handleLicenceSuccess"
+                            :before-upload="beforeAvatarUpload"
+                        >
+                            <img v-if="businessLicenceUrl" :src="businessLicenceUrl" class="avatar"/>
+                            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                        </el-upload>
+                        </div>
+                    </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-form-item :label-width="formLabelWidth" style="text-align: center;">
+                            <el-checkbox true-label="1" false-label="0" v-model="form.companyRegisterVo.isSynchronizationIdis">同步注册国家工业互联网标识解析食品行业二级节点</el-checkbox>
+                            <br>
+                            <el-button type="primary" size="small" @click="submitForm('userInfo')" style="width:200px;text-align: center;">注册</el-button>
+                        </el-form-item>
+                    <el-form-item :label-width="formLabelWidth" class="text-center">
+                        已有账号？
+                        <el-link :underline="false" type="primary" @click="goLogin">立即登录</el-link>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+        </div>
+    </div>
+</template>
+
+<script>
+import CheckPasswordStrong from '@/components/CheckPasswordStrong';
+import {registerUser,existsUserName} from "@/api/login"
+import { getToken } from '@/utils/auth'
+import {validateEmail, validatePhone, validateIDCard, validateChinese,validateURL} from "@/utils/validate"
+import { getBigIndustryList,getSmallIndustryList,getArea } from "@/api/company";
+export default {
+  name: 'register',
+  components: {
+    CheckPasswordStrong
+  },
+  data() {
+    const checkAgainPassword = (rule, value, callback) => {
+      if (value != this.form.password) {
+        return callback(new Error('两次输入密码不一致'));
+      } else {
+        callback()
+      }
+    };
+    const checkIsUserdUser = (rule, value, callback) => {
+        if (validateChinese(value)) {
+            return callback(new Error('用户名不可为中文'));
+        } else {
+            if (!this.isEdit) {
+                existsUserName({account: this.form.account}).then(res => {
+                    callback()
+                }).catch(err => {
+                    return callback(new Error(err.message));
+                })
+            } else {
+                callback()
+            }
+        }
+    };
+    const checkPhone = (rule, value, callback) => {
+        if (!value) {
+            return callback(new Error('手机号不能为空'));
+        } else {
+            if (validatePhone(value)) {
+                callback();
+            } else {
+                return callback(new Error('请输入正确的手机号'));
+            }
+        }
+    }
+    const checkEmail = (rule, value, callback) => {
+        if (!validateEmail(value)) {
+            return callback(new Error('请输入正确格式的Email'));
+        } else {
+            callback();
+        }
+    }
+    const checkIDNum = (rule, value, callback) => {
+        if (!value) {
+            return callback(new Error('请输入身份证件号码'));
+        } else if (this.form.typeId == 1 && !validateIDCard(value)) {
+            return callback(new Error('请输入正确格式的身份证件号码'));
+        } else {
+            callback();
+        }
+    }
+    //法人正面照校验
+    const checkPhotoZ = (rule, value, callback) => {
+        if ("" == value || !value) {
+        return callback(new Error("请上传正面法人证件照"));
+        } else {
+            callback();
+        }
+    };
+    //法人反面照校验
+    const checkPhotoF = (rule, value, callback) => {
+        if ("" == value || !value) {
+        return callback(new Error("请上传反面法人证件照"));
+        } else {
+            callback();
+        }
+    };
+    //营业执照照校验
+    const checkPhotoOpe = (rule, value, callback) => {
+        if ("" == value || !value) {
+        return callback(new Error("请上传营业执照"));
+        } else {
+            callback();
+        }
+    };
+    //网址校验
+    const checkURL = (rule, value, callback) => {
+        if (value && !validateURL(value)) {
+            return callback(new Error("请输入正确格式的网址"));
+        } else {
+            callback();
+        }
+    };
+    return {
+      code_url: config.CODE_URL,
+      codeSrc: '',
+      formLabelWidth: '170px',
+      upload_file: config.UPLOAD_URL, //上传图片的接口地址
+      upload_headers:{
+        powerToken: '800580795f01449f9100c4d2983d13c9'
+      },
+      upload_data:{
+        uploadType:'1',
+        suffixType:'8',
+        folder:'company'
+      },
+      bigIndustryType: [], //行业大类列表
+      smallIndustryType: [], //行业小类列表
+      photoUrl: "", //正面法人证件照
+      reversePhotoUrl: "", //反面法人证件照
+      businessLicenceUrl: "", //组织/单位营业执照
+      provinceValue: "", //注册地的省
+      provinces: [], //注册地-省列表
+      cityValue: "", //注册地的市
+      citys: [], //注册地-市列表
+      areaValue: "", //注册地的区域
+      areas: [], //注册地-区列表
+      form: {
+        name: '',
+        account: '',
+        password: '',
+        confirmPassword: '',
+        email: '',
+        phone: '',
+        verificationCode: '',
+        t:'',
+        "companyRegisterVo": {
+            "isSynchronizationIdis":'1',
+            "areaId": "",
+            "areaName": "",
+            "ceId": "",
+            "cityId": "",
+            "cityName": "",
+            "code": "",
+            "conName": "",
+            "email": "",
+            "enCeAddressF": "",
+            "enCeAddressZ": "",
+            "enCeNumber": "",
+            "enDetAddress": "",
+            "enIntroduction": "",
+            "enLegalName": "",
+            "enOffWeb": "",
+            "enOpeAddress": "",
+            "inBigId": "",
+            "inSmallId": "",
+            "name": "",
+            "phone": "",
+            "provinceId": "",
+            "provinceName": "",
+            "typeId": ""
+        },
+
+      },
+      rules: {
+        name: [
+          {required: true, message: '请输入姓名', trigger: 'blur'}
+        ],
+        account: [
+          {required: true, message: '请输入用户名', trigger: 'blur'},
+          {validator: checkIsUserdUser, trigger: 'blur'}
+        ],
+        password: [
+          {required: true, message: '请输入新密码', trigger: 'blur'},
+          {min: 8, max: 12, message: '长度在 8 到 12 个字符', trigger: 'blur'}
+        ],
+        confirmPassword: [
+          {required: true, message: '请再次输入新密码', trigger: 'blur'},
+          {validator: checkAgainPassword, trigger: 'blur'}
+        ],
+        email: [
+          {required: true, message: '请输入邮箱', trigger: 'blur'},
+          {validator: checkEmail, trigger: 'blur'}
+        ],
+        phone: [
+          {required: true, validator: checkPhone, trigger: 'blur'}
+        ],
+        verificationCode: [
+            { required: true, message: '请输入验证码', trigger: 'blur' }
+        ],
+        companyRegisterVo:{
+          name: [{required: true, message: "请输入企业名称", trigger: "blur"}],
+          code: [
+            {required: true, message: "请输入统一社会信用代码", trigger: "blur"}
+          ],
+
+          typeId: [
+            {required: true, message: "请选择企业类型", trigger: "click"}
+          ],
+          inBigId: [
+            //必须选择完大类才能选择小类，所以只校验小类就可以了
+            {required: true, message: "请选择行业类型", trigger: "click    "}
+          ],
+          enLegalName: [
+            {required: true, message: "请输入法人姓名", trigger: "blur"}
+          ],
+          ceId: [
+            {required: true, message: "请选择法人证件类型", trigger: "click"}
+          ],
+          enCeNumber: [
+            {required: true, message: "请输入法人证件号码", trigger: "blur"}
+            // { type: 'number', message: '法人证件号码必须为数字值'}
+          ],
+          enIntroduction: [
+            {required: true, message: "请输入企业简介", trigger: "blur"}
+          ],
+
+          enDetAddress: [
+            {required: true, message: "请输入注册地详细地址", trigger: "blur"}
+          ],
+          enOffWeb: [{validator: checkURL, trigger: "blur"}],
+          enCeAddressZ: [
+            {required: true, validator: checkPhotoZ, trigger: "blur"}
+          ],
+          enCeAddressF: [
+            {required: true, validator: checkPhotoF, trigger: "blur"}
+          ],
+          enOpeAddress: [
+            {required: true, validator: checkPhotoOpe, trigger: "blur"}
+          ],
+          conName: [
+            {required: true, message: "请输入联系人姓名", trigger: "blur"}
+          ],
+          phone: [{required: true, validator: checkPhone, trigger: "blur"}],
+          email: [{required: true, validator: checkEmail, trigger: "blur"}],
+          areaId: [
+            {required: true, message: "请选择注册区域", trigger: "change"}
+          ]
+        }
+      },
+    }
+  },
+  mounted() {
+    this.form.t = Math.random().toString().substring(0,13)
+    this.codeSrc = this.code_url + "/common/getVerificationCode/" + this.form.t;
+    this.initData()
+  },
+  methods: {
+    //初始化数据
+    initData() {
+      //获取行业大类列表
+      getBigIndustryList().then(res => {
+        this.bigIndustryType = res.data;
+      });
+      this.changeArea("0", 0);
+    },
+    //省市区变化时动态获取
+    changeArea(pid, type, clean) {
+      getArea(pid).then(res => {
+        if (type == 0) {
+          this.provinces = res.data;
+        } else if (type == 1) {
+          if (clean) {
+            this.form.companyRegisterVo.cityId = "";
+            this.form.companyRegisterVo.areaId = "";
+          }
+          this.citys = res.data;
+        } else if (type == 2) {
+          if (clean) {
+            this.form.companyRegisterVo.areaId = "";
+          }
+          this.areas = res.data;
+        }
+      });
+    },
+    goLogin() {
+      this.$router.push({name: 'login'})
+    },
+    //刷新验证码
+    refreshCode: function () {
+      this.form.t = Math.random().toString().substring(0,13)
+      document
+          .getElementById("codePic")
+          .setAttribute(
+              "src",
+              this.code_url + "/common/getVerificationCode/" + this.form.t
+          );
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+            let temp1 = this.provinces.filter(item => {
+                if(item.value == this.form.companyRegisterVo.provinceId)
+                return item
+            })
+            this.form.provinceName = temp1[0].name
+            let temp2 = this.citys.filter(item => {
+                if(item.value == this.form.companyRegisterVo.cityId)
+                return item
+            })
+            this.form.cityName = temp2[0].name
+            let temp3 = this.areas.filter(item => {
+                if(item.value == this.form.companyRegisterVo.areaId)
+                return item
+            })
+            this.form.areaName = temp3[0].name
+
+            let param = JSON.parse(JSON.stringify(this.form))
+            param.password = this.$md5(param.password)
+            param.confirmPassword = this.$md5(param.confirmPassword)
+          registerUser(param).then(res => {
+            this.$message({
+              message: '注册成功！',
+              type: 'success'
+            });
+            this.goLogin()
+          })
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.$router.go(-1)
+    },
+    //行业大类变化获取行业小类
+    changeSmallIndustry(clean) {
+        if (clean) {
+            this.form.companyRegisterVo.inSmallId = "";
+        }
+        getSmallIndustryList(this.form.companyRegisterVo.inBigId).then(res => {
+            this.smallIndustryType = res.data;
+        });
+    },
+    //组织/单位营业执照图片上传成功的回调
+    handleLicenceSuccess(res, file) {
+      this.businessLicenceUrl = URL.createObjectURL(file.raw);
+      this.form.companyRegisterVo.enOpeAddress = res.data;
+    },
+    //法人正面照图片上传成功的回调
+    handlePhotoSuccess(res, file) {
+      this.photoUrl = URL.createObjectURL(file.raw);
+      this.form.companyRegisterVo.enCeAddressZ = res.data;
+    },
+    //法人反面照图片上传成功的回调
+    handleReverseSuccess(res, file) {
+      this.reversePhotoUrl = URL.createObjectURL(file.raw);
+      this.form.companyRegisterVo.enCeAddressF = res.data;
+    },
+    //图片上传前的检测
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 2MB!");
+      }
+      return isLt2M;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scope>
+// .form-footer {
+//   text-align: center;
+// }
+.tab-title {
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: #000000;
+  line-height: 26px;
+  margin: 20px 0;
+  &::before {
+    content: " ";
+    position: absolute;
+    left: -15px;
+    top: 23px;
+    width: 5px;
+    height: 18px;
+    background: #01496E;
+  }
+}
+.el-form-new {
+  max-width: 1200px;
+  padding: 0 70px;
+//   width: 400px;
+//   margin: 0 auto;
+}
+
+.code-refresh {
+  position: absolute;
+  top: 10px;
+  width: 25px;
+  height: 20px;
+  cursor: pointer;
+}
+
+.code-pic {
+  margin: 0 5px;
+  border: 1px solid rgba(220, 220, 220, 1);
+  border-radius: 3px;
+  width: 90px;
+  height: 32px;
+  vertical-align: middle;
+}
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/login/register.vue b/src/views/login/register.vue
index 4cc2781..f8f2048 100644
--- a/src/views/login/register.vue
+++ b/src/views/login/register.vue
@@ -45,68 +45,29 @@
                       <el-form-item label="企业名称：" :label-width="formLabelWidth" prop="companyRegisterVo.name">
                           <el-input v-model="form.companyRegisterVo.name" autocomplete="off" placeholder="请输入企业名称"></el-input>
                       </el-form-item>
-                      <el-form-item label="企业类型：" :label-width="formLabelWidth" prop="companyRegisterVo.typeId">
-                          <!-- 企业类型的下拉菜单 -->
-                          <el-select v-model="form.companyRegisterVo.typeId" placeholder="请选择企业类型">
-                          <el-option label="政府机关" :value="1"></el-option>
-                          <el-option label="研究机构" :value="2"></el-option>
-                          <el-option label="社会团体" :value="3"></el-option>
-                          <el-option label="企事业单位" :value="4"></el-option>
-                          </el-select>
-                      </el-form-item>
-                      <el-form-item label="统一社会信用代码：" :label-width="formLabelWidth" prop="companyRegisterVo.code">
-                          <el-input v-model="form.companyRegisterVo.code" autocomplete="off" placeholder="请输入统一社会信用代码"></el-input>
-                      </el-form-item>
-                      <el-form-item label="法人证件类型：" :label-width="formLabelWidth" prop="companyRegisterVo.ceId">
-                          <!-- 法人证件类型的下拉菜单 -->
-                          <el-select v-model="form.companyRegisterVo.ceId" placeholder="请选择法人证件类型">
-                          <el-option label="中国居民身份证" :value="1"></el-option>
-                          <el-option label="港澳居民往来内地通行证" :value="2"></el-option>
-                          <el-option label="台湾居民往来大陆通行证" :value="3"></el-option>
-                          <el-option label="外国人永久居留身份证" :value="4"></el-option>
-                          <el-option label="港澳台居民居住证" :value="5"></el-option>
-                          <el-option label="护照" :value="6"></el-option>
-                          </el-select>
-                      </el-form-item>
-                      <el-form-item label="法人证件号码：" :label-width="formLabelWidth" prop="companyRegisterVo.enCeNumber">
-                          <el-input v-model="form.companyRegisterVo.enCeNumber" autocomplete="off" placeholder="请输入法人证件号码"></el-input>
-                      </el-form-item>
+                      <el-form-item label="组织/单位营业执照：" :label-width="formLabelWidth" prop="companyRegisterVo.enOpeAddress">
+                        <div class="flex-box">
+                        <el-upload
+                            class="avatar-uploader"
+                            :action="upload_file"
+                            :headers="upload_headers"
+                            :data="upload_data"
+                            :show-file-list="false"
+                            :on-success="handleLicenceSuccess"
+                            :before-upload="beforeAvatarUpload"
+                        >
+                            <img v-if="businessLicenceUrl" :src="businessLicenceUrl" class="avatar"/>
+                            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                        </el-upload>
+                        </div>
+                    </el-form-item>
                     </el-col>
                     <el-col :span="2" style="height:1px;"></el-col>
                     <el-col :span="11">
-                      <el-form-item label="所属行业：" :label-width="formLabelWidth" prop="companyRegisterVo.inBigId">
-                          <!-- 行业大类的下拉菜单 -->
-                          <el-select
-                              v-model="form.companyRegisterVo.inBigId"
-                              placeholder="行业大类"
-                              style="width:calc(50% - 10px);margin-right: 20px;"
-                              @change="changeSmallIndustry(true)"
-                          >
-                          <el-option
-                              v-for="(item,index) in bigIndustryType"
-                              :key="index"
-                              :label="item.name"
-                              :value="item.value"
-                          ></el-option>
-                          </el-select>
-                          <!-- 行业小类的下拉菜单 -->
-                          <el-select
-                              v-model="form.companyRegisterVo.inSmallId"
-                              placeholder="行业小类"
-                              style="width:calc(50% - 10px);"
-                          >
-                          <el-option
-                              v-for="(item,index) in smallIndustryType"
-                              :key="index"
-                              :label="item.name"
-                              :value="item.value"
-                          ></el-option>
-                          </el-select>
-                      </el-form-item>
                       <el-form-item label="法人姓名：" :label-width="formLabelWidth" prop="companyRegisterVo.enLegalName">
                           <el-input v-model="form.companyRegisterVo.enLegalName" autocomplete="off" placeholder="请输入法人姓名"></el-input>
                       </el-form-item>
-                      <el-form-item label="法人证件：" :label-width="formLabelWidth" prop="companyRegisterVo.enCeAddressZ">
+                      <el-form-item label="法人身份证照：" :label-width="formLabelWidth" prop="companyRegisterVo.enCeAddressZ">
                           <div class="flex-box">
                           <el-upload
                               class="avatar-uploader flex-1"
@@ -138,94 +99,13 @@
                     </el-col>
                 </el-row>
                 <el-row>
-                    <el-col :span="24">
-                    <el-form-item label="企业简介：" :label-width="formLabelWidth" prop="companyRegisterVo.enIntroduction">
-                        <!-- <el-input v-model="form.enIntroduction" autocomplete="off"></el-input> -->
-                        <el-input type="textarea" v-model="form.companyRegisterVo.enIntroduction" placeholder="请输入企业简介"></el-input>
+                    <el-form-item :label-width="formLabelWidth"  prop="companyRegisterVo.isSynchronizationIdis">
+                      <el-checkbox true-label="1" false-label="" v-model="form.companyRegisterVo.isSynchronizationIdis"></el-checkbox>
+                      &nbsp;&nbsp;<span class="color-grey">已阅读，并充分理解协议中 <a class="color-blue" @click="goNoticeDetail('YSZCYSYTK')">《中国食品工业互联网产业联盟隐私政策与使用条款》</a>内容。</span>
                     </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="11">
-                    <el-form-item label="组织/单位注册所在地：" :label-width="formLabelWidth" prop="companyRegisterVo.areaId">
-                        <!-- <v-distpicker @selected="onSelected" class="my-distpicker"></v-distpicker> -->
-                        <el-select
-                            v-model="form.companyRegisterVo.provinceId"
-                            placeholder="省"
-                            style="width:calc(33.3% - 7px);margin-right:10px;"
-                            @change="changeArea(form.companyRegisterVo.provinceId,1,true)"
-                        >
-                        <el-option
-                            v-for="(item,index) in provinces"
-                            :key="index"
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        ></el-option>
-                        </el-select>
-                        <el-select
-                            v-model="form.companyRegisterVo.cityId"
-                            placeholder="市"
-                            style="width:calc(33.3% - 7px);margin-right:10px;"
-                            @change="changeArea(form.companyRegisterVo.cityId,2,true)"
-                        >
-                        <el-option
-                            v-for="(item,index) in citys"
-                            :key="index"
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        ></el-option>
-                        </el-select>
-                        <el-select v-model="form.companyRegisterVo.areaId" placeholder="区" style="width:calc(33.3% - 7px);">
-                        <el-option
-                            v-for="(item,index) in areas"
-                            :key="index"
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="官方网址：" :label-width="formLabelWidth" prop="companyRegisterVo.enOffWeb">
-                        <el-input v-model="form.companyRegisterVo.enOffWeb" autocomplete="off" placeholder="请输入官方网址"></el-input>
-                    </el-form-item>
-                    
-
-                    <el-form-item label="联系人姓名：" :label-width="formLabelWidth" prop="companyRegisterVo.conName">
-                        <el-input v-model="form.companyRegisterVo.conName" autocomplete="off" placeholder="请输入联系人姓名"></el-input>
-                    </el-form-item>
-                    <el-form-item label="联系人电话：" :label-width="formLabelWidth" prop="companyRegisterVo.phone">
-                        <el-input v-model="form.companyRegisterVo.phone" autocomplete="off" minlength="11" maxlength="11" placeholder="请输入联系人电话"></el-input>
-                    </el-form-item>
-                    <el-form-item label="联系人邮箱：" :label-width="formLabelWidth" prop="companyRegisterVo.email">
-                        <el-input v-model="form.companyRegisterVo.email" autocomplete="off" placeholder="请输入联系人邮箱"></el-input>
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="2" style="height:1px;"></el-col>
-                    <el-col :span="11">
-                    <el-form-item label="注册详细地址：" :label-width="formLabelWidth" prop="companyRegisterVo.enDetAddress">
-                        <el-input v-model="form.companyRegisterVo.enDetAddress" autocomplete="off" placeholder="请输入注册详细地址"></el-input>
-                    </el-form-item>
-                    <el-form-item label="组织/单位营业执照：" :label-width="formLabelWidth" prop="companyRegisterVo.enOpeAddress">
-                        <div class="flex-box">
-                        <el-upload
-                            class="avatar-uploader"
-                            :action="upload_file"
-                            :headers="upload_headers"
-                            :data="upload_data"
-                            :show-file-list="false"
-                            :on-success="handleLicenceSuccess"
-                            :before-upload="beforeAvatarUpload"
-                        >
-                            <img v-if="businessLicenceUrl" :src="businessLicenceUrl" class="avatar"/>
-                            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                        </el-upload>
-                        </div>
-                    </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
                     <el-form-item :label-width="formLabelWidth" style="text-align: center;">
-                            <el-button type="primary" size="small" @click="submitForm('userInfo')" style="width:200px;text-align: center;">注册</el-button>
-                        </el-form-item>
+                      <el-button type="primary" size="small" @click="submitForm('userInfo')" style="width:200px;text-align: center;">注册</el-button>
+                    </el-form-item>
                     <el-form-item :label-width="formLabelWidth" class="text-center">
                         已有账号？
                         <el-link :underline="false" type="primary" @click="goLogin">立即登录</el-link>
@@ -239,9 +119,7 @@
 <script>
 import CheckPasswordStrong from '@/components/CheckPasswordStrong';
 import {registerUser,existsUserName} from "@/api/login"
-import { getToken } from '@/utils/auth'
-import {validateEmail, validatePhone, validateIDCard, validateChinese,validateURL} from "@/utils/validate"
-import { getBigIndustryList,getSmallIndustryList,getArea } from "@/api/company";
+import {validateEmail, validatePhone, validateChinese} from "@/utils/validate"
 export default {
   name: 'register',
   components: {
@@ -288,15 +166,6 @@ export default {
             callback();
         }
     }
-    const checkIDNum = (rule, value, callback) => {
-        if (!value) {
-            return callback(new Error('请输入身份证件号码'));
-        } else if (this.form.typeId == 1 && !validateIDCard(value)) {
-            return callback(new Error('请输入正确格式的身份证件号码'));
-        } else {
-            callback();
-        }
-    }
     //法人正面照校验
     const checkPhotoZ = (rule, value, callback) => {
         if ("" == value || !value) {
@@ -321,18 +190,10 @@ export default {
             callback();
         }
     };
-    //网址校验
-    const checkURL = (rule, value, callback) => {
-        if (value && !validateURL(value)) {
-            return callback(new Error("请输入正确格式的网址"));
-        } else {
-            callback();
-        }
-    };
     return {
       code_url: config.CODE_URL,
       codeSrc: '',
-      formLabelWidth: '160px',
+      formLabelWidth: '170px',
       upload_file: config.UPLOAD_URL, //上传图片的接口地址
       upload_headers:{
         powerToken: '800580795f01449f9100c4d2983d13c9'
@@ -342,17 +203,9 @@ export default {
         suffixType:'8',
         folder:'company'
       },
-      bigIndustryType: [], //行业大类列表
-      smallIndustryType: [], //行业小类列表
       photoUrl: "", //正面法人证件照
       reversePhotoUrl: "", //反面法人证件照
       businessLicenceUrl: "", //组织/单位营业执照
-      provinceValue: "", //注册地的省
-      provinces: [], //注册地-省列表
-      cityValue: "", //注册地的市
-      citys: [], //注册地-市列表
-      areaValue: "", //注册地的区域
-      areas: [], //注册地-区列表
       form: {
         name: '',
         account: '',
@@ -363,29 +216,12 @@ export default {
         verificationCode: '',
         t:'',
         "companyRegisterVo": {
-            "areaId": "",
-            "areaName": "",
-            "ceId": "",
-            "cityId": "",
-            "cityName": "",
-            "code": "",
-            "conName": "",
-            "email": "",
+            "isSynchronizationIdis":'',
             "enCeAddressF": "",
             "enCeAddressZ": "",
-            "enCeNumber": "",
-            "enDetAddress": "",
-            "enIntroduction": "",
             "enLegalName": "",
-            "enOffWeb": "",
             "enOpeAddress": "",
-            "inBigId": "",
-            "inSmallId": "",
             "name": "",
-            "phone": "",
-            "provinceId": "",
-            "provinceName": "",
-            "typeId": ""
         },
 
       },
@@ -417,35 +253,9 @@ export default {
         ],
         companyRegisterVo:{
           name: [{required: true, message: "请输入企业名称", trigger: "blur"}],
-          code: [
-            {required: true, message: "请输入统一社会信用代码", trigger: "blur"}
-          ],
-
-          typeId: [
-            {required: true, message: "请选择企业类型", trigger: "click"}
-          ],
-          inBigId: [
-            //必须选择完大类才能选择小类，所以只校验小类就可以了
-            {required: true, message: "请选择行业类型", trigger: "click    "}
-          ],
           enLegalName: [
             {required: true, message: "请输入法人姓名", trigger: "blur"}
           ],
-          ceId: [
-            {required: true, message: "请选择法人证件类型", trigger: "click"}
-          ],
-          enCeNumber: [
-            {required: true, message: "请输入法人证件号码", trigger: "blur"}
-            // { type: 'number', message: '法人证件号码必须为数字值'}
-          ],
-          enIntroduction: [
-            {required: true, message: "请输入企业简介", trigger: "blur"}
-          ],
-
-          enDetAddress: [
-            {required: true, message: "请输入注册地详细地址", trigger: "blur"}
-          ],
-          enOffWeb: [{validator: checkURL, trigger: "blur"}],
           enCeAddressZ: [
             {required: true, validator: checkPhotoZ, trigger: "blur"}
           ],
@@ -455,14 +265,9 @@ export default {
           enOpeAddress: [
             {required: true, validator: checkPhotoOpe, trigger: "blur"}
           ],
-          conName: [
-            {required: true, message: "请输入联系人姓名", trigger: "blur"}
+          isSynchronizationIdis:[
+            {required: true, message: "请阅读，并充分理解协议!", trigger: "blur"}
           ],
-          phone: [{required: true, validator: checkPhone, trigger: "blur"}],
-          email: [{required: true, validator: checkEmail, trigger: "blur"}],
-          areaId: [
-            {required: true, message: "请选择注册区域", trigger: "change"}
-          ]
         }
       },
     }
@@ -470,39 +275,15 @@ export default {
   mounted() {
     this.form.t = Math.random().toString().substring(0,13)
     this.codeSrc = this.code_url + "/common/getVerificationCode/" + this.form.t;
-    this.initData()
   },
   methods: {
-    //初始化数据
-    initData() {
-      //获取行业大类列表
-      getBigIndustryList().then(res => {
-        this.bigIndustryType = res.data;
-      });
-      this.changeArea("0", 0);
-    },
-    //省市区变化时动态获取
-    changeArea(pid, type, clean) {
-      getArea(pid).then(res => {
-        if (type == 0) {
-          this.provinces = res.data;
-        } else if (type == 1) {
-          if (clean) {
-            this.form.companyRegisterVo.cityId = "";
-            this.form.companyRegisterVo.areaId = "";
-          }
-          this.citys = res.data;
-        } else if (type == 2) {
-          if (clean) {
-            this.form.companyRegisterVo.areaId = "";
-          }
-          this.areas = res.data;
-        }
-      });
-    },
     goLogin() {
       this.$router.push({name: 'login'})
     },
+    goNoticeDetail(type,title = '关于联盟'){
+      let routeUrl = this.$router.resolve({name:'noticeShow',query:{'type':type,'title':title}});
+      window.open(routeUrl.href, '_blank');
+    },
     //刷新验证码
     refreshCode: function () {
       this.form.t = Math.random().toString().substring(0,13)
@@ -516,34 +297,17 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-            let temp1 = this.provinces.filter(item => {
-                if(item.value == this.form.companyRegisterVo.provinceId)
-                return item
-            })
-            this.form.provinceName = temp1[0].name
-            let temp2 = this.citys.filter(item => {
-                if(item.value == this.form.companyRegisterVo.cityId)
-                return item
-            })
-            this.form.cityName = temp2[0].name
-            let temp3 = this.areas.filter(item => {
-                if(item.value == this.form.companyRegisterVo.areaId)
-                return item
-            })
-            this.form.areaName = temp3[0].name
-
             let param = JSON.parse(JSON.stringify(this.form))
             param.password = this.$md5(param.password)
             param.confirmPassword = this.$md5(param.confirmPassword)
-          registerUser(param).then(res => {
-            this.$message({
-              message: '注册成功！',
-              type: 'success'
-            });
-            this.goLogin()
-          })
+            registerUser(param).then(res => {
+              this.$message({
+                message: '注册成功！',
+                type: 'success'
+              });
+              this.goLogin()
+            })
         } else {
-          console.log('error submit!!');
           return false;
         }
       });
@@ -552,15 +316,6 @@ export default {
       this.$refs[formName].resetFields();
       this.$router.go(-1)
     },
-    //行业大类变化获取行业小类
-    changeSmallIndustry(clean) {
-        if (clean) {
-            this.form.companyRegisterVo.inSmallId = "";
-        }
-        getSmallIndustryList(this.form.companyRegisterVo.inBigId).then(res => {
-            this.smallIndustryType = res.data;
-        });
-    },
     //组织/单位营业执照图片上传成功的回调
     handleLicenceSuccess(res, file) {
       this.businessLicenceUrl = URL.createObjectURL(file.raw);
diff --git a/src/views/public/platform.vue b/src/views/public/platform.vue
index f4c2a80..b9c3c41 100644
--- a/src/views/public/platform.vue
+++ b/src/views/public/platform.vue
@@ -4,10 +4,13 @@
         <a class="platform-box platform-bg-1"  target="_blank" href="http://www.ftiia.com/">
             <a class="title-1" style="z-index:1000;">工业互联网标识解析食品行业二级节点</a>
         </a>
-        <a class="platform-box platform-bg-2">
+        <a class="platform-box platform-bg-2" @click="alertMesg('即将开放,敬请期待！')">
             <a class="title-1" style="z-index:1000;">食品工业智能制造平台</a>
         </a>
-        <a class="platform-box platform-bg-3" target="_blank" href="http://platform.ftiia.com/">
+        <!-- <a class="platform-box platform-bg-3" target="_blank" href="http://platform.ftiia.com/">
+            <a class="title-1" style="z-index:1000;">食品工业互联网公共服务平台</a>
+        </a> -->
+        <a class="platform-box platform-bg-3" @click="alertMesg('即将开放,敬请期待！')">
             <a class="title-1" style="z-index:1000;">食品工业互联网公共服务平台</a>
         </a>
     </div>
@@ -22,6 +25,9 @@ export default {
     mounted() {
     },
     methods:{
+        alertMesg(mes) {
+            this.$alert(mes,'提示',  { confirmButtonText: '确定',});
+        }
     }
 };
 </script>