Merge branch 'feature/zl' into 'test'

auto commit

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!490

src/views/shop/create-shop.vue

@@ -1217,7 +1217,7 @@
 
                      <span class="warehouseAdress-do">
                         <el-button class="btn-small" @click.prevent="createAreaAddress(1, index)">编辑</el-button>
-                        <el-button class="btn-small" @click.prevent="deleteDetectionAdress(index)">删除</el-button>
+                        <el-button class="btn-small" @click.prevent="deleteAreaAdress(index)">删除</el-button>
                      </span>
                     </div>
                   </div>
@@ -2770,7 +2770,7 @@ export default {
           cancelButtonText: '',
           type: 'error'
         }).then(() => {
-        this.formData.detectionAreaAddressList.splice(index,1)
+        this.formData.tradeStoreDetectionAddress = {};
           this.$message({
             type: 'success',
             message: '删除成功!'
@@ -2832,6 +2832,27 @@ export default {
           });
         });
     },
+    deleteAreaAdress(index) {
+      this.$confirm('确定要删除这条地址信息么?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '',
+        type: 'error'
+      }).then(() => {
+        if (this.formData.detectionAreaAddressList[index].key == this.formData.selectedKey) {
+          this.formData.selectedKey = '';
+        }
+        this.formData.detectionAreaAddressList.splice(index,1)
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
     // 选择省
     changeProvince() {
       this.warehouseAdressForm.cityId = "";