冲突修改

src/common/platform.styl

@@ -70,10 +70,11 @@
 }
 .center-content {
   float: right;
-  margin: 160px 0;
+  margin: 80px 0;
   width: 79%;
   line-height: 36px;
   font-size: 16px;
+
 }
 
 
@@ -141,15 +142,24 @@
   position: relative;
   padding: 0 9%;
 }
+
+.space-box:hover{
+  box-shadow: 0 6px 6px rgba(0,0,0,0.16)
+}
+
+.space-box:hover .introduce-title{
+  margin-top: 20px;
+}
+
 .introduce-box {
   width: 60%;
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 3px 6px rgba(0,0,0,0.16)
   cursor: pointer;
   padding: 30px;
 }
+
 .introduce-title {
   margin-top: 24px;
   font-size: 30px;

src/components/PlatformList/PlatformList.vue

@@ -1,11 +1,17 @@
 <template>
   <div>
     <div class="inner d-flex flex-wrap">
-      <div :class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :key="index" class="item-box mb-8" v-for="(item, index) in list">
+      <div
+        :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
+        :key="index"
+        @click="jump(item)"
+        class="item-box mb-8 d-flex flex-column pointer"
+        v-for="(item, index) in list"
+      >
         <img :src="item.picUrl" :title="item.name" class="con-img" v-if="item.picUrl" />
         <img :src="item.visitLocation" :title="item.name" class="con-img" v-else />
         <p class="font-24 my-4 title">{{ item.name }}</p>
-        <p @click="jump(item)" class="font-16 baseColor" style="text-align: right; cursor: pointer">了解更多→</p>
+        <p class="font-16 baseColor" style="text-align: right; cursor: pointer">了解更多→</p>
       </div>
     </div>
     <div class="inner">
@@ -226,14 +232,15 @@ export default {
   width: 20.5%;
   margin-right: 6%;
   border-radius: 4px;
-  position: relative;
-  margin-bottom: 50px;
+  // position: relative;
+  margin-bottom: 30px;
 }
 
 .title {
   text-align: center;
-  position: absolute;
-  bottom: 0;
+  // position: absolute;
+  // bottom: 0;
+  height: 48px;
   width: 100%;
   color: rgba(0, 0, 0, 0.85);
   font-size: 28px;
@@ -262,7 +269,7 @@ export default {
 }
 
 .con-img {
-  height: 100%;
+  height: 270px;
   width: 100%;
   border: none;
 }

src/views/Activity/components/Enroll.vue

@@ -2,44 +2,110 @@
   <div>
     <a-button @click="showModal" type="primary">立即报名</a-button>
 
-    <a-modal :confirm-loading="confirmLoading" :title="title" :visible="visible" @cancel="handleCancel" @ok="handleOk" width="50%">
+    <a-modal
+      :confirm-loading="confirmLoading"
+      :title="title"
+      :visible="visible"
+      @cancel="handleCancel"
+      @ok="handleOk"
+      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 :value="actName" disabled />
         </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.companyName" />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="mb-3" label="参加人员" required>
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          class="mb-3"
+          label="参加人员"
+          required
+        >
           <div :key="index" class="d-flex flex-nowrap mb-3" v-for="(item, index) in people">
             <a-input class="flex-1 mr-3" placeholder="姓名" v-model.trim="item.name" />
             <a-input class="flex-1 mr-3" placeholder="职称" v-model.trim="item.duties" />
             <a-input class="flex-1 mr-3" placeholder="职务" v-model.trim="item.positional" />
-            <a-button @click="changePerson(index)" icon="plus" type="link" v-if="index === people.length - 1" />
+            <a-button
+              @click="changePerson(index)"
+              icon="plus"
+              type="link"
+              v-if="index === people.length - 1"
+            />
           </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
+        >
           <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>

src/views/IncubationPlatform/Children/MakerSpace.vue

@@ -24,7 +24,10 @@
             </div>
             <div>
               目前空间已引入科创咨询专业服务机构，并与多家
-              <span @click="$router.push('/IncubationPlatform/Partner')" class="pointer baseColor">第三方专业机构</span>
+              <span
+                @click="$router.push('/IncubationPlatform/Partner')"
+                class="pointer baseColor"
+              >第三方专业机构</span>
               建立战略合作，聘请
               <span @click="$router.push('')" class="pointer baseColor">创业导师</span>
               30余名，服务领域涵盖专业技术、企业管理、科创咨询、财务税务、法务咨询等，可随时为入孵企业提供针 对性、一对一创业辅导服务。
@@ -38,20 +41,36 @@
           </div>
         </div>
         <div :key="index" style="margin-top: 40px" v-for="(item, index) in list">
-          <div class="d-flex justify-space-between" v-if="index % 2 === 0">
+          <div class="d-flex justify-space-between space-box" v-if="index % 2 === 0">
             <div class="introduce-box">
-              <p @click="item.imgUrl ? jump(item.url) : openModel()" class="introduce-title pointer">{{ item.title }}</p>
+              <p
+                @click="item.imgUrl ? jump(item.url) : openModel()"
+                class="introduce-title pointer"
+              >{{ item.title }}</p>
               <p class="introduce-content" v-if="index === 0">
                 实体空间由
                 <span @click="$router.push('')" class="pointer baseColor">孵化场所</span>、
                 <span @click="$router.push('')" class="pointer baseColor">公共实验室</span>、
                 <span @click="$router.push('')" class="pointer baseColor">中试基地</span>部分组成。
               </p>
-              <p @click="item.imgUrl ? jump(item.url) : openModel()" class="introduce-content pointer" v-else>{{ item.content }}</p>
+              <p
+                @click="item.imgUrl ? jump(item.url) : openModel()"
+                class="introduce-content pointer"
+                v-else
+              >{{ item.content }}</p>
             </div>
-            <img :src="item.imgUrl" @click="item.url ? jump(item.url) : ''" class="pointer" style="width: 452px" />
+            <img
+              :src="item.imgUrl"
+              @click="item.url ? jump(item.url) : ''"
+              class="pointer"
+              style="width: 452px"
+            />
           </div>
-          <div @click="item.url ? jump(item.url) : ''" class="d-flex justify-space-between pointer" v-else>
+          <div
+            @click="item.url ? jump(item.url) : ''"
+            class="d-flex justify-space-between pointer space-box"
+            v-else
+          >
             <img :src="item.imgUrl" style="width: 452px" />
             <div class="introduce-box">
               <p class="introduce-title">{{ item.title }}</p>

src/views/IncubationPlatform/Children/Products.vue

@@ -16,11 +16,16 @@
                 @click="choose(index)"
                 class="ins-name"
                 v-for="(item, index) in productLists"
-                >{{ item.name }}</span
-              >
+              >{{ item.name }}</span>
             </div>
             <div class="flex-1 align-center">
-              <a-input-search @search="searchProduct" class="item-search" enter-button="搜索" placeholder="请输入" v-model="productIpt" />
+              <a-input-search
+                @search="searchProduct"
+                class="item-search"
+                enter-button="搜索"
+                placeholder="请输入"
+                v-model="productIpt"
+              />
             </div>
           </div>
         </div>

src/views/IncubationPlatform/Children/place/EntitySpace.vue

@@ -45,9 +45,10 @@
         拥有20万以上仪器设备26台套，包括AKTA蛋白纯化系统、多功能酶标仪、原子吸收光谱仪、
         液相色谱仪、万级无菌工作间、P2实验室等多种高端、大型实验仪器设备；可提供生物医药、
         食品检测、食用菌、肠道微生物等方面的科学实验、检验检测、小试中试等技术服务与科研成果转化。
-      </div>
-      <div class="center-img">
-        <img src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210120/eb472126971a47438a3227df967ed2cb.png" />
+        <img
+          class="center-img"
+          src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210120/eb472126971a47438a3227df967ed2cb.png"
+        />
       </div>
     </div>
     <!-- 中试基地 -->
@@ -58,16 +59,15 @@
       </div>
       <div class="center-content d-flex flex-column">
         <div>发酵工程中试基地位于山西维尔乳制品有限公司，基地具有发酵乳制品等生产加工条件，可提供微生物发酵实验及相关中试。</div>
-        <div>
-          超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。
-        </div>
+        <div>超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。</div>
         <div>
           干果精深加工中试基地位于吕梁的交城天娇红农业科技有限公司
           ，拥有300余万元的先进分析检测仪器设备及免洗干枣生产车间、浓缩枣汁生产车间等生产加工条件，可提供相关中试研究。
         </div>
-      </div>
-      <div class="center-img">
-        <img src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210120/d80b7f22aabc4c7194324b0f93793a41.png" />
+        <img
+          class="center-img"
+          src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210120/d80b7f22aabc4c7194324b0f93793a41.png"
+        />
       </div>
     </div>
     <!-- 加入流程 -->
@@ -333,16 +333,6 @@ export default {
 }
 
 .center-img {
-  float: right;
-  margin-top: -150px;
   width: 79%;
-  margin-bottom: 160px;
-  text-align: left;
-  line-height: 36px;
-  font-size: 16px;
-
-  img {
-    width: 80%;
-  }
 }
 </style>

src/views/NewPlatform/Children/Core.vue

@@ -150,13 +150,18 @@ export default {
             type: 'tree',
             data: this.treedata,
             top: '2%',
-            left: '12%',
+            left: '6%',
             bottom: '1%',
             right: '40%',
             symbolSize: 7,
-            lineStyle: { width: 4 },
+            lineStyle: { width: 1 },
             itemStyle: { borderWidth: 3, borderColor: '#AACD06' },
-            label: { position: 'left', verticalAlign: 'middle', align: 'right', fontSize: 16 },
+            label: {
+              position: 'top',
+              verticalAlign: 'middle',
+              align: 'center',
+              fontSize: 16,
+            },
             leaves: {
               label: {
                 position: 'right',

src/views/NewPlatform/Children/Platform.vue

@@ -115,7 +115,7 @@ export default {
 
 @media only screen and (max-width: 1650px) {
   .con-title {
-    font-size: 1rem;
+    font-size: 1.3rem;
   }
 }
 
@@ -126,5 +126,6 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
+  font-size: 16px;
 }
 </style>

src/views/NewPlatform/Children/Service.vue

@@ -12,20 +12,26 @@
       </div>
     </div>
     <div class="inner d-flex flex-wrap" style="margin: 60px auto">
-      <div :class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :key="index" class="item-box mb-8" v-for="(item, index) in list">
+      <div
+        :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
+        :key="index"
+        @click="showModal(item.id)"
+        class="item-box mb-8 pointer"
+        v-for="(item, index) in list"
+      >
         <img :src="item.picUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
-        <p class="font-24 my-4">
-          <span @click="showModal(item.id)" style="cursor: pointer">{{ item.name }}</span>
+        <p class="font-24 my-4" style="text-align: center">
+          <span>{{ item.name }}</span>
         </p>
         <p class="font-16 my-4 textColor line-height-30 item-content">{{ item.intro }}</p>
         <!-- <p
           @click="jump(item.id)"
           class="font-16 baseColor"
           style="text-align: right; cursor: pointer"
-        >了解更多→</p> -->
+        >了解更多→</p>-->
       </div>
     </div>
-    <a-modal :confirm-loading="confirmLoading" title="产品购买" :visible="visible" @cancel="handleCancel" @ok="handleOk" 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-input placeholder="请输入公司名称..." v-model.trim="platform.companyName" />
@@ -48,9 +54,9 @@
           <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 :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="需求描述">

src/views/NewPlatform/Children/Share.vue

@@ -15,11 +15,16 @@
               @click="choose(index, 0)"
               class="ins-name"
               v-for="(item, index) in laboratory"
-              >{{ item.name }}</span
-            >
+            >{{ item.name }}</span>
           </div>
           <div class="flex-1 align-center">
-            <a-input-search @search="searchLab" class="item-search" enter-button="搜索" placeholder="搜索实验室" v-model="LabIpt" />
+            <a-input-search
+              @search="searchLab"
+              class="item-search"
+              enter-button="搜索"
+              placeholder="搜索实验室"
+              v-model="LabIpt"
+            />
           </div>
         </div>
         <div class="flex-3 flex-wrap" style="border-top: 1px solid rgba(0, 0, 0, 0.06)">
@@ -31,11 +36,16 @@
               @click="choose(index, 1)"
               class="ins-name"
               v-for="(item, index) in instrument"
-              >{{ item.name }}</span
-            >
+            >{{ item.name }}</span>
           </div>
           <div class="flex-1 align-center">
-            <a-input-search @search="searchIns" class="item-search" enter-button="搜索" placeholder="搜索仪器" v-model="InsIpt" />
+            <a-input-search
+              @search="searchIns"
+              class="item-search"
+              enter-button="搜索"
+              placeholder="搜索仪器"
+              v-model="InsIpt"
+            />
           </div>
         </div>
       </div>

src/views/NewPlatform/Children/Transfer.vue

@@ -15,11 +15,16 @@
               @click="choose(index)"
               class="ins-name"
               v-for="(item, index) in list"
-              >{{ item.name }}</span
-            >
+            >{{ item.name }}</span>
           </div>
           <div class="flex-1 align-center">
-            <a-input-search @search="searchFruit" class="item-search" enter-button="搜索" placeholder="搜索成果" v-model="fruitIpt" />
+            <a-input-search
+              @search="searchFruit"
+              class="item-search"
+              enter-button="搜索"
+              placeholder="搜索成果"
+              v-model="fruitIpt"
+            />
           </div>
         </div>
       </div>
@@ -34,6 +39,7 @@ import { selModel } from 'config/api';
 import Fruit from 'components/PlatformList/Fruit.vue';
 import SenNav from './components/SenNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
+
 export default {
   name: 'Transfer',
   components: { SenNav, Fruit, BreadCrumb },

src/views/User/Login.vue

@@ -3,11 +3,21 @@
     <div class="d-flex flex-column box">
       <!-- 切换登录方式 -->
       <div class="d-flex justify-center my-4">
-        <a-button :class="type === 1 ? 'baseColor ' : 'textColor'" @click="type = 1" class="d-flex flex-column" type="link">
+        <a-button
+          :class="type === 1 ? 'baseColor ' : 'textColor'"
+          @click="type = 1"
+          class="d-flex flex-column"
+          type="link"
+        >
           <span>免密登录</span>
           <div class="head-top mt-1" v-if="type === 1"></div>
         </a-button>
-        <a-button :class="type === 3 ? 'baseColor ' : 'textColor'" @click="type = 3" class="d-flex flex-column" type="link">
+        <a-button
+          :class="type === 3 ? 'baseColor ' : 'textColor'"
+          @click="type = 3"
+          class="d-flex flex-column"
+          type="link"
+        >
           <span>账号登录</span>
           <div class="head-top mt-1" v-if="type === 3"></div>
         </a-button>
@@ -17,25 +27,61 @@
         <a-col :span="8" class="explain" flex="auto">
           <!-- <a-form :form="form" v-model="valid"> -->
           <a-form :form="form" @submit="handleSignIn">
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="手机号">
-              <a-input @change="changePhone" placeholder="请输入手机号" type="tel" v-decorator="['identifier', { rules: phoneRules }]" />
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="手机号"
+            >
+              <a-input
+                @change="changePhone"
+                placeholder="请输入手机号"
+                type="tel"
+                v-decorator="['identifier', { 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="短信验证码">
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="短信验证码"
+            >
               <div class="d-flex flex-nowrap">
-                <a-input placeholder="请输入验证码" type="number" v-decorator="['credential', { rules: codeRules }]" />
-                <a-button class="ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
-                <a-button :disabled="identifier && identifier.length !== 11" @click="getCode" class="ml-2" type="primary" v-else
-                  >获取验证码</a-button
-                >
+                <a-input
+                  placeholder="请输入验证码"
+                  type="number"
+                  v-decorator="['credential', { rules: codeRules }]"
+                />
+                <a-button
+                  class="ml-2"
+                  disabled
+                  type="primary"
+                  v-if="showInterval"
+                >重新发送 {{ interval }}</a-button>
+                <a-button
+                  :disabled="identifier && identifier.length !== 11"
+                  @click="getCode"
+                  class="ml-2"
+                  type="primary"
+                  v-else
+                >获取验证码</a-button>
               </div>
             </a-form-item>
             <!-- <a-form-item
@@ -75,14 +121,25 @@
       <a-row class="d-flex flex-nowrap mt-4" type="flex" v-if="type === 3">
         <a-col :span="8" class="explain" flex="auto">
           <a-form :form="form" @submit="handleSignIn">
-            <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-decorator="['identifier', { rules: [{ required: true, message: '请输入用户名/手机号' }] }]"
               />
             </a-form-item>
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="密码">
-              <a-input-password placeholder="请输入密码" v-decorator="['credential', { rules: passwordRules }]" />
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="密码"
+            >
+              <a-input-password
+                placeholder="请输入密码"
+                v-decorator="['credential', { rules: passwordRules }]"
+              />
             </a-form-item>
             <!-- <a-form-item
               :label-col="formItemLayout.labelCol"