Merge branch 'master' of https://git.czcyedu.com/huoran/FE_middlePlatform_server

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 => {})
         },

src/config/index.js

@@ -18,9 +18,9 @@ export default {
      */
     initialPassword: '111aaa',
     /**
-     * 所属平台：1->职站 2->数据平台
+     * 所属平台：1->职站 2->数据平台 3->中台
      */
-    platformId: 1,
+    platformId: 3,
     /**
      * @description 系统列表
      */

src/utils/http.js

@@ -40,8 +40,8 @@ axios.interceptors.request.use(config => {
 axios.interceptors.response.use(
     response => {
         if (response.status === 200) {
-            if(response.data.status!==200){// 接口定义的非正常返回的时候,应当处于报错状态
-                Message.error(response.data.message)// 非服务器状态码对应的报错信息
+            if(response.data.status && response.data.status!==200){// 接口定义的非正常返回的时候,应当处于报错状态
+                Message.error(response.data.message)
                 return Promise.reject(response);
             }
             return Promise.resolve(response);

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)
         }

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 => {