Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppResidentActivitie/Add.vue

@@ -99,12 +99,15 @@ export default {
   },
   computed: { ...mapState(['user']) },
   onLoad(o) {
-    console.log(o)
+    console.log(this.user)
     this.id = o.id ? o.id : ''
     this.$dict.load('realityStatus').then(() => {
       // this.getDetail()
       this.areaId = this.user.areaId
       this.forms.areaId = this.user.areaId
+
+      this.user.phone = this.forms.contactPhone
+      this.user.name = this.forms.contactPerson
     })
   },