From 9692dce5436bd82f57f166ef83399ddf4fd203e4 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 15 Jul 2021 16:26:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AE=A2=E6=88=B7->?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.js                | 4 ++--
 src/utils/http.js                  | 2 +-
 src/views/customer/AddCustomer.vue | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/config/index.js b/src/config/index.js
index 17241d2..e5f4c83 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -18,9 +18,9 @@ export default {
      */
     initialPassword: '111aaa',
     /**
-     * 所属平台：1->职站 2->数据平台
+     * 所属平台：1->职站 2->数据平台 3->中台
      */
-    platformId: 1,
+    platformId: 3,
     /**
      * @description 系统列表
      */
diff --git a/src/utils/http.js b/src/utils/http.js
index 4c86c9b..532b93d 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -40,7 +40,7 @@ axios.interceptors.request.use(config => {
 axios.interceptors.response.use(
     response => {
         if (response.status === 200) {
-            if(response.data.status!==200){// 接口定义的非正常返回的时候,应当处于报错状态
+            if(response.data.status && response.data.status!==200){// 接口定义的非正常返回的时候,应当处于报错状态
                 Message.error(response.data.message)
                 return Promise.reject(response);
             }
diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue
index 9b0b776..5e35c29 100644
--- a/src/views/customer/AddCustomer.vue
+++ b/src/views/customer/AddCustomer.vue
@@ -182,8 +182,8 @@
                             <el-table-column prop="contractMoney" label="合同金额" align="center">
                             </el-table-column>
                             <el-table-column label="操作" align="center">
-                                <template>
-                                    <el-button type="text">查看</el-button>
+                                <template slot-scope="scope">
+                                    <el-button type="text" @click="showContract(scope.row)">查看</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -440,7 +440,6 @@ export default {
                 }).then(res => {
                     this.NoAdd = true
                 }).catch(res => {
-                    this.$message.warning('该客户已存在')
                     this.NoAdd = false
                 })
             }
@@ -528,6 +527,9 @@ export default {
         IPSure(){
             this.ipVisible = false
         },
+        showContract(row){
+            window.open(`https://view.officeapps.live.com/op/view.aspx?src=${row.contractFile}`)
+        },
         goback(){
             this.$router.go(-1)
         }

From 4084a5870a05fbd49b8a3c704e5b0dfcfe897736 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 15 Jul 2021 16:34:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue    | 5 ++---
 src/views/setting/Person.vue | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index f738f53..2ebf747 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -6,7 +6,7 @@
         <div class="header-right">
             <div class="header-user-con">
                 <div class="user" @click="toPerson">
-                    <el-avatar :size="40" :src="avatar"></el-avatar>
+                    <el-avatar :size="40" :src="$store.state.avatar"></el-avatar>
                     <span class="user-avator">{{userName}}</span>
                 </div>
                 <el-divider class="ml20" direction="vertical"></el-divider>
@@ -19,7 +19,6 @@
 export default {
     data() {
         return {
-            avatar: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
             userName: ''
         };
     },
@@ -30,7 +29,7 @@ export default {
         getUserInfo(){
             this.$get(this.api.queryUserInfoDetails).then(res => {
                 let userInfo = res.result.hrUserInfo
-                if(userInfo.userAvatars) this.avatar = userInfo.userAvatars
+                if(userInfo.userAvatars) this.$store.commit('userAvatar',{avatar: userInfo.userAvatars})
                 this.userName = userInfo.userName
             }).catch(err => {})
         },
diff --git a/src/views/setting/Person.vue b/src/views/setting/Person.vue
index d1dcb6e..4397c04 100644
--- a/src/views/setting/Person.vue
+++ b/src/views/setting/Person.vue
@@ -567,7 +567,7 @@ export default {
         //取得头像地址
         getRes(res) {
             this.avatar = res.message
-            this.$store.commit('userPhoto',{avatar:res.message})
+            this.$store.commit('userAvatar',{avatar:res.message})
         },
         getdata() {
             this.$get(this.api.queryUserInfoDetails).then(res => {