冲突

src/sass/AppSpecialPeople/add.vue

@@ -502,13 +502,8 @@ export default {
         'app/appspecialdrug/addOrUpdate', 'app/appspecialprison/addOrUpdate']
 
       this.$http.post(urlList[this.form.userType], {...this.form}).then(res => {
-<<<<<<< HEAD
         if(res.code == 0) {
           this.$u.toast('信息保存成功')
-=======
-        if (res.code == 0) {
-          this.$u.toast('提交成功')
->>>>>>> cceb98c5b4526a7a0d9daaf4cb517de5e0f6a083
           uni.$emit('specialPeopleList')
           setTimeout(() => {
             uni.navigateBack()
@@ -522,12 +517,7 @@ export default {
         }
       })
     },
-<<<<<<< HEAD
     areaSelect(e){
-=======
-    areaSelect(e) {
-      // console.log(e);
->>>>>>> cceb98c5b4526a7a0d9daaf4cb517de5e0f6a083
       this.form.areaId = e
     },