修改店铺取消按钮

src/views/shop/shop/components/addShop.vue

@@ -132,8 +132,9 @@ export default {
 		},
 		// 取消按钮
 		cancel() {
-			this.open = false;
-			this.reset();
+      this.$emit('closeDialog')
+			// this.open = false;
+			// this.reset();
 		},
 		// 表单重置
 		reset() {

src/views/shop/shop/setShop.vue

 <template>
 	<!-- 添加或修改店铺对话框 -->
-	<el-dialog title="店铺设置" :visible.sync="open" width="900px" append-to-body>
+	<el-dialog title="店铺设置" :visible.sync="open" width="900px" append-to-body >
 		<el-tabs v-model="activeName" @tab-click="handleClick">
 			<el-tab-pane label="店铺信息" name="first">
-				<AddShop :shopId="shopId" @setShopId="setShopId" />
+				<AddShop :shopId="shopId" @setShopId="setShopId" @closeDialog="closeHandle"/>
 			</el-tab-pane>
 			<el-tab-pane :disabled="!shopId" label="机器信息" name="second">
 				<Machine :shopId="shopId" />
@@ -55,6 +55,9 @@ export default {
 			this.setShopId(shopId)
 			this.open = true;
 		},
+    closeHandle () {
+      this.open = false  // 控制取消和X按钮，关闭弹窗
+    }
 
 	}
 };