From 436483ad658913111c69c7673aa7693fa10c6c84 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Mon, 25 Jan 2021 17:57:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Introduce/SettledModel.vue     | 332 +++++++++++++-----
 .../Children/place/EntitySpace.vue            |  23 +-
 .../Children/place/VirtualSpace.vue           |  13 +-
 3 files changed, 263 insertions(+), 105 deletions(-)

diff --git a/src/components/Introduce/SettledModel.vue b/src/components/Introduce/SettledModel.vue
index 5a03197..a5e7256 100644
--- a/src/components/Introduce/SettledModel.vue
+++ b/src/components/Introduce/SettledModel.vue
@@ -1,77 +1,165 @@
 <template>
   <div>
-    <a-button type="primary" @click="showModal"> 加入我们 </a-button>
-    <a-modal width="50%" :title="title" :visible="visible" :confirm-loading="confirmLoading" @ok="handleOk" @cancel="handleCancel">
+    <a-button @click="showModal" type="primary">加入我们</a-button>
+    <a-modal
+      :confirm-loading="confirmLoading"
+      :title="title"
+      :visible="visible"
+      @cancel="handleCancel"
+      @ok="handleOk"
+      width="50%"
+    >
       <a-form :form="form" v-if="current === 0">
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司名称" required>
-          <a-input v-model.trim="platform.company" placeholder="请输入公司名称..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="公司名称"
+          required
+        >
+          <a-input placeholder="请输入公司名称..." v-model.trim="platform.company" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="成立时间" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="成立时间"
+          required
+        >
           <!-- 时间选择器（时间点） -->
           <a-date-picker @change="changeBirthday" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="法人代码" required>
-          <a-input v-model.trim="platform.legalPerson" placeholder="请输入法人代码..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="法人代码"
+          required
+        >
+          <a-input placeholder="请输入法人代码..." v-model.trim="platform.legalPerson" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="现注册地址" required>
-          <a-input v-model.trim="platform.registerSite" placeholder="请输入现注册地址..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="现注册地址"
+          required
+        >
+          <a-input placeholder="请输入现注册地址..." v-model.trim="platform.registerSite" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="注册资金(单位：万)">
-          <a-input type="number" v-model.trim="platform.registerMoney" placeholder="请输入注册资金..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="注册资金(单位：万)"
+        >
+          <a-input placeholder="请输入注册资金..." type="number" v-model.trim="platform.registerMoney" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="员工人数">
-          <a-input type="number" v-model.trim="platform.staffCount" placeholder="请输入员工人数..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="员工人数"
+        >
+          <a-input placeholder="请输入员工人数..." type="number" v-model.trim="platform.staffCount" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="其中研发人数">
-          <a-input type="number" v-model.trim="platform.resarchStaff" placeholder="请输入研发人数..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="其中研发人数"
+        >
+          <a-input placeholder="请输入研发人数..." type="number" v-model.trim="platform.resarchStaff" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="大专以上人员">
-          <a-input type="number" v-model.trim="platform.juniorCollege" placeholder="请输入员工人数..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="大专以上人员"
+        >
+          <a-input placeholder="请输入员工人数..." type="number" v-model.trim="platform.juniorCollege" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="主营业务">
-          <a-input v-model.trim="platform.mainBusiness" placeholder="请输入主营业务..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="主营业务"
+        >
+          <a-input placeholder="请输入主营业务..." v-model.trim="platform.mainBusiness" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="营业收入(单位：万)">
-          <a-input type="number" v-model.trim="platform.businessIncome" placeholder="请输入营业收入..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="营业收入(单位：万)"
+        >
+          <a-input placeholder="请输入营业收入..." type="number" v-model.trim="platform.businessIncome" />
         </a-form-item>
       </a-form>
       <a-form :form="form" v-if="current === 1">
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="产品/技术阶段" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="产品/技术阶段"
+          required
+        >
           <!-- 单选 -->
           <a-radio-group v-model="platform.productTech">
-            <a-radio :value="0" style="margin-right: 20px"> 创意阶段 </a-radio>
-            <a-radio :value="1" style="margin-right: 20px"> 研发阶段 </a-radio>
-            <a-radio :value="2" style="margin-right: 20px"> 转化阶段 </a-radio>
-            <a-radio :value="3" style="margin-right: 20px"> 原型样品 </a-radio>
-            <a-radio :value="4"> 产业化开发 </a-radio>
+            <a-radio :value="0" style="margin-right: 20px">创意阶段</a-radio>
+            <a-radio :value="1" style="margin-right: 20px">研发阶段</a-radio>
+            <a-radio :value="2" style="margin-right: 20px">转化阶段</a-radio>
+            <a-radio :value="3" style="margin-right: 20px">原型样品</a-radio>
+            <a-radio :value="4">产业化开发</a-radio>
           </a-radio-group>
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="申请专利数">
-          <a-input type="number" v-model.trim="platform.patentApply" placeholder="请输入申请专利数..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="申请专利数"
+        >
+          <a-input placeholder="请输入申请专利数..." type="number" v-model.trim="platform.patentApply" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="授权专利数">
-          <a-input type="number" v-model.trim="platform.patentGrented" placeholder="请输入授权专利数..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="授权专利数"
+        >
+          <a-input placeholder="请输入授权专利数..." type="number" v-model.trim="platform.patentGrented" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="发明专利数">
-          <a-input type="number" v-model.trim="platform.patentInvent" placeholder="请输入发明专利数..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="发明专利数"
+        >
+          <a-input placeholder="请输入发明专利数..." type="number" v-model.trim="platform.patentInvent" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="软件著作权">
-          <a-input v-model.trim="platform.softwareRegister" placeholder="请输入软件著作权..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="软件著作权"
+        >
+          <a-input placeholder="请输入软件著作权..." v-model.trim="platform.softwareRegister" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="动植物新品种">
-          <a-input v-model.trim="platform.plantKind" placeholder="请输入动植物新品种..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="动植物新品种"
+        >
+          <a-input placeholder="请输入动植物新品种..." v-model.trim="platform.plantKind" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="集成电路布图设计">
-          <a-input v-model.trim="platform.electricDesign" placeholder="请输入集成电路布图设计..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="集成电路布图设计"
+        >
+          <a-input placeholder="请输入集成电路布图设计..." v-model.trim="platform.electricDesign" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="合作单位">
-          <a-input v-model.trim="platform.friendCompany" placeholder="请输入合作单位..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="合作单位"
+        >
+          <a-input placeholder="请输入合作单位..." v-model.trim="platform.friendCompany" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="上传附件">
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="上传附件"
+        >
           <a-upload
             :action="action"
-            :default-file-list="fileList"
             :before-upload="beforeUpload"
+            :default-file-list="fileList"
             @change="fileChange"
             list-type="picture"
             name="files"
@@ -79,66 +167,145 @@
             <p>1.营业执照复印件（尚无注册的无需梯控）</p>
             <p>2.法定代表或授权代表身份证复印件</p>
             <p>3.主导产品或技术简介</p>
-            <a-button> <a-icon type="upload" />点击上传附件 </a-button>
+            <a-button>
+              <a-icon type="upload" />点击上传附件
+            </a-button>
           </a-upload>
         </a-form-item>
       </a-form>
       <a-form :form="form" v-if="current === 2">
         <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司名称">
           <a-input v-model.trim="platform.companyName" placeholder="请输入公司名称..." />
-        </a-form-item> -->
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="姓名" required>
-          <a-input v-model.trim="platform.manName" placeholder="请输入申请人姓名..." />
+        </a-form-item>-->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="姓名"
+          required
+        >
+          <a-input placeholder="请输入申请人姓名..." v-model.trim="platform.manName" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="性别" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="性别"
+          required
+        >
           <!-- 单选 -->
           <a-radio-group v-model="platform.sex">
-            <a-radio :value="1" style="margin-right: 100px"> 男 </a-radio>
-            <a-radio :value="0"> 女 </a-radio>
+            <a-radio :value="1" style="margin-right: 100px">男</a-radio>
+            <a-radio :value="0">女</a-radio>
           </a-radio-group>
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="职务" required>
-          <a-input v-model.trim="platform.position" placeholder="请输入申请人职务..." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="职务"
+          required
+        >
+          <a-input placeholder="请输入申请人职务..." v-model.trim="platform.position" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
-          <a-input @change="changePhone" type="tel" v-decorator="['tel', { rules: phoneRules }]" placeholder="请输入联系电话.." />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="联系电话"
+          required
+        >
+          <a-input
+            @change="changePhone"
+            placeholder="请输入联系电话.."
+            type="tel"
+            v-decorator="['tel', { rules: phoneRules }]"
+          />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片验证码" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="图片验证码"
+          required
+        >
           <div class="d-flex flex-nowrap">
             <a-input placeholder="图片验证码" type="number" v-model="codeNum" />
-            <img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
+            <img
+              :src="picCode.imageBase64"
+              @click="changePicCode"
+              class="code_img ml-2"
+              v-if="picCode && picCode.imageBase64"
+            />
             <a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>获取验证码</a-button>
             <!-- <a-input v-decorator="['account', { rules: rules.account }]" /> -->
           </div>
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="短信验证码" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="短信验证码"
+          required
+        >
           <div class="d-flex flex-nowrap">
             <a-input placeholder="请输入验证码" type="number" v-model="platform.code" />
-            <a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
-            <a-button :disabled="platform.isTel === false" @click="getCode" class="code_img ml-2" type="primary" v-else>
-              获取验证码
-            </a-button>
+            <a-button
+              class="code_img ml-2"
+              disabled
+              type="primary"
+              v-if="showInterval"
+            >重新发送 {{ interval }}</a-button>
+            <a-button
+              :disabled="platform.isTel === false"
+              @click="getCode"
+              class="code_img ml-2"
+              type="primary"
+              v-else
+            >获取验证码</a-button>
           </div>
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="电子邮箱">
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="电子邮箱"
+        >
           <!-- 电子邮箱 -->
-          <a-input @change="changeEamil" type="email" v-decorator="['email', { rules: emailRules }]" placeholder="请输入电子邮箱..." />
+          <a-input
+            @change="changeEamil"
+            placeholder="请输入电子邮箱..."
+            type="email"
+            v-decorator="['email', { rules: emailRules }]"
+          />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="身份证号" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="身份证号"
+          required
+        >
           <!-- 身份证号 -->
-          <a-input @change="changeIdCard" v-decorator="['idCard', { rules: idCardRules }]" placeholder="请输入身份证号..." />
+          <a-input
+            @change="changeIdCard"
+            placeholder="请输入身份证号..."
+            v-decorator="['idCard', { rules: idCardRules }]"
+          />
         </a-form-item>
       </a-form>
       <a-steps :current="current">
-        <a-step style="cursor: pointer" @click="current = 0">
+        <a-step @click="current = 0" style="cursor: pointer">
           <template slot="title">
             <span v-if="current === 0">Waiting...</span>
-            <span v-else> 完成</span>
+            <span v-else>完成</span>
           </template>
           <span slot="description">企业基本信息</span>
         </a-step>
-        <a-step style="cursor: pointer" @click="current = 1" :title="current > 1 ? '完成' : 'Waiting...'" description="企业详细信息" />
-        <a-step style="cursor: pointer" @click="current = 2" :title="current > 2 ? '完成' : 'Waiting...'" description="申请人基本信息" />
+        <a-step
+          :title="current > 1 ? '完成' : 'Waiting...'"
+          @click="current = 1"
+          description="企业详细信息"
+          style="cursor: pointer"
+        />
+        <a-step
+          :title="current > 2 ? '完成' : 'Waiting...'"
+          @click="current = 2"
+          description="申请人基本信息"
+          style="cursor: pointer"
+        />
       </a-steps>
     </a-modal>
   </div>
@@ -162,10 +329,6 @@ export default {
       type: Number,
       default: 1,
     },
-    isShowModel: {
-      type: Number,
-      default: 0,
-    },
   },
   data() {
     return {
@@ -238,16 +401,8 @@ export default {
       interval: 120, // 验证码有效时间倒计时
     };
   },
-  computed: mapState('user', ['picCode', 'anyringToken']),
-  watch: {
-    isShowModel(val) {
-      if (val === 1 && !this.anyringToken) {
-        this.visible = true;
-      } else {
-        this.visible = false;
-      }
-    },
-  },
+  computed: mapState('user', ['picCode']),
+
   async created() {
     this.sendPicCode();
     await this.getUserSer();
@@ -262,22 +417,19 @@ export default {
         this.platform.companyName = this.userSer.companyName;
       }
     }
-    if (this.isShowModel === 1 && !this.anyringToken) {
-      this.visible = true;
-    } else {
-      this.visible = false;
-    }
   },
+
   methods: {
     ...mapActions('user', ['sendCode', 'sendPicCode']),
     ...mapActions('home', ['getUserSer']),
     ...mapMutations('home', ['setPagePath']),
     // 显示表单输入框
     showModal() {
-      if (!this.anyringToken) {
+      const anyringToken = sessionStorage.getItem('anyringToken');
+      if (!anyringToken) {
         this.setPagePath(this.$route.path);
         this.$router.push('/login');
-        this.$message.error('请先登录');
+        this.$message.warning('请先登录');
       } else {
         this.visible = true;
       }
diff --git a/src/views/IncubationPlatform/Children/place/EntitySpace.vue b/src/views/IncubationPlatform/Children/place/EntitySpace.vue
index d76e308..79bdf32 100644
--- a/src/views/IncubationPlatform/Children/place/EntitySpace.vue
+++ b/src/views/IncubationPlatform/Children/place/EntitySpace.vue
@@ -7,7 +7,7 @@
     <div class="top-box">
       <banner :show-page="49" />
       <!-- <add-model :value="2" class="add-mol" style="height: 32px" /> -->
-      <settled-model :type-num="1" class="add-mol" style="height: 32px" />
+      <settled-model :type-num="1" class="add-mol" ref="childModel" style="height: 32px" />
       <a-button class="set-mol" type="primary">统计信息填报</a-button>
 
       <!-- <div class="top-title">实体众创空间</div>
@@ -104,7 +104,7 @@
         <div style="margin-left: 40px">入驻企业名录</div>
       </div>
       <div class="center-content">
-        <settled-enterprise :lists="lists" :is-show-model="isShowModel" />
+        <settled-enterprise :lists="lists" />
         <!-- <div :key="index" class="ent-box" v-for="(item, index) in lists">
           <p class="ent-index">{{ index + 1 }}</p>
           <span class="ent-name" style="margin-left: 50px">{{ item.company }}</span>
@@ -137,23 +137,20 @@ export default {
       ],
       list: [],
       pageSize: 18,
-      isShowModel: 0,
       current: 1,
       lists: [],
     };
   },
+
   beforeRouteEnter(to, from, next) {
-    next(vm => {
-      //  这里的vm指的就是vue实例，可以用来当做this使用
-      // console.log(to);
-      // console.log(from);
-      if (from.fullPath === '/login') {
-        vm.isShowModel = 1;
-      } else {
-        vm.isShowModel = 0;
-      }
-    });
+    if (from.path === '/login' || from.path === '/register') {
+      return next(vm => {
+        vm.$refs.childModel.showModal();
+      });
+    }
+    next();
   },
+
   created() {
     this.searchEnt();
   },
diff --git a/src/views/IncubationPlatform/Children/place/VirtualSpace.vue b/src/views/IncubationPlatform/Children/place/VirtualSpace.vue
index ce365fd..c50f9b7 100644
--- a/src/views/IncubationPlatform/Children/place/VirtualSpace.vue
+++ b/src/views/IncubationPlatform/Children/place/VirtualSpace.vue
@@ -7,7 +7,7 @@
     <div class="top-box">
       <banner :show-page="48" />
       <!-- <add-model :value="3" class="add-mol" style="height: 32px" /> -->
-      <settled-model :type-num="0" class="add-mol" style="height: 32px" />
+      <settled-model :type-num="0" class="add-mol" ref="childModel" style="height: 32px" />
       <a-button class="set-mol" type="primary">统计信息填报</a-button>
     </div>
     <!-- <div class="center-box">
@@ -42,7 +42,7 @@
         <div style="margin-left: 40px">入驻企业名录</div>
       </div>
       <div class="center-content">
-        <settled-enterprise :lists="lists" :is-show-model="isShowModel" />
+        <settled-enterprise :lists="lists" />
         <!-- <div :key="index" class="ent-box" v-for="(item, index) in lists">
           <p class="ent-index">{{ index + 1 }}</p>
           <span class="ent-name" style="margin-left: 50px">{{ item.company }}</span>
@@ -81,6 +81,15 @@ export default {
     };
   },
 
+  beforeRouteEnter(to, from, next) {
+    if (from.path === '/login' || from.path === '/register') {
+      return next(vm => {
+        vm.$refs.childModel.showModal();
+      });
+    }
+    next();
+  },
+
   created() {
     this.searchEnt();
   },

From 8206006501a03c95d55683001b4e423b74cd7ccb Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Mon, 25 Jan 2021 18:12:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=90=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HeadNav/HeadNav.vue            | 14 ++-
 .../IncubationPlatform/Children/Services.vue  | 92 ++++++++++++++---
 src/views/NewPlatform/Children/Service.vue    | 98 +++++++++++++++----
 3 files changed, 166 insertions(+), 38 deletions(-)

diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue
index 8188a54..0130091 100644
--- a/src/components/HeadNav/HeadNav.vue
+++ b/src/components/HeadNav/HeadNav.vue
@@ -192,16 +192,20 @@ export default {
 
   computed: {
     ...mapState('user', ['anyringToken', 'user']),
+
     nickName() {
-      const anyringToken = sessionStorage.getItem('anyringToken');
-      const user = JSON.parse(sessionStorage.getItem('user'));
+      const anyringToken = sessionStorage.getItem('anyringToken') || this.anyringToken;
+      const user = sessionStorage.getItem('user') && JSON.parse(sessionStorage.getItem('user'));
       if (anyringToken) {
-        if (user.wxInfo && user.wxInfo.nickname) {
+        if (user.wxInfo.nickname) {
           return user.wxInfo.nickname;
+        } else {
+          const account = this.user.account || user.account;
+          return account;
         }
-        return user.account;
+      } else {
+        return '';
       }
-      return '';
     },
   },
 
diff --git a/src/views/IncubationPlatform/Children/Services.vue b/src/views/IncubationPlatform/Children/Services.vue
index 2f2ca8b..82f4996 100644
--- a/src/views/IncubationPlatform/Children/Services.vue
+++ b/src/views/IncubationPlatform/Children/Services.vue
@@ -42,36 +42,94 @@
         v-show="total > 8"
       />
     </div>
-    <a-modal :confirm-loading="confirmLoading" :visible="visible" @cancel="handleCancel" @ok="handleOk" title="产品购买" width="50%">
+    <a-modal
+      :confirm-loading="confirmLoading"
+      :visible="visible"
+      @cancel="handleCancel"
+      @ok="handleOk"
+      title="产品购买"
+      width="50%"
+    >
       <a-form :form="form">
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司名称">
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="公司名称"
+        >
           <a-input placeholder="请输入公司名称..." v-model.trim="platform.companyName" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系人" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="联系人"
+          required
+        >
           <a-input placeholder="请输入联系人..." v-model.trim="platform.manName" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
-          <a-input @change="changePhone" placeholder="请输入联系电话.." type="tel" v-decorator="['tel', { rules: phoneRules }]" />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="联系电话"
+          required
+        >
+          <a-input
+            @change="changePhone"
+            placeholder="请输入联系电话.."
+            type="tel"
+            v-decorator="['tel', { rules: phoneRules }]"
+          />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片验证码" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="图片验证码"
+          required
+        >
           <div class="d-flex flex-nowrap">
             <a-input placeholder="图片验证码" type="number" v-model="codeNum" />
-            <img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
+            <img
+              :src="picCode.imageBase64"
+              @click="changePicCode"
+              class="code_img ml-2"
+              v-if="picCode && picCode.imageBase64"
+            />
             <a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>获取验证码</a-button>
             <!-- <a-input v-decorator="['account', { rules: rules.account }]" /> -->
           </div>
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="短信验证码" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="短信验证码"
+          required
+        >
           <div class="d-flex flex-nowrap">
             <a-input placeholder="请输入验证码" type="number" v-model="platform.code" />
-            <a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
-            <a-button :disabled="platform.isTel === false" @click="getCode" class="code_img ml-2" type="primary" v-else
-              >获取验证码</a-button
-            >
+            <a-button
+              class="code_img ml-2"
+              disabled
+              type="primary"
+              v-if="showInterval"
+            >重新发送 {{ interval }}</a-button>
+            <a-button
+              :disabled="platform.isTel === false"
+              @click="getCode"
+              class="code_img ml-2"
+              type="primary"
+              v-else
+            >获取验证码</a-button>
           </div>
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="需求描述">
-          <a-textarea placeholder="请输入需求描述..." style="height: 120px" v-model.trim="platform.describe" />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="需求描述"
+        >
+          <a-textarea
+            placeholder="请输入需求描述..."
+            style="height: 120px"
+            v-model.trim="platform.describe"
+          />
         </a-form-item>
         <a-form-item
           :label-col="formItemLayout.labelCol"
@@ -81,13 +139,15 @@
         >
           <a-upload
             :action="action"
-            :default-file-list="fileList"
             :before-upload="beforeUpload"
+            :default-file-list="fileList"
             @change="fileChange"
             list-type="picture"
             name="files"
           >
-            <a-button> <a-icon type="upload" />点击上传附件 </a-button>
+            <a-button>
+              <a-icon type="upload" />点击上传附件
+            </a-button>
           </a-upload>
         </a-form-item>
       </a-form>
diff --git a/src/views/NewPlatform/Children/Service.vue b/src/views/NewPlatform/Children/Service.vue
index bf4e3f8..98a5af1 100644
--- a/src/views/NewPlatform/Children/Service.vue
+++ b/src/views/NewPlatform/Children/Service.vue
@@ -31,47 +31,111 @@
         >了解更多→</p>-->
       </div>
     </div>
-    <a-modal :confirm-loading="confirmLoading" :visible="visible" @cancel="handleCancel" @ok="handleOk" title="产品购买" width="50%">
+    <a-modal
+      :confirm-loading="confirmLoading"
+      :visible="visible"
+      @cancel="handleCancel"
+      @ok="handleOk"
+      title="产品购买"
+      width="50%"
+    >
       <a-form :form="form">
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司名称">
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="公司名称"
+        >
           <a-input placeholder="请输入公司名称..." v-model.trim="platform.companyName" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系人" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="联系人"
+          required
+        >
           <a-input placeholder="请输入联系人..." v-model.trim="platform.manName" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
-          <a-input @change="changePhone" placeholder="请输入联系电话.." type="tel" v-decorator="['tel', { rules: phoneRules }]" />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="联系电话"
+          required
+        >
+          <a-input
+            @change="changePhone"
+            placeholder="请输入联系电话.."
+            type="tel"
+            v-decorator="['tel', { rules: phoneRules }]"
+          />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片验证码" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="图片验证码"
+          required
+        >
           <div class="d-flex flex-nowrap">
             <a-input placeholder="图片验证码" type="number" v-model="codeNum" />
-            <img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
+            <img
+              :src="picCode.imageBase64"
+              @click="changePicCode"
+              class="code_img ml-2"
+              v-if="picCode && picCode.imageBase64"
+            />
             <a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>获取验证码</a-button>
             <!-- <a-input v-decorator="['account', { rules: rules.account }]" /> -->
           </div>
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="短信验证码" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="短信验证码"
+          required
+        >
           <div class="d-flex flex-nowrap">
             <a-input placeholder="请输入验证码" type="number" v-model="platform.code" />
-            <a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
-            <a-button :disabled="platform.isTel === false" @click="getCode" class="code_img ml-2" type="primary" v-else
-              >获取验证码</a-button
-            >
+            <a-button
+              class="code_img ml-2"
+              disabled
+              type="primary"
+              v-if="showInterval"
+            >重新发送 {{ interval }}</a-button>
+            <a-button
+              :disabled="platform.isTel === false"
+              @click="getCode"
+              class="code_img ml-2"
+              type="primary"
+              v-else
+            >获取验证码</a-button>
           </div>
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="需求描述">
-          <a-textarea placeholder="请输入需求描述..." style="height: 120px" v-model.trim="platform.describe" />
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="需求描述"
+        >
+          <a-textarea
+            placeholder="请输入需求描述..."
+            style="height: 120px"
+            v-model.trim="platform.describe"
+          />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="上传附件">
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="上传附件"
+        >
           <a-upload
             :action="action"
-            :default-file-list="fileList"
             :before-upload="beforeUpload"
+            :default-file-list="fileList"
             @change="fileChange"
             list-type="picture"
             name="files"
           >
-            <a-button> <a-icon type="upload" />点击上传附件 </a-button>
+            <a-button>
+              <a-icon type="upload" />点击上传附件
+            </a-button>
           </a-upload>
         </a-form-item>
       </a-form>