From 1f6296c66f5963e69f35b71fabb69fe1a79285f4 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 25 Mar 2026 18:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=BA=97=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/app/shop/addEdit.vue                | 690 +++++++++---------
 src/views/app/shop/dictManage.vue             |   9 +-
 .../hiver/shopArea-tree-choose.vue            | 407 +++++------
 3 files changed, 537 insertions(+), 569 deletions(-)

diff --git a/src/views/app/shop/addEdit.vue b/src/views/app/shop/addEdit.vue
index d0aa7b4..f2f7160 100644
--- a/src/views/app/shop/addEdit.vue
+++ b/src/views/app/shop/addEdit.vue
@@ -1,357 +1,359 @@
 <template>
-  <div class="user-edit">
-    <!-- Drawer抽屉 -->
-    <Drawer
-      :title="title"
-      v-model="visible"
-      width="720"
-      draggable
-      :mask-closable="type == '0'"
-    >
-      <div :style="{ maxHeight: maxHeight }" class="drawer-content">
+	<div class="user-edit">
+		<!-- Drawer抽屉 -->
+		<Drawer :title="title" v-model="visible" width="720" draggable :mask-closable="type == '0'">
+			<div :style="{ maxHeight: maxHeight }" class="drawer-content">
 
 
-        <Form
-          ref="form"
-          :model="form"
-          :rules="formValidate"
-          label-position="top"
-        >
-          <Row :gutter="32" >
-            <Col span="12">
-              <FormItem label="店铺名称" prop="shopName">
-                <Input
-                  v-model="form.shopName"
-                  autocomplete="off"
-                  :maxlength="16"
-                />
-              </FormItem>
-            </Col>
-            <Col span="12">
-                <FormItem label="店铺图标" class="form-noheight">
-                  <upload-pic-input v-model="form.shopIcon"></upload-pic-input>
-                </FormItem>
-            </Col>
-          </Row>
-           <Row :gutter="32">
-              <Col span="12">
-               <FormItem label="所属区域" class="form-noheight">
-                   <shopArea-tree-choose
-                     @on-change="handleSelectShopAreaTree"
-                     ref="shopAreaTree"
-                   ></shopArea-tree-choose>
-                 </FormItem>
-              </Col>
-               <Col span="12">
-                   <FormItem label="店铺分类" class="form-noheight">
-                       <dict dict="shopType" v-model="form.shopType" transfer />
-                   </FormItem>
-               </Col>
-            </Row>
-            <Row :gutter="32">
-                <Col span="24">
-                    <FormItem label="店铺详细地址" prop="shopAddress">
-                        <Input v-model="form.shopAddress" />
-                    </FormItem>
-                </Col>
-            </Row>
-			<Row :gutter="32" >
-			  <Col span="12">
-			    <FormItem label="联系方式" prop="contactPhone">
-			      <Input
-			        v-model="form.contactPhone"
-			        autocomplete="off"
-			        :maxlength="16"
-			      />
-			    </FormItem>
-			  </Col>
-			  <Col span="12">
-				  <FormItem label="副标题" prop="contactPhone">
-				    <Input
-				      v-model="form.subtitle"
-				      autocomplete="off"
-				      :maxlength="16"
-				    />
-				  </FormItem>
-			  </Col>
-			</Row>
-			<Row :gutter="32" >
-			  <Col span="12">
-			    <FormItem label="支付宝账号" prop="contactPhone">
-			      <Input
-			        v-model="form.aliAccount"
-			        autocomplete="off"
-			        :maxlength="16"
-			      />
-			    </FormItem>
-			  </Col>
-			  <Col span="12">
-				  <FormItem label="支付宝户名" prop="contactPhone">
-				    <Input
-				      v-model="form.aliName"
-				      autocomplete="off"
-				      :maxlength="16"
-				    />
-				  </FormItem>
-			  </Col>
-			</Row>
-			<Row :gutter="32" >
-			  <Col span="12">
-			    <FormItem label="排名" prop="shoprank">
-			      <Input
-			        v-model="form.shoprank"
-			        autocomplete="off"
-			        :maxlength="16"
-			      />
-			    </FormItem>
-			  </Col>
-			</Row>
-          <Row :gutter="32">
+				<Form ref="form" :model="form" :rules="formValidate" label-position="top">
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="店铺名称" prop="shopName">
+							<Input v-model="form.shopName" autocomplete="off" :maxlength="16" />
+						</FormItem>
+						</Col>
+						<Col span="12">
+						<FormItem label="店铺图标" class="form-noheight">
+							<upload-pic-input v-model="form.shopIcon"></upload-pic-input>
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="所属区域" class="form-noheight">
+							<shopArea-tree-choose @on-change="handleSelectShopAreaTree"
+								ref="shopAreaTree"></shopArea-tree-choose>
+						</FormItem>
+						</Col>
+						<Col span="12">
+						<FormItem label="店铺分类" class="form-noheight">
+							<dict dict="shopType" v-model="form.shopType" transfer />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="24">
+						<FormItem label="店铺详细地址" prop="shopAddress">
+							<Input v-model="form.shopAddress" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="联系方式" prop="contactPhone">
+							<Input v-model="form.contactPhone" autocomplete="off" :maxlength="16" />
+						</FormItem>
+						</Col>
+						<Col span="12">
+						<FormItem label="副标题" prop="contactPhone">
+							<Input v-model="form.subtitle" autocomplete="off" :maxlength="16" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="支付宝账号" prop="contactPhone">
+							<Input v-model="form.aliAccount" autocomplete="off" :maxlength="16" />
+						</FormItem>
+						</Col>
+						<Col span="12">
+						<FormItem label="支付宝户名" prop="contactPhone">
+							<Input v-model="form.aliName" autocomplete="off" :maxlength="16" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="排名" prop="shoprank">
+							<Input v-model="form.shoprank" autocomplete="off" :maxlength="16" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
 
-            <Col span="24">
-              <FormItem label="备注">
-                <Input type="textarea" v-model="form.remark" :rows="4" />
-              </FormItem>
-            </Col>
-          </Row>
-          <Divider />
+						<Col span="24">
+						<FormItem label="备注">
+							<Input type="textarea" v-model="form.remark" :rows="4" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Divider />
 
 
 
-        </Form>
-      </div>
-      <div class="drawer-footer br" v-show="type != '0'">
-        <Button type="primary" :loading="submitLoading" @click="submit"
-          >提交</Button
-        >
-        <Button @click="visible = false">取消</Button>
-      </div>
-    </Drawer>
-  </div>
+				</Form>
+			</div>
+			<div class="drawer-footer br" v-show="type != '0'">
+				<Button type="primary" :loading="submitLoading" @click="submit">提交</Button>
+				<Button @click="visible = false">取消</Button>
+			</div>
+		</Drawer>
+	</div>
 </template>
 
 <script>
-import {getUsersByRoleName,getDictDataByType} from "@/api/index";
-import {
-  validateUsername,
-  validateMobile,
-  validatePassword,
-} from "@/libs/validate";
-import shopAreaTreeChoose from "@/views/my-components/hiver/shopArea-tree-choose";
-import uploadPicInput from "@/views/my-components/hiver/upload-pic-input";
-import SetPassword from "@/views/my-components/hiver/set-password";
-import dict from "@/views/my-components/hiver/dict";
-import {addShop, editShop} from "@/api/app";
-export default {
-  name: "addEdit",
-  components: {
-    shopAreaTreeChoose,
-    uploadPicInput,
-    SetPassword,
-    dict,
-  },
-  props: {
-    value: {
-      type: Boolean,
-      default: false,
-    },
-    data: {
-      type: Object,
-    },
-    type: {
-      type: String,
-      default: "0",
-    },
-  },
-  data() {
-    return {
-      roleList: [],
-      roleList2: [],
-      shopAreaList: [],
-      businessDistrictLevelList: [],
-      visible: this.value,
-      title: "",
-      passColor: "",
-      submitLoading: false,
-      maxHeight: 510,
-      form: {
-        address: [],
-      },
-      formValidate: {
-        // 表单验证规则
-        username: [
-          { required: true, message: "请输入登录账号", trigger: "blur" },
-          { validator: validateUsername, trigger: "blur" },
-        ],
-        nickname: [
-          { required: true, message: "请输入用户名", trigger: "blur" },
-        ],
-        mobile: [
-          { required: true, message: "请输入手机号", trigger: "blur" },
-          { validator: validateMobile, trigger: "blur" },
-        ],
-        password: [
-          { required: true, message: "请输入密码", trigger: "blur" },
-          { validator: validatePassword, trigger: "blur" },
-        ],
-        email: [
-          { required: true, message: "请输入邮箱地址" },
-          { type: "email", message: "邮箱格式不正确" },
-        ],
-      },
-    };
-  },
-  methods: {
-    init() {
-      this.getRoleList();
-    },
-    getRoleList() {
-      getUsersByRoleName("ROLE_OWNER").then((res) => {
-        if (res.success) {
-          this.roleList = res.result;
-        }
-      });
-      getUsersByRoleName("ROLE_MANAGER").then((res) => {
-        if (res.success) {
-          this.roleList2 = res.result;
-        }
-      });
-      getDictDataByType("mallMuseumType").then((res) => {
-          if (res.success) {
-            this.businessDistrictLevelList = res.result;
-          }
-       });
-       getDictDataByType("mallRegion").then((res) => {
-         if (res.success) {
-           this.shopAreaList = res.result;
-         }
-      });
-        getDictDataByType("shopType").then((res) => {
-            if (res.success) {
-                this.shopType = res.result;
-            }
-        });
-    },
-    handleSelectShopAreaTree(v) {
-      this.form.shopArea = v;
-    },
-    changePass(v, grade, strength) {
-      this.form.passStrength = strength;
-    },
-    submit() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          if (typeof this.form.chargeTime == "object") {
-            this.form.chargeTime = this.format(this.form.chargeTime, "yyyy-MM-dd");
-          }
-          if (typeof this.form.startTime == "object") {
-            this.form.startTime = this.format(this.form.startTime, "yyyy-MM-dd");
-          }
-          if (typeof this.form.endTime == "object") {
-            this.form.endTime = this.format(this.form.endTime, "yyyy-MM-dd");
-          }
-          debugger;
-          if(this.form.users == '' || this.form.users == null){
-              delete this.form.users;
-          }
-          // 处理商品分类的名称
-          if(this.form.shopType != '' && this.form.shopType != null){
-              this.shopType.forEach(item => {
-                  debugger;
-                  if (this.form.shopType == item.value) {
-                      this.form.shopTypeTitle = item.title;
-                  }
-              });
-          }
-		  this.form.shopMangerId =  this.form.shopOwnerId
-          if (this.type == "1") {
-            // 编辑
-            this.submitLoading = true;
-			delete this.form.products
-			delete this.form.saleCount
-			delete this.form.shopTakeaway
-			
-            editShop(this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.$emit("on-submit", true);
-                this.visible = false;
-              }
-            });
-          } else {
-            // 添加
-            this.submitLoading = true;
-            addShop(this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.$emit("on-submit", true);
-                this.visible = false;
-              }
-            });
-          }
-        }
-      });
-    },
-    setCurrentValue(value) {
-      if (value === this.visible) {
-        return;
-      }
-      if (this.type == "1") {
-        this.title = "编辑店铺";
-        this.maxHeight =
-          Number(document.documentElement.clientHeight - 121) + "px";
-      } else if (this.type == "2") {
-        this.title = "添加店铺";
-        this.maxHeight =
-          Number(document.documentElement.clientHeight - 121) + "px";
-      } else {
-        this.title = "店铺详情";
-        this.maxHeight = "100%";
-      }
-      // 清空数据
-      this.$refs.form.resetFields();
-      if (this.type == "0" || this.type == "1") {
-        // 回显数据
-        let data = this.data;
-        // 地址
-        if (data.address) {
-          data.address = data.address.split(",");
-        } else {
-          data.address = [];
-        }
-        // 商圈
-         this.$refs.shopAreaTree.setData(data.shopArea, data.shopAreaTitle);
-        // 回显
-        this.form = data;
-      } else {
-        // 添加
-        //this.$refs.shopAreaTree.setData("", "");
-        this.form = {
-          /*type: 0,
-          sex: "",
-          address: [],*/
-        };
-      }
-      this.visible = value;
-    },
-  },
-  watch: {
-    value(val) {
-      this.setCurrentValue(val);
-    },
-    visible(value) {
-      this.$emit("input", value);
-    },
-  },
-  mounted() {
-    this.init();
-  },
-};
+	import {
+		getUsersByRoleName,
+		getDictDataByType
+	} from "@/api/index";
+	import {
+		validateUsername,
+		validateMobile,
+		validatePassword,
+	} from "@/libs/validate";
+	import shopAreaTreeChoose from "@/views/my-components/hiver/shopArea-tree-choose";
+	import uploadPicInput from "@/views/my-components/hiver/upload-pic-input";
+	import SetPassword from "@/views/my-components/hiver/set-password";
+	import dict from "@/views/my-components/hiver/dict";
+	import {
+		addShop,
+		editShop,
+		initShopArea,
+		loadShopArea,
+	} from "@/api/app";
+	export default {
+		name: "addEdit",
+		components: {
+			shopAreaTreeChoose,
+			uploadPicInput,
+			SetPassword,
+			dict,
+		},
+		props: {
+			value: {
+				type: Boolean,
+				default: false,
+			},
+			data: {
+				type: Object,
+			},
+			type: {
+				type: String,
+				default: "0",
+			},
+		},
+		data() {
+			return {
+				roleList: [],
+				roleList2: [],
+				shopAreaList: [],
+				businessDistrictLevelList: [],
+				visible: this.value,
+				title: "",
+				passColor: "",
+				submitLoading: false,
+				maxHeight: 510,
+				form: {
+					address: [],
+				},
+				formValidate: {
+					// 表单验证规则
+					username: [{
+							required: true,
+							message: "请输入登录账号",
+							trigger: "blur"
+						},
+						{
+							validator: validateUsername,
+							trigger: "blur"
+						},
+					],
+					nickname: [{
+						required: true,
+						message: "请输入用户名",
+						trigger: "blur"
+					}, ],
+					mobile: [{
+							required: true,
+							message: "请输入手机号",
+							trigger: "blur"
+						},
+						{
+							validator: validateMobile,
+							trigger: "blur"
+						},
+					],
+					password: [{
+							required: true,
+							message: "请输入密码",
+							trigger: "blur"
+						},
+						{
+							validator: validatePassword,
+							trigger: "blur"
+						},
+					],
+					email: [{
+							required: true,
+							message: "请输入邮箱地址"
+						},
+						{
+							type: "email",
+							message: "邮箱格式不正确"
+						},
+					],
+				},
+			};
+		},
+		methods: {
+			init(v) {
+				console.log("111")
+				this.getRoleList(v);
+			},
+			getRoleList(v) {
+				getUsersByRoleName("ROLE_OWNER").then((res) => {
+					if (res.success) {
+						this.roleList = res.result;
+					}
+				});
+				getUsersByRoleName("ROLE_MANAGER").then((res) => {
+					if (res.success) {
+						this.roleList2 = res.result;
+					}
+				});
+				getDictDataByType("mallMuseumType").then((res) => {
+					if (res.success) {
+						this.businessDistrictLevelList = res.result;
+					}
+				});
+				initShopArea().then((res) => {
+
+					if (res.success) {
+						res.result.forEach(function(e) {
+							if (e.isParent) {
+								e.loading = false;
+								e.children = [];
+								e._loading = false;
+							}
+						});
+						this.data = res.result;
+					}
+				});
+				getDictDataByType("shopType").then((res) => {
+					if (res.success) {
+						this.shopType = res.result;
+					}
+				});
+			},
+			handleSelectShopAreaTree(v) {
+				this.form.shopArea = v;
+			},
+			changePass(v, grade, strength) {
+				this.form.passStrength = strength;
+			},
+			submit() {
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						if (typeof this.form.chargeTime == "object") {
+							this.form.chargeTime = this.format(this.form.chargeTime, "yyyy-MM-dd");
+						}
+						if (typeof this.form.startTime == "object") {
+							this.form.startTime = this.format(this.form.startTime, "yyyy-MM-dd");
+						}
+						if (typeof this.form.endTime == "object") {
+							this.form.endTime = this.format(this.form.endTime, "yyyy-MM-dd");
+						}
+						debugger;
+						if (this.form.users == '' || this.form.users == null) {
+							delete this.form.users;
+						}
+						// 处理商品分类的名称
+						if (this.form.shopType != '' && this.form.shopType != null) {
+							this.shopType.forEach(item => {
+								debugger;
+								if (this.form.shopType == item.value) {
+									this.form.shopTypeTitle = item.title;
+								}
+							});
+						}
+						this.form.shopMangerId = this.form.shopOwnerId
+						if (this.type == "1") {
+							// 编辑
+							this.submitLoading = true;
+							delete this.form.products
+							delete this.form.saleCount
+							delete this.form.shopTakeaway
+
+							editShop(this.form).then((res) => {
+								this.submitLoading = false;
+								if (res.success) {
+									this.$Message.success("操作成功");
+									this.$emit("on-submit", true);
+									this.visible = false;
+								}
+							});
+						} else {
+							// 添加
+							this.submitLoading = true;
+							addShop(this.form).then((res) => {
+								this.submitLoading = false;
+								if (res.success) {
+									this.$Message.success("操作成功");
+									this.$emit("on-submit", true);
+									this.visible = false;
+								}
+							});
+						}
+					}
+				});
+			},
+			setCurrentValue(value) {
+				if (value === this.visible) {
+					return;
+				}
+				if (this.type == "1") {
+					this.title = "编辑店铺";
+					this.maxHeight =
+						Number(document.documentElement.clientHeight - 121) + "px";
+				} else if (this.type == "2") {
+					this.title = "添加店铺";
+					this.maxHeight =
+						Number(document.documentElement.clientHeight - 121) + "px";
+				} else {
+					this.title = "店铺详情";
+					this.maxHeight = "100%";
+				}
+				// 清空数据
+				this.$refs.form.resetFields();
+				if (this.type == "0" || this.type == "1") {
+					// 回显数据
+					let data = this.data;
+					// 地址
+					if (data.address) {
+						data.address = data.address.split(",");
+					} else {
+						data.address = [];
+					}
+					// 商圈
+					this.$refs.shopAreaTree.setData(data.shopArea, data.shopAreaTitle);
+					// 回显
+					this.form = data;
+				} else {
+					// 添加
+					//this.$refs.shopAreaTree.setData("", "");
+					this.form = {
+						/*type: 0,
+						sex: "",
+						address: [],*/
+					};
+				}
+				this.visible = value;
+			},
+		},
+		watch: {
+			value(val) {
+				this.setCurrentValue(val);
+			},
+			visible(value) {
+				this.$emit("input", value);
+			},
+		},
+		mounted() {
+			this.init();
+		},
+	};
 </script>
 
 <style lang="less">
-@import "@/styles/drawer-common.less";
-</style>
-
+	@import "@/styles/drawer-common.less";
+</style>
\ No newline at end of file
diff --git a/src/views/app/shop/dictManage.vue b/src/views/app/shop/dictManage.vue
index bf119eb..9085f0a 100644
--- a/src/views/app/shop/dictManage.vue
+++ b/src/views/app/shop/dictManage.vue
@@ -392,7 +392,7 @@
 						specNum:9999
 					}],
 					sellTime:0, //可售时间
-					isMoreBuy:0,
+					isMoreBuy:0, //加料
 					sellBeginTime:'', //可售时段自定义---开始时间
 					sellEndTime:'', //可售时段自定义---结束时间
 					attributeList:'',
@@ -775,8 +775,6 @@
 				}).then((res) => {
 					if(res.code == 200){
 						this.categorySonData = res.result.content
-						console.log("this.modalclassType",this.modalclassType)
-						console.log("this.categorySonData",this.categorySonData)
 						if(this.modalclassType == 'shuxing'){
 							for (var i = 0; i < this.categorySonData.length; i++) {
 								if(this.attrValueArr.length>0){
@@ -834,9 +832,6 @@
 				this.addGoodsForm.isMoreBuy = type;
 			},
 			checkSpecValue(index){
-				//this.typeToAttrName = res.result.content[this.categoryIndex].title
-				console.log("this.categorySonData[index]",this.categorySonData[index])
-				console.log("this.modalclassType",this.modalclassType)
 				this.categorySonData[index].checked = !this.categorySonData[index].checked
 				if(this.modalclassType == 'shuxing'){
 					if(this.categorySonData[index].checked == true){
@@ -865,8 +860,6 @@
 			},
 			guigeSubmit(){
 				if(this.modalclassType == 'shuxing'){
-					console.log("this.addGoodsForm.attributeList1",this.addGoodsForm.attributeList1)
-					console.log("this.attrValueArr",this.attrValueArr)
 					for(let i=0;i<this.attrValueArr.length;i++){
 						if(this.addGoodsForm.attributeList1.size == 0){
 							//set  has get
diff --git a/src/views/my-components/hiver/shopArea-tree-choose.vue b/src/views/my-components/hiver/shopArea-tree-choose.vue
index 61cda6f..6355920 100644
--- a/src/views/my-components/hiver/shopArea-tree-choose.vue
+++ b/src/views/my-components/hiver/shopArea-tree-choose.vue
@@ -1,226 +1,199 @@
 <template>
-  <div>
-    <div style="display: flex;">
-      <Input
-        v-model="shopAreaTitle"
-        readonly
-        :size="size"
-        :disabled="disabled"
-        :prefix="prefix"
-        :suffix="suffix"
-        style="margin-right: 10px"
-        :placeholder="placeholder"
-        :clearable="clearable"
-        @on-clear="clearSelect"
-      />
-      <Poptip
-        transfer
-        trigger="click"
-        placement="right"
-        title="选择区域"
-        width="250"
-      >
-        <Button
-          :size="size"
-          :disabled="disabled"
-          :icon="icon"
-          :type="type"
-          :shape="shape"
-          :ghost="ghost"
-          >{{ text }}</Button
-        >
-        <div slot="content">
-          <Input
-            v-model="searchKey"
-            suffix="ios-search"
-            @on-change="searchDep"
-            placeholder="输入区域名搜索"
-            clearable
-          />
-          <div class="dep-tree-bar">
-            <Tree
-              :data="dataDep"
-              :load-data="loadData"
-              @on-select-change="selectTree"
-              :multiple="multiple"
-            ></Tree>
-            <Spin size="large" fix v-if="depLoading"></Spin>
-          </div>
-        </div>
-      </Poptip>
-    </div>
-  </div>
+	<div>
+		<div style="display: flex;">
+			<Input v-model="shopAreaTitle" readonly :size="size" :disabled="disabled" :prefix="prefix" :suffix="suffix"
+				style="margin-right: 10px" :placeholder="placeholder" :clearable="clearable" @on-clear="clearSelect" />
+			<Poptip transfer trigger="click" placement="right" title="选择区域" width="250">
+				<Button :size="size" :disabled="disabled" :icon="icon" :type="type" :shape="shape"
+					:ghost="ghost">{{ text }}</Button>
+				<div slot="content">
+					<Input v-model="searchKey" suffix="ios-search" @on-change="searchDep" placeholder="输入区域名搜索"
+						clearable />
+					<div class="dep-tree-bar">
+						<Tree :data="dataDep" :load-data="loadData" @on-select-change="selectTree" :multiple="multiple">
+						</Tree>
+						<Spin size="large" fix v-if="depLoading"></Spin>
+					</div>
+				</div>
+			</Poptip>
+		</div>
+	</div>
 </template>
 
 <script>
-import { initShopArea, loadShopArea, searchShopArea } from "@/api/app";
-export default {
-  name: "shopAreaTreeChoose",
-  props: {
-    text: {
-      type: String,
-      default: "选择区域",
-    },
-    icon: {
-      type: String,
-      default: "md-list",
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-    size: String,
-    type: String,
-    shape: String,
-    ghost: {
-      type: Boolean,
-      default: false,
-    },
-    prefix: String,
-    suffix: String,
-    multiple: {
-      type: Boolean,
-      default: false,
-    },
-    clearable: {
-      type: Boolean,
-      default: true,
-    },
-    placeholder: {
-      type: String,
-      default: "点击选择区域",
-    },
-  },
-  data() {
-    return {
-      depLoading: false,
-      shopAreaTitle: "",
-      searchKey: "",
-      dataDep: [],
-      selectDep: [],
-      shopArea: [],
-    };
-  },
-  methods: {
-    initShopAreaData() {
-      loadShopArea(JSON.parse(this.getStore("userInfo")).departmentId).then((res) => {
-        if (res.success) {
-          res.result.forEach(function (e) {
-            if (e.isParent) {
-              e.loading = false;
-              e.children = [];
-            }
-            if (e.status == -1) {
-              e.title = "[已禁用] " + e.title;
-              e.disabled = true;
-            }
-          });
-          this.dataDep = res.result;
-        }
-      });
-    },
-    loadData(item, callback) {
-      loadShopArea(item.id).then((res) => {
-        if (res.success) {
-          res.result.forEach(function (e) {
-            if (e.isParent) {
-              e.loading = false;
-              e.children = [];
-            }
-            if (e.status == -1) {
-              e.title = "[已禁用] " + e.title;
-              e.disabled = true;
-            }
-          });
-          callback(res.result);
-        }
-      });
-    },
-    searchDep() {
-      // 搜索圈层
-      if (this.searchKey) {
-        this.depLoading = true;
-        searchShopArea({ title: this.searchKey }).then((res) => {
-          this.depLoading = false;
-          if (res.success) {
-            res.result.forEach(function (e) {
-              if (e.status == -1) {
-                e.title = "[已禁用] " + e.title;
-                e.disabled = true;
-              }
-            });
-            this.dataDep = res.result;
-          }
-        });
-      } else {
-        this.initShopAreaData();
-      }
-    },
-    selectTree(v) {
-      let ids = [],
-        title = "";
-      v.forEach((e) => {
-        ids.push(e.id);
-        if (title == "") {
-          title = e.title;
-        } else {
-          title = title + "、" + e.title;
-        }
-      });
-      this.shopArea = ids;
-      this.shopAreaTitle = title;
-      if (this.multiple) {
-        this.$emit("on-change", this.shopArea);
-      } else {
-        this.$emit("on-change", this.shopArea[0]);
-      }
-    },
-    clearSelect() {
-      this.shopArea = [];
-      this.shopAreaTitle = "";
-      this.initShopAreaData();
-      if (this.multiple) {
-        this.$emit("on-change", []);
-      } else {
-        this.$emit("on-change", "");
-      }
-      this.$emit("on-clear");
-    },
-    setData(ids, title) {
-      this.shopAreaTitle = title;
-      if (this.multiple) {
-        this.shopArea = ids;
-      } else {
-        this.shopArea = [];
-        this.shopArea.push(ids);
-      }
-      this.$emit("on-change", this.shopArea);
-    },
-  },
-  mounted() {
-    this.initShopAreaData();
-  },
-};
+	import {
+		initShopArea,
+		loadShopArea,
+		searchShopArea
+	} from "@/api/app";
+	export default {
+		name: "shopAreaTreeChoose",
+		props: {
+			text: {
+				type: String,
+				default: "选择区域",
+			},
+			icon: {
+				type: String,
+				default: "md-list",
+			},
+			disabled: {
+				type: Boolean,
+				default: false,
+			},
+			size: String,
+			type: String,
+			shape: String,
+			ghost: {
+				type: Boolean,
+				default: false,
+			},
+			prefix: String,
+			suffix: String,
+			multiple: {
+				type: Boolean,
+				default: false,
+			},
+			clearable: {
+				type: Boolean,
+				default: true,
+			},
+			placeholder: {
+				type: String,
+				default: "点击选择区域",
+			},
+		},
+		data() {
+			return {
+				depLoading: false,
+				shopAreaTitle: "",
+				searchKey: "",
+				dataDep: [],
+				selectDep: [],
+				shopArea: [],
+			};
+		},
+		methods: {
+			initShopAreaData() {
+				initShopArea().then((res) => {
+					if (res.success) {
+						res.result.forEach(function(e) {
+							if (e.isParent) {
+								e.loading = false;
+								e.children = [];
+							}
+							if (e.status == -1) {
+								e.title = "[已禁用] " + e.title;
+								e.disabled = true;
+							}
+						});
+						this.dataDep = res.result;
+					}
+				});
+			},
+			loadData(item, callback) {
+				loadShopArea(item.id).then((res) => {
+					if (res.success) {
+						res.result.forEach(function(e) {
+							if (e.isParent) {
+								e.loading = false;
+								e.children = [];
+							}
+							if (e.status == -1) {
+								e.title = "[已禁用] " + e.title;
+								e.disabled = true;
+							}
+						});
+						callback(res.result);
+					}
+				});
+			},
+			searchDep() {
+				// 搜索圈层
+				if (this.searchKey) {
+					this.depLoading = true;
+					searchShopArea({
+						title: this.searchKey
+					}).then((res) => {
+						this.depLoading = false;
+						if (res.success) {
+							res.result.forEach(function(e) {
+								if (e.status == -1) {
+									e.title = "[已禁用] " + e.title;
+									e.disabled = true;
+								}
+							});
+							this.dataDep = res.result;
+						}
+					});
+				} else {
+					this.initShopAreaData();
+				}
+			},
+			selectTree(v) {
+				let ids = [],
+					title = "";
+				v.forEach((e) => {
+					ids.push(e.id);
+					if (title == "") {
+						title = e.title;
+					} else {
+						title = title + "、" + e.title;
+					}
+				});
+				this.shopArea = ids;
+				this.shopAreaTitle = title;
+				if (this.multiple) {
+					this.$emit("on-change", this.shopArea);
+				} else {
+					this.$emit("on-change", this.shopArea[0]);
+				}
+			},
+			clearSelect() {
+				this.shopArea = [];
+				this.shopAreaTitle = "";
+				this.initShopAreaData();
+				if (this.multiple) {
+					this.$emit("on-change", []);
+				} else {
+					this.$emit("on-change", "");
+				}
+				this.$emit("on-clear");
+			},
+			setData(ids, title) {
+				this.shopAreaTitle = title;
+				if (this.multiple) {
+					this.shopArea = ids;
+				} else {
+					this.shopArea = [];
+					this.shopArea.push(ids);
+				}
+				this.$emit("on-change", this.shopArea);
+			},
+		},
+		mounted() {
+			this.initShopAreaData();
+		},
+	};
 </script>
 
 <style lang="less">
-.dep-tree-bar {
-  position: relative;
-  min-height: 80px;
-  max-height: 500px;
-  overflow: auto;
-  margin-top: 5px;
-}
+	.dep-tree-bar {
+		position: relative;
+		min-height: 80px;
+		max-height: 500px;
+		overflow: auto;
+		margin-top: 5px;
+	}
 
-.dep-tree-bar::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
-}
-
-.dep-tree-bar::-webkit-scrollbar-thumb {
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 0 2px #d1d1d1;
-  background: #e4e4e4;
-}
-</style>
+	.dep-tree-bar::-webkit-scrollbar {
+		width: 6px;
+		height: 6px;
+	}
 
+	.dep-tree-bar::-webkit-scrollbar-thumb {
+		border-radius: 4px;
+		-webkit-box-shadow: inset 0 0 2px #d1d1d1;
+		background: #e4e4e4;
+	}
+</style>
\ No newline at end of file