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] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E7=99=BB=E5=BD=95=E5=90=8D?=
 =?UTF-8?q?=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>