From a7f962bf754b3d0e7b32dd514b3efea1c3b84928 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Tue, 26 Jan 2021 09:36:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=88=91=E4=BB=AC-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/About/Children/Organ.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/About/Children/Organ.vue b/src/views/About/Children/Organ.vue
index e6250ba..2319681 100644
--- a/src/views/About/Children/Organ.vue
+++ b/src/views/About/Children/Organ.vue
@@ -93,9 +93,9 @@ export default {
             bottom: '1%',
             right: '20%',
             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',

From affc2854c0377a7bc77cc29961956dc70b6507d5 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Tue, 26 Jan 2021 09:55:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Children/MakerSpace.vue                   |   6 +-
 src/views/Industry/Children/Serve.vue         | 111 ++++++++++++++----
 src/views/NewPlatform/Children/Core.vue       |   9 +-
 src/views/User/Login.vue                      |   5 +-
 4 files changed, 98 insertions(+), 33 deletions(-)

diff --git a/src/views/IncubationPlatform/Children/MakerSpace.vue b/src/views/IncubationPlatform/Children/MakerSpace.vue
index c9ba253..36eb15b 100644
--- a/src/views/IncubationPlatform/Children/MakerSpace.vue
+++ b/src/views/IncubationPlatform/Children/MakerSpace.vue
@@ -4,9 +4,9 @@
     <div class="inner my-1">
       <bread-crumb :arr="arr" />
     </div>
-    <div @click="openModel()">
-      <banner :show-page="showPage" class="pointer" />
-    </div>
+    <!-- <div @click="openModel()" class="pointer"> -->
+    <banner :show-page="showPage" />
+    <!-- </div> -->
     <div class="inner">
       <div>
         <div class="d-flex flex-column white">
diff --git a/src/views/Industry/Children/Serve.vue b/src/views/Industry/Children/Serve.vue
index 1df0e03..3684530 100644
--- a/src/views/Industry/Children/Serve.vue
+++ b/src/views/Industry/Children/Serve.vue
@@ -12,47 +12,116 @@
       </div>
     </div>
     <div class="inner d-flex flex-wrap" style="margin: 60px auto">
-      <div :class="(index + 1) % 3 === 0 ? 'margin-0' : ''" :key="index" class="item-box mb-8" v-for="(item, index) in list">
-        <img :src="item.picUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" @click="showModal(item.id)" />
-        <p class="font-24 my-4" @click="showModal(item.id)">{{ item.name }}</p>
+      <div
+        :class="(index + 1) % 3 === 0 ? 'margin-0' : ''"
+        :key="index"
+        class="item-box mb-8"
+        v-for="(item, index) in list"
+      >
+        <img
+          :src="item.picUrl"
+          @click="showModal(item.id)"
+          style="height: 220px; width: 100%; border: 1px solid #ccc"
+        />
+        <p @click="showModal(item.id)" 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-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"
@@ -62,13 +131,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/Core.vue b/src/views/NewPlatform/Children/Core.vue
index 4c8f0f2..120616b 100644
--- a/src/views/NewPlatform/Children/Core.vue
+++ b/src/views/NewPlatform/Children/Core.vue
@@ -32,16 +32,13 @@
       <div class="bottom-content">
         <div :style="{ height: '500px' }" id="treeChart"></div>
         <div class="absolute-box" style="top: 2.5%" v-if="showDiv">
-          <div class="case"></div>
-          科技资源共享服务平台
+          <div class="case"></div>科技资源共享服务平台
         </div>
         <div class="absolute-box" style="top: 39%; height: 33%" v-if="showDiv">
-          <div class="case"></div>
-          知识产权与技术转移转化服务平台
+          <div class="case"></div>知识产权与技术转移转化服务平台
         </div>
         <div class="absolute-box" style="top: 72%; height: 25%" v-if="showDiv">
-          <div class="case"></div>
-          知识培训与科技人才服务平台
+          <div class="case"></div>知识培训与科技人才服务平台
         </div>
       </div>
     </div>
diff --git a/src/views/User/Login.vue b/src/views/User/Login.vue
index cd9c01e..3796d1f 100644
--- a/src/views/User/Login.vue
+++ b/src/views/User/Login.vue
@@ -136,10 +136,7 @@
               :wrapper-col="formItemLayout.wrapperCol"
               label="密码"
             >
-              <a-input-password
-                placeholder="请输入密码"
-                v-decorator="['credential', { rules: passwordRules }]"
-              />
+              <a-input-password placeholder="请输入密码" v-decorator="['credential']" />
             </a-form-item>
             <!-- <a-form-item
               :label-col="formItemLayout.labelCol"