diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 222363e..0000000
Binary files a/dist.zip and /dev/null differ
diff --git a/index.html b/index.html
index 7809021..7fe64e5 100644
--- a/index.html
+++ b/index.html
@@ -67,5 +67,5 @@
 </body>
 
 </html>
-<!-- <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=F3RBZ-XXYLJ-HDWFM-XAM33-JB75K-42F64"></script> -->
-<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=F3RBZ-XXYLJ-HDWFM-XAM33-JB75K-42F64"></script>
\ No newline at end of file
+<script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=	
+5OGBZ-CQCCJ-5FBFJ-KBK6B-C2DM2-VBF2J"></script>
\ No newline at end of file
diff --git a/src/api/goods.ts b/src/api/goods.ts
index 51e53a4..c9699b4 100644
--- a/src/api/goods.ts
+++ b/src/api/goods.ts
@@ -23,4 +23,9 @@ export function apiGoodsDelete(params: any) {
 // 商品主表详情
 export function apiGoodsDetail(params: any) {
     return request.get({ url: '/goods/detail', params })
+}
+
+// 商品分类列表
+export function checkCategory(params: any) {
+    return request.post({ url: '/goodsCategory/checkCategory', params })
 }
\ No newline at end of file
diff --git a/src/api/goods_category.ts b/src/api/goods_category.ts
new file mode 100644
index 0000000..d43ee65
--- /dev/null
+++ b/src/api/goods_category.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 商品分类列表
+export function apiGoodsCategoryLists(params: any) {
+    return request.get({ url: '/goods_category/lists', params })
+}
+
+// 添加商品分类
+export function apiGoodsCategoryAdd(params: any) {
+    return request.post({ url: '/goods_category/add', params })
+}
+
+// 编辑商品分类
+export function apiGoodsCategoryEdit(params: any) {
+    return request.post({ url: '/goods_category/edit', params })
+}
+
+// 删除商品分类
+export function apiGoodsCategoryDelete(params: any) {
+    return request.post({ url: '/goods_category/delete', params })
+}
+
+// 商品分类详情
+export function apiGoodsCategoryDetail(params: any) {
+    return request.get({ url: '/goods_category/detail', params })
+}
\ No newline at end of file
diff --git a/src/components/map/map-choose.vue b/src/components/map/map-choose.vue
index 2f8347e..f015794 100644
--- a/src/components/map/map-choose.vue
+++ b/src/components/map/map-choose.vue
@@ -1,82 +1,110 @@
 <template>
-    <div :key="domKey">
-        <el-button @click="selectCoordinate" type="primary">位置选择</el-button>
-        <el-dialog title="位置选择" @close="cancelMap" v-model="codeVisible" width="100%">
-            <div class="flex flex-col justify-between">
-                <vqqmap v-model="location" @update="mapChange" :options="options" />
-                <div class="dialog-footer" style="padding-top: 50px; display: flex; justify-content: right">
-                    <div>
-                        <el-button @click="cancelMap">取 消</el-button>
-                        <el-button type="primary" @click="handelOk">确 定</el-button>
-                    </div>
-                </div>
-            </div>
-        </el-dialog>
-    </div>
+    <el-input v-model="searchKeyword" placeholder="请输入搜索的地址" @change="handleSearch"></el-input>
+    <div class="map mt-2" id="tx_map_d"></div>
 </template>
 
-<script setup lang="ts">
-import vqqmap from "vue-qqmap";
-const domKey = ref(0);
-const formData = reactive<object>({});
-const emit = defineEmits(["getLocation"]);
-// 地图
-const location = reactive({
-    lat: "",
-    lng: "",
-    address: "",
-});
-const props = defineProps({
-    atLocation: {
-        type: String,
-        default: "31.1269,104.3978",
-    },
-    address: {
-        type: String,
-        default: "德阳市人民政府",
-    },
-});
-
-watch(
-    [() => props.atLocation, () => props.address],
-    ([newVal1, newVal2], [oldVal1, oldVal2]) => {
-        if (newVal1) {
-            location.lat = newVal1.split(",")[0];
-            location.lng = newVal1.split(",")[1];
-            location.address = newVal2;
-        } else {
-            location.latitude = "";
-            location.longitude = "";
-            location.address = "";
-            return "";
+<script>
+import { ref, reactive, defineComponent, nextTick, onMounted } from "vue";
+export default defineComponent({
+    props: {
+        initLoc: {
+            type: String,
+            default: ''
         }
     },
-    { immediate: true, deep: true }
-);
-const options = reactive({ key: "F3RBZ-XXYLJ-HDWFM-XAM33-JB75K-42F64" });
+    emits: ["update:coordinate"],
+    setup(props, { emit }) {
+        const loc = reactive({
+            lat: "",
+            lng: "",
+        });
+        const searchKeyword = ref("");
+        let markerFlag = null;
+        let map = null;
+        let geocoder = null;
+        let center = null;
+        onMounted(() => {
+            nextTick(() => {
+                initMap();
+            });
+        });
+        const initMap = () => {
+            const initLocation = props.initLoc
+            if (initLocation) {
+                const l = initLocation.split(',')
+                center = new TMap.LatLng(l[0], l[1]);
+            } else {
+                //定义地图中心点坐标
+                center = new TMap.LatLng(39.98412, 116.307484);
+            }
 
-const codeVisible = ref(false);
-// 弹出地图弹框
-const selectCoordinate = () => {
-    codeVisible.value = true;
-    formData.latitude = location.lat;
-    formData.longitude = location.lng;
-    formData.address = location.address;
-};
-// 地图更换
-const mapChange = (data) => {
-    formData.latitude = data.lat;
-    formData.longitude = data.lng;
-    formData.address = data.address;
-};
-const cancelMap = () => {
-    codeVisible.value = false;
-    emit("getLocation", formData);
-    domKey.value = domKey.value + 1;
-};
-const handelOk = () => {
-    codeVisible.value = false;
-    emit("getLocation", formData);
-    domKey.value = domKey.value + 1;
-};
-</script>
\ No newline at end of file
+            //定义map变量，调用 TMap.Map() 构造函数创建地图
+            map = new TMap.Map(document.getElementById("tx_map_d"), {
+                center: center, //设置地图中心点坐标
+                zoom: 17.2, //设置地图缩放级别
+                pitch: 43.5, //设置俯仰角
+                rotation: 45, //设置地图旋转角度
+            });
+            removeMarker();
+            createMarker(center);
+
+            geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+            // 创建点聚合实例
+            map.on("click", function (evt) {
+                loc.lat = evt.latLng.getLat();
+                loc.lng = evt.latLng.getLng();
+                removeMarker();
+                createMarker(evt.latLng);
+            });
+        };
+        const createMarker = (latLng) => {
+            if (!markerFlag) {
+                markerFlag = new TMap.MultiMarker({
+                    id: "marker-layer",
+                    map: map,
+                    geometries: [
+                        {
+                            id: "marker",
+                            styleId: "marker",
+                            position: latLng,
+                        },
+                    ],
+                });
+                emit('update:coordinate', { 'lat': latLng.lat, 'lng': latLng.lng });
+            }
+        };
+        const removeMarker = () => {
+            if (markerFlag) {
+                markerFlag.setMap(null);
+                markerFlag = null;
+            }
+        };
+        const covert = (val) => {
+            geocoder.getLocation({ address: val }).then((result) => {
+                removeMarker();
+                createMarker(result.result.location);
+                // 设置地图中心为新地址位置
+                map.setCenter(result.result.location);
+            });
+        };
+        // 搜索地址
+        const handleSearch = () => {
+            if (searchKeyword.value) {
+                covert(searchKeyword.value);
+            }
+        };
+        return {
+            handleSearch,
+            searchKeyword,
+        };
+    },
+});
+</script>
+
+<style lang="scss" scoped>
+.map {
+    width: 100%;
+    height: 400px;
+}
+</style>
diff --git a/src/views/goods/edit copy.vue b/src/views/goods/edit copy.vue
new file mode 100644
index 0000000..bd7f0d6
--- /dev/null
+++ b/src/views/goods/edit copy.vue	
@@ -0,0 +1,348 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+            @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="商品名称" prop="name">
+                    <el-input v-model="formData.name" clearable placeholder="请输入商品名称" />
+                </el-form-item>
+                <el-form-item label="商品编码" prop="code">
+                    <el-input v-model="formData.code" clearable placeholder="请输入商品编码" />
+                </el-form-item>
+                <el-form-item label="一级分类id" prop="first_category_id">
+                    <el-input v-model="formData.first_category_id" clearable placeholder="请输入一级分类id" />
+                </el-form-item>
+                <el-form-item label="二级分类id" prop="second_category_id">
+                    <el-input v-model="formData.second_category_id" clearable placeholder="请输入二级分类id" />
+                </el-form-item>
+                <el-form-item label="三级分类id" prop="third_category_id">
+                    <el-input v-model="formData.third_category_id" clearable placeholder="请输入三级分类id" />
+                </el-form-item>
+                <el-form-item label="品牌id" prop="brand_id">
+                    <el-input v-model="formData.brand_id" clearable placeholder="请输入品牌id" />
+                </el-form-item>
+                <el-form-item label="供应商id" prop="supplier_id">
+                    <el-input v-model="formData.supplier_id" clearable placeholder="请输入供应商id" />
+                </el-form-item>
+                <el-form-item label="商品状态:-1-回收站；0-下架；1-上架" prop="status">
+                    <el-input v-model="formData.status" clearable placeholder="请输入商品状态:-1-回收站；0-下架；1-上架" />
+                </el-form-item>
+                <el-form-item label="商品主图" prop="image">
+                    <el-input v-model="formData.image" clearable placeholder="请输入商品主图" />
+                </el-form-item>
+                <el-form-item label="商品视频" prop="video">
+                    <el-input v-model="formData.video" clearable placeholder="请输入商品视频" />
+                </el-form-item>
+                <el-form-item label="商品自定义海报" prop="poster">
+                    <el-input v-model="formData.poster" clearable placeholder="请输入商品自定义海报" />
+                </el-form-item>
+                <el-form-item label="商品简介" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入商品简介" />
+                </el-form-item>
+                <el-form-item label="商品详细描述" prop="content">
+                    <el-input v-model="formData.content" clearable placeholder="请输入商品详细描述" />
+                </el-form-item>
+                <el-form-item label="排序" prop="sort">
+                    <el-input v-model="formData.sort" clearable placeholder="请输入排序" />
+                </el-form-item>
+                <el-form-item label="商品销量" prop="sales_sum">
+                    <el-input v-model="formData.sales_sum" clearable placeholder="请输入商品销量" />
+                </el-form-item>
+                <el-form-item label="虚拟销量" prop="virtual_sales_sum">
+                    <el-input v-model="formData.virtual_sales_sum" clearable placeholder="请输入虚拟销量" />
+                </el-form-item>
+                <el-form-item label="商品点击量" prop="click_count">
+                    <el-input v-model="formData.click_count" clearable placeholder="请输入商品点击量" />
+                </el-form-item>
+                <el-form-item label="虚拟点击量" prop="virtual_click">
+                    <el-input v-model="formData.virtual_click" clearable placeholder="请输入虚拟点击量" />
+                </el-form-item>
+                <el-form-item label="商品规格:1-统一规格；2-多规格；" prop="spec_type">
+                    <el-input v-model="formData.spec_type" clearable placeholder="请输入商品规格:1-统一规格；2-多规格；" />
+                </el-form-item>
+                <el-form-item label="最高价格" prop="max_price">
+                    <el-input v-model="formData.max_price" clearable placeholder="请输入最高价格" />
+                </el-form-item>
+                <el-form-item label="最低价格" prop="min_price">
+                    <el-input v-model="formData.min_price" clearable placeholder="请输入最低价格" />
+                </el-form-item>
+                <el-form-item label="市场价（sku中最高的市场价）" prop="market_price">
+                    <el-input v-model="formData.market_price" clearable placeholder="请输入市场价（sku中最高的市场价）" />
+                </el-form-item>
+                <el-form-item label="总库存" prop="stock">
+                    <el-input v-model="formData.stock" clearable placeholder="请输入总库存" />
+                </el-form-item>
+                <el-form-item label="库存预警" prop="stock_warn">
+                    <el-input v-model="formData.stock_warn" clearable placeholder="请输入库存预警" />
+                </el-form-item>
+                <el-form-item label="是否显示库存：1-是；0-否" prop="is_show_stock">
+                    <el-input v-model="formData.is_show_stock" clearable placeholder="请输入是否显示库存：1-是；0-否" />
+                </el-form-item>
+                <el-form-item label="运费类型：1-包邮；2-统一运费；3-运费模板" prop="free_shipping_type">
+                    <el-input v-model="formData.free_shipping_type" clearable
+                        placeholder="请输入运费类型：1-包邮；2-统一运费；3-运费模板" />
+                </el-form-item>
+                <el-form-item label="统一运费金额" prop="free_shipping">
+                    <el-input v-model="formData.free_shipping" clearable placeholder="请输入统一运费金额" />
+                </el-form-item>
+                <el-form-item label="运费模板" prop="free_shipping_template_id">
+                    <el-input v-model="formData.free_shipping_template_id" clearable placeholder="请输入运费模板" />
+                </el-form-item>
+                <el-form-item label="分销佣金：1-开启；0-不开启" prop="is_commission">
+                    <el-input v-model="formData.is_commission" clearable placeholder="请输入分销佣金：1-开启；0-不开启" />
+                </el-form-item>
+                <el-form-item label="一级分销比例" prop="first_ratio">
+                    <el-input v-model="formData.first_ratio" clearable placeholder="请输入一级分销比例" />
+                </el-form-item>
+                <el-form-item label="二级分销比例" prop="second_ratio">
+                    <el-input v-model="formData.second_ratio" clearable placeholder="请输入二级分销比例" />
+                </el-form-item>
+                <el-form-item label="三级分销比例" prop="three_ratio">
+                    <el-input v-model="formData.three_ratio" clearable placeholder="请输入三级分销比例" />
+                </el-form-item>
+                <el-form-item label="区域股东分红：1-开启；0-不开启" prop="is_share_bouns">
+                    <el-input v-model="formData.is_share_bouns" clearable placeholder="请输入区域股东分红：1-开启；0-不开启" />
+                </el-form-item>
+                <el-form-item label="区域分红比例" prop="region_ratio">
+                    <el-input v-model="formData.region_ratio" clearable placeholder="请输入区域分红比例" />
+                </el-form-item>
+                <el-form-item label="股东分红比例" prop="shareholder_ratio">
+                    <el-input v-model="formData.shareholder_ratio" clearable placeholder="请输入股东分红比例" />
+                </el-form-item>
+                <el-form-item label="新品推荐：1-是；0-否" prop="is_new">
+                    <el-input v-model="formData.is_new" clearable placeholder="请输入新品推荐：1-是；0-否" />
+                </el-form-item>
+                <el-form-item label="好物优选：1-是；0-否" prop="is_best">
+                    <el-input v-model="formData.is_best" clearable placeholder="请输入好物优选：1-是；0-否" />
+                </el-form-item>
+                <el-form-item label="猜你喜欢：1-是；0-否" prop="is_like">
+                    <el-input v-model="formData.is_like" clearable placeholder="请输入猜你喜欢：1-是；0-否" />
+                </el-form-item>
+                <el-form-item label="是否开启拼团[0=否， 1=是]" prop="is_team">
+                    <el-input v-model="formData.is_team" clearable placeholder="请输入是否开启拼团[0=否， 1=是]" />
+                </el-form-item>
+                <el-form-item label="积分抵扣：1-开启；0-不开启" prop="is_integral">
+                    <el-input v-model="formData.is_integral" clearable placeholder="请输入积分抵扣：1-开启；0-不开启" />
+                </el-form-item>
+                <el-form-item label="会员价：1-开启；0-不开启" prop="is_member">
+                    <el-input v-model="formData.is_member" clearable placeholder="请输入会员价：1-开启；0-不开启" />
+                </el-form-item>
+                <el-form-item label="赠送积分类型：0-不赠送；1-赠送固定积分；2-按比例赠送积分" prop="give_integral_type">
+                    <el-input v-model="formData.give_integral_type" clearable
+                        placeholder="请输入赠送积分类型：0-不赠送；1-赠送固定积分；2-按比例赠送积分" />
+                </el-form-item>
+                <el-form-item label="赠送积分；" prop="give_integral">
+                    <el-input v-model="formData.give_integral" clearable placeholder="请输入赠送积分；" />
+                </el-form-item>
+                <el-form-item label="是否删除：1-是；0-否" prop="del">
+                    <el-input v-model="formData.del" clearable placeholder="请输入是否删除：1-是；0-否" />
+                </el-form-item>
+                <el-form-item label="是否开启快递配送:1-是;0-否;" prop="is_express">
+                    <el-input v-model="formData.is_express" clearable placeholder="请输入是否开启快递配送:1-是;0-否;" />
+                </el-form-item>
+                <el-form-item label="是否开启上门自提:1-是;0-否;" prop="is_selffetch">
+                    <el-input v-model="formData.is_selffetch" clearable placeholder="请输入是否开启上门自提:1-是;0-否;" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="goodsEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiGoodsAdd, apiGoodsEdit, apiGoodsDetail } from '@/api/goods'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑商品主表' : '新增商品主表'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    name: '',
+    code: '',
+    first_category_id: '',
+    second_category_id: '',
+    third_category_id: '',
+    brand_id: '',
+    supplier_id: '',
+    status: '',
+    image: '',
+    video: '',
+    poster: '',
+    remark: '',
+    content: '',
+    sort: '',
+    sales_sum: '',
+    virtual_sales_sum: '',
+    click_count: '',
+    virtual_click: '',
+    spec_type: '',
+    max_price: '',
+    min_price: '',
+    market_price: '',
+    stock: '',
+    stock_warn: '',
+    is_show_stock: '',
+    free_shipping_type: '',
+    free_shipping: '',
+    free_shipping_template_id: '',
+    is_commission: '',
+    first_ratio: '',
+    second_ratio: '',
+    three_ratio: '',
+    is_share_bouns: '',
+    region_ratio: '',
+    shareholder_ratio: '',
+    is_new: '',
+    is_best: '',
+    is_like: '',
+    is_team: '',
+    is_integral: '',
+    is_member: '',
+    give_integral_type: '',
+    give_integral: '',
+    del: '',
+    is_express: '',
+    is_selffetch: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    name: [{
+        required: true,
+        message: '请输入商品名称',
+        trigger: ['blur']
+    }],
+    first_category_id: [{
+        required: true,
+        message: '请输入一级分类id',
+        trigger: ['blur']
+    }],
+    second_category_id: [{
+        required: true,
+        message: '请输入二级分类id',
+        trigger: ['blur']
+    }],
+    third_category_id: [{
+        required: true,
+        message: '请输入三级分类id',
+        trigger: ['blur']
+    }],
+    status: [{
+        required: true,
+        message: '请输入商品状态:-1-回收站；0-下架；1-上架',
+        trigger: ['blur']
+    }],
+    image: [{
+        required: true,
+        message: '请输入商品主图',
+        trigger: ['blur']
+    }],
+    is_show_stock: [{
+        required: true,
+        message: '请输入是否显示库存：1-是；0-否',
+        trigger: ['blur']
+    }],
+    free_shipping_type: [{
+        required: true,
+        message: '请输入运费类型：1-包邮；2-统一运费；3-运费模板',
+        trigger: ['blur']
+    }],
+    is_commission: [{
+        required: true,
+        message: '请输入分销佣金：1-开启；0-不开启',
+        trigger: ['blur']
+    }],
+    is_share_bouns: [{
+        required: true,
+        message: '请输入区域股东分红：1-开启；0-不开启',
+        trigger: ['blur']
+    }],
+    is_team: [{
+        required: true,
+        message: '请输入是否开启拼团[0=否， 1=是]',
+        trigger: ['blur']
+    }],
+    is_integral: [{
+        required: true,
+        message: '请输入积分抵扣：1-开启；0-不开启',
+        trigger: ['blur']
+    }],
+    is_member: [{
+        required: true,
+        message: '请输入会员价：1-开启；0-不开启',
+        trigger: ['blur']
+    }],
+    give_integral_type: [{
+        required: true,
+        message: '请输入赠送积分类型：0-不赠送；1-赠送固定积分；2-按比例赠送积分',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiGoodsDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiGoodsEdit(data)
+        : await apiGoodsAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/goods/edit.vue b/src/views/goods/edit.vue
index bd7f0d6..fcab077 100644
--- a/src/views/goods/edit.vue
+++ b/src/views/goods/edit.vue
@@ -2,13 +2,49 @@
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
             @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="商品名称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="请输入商品名称" />
-                </el-form-item>
-                <el-form-item label="商品编码" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入商品编码" />
-                </el-form-item>
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"></el-form>
+            <el-tabs type="border-card">
+                <el-tab-pane label="基础设置">
+                    <el-form-item label="商品名称" prop="name">
+                        <el-input v-model="formData.name" clearable placeholder="请输入商品名称" />
+                    </el-form-item>
+
+                    <el-form-item label="商品编码" prop="code">
+                        <el-input v-model="formData.code" clearable placeholder="请输入商品编码" />
+                    </el-form-item>
+
+                    <el-form-item label="商品分类" prop="code">
+                        <div>
+                            <el-select v-model="formData.region" placeholder="please select your zone">
+                                <el-option label="请选择分类" value="shanghai" />
+                                <el-option label="Zone two" value="beijing" />
+                            </el-select>
+                        </div>
+
+                        <div>
+                            <el-select v-model="formData.region" placeholder="please select your zone">
+                                <el-option label="Zone one" value="shanghai" />
+                                <el-option label="Zone two" value="beijing" />
+                            </el-select>
+                        </div>
+
+                        <div>
+                            <el-select v-model="formData.region" placeholder="please select your zone">
+                                <el-option label="Zone one" value="shanghai" />
+                                <el-option label="Zone two" value="beijing" />
+                            </el-select>
+                        </div>
+                    </el-form-item>
+
+
+                </el-tab-pane>
+                <el-tab-pane label="价格库存"></el-tab-pane>
+                <el-tab-pane label="商品详情"></el-tab-pane>
+                <el-tab-pane label="销售设置"></el-tab-pane>
+            </el-tabs>
+            <!-- <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+               
+           
                 <el-form-item label="一级分类id" prop="first_category_id">
                     <el-input v-model="formData.first_category_id" clearable placeholder="请输入一级分类id" />
                 </el-form-item>
@@ -143,7 +179,7 @@
                 <el-form-item label="是否开启上门自提:1-是;0-否;" prop="is_selffetch">
                     <el-input v-model="formData.is_selffetch" clearable placeholder="请输入是否开启上门自提:1-是;0-否;" />
                 </el-form-item>
-            </el-form>
+            </el-form> -->
         </popup>
     </div>
 </template>
@@ -151,7 +187,7 @@
 <script lang="ts" setup name="goodsEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import { apiGoodsAdd, apiGoodsEdit, apiGoodsDetail } from '@/api/goods'
+import { apiGoodsAdd, apiGoodsEdit, apiGoodsDetail, checkCategory } from '@/api/goods'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
@@ -297,6 +333,9 @@ const formRules = reactive<any>({
     }]
 })
 
+onMounted(() => {
+    category()
+});
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
@@ -315,6 +354,12 @@ const getDetail = async (row: Record<string, any>) => {
     setFormData(data)
 }
 
+const category = async () => {
+    const { data, code } = await checkCategory({})
+    console.log("data,code>>>", data, code);
+    return false;
+}
+
 
 // 提交按钮
 const handleSubmit = async () => {
diff --git a/src/views/goods_category/edit.vue b/src/views/goods_category/edit.vue
new file mode 100644
index 0000000..667709f
--- /dev/null
+++ b/src/views/goods_category/edit.vue
@@ -0,0 +1,146 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="分类名称" prop="name">
+                    <el-input v-model="formData.name" clearable placeholder="请输入分类名称" />
+                </el-form-item>
+                <el-form-item label="父级id" prop="pid">
+                    <el-input v-model="formData.pid" clearable placeholder="请输入父级id" />
+                </el-form-item>
+                <el-form-item label="等级" prop="level">
+                    <el-input v-model="formData.level" clearable placeholder="请输入等级" />
+                </el-form-item>
+                <el-form-item label="排序" prop="sort">
+                    <el-input v-model="formData.sort" clearable placeholder="请输入排序" />
+                </el-form-item>
+                <el-form-item label="是否显示:1-是;0-否" prop="is_show">
+                    <el-input v-model="formData.is_show" clearable placeholder="请输入是否显示:1-是;0-否" />
+                </el-form-item>
+                <el-form-item label="是否首页推荐：1-是；0-否" prop="is_recommend">
+                    <el-input v-model="formData.is_recommend" clearable placeholder="请输入是否首页推荐：1-是；0-否" />
+                </el-form-item>
+                <el-form-item label="分类图片" prop="image">
+                    <el-input v-model="formData.image" clearable placeholder="请输入分类图片" />
+                </el-form-item>
+                <el-form-item label="分类描述" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入分类描述" />
+                </el-form-item>
+                <el-form-item label="删除标志:1-是；0-否" prop="del">
+                    <el-input v-model="formData.del" clearable placeholder="请输入删除标志:1-是；0-否" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="goodsCategoryEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiGoodsCategoryAdd, apiGoodsCategoryEdit, apiGoodsCategoryDetail } from '@/api/goods_category'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑商品分类' : '新增商品分类'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    name: '',
+    pid: '',
+    level: '',
+    sort: '',
+    is_show: '',
+    is_recommend: '',
+    image: '',
+    remark: '',
+    del: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    name: [{
+        required: true,
+        message: '请输入分类名称',
+        trigger: ['blur']
+    }],
+    pid: [{
+        required: true,
+        message: '请输入父级id',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiGoodsCategoryDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiGoodsCategoryEdit(data) 
+        : await apiGoodsCategoryAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/goods_category/index.vue b/src/views/goods_category/index.vue
new file mode 100644
index 0000000..c077699
--- /dev/null
+++ b/src/views/goods_category/index.vue
@@ -0,0 +1,165 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                class="mb-[-16px]"
+                :model="queryParams"
+                inline
+            >
+                <el-form-item label="分类名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入分类名称" />
+                </el-form-item>
+                <el-form-item label="父级id" prop="pid">
+                    <el-input class="w-[280px]" v-model="queryParams.pid" clearable placeholder="请输入父级id" />
+                </el-form-item>
+                <el-form-item label="等级" prop="level">
+                    <el-input class="w-[280px]" v-model="queryParams.level" clearable placeholder="请输入等级" />
+                </el-form-item>
+                <el-form-item label="排序" prop="sort">
+                    <el-input class="w-[280px]" v-model="queryParams.sort" clearable placeholder="请输入排序" />
+                </el-form-item>
+                <el-form-item label="是否显示:1-是;0-否" prop="is_show">
+                    <el-input class="w-[280px]" v-model="queryParams.is_show" clearable placeholder="请输入是否显示:1-是;0-否" />
+                </el-form-item>
+                <el-form-item label="是否首页推荐：1-是；0-否" prop="is_recommend">
+                    <el-input class="w-[280px]" v-model="queryParams.is_recommend" clearable placeholder="请输入是否首页推荐：1-是；0-否" />
+                </el-form-item>
+                <el-form-item label="分类图片" prop="image">
+                    <el-input class="w-[280px]" v-model="queryParams.image" clearable placeholder="请输入分类图片" />
+                </el-form-item>
+                <el-form-item label="分类描述" prop="remark">
+                    <el-input class="w-[280px]" v-model="queryParams.remark" clearable placeholder="请输入分类描述" />
+                </el-form-item>
+                <el-form-item label="删除标志:1-是；0-否" prop="del">
+                    <el-input class="w-[280px]" v-model="queryParams.del" clearable placeholder="请输入删除标志:1-是；0-否" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['goods_category/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['goods_category/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="分类名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="父级id" prop="pid" show-overflow-tooltip />
+                    <el-table-column label="等级" prop="level" show-overflow-tooltip />
+                    <el-table-column label="排序" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="是否显示:1-是;0-否" prop="is_show" show-overflow-tooltip />
+                    <el-table-column label="是否首页推荐：1-是；0-否" prop="is_recommend" show-overflow-tooltip />
+                    <el-table-column label="分类图片" prop="image" show-overflow-tooltip />
+                    <el-table-column label="分类描述" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="删除标志:1-是；0-否" prop="del" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                             <el-button
+                                v-perms="['goods_category/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                            <el-button
+                                v-perms="['goods_category/delete']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                            >
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="goodsCategoryLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiGoodsCategoryLists, apiGoodsCategoryDelete } from '@/api/goods_category'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    name: '',
+    pid: '',
+    level: '',
+    sort: '',
+    is_show: '',
+    is_recommend: '',
+    image: '',
+    remark: '',
+    del: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiGoodsCategoryLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiGoodsCategoryDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/shop/edit.vue b/src/views/shop/edit.vue
index 4b4652e..e003562 100644
--- a/src/views/shop/edit.vue
+++ b/src/views/shop/edit.vue
@@ -19,36 +19,25 @@
                     <material-picker v-model="formData.image" :limit="1" />
                 </el-form-item>
                 <el-form-item label="坐标" prop="coordinate">
-                    <el-input v-model="formData.coordinate" clearable placeholder="请输入坐标" />
-                </el-form-item>
-                <el-form-item label="0禁用 1启用" prop="state">
-                    <el-input v-model="formData.state" clearable placeholder="请输入0禁用 1启用" />
+                    <el-input v-model="formData.coordinate" clearable placeholder="请输入坐标" disabled />
                 </el-form-item>
                 <el-form-item label="经纬度" prop="code">
-                    <el-input v-model="code" name="code" clearable @click="selectCoordinate" />
-                    <el-dialog v-model="codeVisible">
-                        <div class="flex flex-col justify-between">
-                            <vqqmap v-model="location" @update="mapChange" :options="options" width="100%"></vqqmap>
-                            <div class="insertButton">
-                                <el-button @click="cancelMap">取消</el-button>
-                                <el-button type="primary" @click="codeVisible = false">确认</el-button>
-                            </div>
-                        </div>
-                    </el-dialog>
+                    <map-choose @update:coordinate="getPosition" :initLoc="formData.coordinate"></map-choose>
                 </el-form-item>
-
             </el-form>
         </popup>
     </div>
 </template>
 
 <script lang="ts" setup name="shopEdit">
-import vqqmap from 'vue-qqmap'
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiShopAdd, apiShopEdit, apiShopDetail } from '@/api/shop'
 import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
+import { defineComponent, type PropType } from 'vue'
+import MapChoose from '@/components/map/map-choose.vue';
+import DataTable from '../dev_tools/components/data-table.vue'
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -76,7 +65,8 @@ const formData = reactive({
     image: '',
     coordinate: '',
     state: '',
-    dtime: '',
+    lat: '',
+    lng: ''
 })
 
 
@@ -85,7 +75,6 @@ const formRules = reactive<any>({
 
 })
 
-
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     for (const key in formData) {
@@ -128,28 +117,11 @@ const handleClose = () => {
     emit('close')
 }
 
-// 地图
-const location = reactive({ lat: 30.572924, lng: 104.066128, address: '成都市人民政府' })
-const options = reactive({ key: 'Z72BZ-CAR6Z-B5ZXL-ZPCOP-HB5TO-22FC4' })
-const code = ref(undefined)
-const dialogVisible = ref(false)
-const codeVisible = ref(false)
-// 弹出地图弹框
-const selectCoordinate = () => {
-    codeVisible.value = true
-    code.value = location.address
-    formData.value.latitude = location.lat
-    formData.value.longitude = location.lng
+const getPosition = (data) => {
+    formData.coordinate = data.lat + ',' + data.lng
+    formData.lat = data.lat
+    formData.lng = data.lng
 }
-// 地图更换
-const mapChange = (data) => {
-    code.value = data.address
-    formData.value.latitude = data.lat
-    formData.value.longitude = data.lng
-}
-
-
-
 
 defineExpose({
     open,