Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/pc-admin

src/views/carouselFigure/advertisementEdit.vue

           this.form = res
           this.imageUrl = res.image
           this.showPlace = res.targetName
-        }).catch(() => {
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
           console.log('carouselFigure/getByIdExtendContent err')
         })
       },
       getBuildList() {
         this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
           this.buildingList = res.records
-        }).catch(() => {
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
           console.log('building/getBuildings err')
         })
       },
           this.$store.dispatch('carouselFigure/addExtendContent', this.form).then((res) => {
             this.$message.success('操作成功')
             this.$router.go(-1)
-          }).catch(() => {
-
+          }).catch((err) => {
+            this.$notify.error(err.msg || err.message);
           })
           return
         }
         this.$store.dispatch('carouselFigure/updateExtendContent', this.form).then((res) => {
           this.$message.success('操作成功')
           this.$router.go(-1)
-        }).catch(() => {
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
           console.log('carouselFigure/updateExtendContent err')
         })
       },

src/views/carouselFigure/edit.vue

         this.form = res
         this.imageUrl = res.image
         this.showPlace = res.targetName
-      }).catch(() => {
+      }).catch((err) => {
+        this.$notify.error(err.msg || err.message);
         console.log('carouselFigure/getByIdExtendContent err')
       })
     },
     getBuildList() {
       this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
         this.buildingList = res.records
-      }).catch(() => {
+      }).catch((err) => {
+        this.$notify.error(err.msg || err.message);
         console.log('building/getBuildings err')
       })
     },
         this.$store.dispatch('carouselFigure/addExtendContent', this.form).then((res) => {
           this.$message.success('操作成功')
           this.$router.go(-1)
-        }).catch(() => {
-
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
         })
         return
       }
       this.$store.dispatch('carouselFigure/updateExtendContent', this.form).then((res) => {
         this.$message.success('操作成功')
         this.$router.go(-1)
-      }).catch(() => {
+      }).catch((err) => {
+        this.$notify.error(err.msg || err.message);
         console.log('carouselFigure/updateExtendContent err')
       })
     },

src/views/customer/customerDetails.vue

       <el-col :span="9">
         <div class="grid-content">
           <p class="title">置业顾问信息</p>
-          <img class="touxiang" src="http://img1.imgtn.bdimg.com/it/u=1022041283,4133755956&fm=26&gp=0.jpg" alt="">
+          <img class="touxiang" :src="customerDetail.consultant === null ? '' :  customerDetail.consultant.picture" alt="">
           <p class="name">{{  customerDetail.consultant === null ? '' :  customerDetail.consultant.name }}</p>
           <p class="phone">{{ customerDetail.consultant === null ? '' :  customerDetail.consultant.phone }}</p>
           <div class="info">
         <div class="grid-content">
           <p class="title">客户信息</p>
           <div style="display:flex">
-            <img class="touxiang" src="http://img1.imgtn.bdimg.com/it/u=1022041283,4133755956&fm=26&gp=0.jpg" alt="">
+            <img class="touxiang" :src="customerDetail.picture" alt="">
             <div style="width:100%">
               <p class="info-box">用户名称：<span>{{ customerDetail.name }}</span></p>
               <p class="info-box">国家：<span>{{ customerDetail.country }}</span></p>

src/views/customer/editCustomer.vue

             this.detail = data;
             this.dialogImageUrl = data.picture
             this.imageUrl = data.picture
+          }).catch((err) => {
+            this.$notify.error(err.msg || err.message);
           });
         }
       },
                 })
                 .catch(err => {
                   this.hideLoadding();
-                  this.$notify.error(err.message);
+                  this.$notify.error(err.msg || err.message);
                 });
       },
 
           this.dialogForm.pageNumber = res.current
           this.dialogForm.pageSize = res.size
           this.dialogTotal = res.total
-        }).catch(()=> {
+        }).catch((err)=> {
+          this.$notify.error(err.msg || err.message);
           console.log('persons/getConsultants err')
         })
       },

src/views/customer/editRecommend.vue

           this.detail = data;
           this.dialogImageUrl = data.picture
           this.imageUrl = data.picture
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
         });
       }
     },
         })
         .catch(err => {
           this.hideLoadding();
-          this.$notify.error(err.message);
+          this.$notify.error(err.msg || err.message);
         });
     },
 
         this.dialogForm.pageNumber = res.current
         this.dialogForm.pageSize = res.size
         this.dialogTotal = res.total
-      }).catch(()=> {
+      }).catch((err)=> {
+        this.$notify.error(err.msg || err.message);
         console.log('persons/getConsultants err')
       })
     },

src/views/customer/list.vue

       </el-table-column>
       <el-table-column  label="置业顾问">
         <template slot-scope="scope">
-          <span>{{scope.row.name}}</span>
-          <p>{{scope.row.phone}}</p>
+          <span>{{scope.row.consultantName}}</span>
+          <p>{{scope.row.consultTel}}</p>
         </template>
       </el-table-column>
       <el-table-column fixed="right"  width="200" label="操作">

src/views/customer/recommendCustomer.vue

       </el-table-column>
       <el-table-column  label="推荐人">
         <template slot-scope="scope">
-          <span>{{scope.row.name}}</span>
-          <p>{{scope.row.phone}}</p>
+          <span>{{scope.row.recommendName }}</span>
+          <p>{{scope.row.recommendTel}}</p>
         </template>
       </el-table-column>
       <el-table-column

src/views/news/edi/index.vue

             getTypeList() {
                 this.$store.dispatch('news/getTypeList', this.typeForm).then((res) => {
                     this.typeList = res.records
-                }).catch(() => {
+                }).catch((err) => {
+                    this.$notify.error(err.msg || err.message);
                     console.log('news/getTypeList err')
                 })
             },
             getBuildList() {
                 this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
                     this.buildingList = res.records
-                }).catch(() => {
+                }).catch((err) => {
+                    this.$notify.error(err.msg || err.message);
                     console.log('building/getBuildings err')
                 })
             },
                         this.$message.success('操作成功！')
                         this.$router.go(-1)
                         // console.log(res)
-                    }).catch(() => {
+                    }).catch((err) => {
+                        this.$notify.error(err.msg || err.message);
                         console.log('news/add err')
                     })
 
                     this.$message.success('操作成功！')
                     this.$router.go(-1)
                     // console.log(res)
-                }).catch(() => {
+                }).catch((err) => {
+                    this.$notify.error(err.msg || err.message);
                     console.log('news/update err')
                 })
 
                     this.imageUrl = res.newsImg
                     this.form.buildingId = res.buildingId
                     this.form.newsDetail = res.newsDetail
-                }).catch(() => {
+                }).catch((err) => {
+                    this.$notify.error(err.msg || err.message);
                     console.log('news/getById err')
                 })
             }

src/views/news/type/edi/index.vue

                         this.$message.success('操作成功！')
                         this.$router.go(-1)
                         // console.log(res)
-                    }).catch(() => {
+                    }).catch((err) => {
+                        this.$notify.error(err.msg || err.message);
                         console.log('news/addType err')
                     })