diff --git a/src/views/app/business/logiticsCompany/addEdit.vue b/src/views/app/business/logiticsCompany/addEdit.vue
new file mode 100644
index 0000000..2175930
--- /dev/null
+++ b/src/views/app/business/logiticsCompany/addEdit.vue
@@ -0,0 +1,247 @@
+<template>
+	<div class="company-edit">
+		<!-- Drawer抽屉 -->
+		<Drawer :title="title" v-model="visible" width="500" draggable :mask-closable="type == '0'">
+			<div :style="{ maxHeight: maxHeight }" class="drawer-content">
+				<div class="drawer-header">
+					<div style="margin-right: 16px">优惠券配置</div>
+				</div>
+				<Form ref="form" :model="form" :rules="formValidate" label-position="top">
+					<Row :gutter="32">
+						<Col span="24">
+						<FormItem label="优惠券名称" prop="name">
+							<Input v-model="form.name" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="24">
+						<FormItem label="发券总数" prop="totalCount">
+							<Input v-model="form.totalCount" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="24">
+						<FormItem label="适用范围" prop="applyScene">
+							<RadioGroup v-model="form.applyScene">
+							   <Radio label="0">全部</Radio>
+							   <Radio label="1">外卖/买饭</Radio>
+							   <Radio label="2">快递/跑腿</Radio>
+							   <Radio label="3">二手物品交易</Radio>
+							</RadioGroup>
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="24">
+						<FormItem label="使用门槛">
+							<RadioGroup v-model="form.type">
+							   <Radio label="2">无门槛</Radio>
+							   <Radio label="1">满<Input v-model='form.minAmount' style="width: 50px;"></Input >元可使用</Radio>
+							</RadioGroup>
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="24">
+						<FormItem label="优惠金额">
+							<Input v-model='form.discountAmount'></Input>
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="24">
+						<FormItem label="每人限领数量">
+							<Input v-model='form.limitPerUser'></Input>
+						</FormItem>
+						</Col>
+					</Row>
+					
+					<Row :gutter="32">
+						<Col span="24">
+						<FormItem label="有效期">
+							<RadioGroup v-model="form.validType" vertical>
+							   <Radio label="1">固定日期</Radio>
+							   <DatePicker @on-change="changeDate" v-if="form.validType == '1'" type="daterange" split-panels placeholder="选择起始时间" style="width: 200px"></DatePicker>
+							   <Radio label="2">领券后<Input v-model='form.validDays' style="width: 50px;"></Input >天有效</Radio>
+							</RadioGroup>
+							
+						</FormItem>
+						</Col>
+					</Row>
+				</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 {
+		addCoupon,
+		editCoupon
+	} from "@/api/app";
+	import dict from "@/views/my-components/hiver/dict";
+	import uploadPicInput from "@/views/my-components/hiver/upload-pic-input";
+	import regionTreeChoose from "@/views/my-components/hiver/region-tree-choose";
+	export default {
+		name: "company",
+		components: {
+			dict,
+			uploadPicInput,
+			regionTreeChoose
+		},
+		props: {
+			value: {
+				type: Boolean,
+				default: false,
+			},
+			data: {
+				type: Object,
+			},
+			type: {
+				type: String,
+				default: "0",
+			},
+		},
+		data() {
+			return {
+				menkan:'',
+				xianzhi:'',
+				youxiao:'',
+				
+				roleList: [],
+				visible: this.value,
+				title: "",
+				data: [],
+				passColor: "",
+				submitLoading: false,
+				maxHeight: 510,
+				form: {
+					name: '', //优惠券名称
+					applyScene:'', //适用场景：0-通用，1-外卖/买饭，2-快递/跑腿，3-二手物品交易
+					type:'', //优惠券类型：1-满减券，2-无门槛直减券
+					minAmount:'', //使用门槛金额
+					discountAmount:'', //抵扣面额
+					totalCount:'', //发行总数
+					limitPerUser:1, //每人最多限领张数
+					validType:'', //有效期类型：1-绝对时间段有效，2-领取后相对天数有效
+					validStartTime:'', //有效期开始时间
+					validEndTime:'', //有效期结束时间
+					validDays:'', //自领取之日起有效天数
+					
+					issuerType:1, //发放方：1-平台，2-商家
+					issuerId:0, //发放方ID 0-平台
+					status:1, //状态：0-已下架/停发，1-发放中
+					regionId:JSON.parse(this.getStore("user")).departmentId, //学校id
+				},
+				formValidate: {
+					// 表单验证规则
+					name: [{
+						required: true,
+						message: "请输入优惠券名称",
+						trigger: "change"
+					}, ],
+					contacts: [{
+						required: true,
+						message: "请输入联系人",
+						trigger: "change"
+					}, ],
+					mobile: [{
+						required: true,
+						message: "请输入手机号",
+						trigger: "change"
+					}, ],
+				},
+			};
+		},
+		methods: {
+			init() {
+
+			},
+			changeDate(v){
+				console.log(v)
+				this.form.validStartTime = v[0]
+				this.form.validEndTime = v[1]
+			},
+			submit() {
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						if (this.type == "1") {
+							// 编辑
+							this.submitLoading = true;
+							editCoupon(this.form).then((res) => {
+								this.submitLoading = false;
+								if (res.success) {
+									this.$Message.success("操作成功");
+									this.$emit("on-submit", true);
+									this.visible = false;
+								}
+							});
+						} else {
+							// 添加1
+							this.submitLoading = true;
+							addCoupon(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;
+					// 回显
+					this.form = data;
+					this.form.applyScene = JSON.stringify(this.form.applyScene)
+					this.form.type = JSON.stringify(this.form.type)
+					this.form.validType = JSON.stringify(this.form.validType)
+					console.log('优惠券',this.form)
+				}
+				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>
\ No newline at end of file
diff --git a/src/views/app/business/logiticsCompany/dictManage.vue b/src/views/app/business/logiticsCompany/dictManage.vue
new file mode 100644
index 0000000..6bae70f
--- /dev/null
+++ b/src/views/app/business/logiticsCompany/dictManage.vue
@@ -0,0 +1,315 @@
+<template>
+	<div class="search">
+		<Button @click="findAllRecords" type="primary" icon="md-add">新增商品</Button>
+		<Card>
+			<Table :loading="loading" border :columns="columns" :data="data" :size="tableSize" ref="table"
+				sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+			<Row type="flex" justify="end" class="page">
+				<Page :current="searchForm.pageNum" :total="total" :page-size="searchForm.pageSize"
+					@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+					size="small" show-total show-elevator show-sizer></Page>
+			</Row>
+		</Card>
+		<Modal :title="商品维护" v-model="tranVisiable" :mask-closable="false" :scrollabele="true" :width="1000">
+			<transfer-station v-if="tranVisiable" ref="dialog"></transfer-station>
+			<div slot="footer" v-show=tranVisiable>
+				<Button type="text" @click="tranVisiable = false">关闭</Button>
+			</div>
+		</Modal>
+	</div>
+
+</template>
+
+<script>
+	import {
+		addLogisticsStation,
+		updateLogisticsStation,
+		deleteLogisticsStation,
+		getLogisticsStationPageList
+	} from "@/api/app";
+	import uploadPicInput from "@/views/my-components/hiver/upload-pic-input";
+	import transferStation from "@/views/app/business/lineManage/transferStation.vue";
+	import {
+		shortcuts
+	} from "@/libs/shortcuts";
+	export default {
+		name: "logisticsAddress",
+		components: {
+			uploadPicInput,
+			transferStation
+		},
+		data() {
+			return {
+				exportTitle: "商品",
+				tableSize: "default",
+				showType: "0",
+				tranVisiable:false,
+				stationModalVisible: false,
+				openSearch: true, // 显示搜索
+				openTip: true, // 显示提示
+				loading: true, // 表单加载状态
+				modalType: 0, // 添加或编辑标识
+				modalVisible: false, // 添加或编辑显示
+				modalTitle: "", // 添加或编辑标题
+				searchForm: {
+					pageNum: 1,
+					pageSize: 10,
+					circuitId:"",
+					stationName:""
+				},
+				selectDate: null,
+				options: {
+					shortcuts: shortcuts,
+				},
+				form: {
+					circuitId:'',
+					stationName:'',
+					freightRules:'',
+					landingFeeRules:'',
+					deliveryFeeRules:''
+				},
+				submitLoading: false, // 添加或编辑提交状态
+				selectList: [], // 多选数据
+				columns: [
+					{
+						type: "index",
+						width: 60,
+						align: "center",
+						fixed: "left",
+					},
+					{
+						title: "线路id",
+						key: "circuitId",
+						minWidth: 125,
+						sortable: true,
+						fixed: "left",
+					},
+					{
+						title: "商品名称",
+						key: "stationName",
+						minWidth: 125,
+						sortable: true,
+						fixed: "left",
+					},
+					{
+						title: "运费规则",
+						key: "freightRules",
+						minWidth: 125,
+						sortable: true,
+						fixed: "left",
+					},
+					{
+						title: "落地费规则",
+						key: "landingFeeRules",
+						minWidth: 125,
+						sortable: true,
+						fixed: "left",
+					},
+					{
+						title: "送货费规则",
+						key: "deliveryFeeRules",
+						minWidth: 125,
+						sortable: true,
+						fixed: "left",
+					},
+					{
+						title: "操作",
+						key: "action",
+						width: 200,
+						align: "center",
+						fixed: "right",
+						render: (h, params) => {
+							return h("div", [
+								h(
+									"a", {
+										on: {
+											click: () => {
+												this.edit(params.row);
+											},
+										},
+									},
+									"编辑"
+								),
+								h("Divider", {
+									props: {
+										type: "vertical",
+									},
+								}),
+								h(
+									"a", {
+										on: {
+											click: () => {
+												this.edit(params.row);
+											},
+										},
+									},
+									"下架"
+								),
+								h("Divider", {
+									props: {
+										type: "vertical",
+									},
+								}),
+								h(
+									"a", {
+										on: {
+											click: () => {
+												this.remove(params.row);
+											},
+										},
+									},
+									"删除"
+								),
+							]);
+						},
+					},
+				],
+				data: [], // 表单数据
+				total: 0, // 表单数据总数
+				rechargeWorkerId: "",
+			};
+		},
+		methods: {
+			init() {
+				// this.getDataList();
+			},
+			initRecharge(data) {
+				//data是父组件弹窗传递过来的值，我们可以打印看看
+				console.log(data);
+				this.searchForm.circuitId = data.id;
+				this.getDataList();
+			},
+			changePage(v) {
+				this.searchForm.pageNum = v;
+				this.getDataList();
+				this.clearSelectAll();
+			},
+			exportCustomData() {
+				this.loading = true;
+				if(this.showType == 1){  //新增
+					addLogisticsStation(this.form).then((res) => {
+						this.loading = false;
+						if (res.code == 200) {
+							this.$Message.success("保存成功");
+							this.getDataList();
+						}
+					});
+				}else if(this.showType == 2){ //编辑
+					updateLogisticsStation(this.form).then((res) => {
+						this.loading = false;
+						if (res.code == 200) {
+							this.$Message.success("保存成功");
+							this.getDataList();
+						}
+					});
+				}
+				
+			},
+			changePageSize(v) {
+				this.searchForm.pageSize = v;
+				this.getDataList();
+			},
+			remove(v) {
+				this.$Modal.confirm({
+					title: "确认删除",
+					content: "您确认要删除该商品吗?",
+					loading: true,
+					onOk: () => {
+						deleteLogisticsStation({
+							id: v.id
+						}).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.clearSelectAll();
+								this.$Message.success("删除成功");
+								this.getDataList();
+							}
+						});
+					},
+				});
+			},
+			changeSort(e) {
+				this.searchForm.sort = e.key;
+				this.searchForm.order = e.order;
+				if (e.order === "normal") {
+					this.searchForm.order = "";
+				}
+				this.getDataList();
+			},
+			findAllRecords(v) {
+				this.tranVisiable = true;
+				console.log(v)
+				this.$nextTick(() => {
+					this.$refs.dialog.initRecharges(v);
+				});
+			},
+			clearSelectAll() {
+				this.$refs.table.selectAll(false);
+			},
+			changeSelect(e) {
+				this.selectList = e;
+			},
+			selectDateRange(v) {
+				if (v) {
+					this.searchForm.startDate = v[0];
+					this.searchForm.endDate = v[1];
+				}
+			},
+			addStation() {
+				this.form = {
+					circuitId:'',
+					stationName:'',
+					freightRules:'',
+					landingFeeRules:'',
+					deliveryFeeRules:''
+				}
+				this.showType = "1";
+				this.form.circuitId = this.searchForm.circuitId
+				this.stationModalVisible = true
+			},
+			edit(v) {
+				// 转换null为""
+				for (let attr in v) {
+					if (v[attr] == null) {
+						v[attr] = "";
+					}
+				}
+				let str = JSON.stringify(v);
+				let data = JSON.parse(str);
+				this.form = data;
+				this.showType = "2";
+				this.stationModalVisible = true;
+			},
+			changeTableSize(v) {
+				this.tableSize = v;
+			},
+			exportData() {
+				this.$refs.table.exportCsv({
+					filename: "数据",
+				});
+			},
+			getDataList(params) {
+				this.loading = true;
+				// 带多条件搜索参数获取表单数据 请自行修改接口
+				getLogisticsStationPageList(this.searchForm).then((res) => {
+					debugger;
+					this.loading = false;
+					if (res.code == 200) {
+						this.data = res.result.records;
+						this.total = res.result.total;
+						if (this.data && this.data.length == 0 && this.searchForm.pageNum > 1) {
+							this.searchForm.pageNum -= 1;
+							this.getDataList();
+						}
+					}
+				});
+			},
+		},
+		mounted() {
+			//this.init();
+		},
+	};
+</script>
+<style lang="less">
+	//@import "@/styles/table-common.less";
+</style>
\ No newline at end of file
diff --git a/src/views/app/business/logiticsCompany/transferStation.vue b/src/views/app/business/logiticsCompany/transferStation.vue
new file mode 100644
index 0000000..56547a1
--- /dev/null
+++ b/src/views/app/business/logiticsCompany/transferStation.vue
@@ -0,0 +1,1008 @@
+<style lang="less">
+	@import "@/styles/tree&table-common.less";
+	.btn{
+		width: 80px;
+		height: 30px;
+		text-align: center;
+		line-height: 30px;
+		background: #008ba0;
+		color:#fff;
+		border-right:1px solid #fff;
+	}
+	.content-left {
+		width: 80px;
+		background: #eee;
+		height: 475px;
+		overflow: scroll;
+		scrollbar-width: none;
+	}
+	.left-box {
+		width: 100%;
+		height: 50px;
+		font-size: 14px;
+		text-align: center;
+		line-height: 50px;
+		border-bottom: 1px solid #fff;
+	}
+	
+	.left-box-hover {
+		width: 100%;
+		height: 50px;
+		font-size: 14px;
+		text-align: center;
+		line-height: 50px;
+		border-bottom: 1px solid #fff;
+		background-color: #fff;
+	}
+	
+	.red {
+		border-right: 3px solid red;
+	}
+	.content-low{
+		height: 50px;
+		padding: 3px 5px;
+		border:1px solid #eee;
+		display: inline;
+		margin-right: 5px;
+		font-weight: bold;
+	}
+	.checked{
+		background: #60F3FF;
+		color: #fff !important;
+	}
+</style>
+<template>
+	<div class="search">
+		<Card>
+			<Row type="flex" justify="space-between">
+				<Col v-show="expand" span="5">
+				<Alert show-icon>
+					当前选择：
+					<span class="select-title">{{ editTitle }}</span>
+					<a class="select-clear" v-if="editTitle" @click="cancelEdit">取消选择</a>
+				</Alert>
+				<Input v-model="searchKey" suffix="ios-search" @on-change="search" placeholder="输入搜索分类" clearable />
+				<div style="position: relative">
+					<div class="tree-bar" :style="{ maxHeight: maxHeight }">
+						<Tree ref="tree" :data="treeData" @on-select-change="selectTree"></Tree>
+					</div>
+					<Spin size="large" fix v-if="treeLoading"></Spin>
+				</div>
+				</Col>
+				<div class="expand">
+					<Icon :type="expandIcon" size="16" class="icon" @click="changeExpand" />
+				</div>
+				<Col :span="span">
+				
+				<Row align="middle" justify="space-between" class="operation">
+					
+					<div class="icons">
+						<Tooltip content="刷新" placement="top" transfer>
+							<Icon type="md-refresh" size="18" class="item" @click="getDataList" />
+						</Tooltip>
+					</div>
+				</Row>
+				<Row v-show="openSearch">
+					<Form ref="searchForm" :model="searchForm" inline :label-width="70">
+						<FormItem label="商品名称" prop="nickname">
+							<Input type="text" v-model="searchForm.keyWord" clearable placeholder="请输入商品名称"
+								style="width: 200px" />
+						</FormItem>
+						<FormItem style="margin-left: -35px" class="br">
+							<Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
+							<Button @click="handleReset">重置</Button>
+							<a class="drop-down" @click="dropDown">
+								{{ dropDownContent }}
+								<Icon :type="dropDownIcon"></Icon>
+							</a>
+						</FormItem>
+					</Form>
+				</Row>
+				<Table :loading="loading" border :columns="columns" :data="data" :size="tableSize" sortable="custom"
+					@on-sort-change="changeSort" @on-selection-change="showSelect" ref="table"></Table>
+				<Row type="flex" justify="end" class="page">
+					<Page :current="searchForm.pageNum" :total="total" :page-size="searchForm.pageSize"
+						@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+						size="small" show-total show-elevator show-sizer></Page>
+				</Row>
+				</Col>
+			</Row>
+		</Card>
+
+	</div>
+</template>
+
+<script>
+	import {
+		searchDict,
+		getAllDictDataList,
+		addDictData,
+		editDictData,
+		deleteData,
+	} from "@/api/index";
+	import {
+		goodsType,
+		deleteType,
+		categoryList,
+		categorySonList,
+		productSave,
+		getShareList,
+		productEdit,
+		productDelete,
+		productisMust,
+		productisPush,
+		productUp,
+		productDown
+	} from "@/api/app";
+	export default {
+		name: "dic-manage",
+		components: {
+		},
+		data() {
+			return {
+				Visiable: false,
+				specValueArr:[],
+				attrValueArr:[],
+				modalclassType:'',
+				shopId: '',
+				tableSize: "default",
+				dataLength: 0,
+				showAddDict: false,
+				dictForm: {},
+				showEditDict: false,
+				openSearch: true,
+				categoryIndex: 0,
+				openTip: true,
+				treeLoading: false, // 树加载状态
+				maxHeight: "500px",
+				loading: false, // 表格加载状态
+				editTitle: "", // 编辑节点名称
+				searchKey: "", // 搜索树
+				expand: true,
+				span: 18,
+				expandIcon: "ios-arrow-back",
+				selectNode: {},
+				categoryData:[],
+				categorySonData:[],
+				treeData: [], // 树数据
+				selectList: [], // 多选数据
+				searchForm: {
+					// 搜索框对应data对象
+					categoryId: "",
+					shopId:'',
+					order: "",
+					pageNum: 1,
+					pageSize: "10",
+					searchStr: "",
+					sort: ""
+				},
+				modalType: 0, // 添加或编辑标识
+				modalVisible: false, // 添加或编辑显示
+				modalclass:false,
+				modalTitle: "", // 添加或编辑标题
+				form: {
+					// 添加或编辑表单对象初始化数据
+					title: "",
+					value: "",
+					status: 0,
+					description: "",
+					sort: 0,
+				},
+				addGoodsForm:{
+					id:'',
+					shopId:'',
+					categoryId:'', //商品分类id
+					categoryName:'', //商品分类名称
+					productPicture:'', //商品图标
+					productName:'', //商品名称
+					orderFiled:'', //商品名称
+					lunchBox:0, //餐盒
+					startPayNum:'', //起售数量
+					attributeListPrice:[{ //商品规格
+						specPrice:"",
+						specNum:9999
+					}],
+					sellTime:0, //可售时间
+					isMoreBuy:0, //加料
+					sellBeginTime:'', //可售时段自定义---开始时间
+					sellEndTime:'', //可售时段自定义---结束时间
+					attributeList:'',
+					productGroupBuyPrices:[],
+					attributeList1:new Map(), //商品属性
+					productIntro:"" //详细图文
+				},
+				formValidate: {
+					// 表单验证规则
+					productName: [{
+						required: true,
+						message: "请输入",
+						trigger: "blur"
+					}]
+				},
+				columns: [
+					{
+						type: "index",
+						width: 60,
+						align: "center",
+					},
+					{
+						title: "图片",
+						key: "productPicture",
+						minWidth: 60,
+						render: (h, params) => {
+							return h("img", {
+								attrs: {
+									src: params.row.productPicture,
+								},
+								style: {
+									cursor: "zoom-in",
+									width: "80px",
+									height: "60px",
+									margin: "10px 0",
+									"object-fit": "contain",
+								},
+								on: {
+									click: () => {
+										this.showPic(params.row);
+									},
+								},
+							});
+						},
+					},
+					{
+						title: "名称",
+						key: "productName",
+						minWidth: 60,
+					},
+					{
+						title: "排名",
+						key: "orderFiled",
+						width: 100,
+					},
+					{
+						title: "操作",
+						key: "action",
+						width: 350,
+						align: "center",
+						fixed: "right",
+						render: (h, params) => {
+							
+							return h("div", [
+								h(
+									"a", {
+										on: {
+											click: () => {
+												this.edit(params.row);
+											},
+										},
+									},
+									"选择该商品"
+								),
+							]);
+						},
+					},
+				],
+				submitLoading: false, // 添加或编辑提交状态
+				data: [], //表单数据
+				total: 0, // 表单数据总数
+				screenWidth: 0,
+			};
+		},
+		methods: {
+			onCanbuyChange(categoryName, value){
+				// 更新Map中对应分类的canbuy值
+				let entry = this.addGoodsForm.attributeList1.get(categoryName)
+				if(entry){
+					entry.canbuy = parseInt(value) || 1
+					this.addGoodsForm.attributeList1.set(categoryName, entry)
+				}
+			},
+			init(v) {
+				this.shopId = v.id
+				this.searchForm.shopId = v.id
+				this.addGoodsForm.shopId = v.id
+				// if(this.addGoodsForm.productGroupBuyPrices == null){
+				// 	this.addGoodsForm.productGroupBuyPrices = []
+				// }
+				console.log('aaa',this.addGoodsForm)
+				this.screenWidth = window.screen.width;
+				// 获取树数据
+				this.getGoodsType();
+				// 获取表单数据
+				// this.getDataList();
+			},
+			changePrice(index){
+				this.specValueArr[index].specPrice = this.addGoodsForm.attributeListPrice[index].specPrice
+			},
+			changeCount(index){
+				this.specValueArr[index].specNum = this.addGoodsForm.attributeListPrice[index].specNum
+			},
+			getGoodsType() {
+				this.treeLoading = true;
+				goodsType({
+					shopId: this.shopId
+				}).then((res) => {
+					this.treeLoading = false;
+					if (res.success) {
+						this.treeData = res.result;
+						let bidain ={
+							    "id": "bidian",
+							    "delFlag": 0,
+							    "categoryName": '必点',
+							    "shopId": this.shopId,
+							    "count": 0,
+							    "stockCount": 0,
+							    "minusStockCount": null,
+							    "sort": null,
+							    "title": '必点',
+							    "nodeKey": 0
+						}
+						let tuijian ={
+							    "id": "tuijian",
+							    "delFlag": 0,
+							    "categoryName": '推荐',
+							    "shopId": this.shopId,
+							    "count": 0,
+							    "stockCount": 0,
+							    "minusStockCount": null,
+							    "sort": null,
+							    "title": '推荐',
+							    "nodeKey": 0
+						}
+						for (let i = 0; i < this.treeData.length; i++) {
+							this.treeData[i].title = this.treeData[i].categoryName
+						}
+						this.treeData.unshift(bidain)
+						this.treeData.unshift(tuijian)
+					}
+				});
+			},
+			search() {
+				// 搜索树
+				if (this.searchKey) {
+					this.treeLoading = true;
+					searchDict({
+						key: this.searchKey
+					}).then((res) => {
+						this.treeLoading = false;
+						if (res.success) {
+							this.treeData = res.result;
+						}
+					});
+				} else {
+					// 为空重新加载
+					this.getGoodsType();
+				}
+			},
+			checkSpec(type){
+				this.modalclass = true;
+				this.modalclassType = type
+				if(type == 'shuxing'){
+					this.modalTitle = "选择属性";
+				}else{
+					this.modalTitle = "选择规格";
+				}
+				getAllDictDataList({
+					name: "",
+					status: "",
+					pageNumber: 1,
+					pageSize: 100000,
+					sort: 'sortOrder',
+					order: 'asc',
+					dictId: '2026945661353725952'
+				}).then((res) => {
+					if(res.code == 200){
+						this.categoryData = res.result.content
+						for (var i = 0; i < this.categoryData.length; i++) {
+							if (i == this.categoryIndex) {
+								this.categoryData[i].parentId = true
+							} else {
+								this.categoryData[i].parentId = false
+							}
+						}
+						//如果是选择属性，需要拿一个分类名，保存成parent
+						this.typeToAttrName = res.result.content[this.categoryIndex].title
+						this.getCateGorySon(res.result.content[this.categoryIndex].id)
+					}
+				});
+			},
+			deldantiaoguige(index){
+				for (var m = 0; m < this.specValueArr.length; m++) {
+					if(this.specValueArr[m].id == this.addGoodsForm.attributeListPrice[index].id){
+						this.specValueArr.splice(m,1)
+						this.addGoodsForm.attributeListPrice.splice(index,1)
+						console.log("11",this.addGoodsForm.attributeListPrice)
+						if(this.addGoodsForm.attributeListPrice.length == 1){
+							this.addGoodsForm.attributeListPrice = []
+							this.addGoodsForm.attributeListPrice.push({
+								specName:"",
+								specPrice:'',
+								specNum:9999
+							})
+							this.specValueArr = []
+						}
+						this.$forceUpdate()
+						return
+					}
+				}
+			},
+			delGroup(index){
+				this.addGoodsForm.productGroupBuyPrices.splice(index,1)
+			},
+			addGroup(){
+				let data = {
+					groupCount:'',
+					groupPrice:0
+				}
+				this.addGoodsForm.productGroupBuyPrices.push(data)
+			},
+			showPic(v) {
+				let image = new Image();
+				image.src = v.productPicture;
+				let viewer = new Viewer(image, {
+					hidden: function() {
+						viewer.destroy();
+					},
+				});
+				viewer.show();
+			},
+			getCateGorySon(id){
+				getAllDictDataList({
+					name: "",
+					status: "",
+					pageNumber: 1,
+					pageSize: 100000,
+					sort: 'sortOrder',
+					order: 'asc',
+					dictId: id
+				}).then((res) => {
+					if(res.code == 200){
+						this.categorySonData = res.result.content
+						if(this.modalclassType == 'shuxing'){
+							for (var i = 0; i < this.categorySonData.length; i++) {
+								if(this.attrValueArr.length>0){
+									let index1 = false
+									for (var m = 0; m < this.attrValueArr.length; m++) {
+										if(this.attrValueArr[m].title == this.categorySonData[i].title && this.attrValueArr[m].parentName == this.typeToAttrName){
+											index1 = true
+											this.categorySonData[i].checked = true
+										}
+									}
+									if(index1){
+										this.categorySonData[i].checked = true
+									}
+								}else{
+									this.categorySonData[i].checked = false
+								}
+							}
+						}else{
+							//guige
+							
+							
+							for (var i = 0; i < this.categorySonData.length; i++) {
+								if(this.specValueArr.length>0){
+									for (var m = 0; m < this.specValueArr.length; m++) {
+										if(this.specValueArr[m].id == this.categorySonData[i].id){
+											this.categorySonData[i].checked = true
+										}
+									}
+								}else{
+									this.categorySonData[i].checked = false
+								}
+							}
+						}
+						
+					}
+				});
+			},
+			//点击左侧菜单切换
+			clickLeftBtn(index) {
+				for (var i = 0; i < this.categoryData.length; i++) {
+					if (i == index) {
+						this.categoryData[i].parentId = true
+					} else {
+						this.categoryData[i].parentId = false
+					}
+				}
+				this.categoryIndex = index
+				this.typeToAttrName = this.categoryData[this.categoryIndex].title
+				this.getCateGorySon(this.categoryData[this.categoryIndex].id)
+			},
+			checkSellTime(type){
+				this.addGoodsForm.sellTime = type;
+			},
+			checkisMoreBuy(type){
+				this.addGoodsForm.isMoreBuy = type;
+			},
+			checkSpecValue(index){
+				this.categorySonData[index].checked = !this.categorySonData[index].checked
+				if(this.modalclassType == 'shuxing'){
+					if(this.categorySonData[index].checked == true){
+						this.categorySonData[index].parentName = this.typeToAttrName
+						this.attrValueArr.push(this.categorySonData[index])
+					}else{
+						for(let i=0;i<this.attrValueArr.length;i++){
+							if(this.categorySonData[index].title == this.attrValueArr[i].title){
+								this.attrValueArr.splice(i,1)
+							}
+						}
+					}
+				}else{
+					//guige
+					if(this.categorySonData[index].checked == true){
+						this.specValueArr.push(this.categorySonData[index])
+					}else{
+						for(let i=0;i<this.specValueArr.length;i++){
+							if(this.categorySonData[index].id == this.specValueArr[i].id){
+								this.specValueArr.splice(i,1)
+							}
+						}
+					}
+				}
+				this.$forceUpdate()
+			},
+			guigeSubmit(){
+				if(this.modalclassType == 'shuxing'){
+					// 先保存旧的canbuy值
+					let oldCanbuyMap = {}
+					this.addGoodsForm.attributeList1.forEach((value, key) => {
+						oldCanbuyMap[key] = value.canbuy || 1
+					})
+					for(let i=0;i<this.attrValueArr.length;i++){
+						if(this.addGoodsForm.attributeList1.size == 0){
+							//set  has get
+							let data = {
+								title:[],
+								canbuy: oldCanbuyMap[this.attrValueArr[i].parentName] || 1
+							}
+							data.title.push(this.attrValueArr[i].title)
+							this.addGoodsForm.attributeList1.set(this.attrValueArr[i].parentName,data)
+						}else{
+							if(this.addGoodsForm.attributeList1.has(this.attrValueArr[i].parentName) && this.addGoodsForm.attributeList1.get(this.attrValueArr[i].parentName).title.indexOf(this.attrValueArr[i].title) == -1){
+								this.addGoodsForm.attributeList1.get(this.attrValueArr[i].parentName).title.push(this.attrValueArr[i].title)
+							}else if(!this.addGoodsForm.attributeList1.has(this.attrValueArr[i].parentName)){
+								let data = {
+									title:[],
+									canbuy: oldCanbuyMap[this.attrValueArr[i].parentName] || 1
+								}
+								data.title.push(this.attrValueArr[i].title)
+								this.addGoodsForm.attributeList1.set(this.attrValueArr[i].parentName,data)
+							}
+						}
+					}
+				}else{
+					//guige
+					let message = []
+					console.log("this.specValueArr",this.specValueArr)
+					for(let i=0;i<this.specValueArr.length;i++){
+						for(let m=0;m<this.addGoodsForm.attributeListPrice.length;m++){
+							if(this.specValueArr[i].id == this.addGoodsForm.attributeListPrice[m].id){
+								this.specValueArr[i].specPrice = this.addGoodsForm.attributeListPrice[m].specPrice
+								this.specValueArr[i].specName = this.addGoodsForm.attributeListPrice[m].specName
+								this.specValueArr[i].specNum = this.addGoodsForm.attributeListPrice[m].specNum
+							}
+						}
+						message.push({
+							id:this.specValueArr[i].id,
+							specName:this.specValueArr[i].specName == undefined ? this.specValueArr[i].title : this.specValueArr[i].specName,
+							specPrice:this.specValueArr[i].specPrice == undefined ? '' : this.specValueArr[i].specPrice,
+							specNum:this.specValueArr[i].specNum == undefined ? 9999 : this.specValueArr[i].specNum
+						})
+					}
+					this.addGoodsForm.attributeListPrice = message
+				}
+				
+				this.modalclass = false;
+			},
+			selectTree(v) {
+				if (v.length > 0) {
+					// 转换null为""
+					for (let attr in v[0]) {
+						if (v[0][attr] == null) {
+							v[0][attr] = "";
+						}
+					}
+					let str = JSON.stringify(v[0]);
+					let data = JSON.parse(str);
+					this.selectNode = data;
+					this.dictForm = data;
+					this.editTitle = data.title;
+					// 重新加载表
+					this.searchForm.pageNum = 1;
+					this.searchForm.pageSize = 10;
+					this.getDataList();
+				} else {
+					this.cancelEdit();
+				}
+			},
+			cancelEdit() {
+				let data = this.$refs.tree.getSelectedNodes()[0];
+				if (data) {
+					data.selected = false;
+				}
+				// 取消选择后获取全部数据
+				this.selectNode = {};
+				this.editTitle = "";
+				// this.getDataList();
+			},
+			changeTableSize(v) {
+				this.tableSize = v;
+			},
+			exportData() {
+				this.$refs.table.exportCsv({
+					filename: "数据",
+				});
+			},
+			changeSelect(v) {
+				this.selectList = v;
+			},
+			changeExpand() {
+				this.expand = !this.expand;
+				if (this.expand) {
+					this.expandIcon = "ios-arrow-back";
+					this.span = 18;
+				} else {
+					this.expandIcon = "ios-arrow-forward";
+					this.span = 23;
+				}
+			},
+			changePage(v) {
+				this.searchForm.pageNum = v;
+				// this.getDataList();
+				this.clearSelectAll();
+			},
+			changePageSize(v) {
+				this.searchForm.pageSize = v;
+				// this.getDataList();
+			},
+			getDataList() {
+				this.loading = true;
+				// if (this.selectNode.id) {
+					this.searchForm.categoryId = this.selectNode.id;
+				// } else {
+				// 	delete this.searchForm.dictId;
+				// }
+				if (!this.searchForm.status) {
+					this.searchForm.status = "";
+				}
+				getShareList(this.searchForm).then((res) => {
+					this.loading = false;
+					if (res.success) {
+						this.data = res.result.records;
+						this.total = res.result.total;
+						if (this.data.length == 0 && this.searchForm.pageNum > 1) {
+							this.searchForm.pageNum -= 1;
+							this.getDataList();
+						}
+					}
+				});
+			},
+			handleSearch() {
+				this.searchForm.pageNum = 1;
+				this.searchForm.pageSize = 10;
+				this.getDataList();
+			},
+			handleReset() {
+				this.$refs.searchForm.resetFields();
+				this.searchForm.pageNum = 1;
+				this.searchForm.pageSize = 10;
+				// 重新加载数据
+				// this.getDataList();
+			},
+			changeSort(e) {
+				this.searchForm.sort = e.key;
+				this.searchForm.order = e.order;
+				if (e.order == "normal") {
+					this.searchForm.order = "";
+				}
+				// this.getDataList();
+			},
+			showSelect(e) {
+				this.selectList = e;
+			},
+			clearSelectAll() {
+				this.$refs.table.selectAll(false);
+			},
+			refreshDict() {
+				this.getGoodsType();
+				this.selectNode = {};
+				this.editTitle = "";
+				// this.getDataList();
+			},
+			handleDropdown(name) {
+				if (name == "editDict") {
+					if (!this.selectNode.id) {
+						this.$Message.warning("您还未选择要编辑的分类");
+						return;
+					}
+					this.handleEditDict();
+				} else if (name == "delDict") {
+					this.delDict();
+				} else if (name == "refreshDict") {
+					this.refreshDict();
+				}
+			},
+			handleAddDict() {
+				this.dataLength = this.treeData.length + 1;
+				this.showAddDict = true;
+				this.$refs.addTypePage.init(this.shopId)
+			},
+			handleEditDict() {
+				this.showEditDict = true;
+				this.$refs.editTypePage.init(this.shopId)
+			},
+			editDictSuccess(v) {
+				for (let attr in v) {
+					if (v[attr] == null) {
+						v[attr] = "";
+					}
+				}
+				let str = JSON.stringify(v);
+				let data = JSON.parse(str);
+				this.dictForm = data;
+				this.editTitle = v.title + "(" + v.type + ")";
+				this.getGoodsType();
+			},
+			delDict() {
+				if (!this.selectNode.id) {
+					this.$Message.warning("您还未选择要删除的分类");
+					return;
+				}
+				this.$Modal.confirm({
+					title: "确认删除",
+					loading: true,
+					content: "您确认要删除分类 " + this.selectNode.title + " 及其所有数据?",
+					onOk: () => {
+						// 删除
+						deleteType({
+							id: this.selectNode.id,
+							shopId: this.shopId
+						}).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.$Message.success("操作成功");
+								this.refreshDict();
+							}
+						});
+					},
+				});
+			},
+			getChildren(v) {
+				this.Visiable = true;
+				this.$nextTick(() => {
+					this.$refs.dialog.initRecharge(v);
+				});
+			},
+			add() {
+				if (!this.selectNode.id) {
+					this.$Message.warning("请先选择一个分类");
+					return;
+				}
+				this.modalType = 0;
+				this.modalTitle = "添加分类 " + this.editTitle + " 的数据";
+				this.$refs.form.resetFields();
+				this.form.sort = this.data.length + 1;
+				this.addGoodsForm = {
+					id:'',
+					shopId:'',
+					categoryId:'', //商品分类id
+					categoryName:'', //商品分类名称
+					productPicture:'', //商品图标
+					productName:'', //商品名称
+					lunchBox:0, //餐盒
+					startPayNum:'', //起售数量
+					orderFiled:'',//排名
+					attributeListPrice:[{ //商品规格
+						specPrice:"",
+						specNum:9999
+					}],
+					sellTime:0, //可售时间
+					sellBeginTime:'', //可售时段自定义---开始时间
+					sellEndTime:'', //可售时段自定义---结束时间
+					attributeList:'',
+					productGroupBuyPrices:[],
+					attributeList1:new Map(), //商品属性
+					productIntro:"" //详细图文
+				}
+				this.specValueArr = []
+				this.attrValueArr = []
+				this.addGoodsForm.shopId = this.shopId
+				this.addGoodsForm.categoryId = this.selectNode.id
+				this.addGoodsForm.categoryName = this.selectNode.categoryName
+				this.modalVisible = true;
+			},
+			edit(v) {
+				this.modalType = 1;
+				if (this.editTitle) {
+					this.modalTitle = "编辑分类 " + this.editTitle + " 的数据";
+				} else {
+					this.modalTitle = "编辑分类数据";
+				}
+				// 转换null为""
+				for (let attr in v) {
+					if (v[attr] == null) {
+						v[attr] = "";
+					}
+				}
+				let str = JSON.stringify(v);
+				let data = JSON.parse(str);
+				console.log('111111',data)
+				this.addGoodsForm = data;
+				if(this.addGoodsForm.productGroupBuyPrices == ''){
+					this.addGoodsForm.productGroupBuyPrices = []
+				}
+				this.addGoodsForm.attributeList1 = JSON.parse(this.addGoodsForm.attributeList)
+				this.addGoodsForm.attributeList1 = new Map(Object.entries(this.addGoodsForm.attributeList1));
+				// 兼容历史数据：如果没有canbuy字段，默认设为1
+				this.addGoodsForm.attributeList1.forEach((value, key) => {
+					if(value.canbuy === undefined || value.canbuy === null){
+						value.canbuy = 1
+					}
+				});
+				this.addGoodsForm.attributeListPrice = JSON.parse(this.addGoodsForm.attributeListPrice)
+				
+				this.addGoodsForm.attributeList1.forEach((value, key) => {
+					for(let i = 0;i<value.title.length;i++){
+						this.attrValueArr.push({
+							parentName:key,
+							title:value.title[i]
+						})
+					}
+				});
+				this.specValueArr = this.addGoodsForm.attributeListPrice
+				
+				this.addGoodsForm.sellTime = this.addGoodsForm.sellBeginTime != '' ? 1 : 0
+				this.modalVisible = true;
+			},
+			handelSubmit() {
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						
+						
+						this.submitLoading = true;
+						if (this.modalType == 0) {
+							// 添加 避免编辑后传入id等数据 记得删除
+							delete this.addGoodsForm.id;
+							if(this.addGoodsForm.isMoreBuy != 1){
+								this.addGoodsForm.isMoreBuy = 0
+							}
+							this.addGoodsForm.attributeListPrice = JSON.stringify(this.addGoodsForm.attributeListPrice)
+							this.addGoodsForm.attributeList = Object.fromEntries(this.addGoodsForm.attributeList1)
+							this.addGoodsForm.attributeList = JSON.stringify(this.addGoodsForm.attributeList)
+							productSave(this.addGoodsForm).then((res) => {
+								this.submitLoading = false;
+								if (res.success) {
+									this.$Message.success("操作成功");
+									this.getDataList();
+									this.modalVisible = false;
+								}
+							});
+						} else if (this.modalType == 1) {
+							// 编辑
+							
+							this.addGoodsForm.attributeListPrice = JSON.stringify(this.addGoodsForm.attributeListPrice)
+							this.addGoodsForm.attributeList = Object.fromEntries(this.addGoodsForm.attributeList1)
+							this.addGoodsForm.attributeList = JSON.stringify(this.addGoodsForm.attributeList)
+							this.addGoodsForm.productPictures = []
+							productEdit(this.addGoodsForm).then((res) => {
+								this.submitLoading = false;
+								if (res.success) {
+									this.$Message.success("操作成功");
+									this.getDataList();
+									this.modalVisible = false;
+								}
+							});
+						}
+					}
+				});
+			},
+			remove(v) {
+				this.$Modal.confirm({
+					title: "确认删除",
+					content: "您确认要删除 " + v.productName + " ?",
+					loading: true,
+					onOk: () => {
+						// 删除
+						productDelete({
+							id: v.id
+						}).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.clearSelectAll();
+								this.$Message.success("操作成功");
+								this.getDataList();
+							}
+						});
+					},
+				});
+			},
+			upDown(v,value) {
+				if(value == 0){
+					productDown({
+						id: v.id
+					}).then((res) => {
+						this.$Modal.remove();
+						if (res.success) {
+							this.clearSelectAll();
+							this.$Message.success("操作成功");
+							this.getDataList();
+						}
+					});
+				}else{
+					productUp({
+						id: v.id
+					}).then((res) => {
+						this.$Modal.remove();
+						if (res.success) {
+							this.clearSelectAll();
+							this.$Message.success("操作成功");
+							this.getDataList();
+						}
+					});
+				}
+				
+			},
+			isPush(v,value) {
+				productisPush({
+					id: v.id,
+					isPush:value
+				}).then((res) => {
+					this.$Modal.remove();
+					if (res.success) {
+						this.clearSelectAll();
+						this.$Message.success("操作成功");
+						this.getDataList();
+					}
+				});
+			},
+			isMust(v,value) {
+				productisMust({
+					id: v.id,
+					isMust:value
+				}).then((res) => {
+					this.$Modal.remove();
+					if (res.success) {
+						this.clearSelectAll();
+						this.$Message.success("操作成功");
+						this.getDataList();
+					}
+				});
+			},
+			delAll() {
+				if (this.selectList.length <= 0) {
+					this.$Message.warning("您还未选择要删除的数据");
+					return;
+				}
+				this.$Modal.confirm({
+					title: "确认删除",
+					content: "您确认要删除所选的 " + this.selectList.length + " 条数据?",
+					loading: true,
+					onOk: () => {
+						let ids = "";
+						this.selectList.forEach(function(e) {
+							ids += e.id + ",";
+						});
+						ids = ids.substring(0, ids.length - 1);
+						// 批量删除
+						deleteData({
+							ids: ids
+						}).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.$Message.success("操作成功");
+								this.clearSelectAll();
+								// this.getDataList();
+							}
+						});
+					},
+				});
+			},
+		},
+		mounted() {
+			// 计算高度
+			let height = document.documentElement.clientHeight;
+			this.maxHeight = Number(height - 287) + "px";
+			this.init();
+		},
+	};
+</script>
\ No newline at end of file