From 1a2731cf2b2f5ffee0a1a6809b4f0106e7cc2b2c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 17 Jul 2024 14:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E3=80=81=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E3=80=81?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=8D=95=E4=BD=8D=E7=AD=89=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=99=90=E5=88=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E9=97=A8=E5=BA=97=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 .../store/store_branch_product/index.vue      | 182 ++++--
 src/views/store/store_product/edit.vue        | 610 ++++++++++--------
 src/views/store/store_product/index.vue       | 295 ++++++---
 src/views/user/indexList.vue                  |  69 +-
 5 files changed, 726 insertions(+), 434 deletions(-)

diff --git a/.env.development b/.env.development
index 6df9ba57..c41c52b7 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@ NODE_ENV = 'development'
 VITE_NOW_TYPE = 'dist'
 
 # Base API
-# VITE_APP_BASE_URL='http://192.168.1.22:8545'
-VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
+VITE_APP_BASE_URL='http://192.168.1.22:8545'
+# VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
 # VITE_APP_BASE_URL='https://multi-store.lihaink.cn'
 
diff --git a/src/views/store/store_branch_product/index.vue b/src/views/store/store_branch_product/index.vue
index 56bc8fa9..1b8041f2 100644
--- a/src/views/store/store_branch_product/index.vue
+++ b/src/views/store/store_branch_product/index.vue
@@ -1,24 +1,46 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="门店" prop="store_id">
                     <!-- <el-input class="w-[280px]" v-model="queryParams.store_id" clearable placeholder="请输入门店" /> -->
-                    <el-select v-model="queryParams.store_id" filterable remote reserve-keyword
-                        placeholder="输入门店名称搜索" remote-show-suffix :remote-method="remoteMethod" :loading="storeloading"
-                        style="width: 240px" @change="resetPage">
-                        <el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
+                    <el-select
+                        v-model="queryParams.store_id"
+                        filterable
+                        remote
+                        reserve-keyword
+                        placeholder="输入门店名称搜索"
+                        remote-show-suffix
+                        :remote-method="remoteMethod"
+                        :loading="storeloading"
+                        style="width: 240px"
+                        @change="resetPage"
+                    >
+                        <el-option
+                            v-for="item in storeList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="商品名称" prop="store_name">
-                    <el-input class="w-[280px]" v-model="queryParams.store_name" @keydown.enter="resetPage" clearable placeholder="请输入商品名称" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.store_name"
+                        @keydown.enter="resetPage"
+                        clearable
+                        placeholder="请输入商品名称"
+                    />
                 </el-form-item>
                 <el-form-item label="商品条码" prop="bar_code">
-                    <el-input class="w-[280px]" v-model="queryParams.bar_code" @keydown.enter="resetPage" clearable placeholder="请输入商品条码" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.bar_code"
+                        @keydown.enter="resetPage"
+                        clearable
+                        placeholder="请输入商品条码"
+                    />
                 </el-form-item>
                 <!-- <el-form-item label="状态" prop="bar_code">
                     <el-select v-model="queryParams.status"
@@ -27,7 +49,7 @@
                         <el-option v-for="item in [{id:1,name:'上架'},{id:0,name:'下架'}]" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item> -->
-                
+
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -48,25 +70,73 @@
                     <el-table-column label="门店" prop="system_store_name" show-overflow-tooltip />
                     <el-table-column label="分类" prop="cate_name" show-overflow-tooltip />
                     <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" show-overflow-tooltip >
+                    <el-table-column label="商品图片" prop="image" show-overflow-tooltip>
                         <template #default="{ row }">
-                            <el-image class="w-[40px] h-[40px]" :src="row.image"  :preview-teleported="true"/>
+                            <el-image
+                                class="w-[40px] h-[40px]"
+                                :src="row.image"
+                                :preview-teleported="true"
+                            />
                         </template>
                     </el-table-column>
-                    <el-table-column label="价格" prop="price" show-overflow-tooltip />
+                    <el-table-column
+                        label="供货价"
+                        prop="purchase"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="商户价"
+                        prop="cost"
+                        min-width="120"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="会员价"
+                        prop="vip_price"
+                        min-width="120"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="终端零售价"
+                        prop="price"
+                        min-width="120"
+                        show-overflow-tooltip
+                    />
                     <el-table-column label="商品条码" prop="bar_code" show-overflow-tooltip />
                     <el-table-column label="销量" prop="sales" show-overflow-tooltip />
                     <el-table-column label="售卖库存" prop="stock" show-overflow-tooltip />
                     <el-table-column label="兑换库存" prop="swap" show-overflow-tooltip />
                     <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status" >
+                    <el-table-column label="状态" prop="status">
                         <template #default="{ row }">
-                            <el-switch size="large" @change="statusChange(row)" v-model="row.status" :active-value="1" :inactive-value="0" active-text="上架" inactive-text="下架" inline-prompt />
+                            <el-switch
+                                size="large"
+                                @change="statusChange(row)"
+                                v-model="row.status"
+                                :active-value="1"
+                                :inactive-value="0"
+                                active-text="上架"
+                                inactive-text="下架"
+                                inline-prompt
+                            />
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作" min-width="140" fixed="right" align="center" show-overflow-tooltip >
+                    <el-table-column
+                        label="操作"
+                        min-width="140"
+                        fixed="right"
+                        align="center"
+                        show-overflow-tooltip
+                    >
                         <template #default="{ row }">
-                            <el-button type="primary" v-prems="['store_branch_product.store_branch_product/deit']" link @click="handleEdit(row)">编辑</el-button>
+                            <el-button
+                                type="primary"
+                                v-prems="['store_branch_product.store_branch_product/deit']"
+                                link
+                                @click="handleEdit(row)"
+                                >编辑</el-button
+                            >
                             <!-- 此处删除无效果 -->
                             <!-- <el-button type="danger" v-perms="['store_branch_product.store_branch_product/delete']" link @click="handleDelete(row.id)">删除</el-button> -->
                         </template>
@@ -77,7 +147,13 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <edit-popup
+            v-if="showEdit"
+            ref="editRef"
+            :dict-data="dictData"
+            @success="getLists"
+            @close="showEdit = false"
+        />
     </div>
 </template>
 
@@ -96,7 +172,6 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
-
 // 查询条件
 const queryParams = reactive({
     store_id: '',
@@ -148,26 +223,28 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 
-const storeloading = ref(false);
-const storeList = ref([]);
-const remoteMethod = (e:string='') => {
-    storeloading.value = true;
+const storeloading = ref(false)
+const storeList = ref([])
+const remoteMethod = (e = '') => {
+    storeloading.value = true
     apiSystemStoreLists({
         name: e,
         page_size: 50
-    }).then(res => {
-        storeList.value = res.lists;
-        setTimeout(()=>{
-            storeloading.value = false;
-        },300)
-    }).catch(err => {
-        setTimeout(()=>{
-            storeloading.value = false;
-        },300)
     })
+        .then((res) => {
+            storeList.value = res.lists
+            setTimeout(() => {
+                storeloading.value = false
+            }, 300)
+        })
+        .catch((err) => {
+            setTimeout(() => {
+                storeloading.value = false
+            }, 300)
+        })
 }
 
-const statusChange = (row:any)=>{
+const statusChange = (row: any) => {
     apiStoreBranchProductUpdate({
         id: row.id,
         store_name: row.store_name,
@@ -179,24 +256,23 @@ const statusChange = (row:any)=>{
 }
 
 const producStatus = ref('0')
-const changeProducStatus = (e: any)=>{
-    if(e==0) {
-        queryParams.status = null;
-        queryParams.stock = null;
-    }else if(e==1){
-        queryParams.status = 1;
-        queryParams.stock = null;
-    }else if(e==2){
-        queryParams.status = 0;
-        queryParams.stock = null;
-    }else if(e==3){
-        queryParams.status = null;
-        queryParams.stock = 10;
-    }else if(e==4){
-        queryParams.status = null;
-        queryParams.stock = 0;
+const changeProducStatus = (e: any) => {
+    if (e == 0) {
+        queryParams.status = null
+        queryParams.stock = null
+    } else if (e == 1) {
+        queryParams.status = 1
+        queryParams.stock = null
+    } else if (e == 2) {
+        queryParams.status = 0
+        queryParams.stock = null
+    } else if (e == 3) {
+        queryParams.status = null
+        queryParams.stock = 10
+    } else if (e == 4) {
+        queryParams.status = null
+        queryParams.stock = 0
     }
-    getLists();
+    getLists()
 }
 </script>
-
diff --git a/src/views/store/store_product/edit.vue b/src/views/store/store_product/edit.vue
index a87ea760..c7ab4104 100644
--- a/src/views/store/store_product/edit.vue
+++ b/src/views/store/store_product/edit.vue
@@ -1,114 +1,213 @@
 <template>
     <el-card>
         <div class="mb-4 text-lg font-bold">
-            {{ mode == "add" ? "添加商品" : "编辑商品" }}
+            {{ mode == 'add' ? '添加商品' : '编辑商品' }}
         </div>
         <div>
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-            <el-form-item label="商品图片" prop="image">
-                <material-picker v-model="formData.image" :limit="1" />
-            </el-form-item>
-            <el-form-item label="商品名称" prop="store_name">
-                <el-input v-model="formData.store_name" class="w-[500px]" clearable placeholder="请输入商品名称" :readonly="false" />
-            </el-form-item>
-            <el-form-item label="商品条码" prop="bar_code">
-                <el-input v-model="formData.bar_code" class="w-[500px]" @input="validateInput" clearable placeholder="请输入商品条码" :readonly="false" />
-            </el-form-item>
-            <el-form-item label="商品规格" prop="store_info">
-                <el-input v-model="formData.store_info" class="w-[500px]" clearable placeholder="请输入商品规格" :readonly="false" />
-            </el-form-item>
-            <el-form-item label="商品类型" prop="product_type">
-                <el-radio-group v-model="formData.product_type" :disabled="mode!='add'">
-                    <el-radio :label="0">普通产品</el-radio>
-                    <el-radio :label="1">供销系列产品</el-radio>
-                    <el-radio :label="2">兑换产品</el-radio>
-                    <el-radio :label="3">赠品</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="商品分类" prop="cate_arr">
-                <el-cascader  class="w-[500px]" v-model="formData.cate_arr" filterable clearable
-                    :before-filter="beforeFilter" :props="props" placeholder="请选择商品分类" />
-            </el-form-item>
-            <el-form-item label="商品单位" prop="unit">
-                <el-cascader class="w-[500px]" v-model="formData.unit" :options="unitList" :props="{
-                    value: 'id',
-                    label: 'name',
-                    emitPath: false,
-                }" placeholder="请选择商品单位" />
-            </el-form-item>
-            <el-form-item :label="filterStockName(formData.product_type)" prop="stock">
-                <el-input v-model="formData.stock" type="number" class="w-[500px]" clearable placeholder="请输入库存" :readonly="false" />
-            </el-form-item>
-            <!-- <el-form-item label="兑换库存" prop="swap">
+                <el-form-item label="商品图片" prop="image">
+                    <material-picker v-model="formData.image" :limit="1" />
+                </el-form-item>
+                <el-form-item label="商品名称" prop="store_name">
+                    <el-input
+                        v-model="formData.store_name"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入商品名称"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <el-form-item label="商品条码" prop="bar_code">
+                    <el-input
+                        v-model="formData.bar_code"
+                        class="w-[500px]"
+                        @input="validateInput"
+                        clearable
+                        placeholder="请输入商品条码"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <el-form-item label="商品规格" prop="store_info">
+                    <el-input
+                        v-model="formData.store_info"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入商品规格"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <el-form-item label="商品类型" prop="product_type">
+                    <el-radio-group v-model="formData.product_type" :disabled="mode != 'add'">
+                        <el-radio :label="0">普通产品</el-radio>
+                        <el-radio :label="1">供销系列产品</el-radio>
+                        <el-radio :label="2">兑换产品</el-radio>
+                        <el-radio :label="3">赠品</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="商品分类" prop="cate_arr">
+                    <el-cascader
+                        class="w-[500px]"
+                        v-model="formData.cate_arr"
+                        filterable
+                        clearable
+                        :before-filter="beforeFilter"
+                        :props="props"
+                        placeholder="请选择商品分类"
+                    />
+                </el-form-item>
+                <el-form-item label="商品单位" prop="unit">
+                    <el-cascader
+                        class="w-[500px]"
+                        v-model="formData.unit"
+                        :options="unitList"
+                        :props="{
+                            value: 'id',
+                            label: 'name',
+                            emitPath: false
+                        }"
+                        placeholder="请选择商品单位"
+                    />
+                </el-form-item>
+                <el-form-item :label="filterStockName(formData.product_type)" prop="stock">
+                    <el-input
+                        v-model="formData.stock"
+                        type="number"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入库存"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <!-- <el-form-item label="兑换库存" prop="swap">
                 <el-input v-model="formData.swap" type="number" class="w-[500px]" clearable placeholder="请输入库存" :readonly="false" />
             </el-form-item> -->
-            <el-form-item label="供货价" prop="purchase">
-                <el-input v-model="formData.purchase" type="number" class="w-[500px]" clearable placeholder="请输入供货价" :readonly="false" />
-            </el-form-item>
-            <el-form-item label="商户价" prop="cost">
-                <el-input v-model="formData.cost" type="number" class="w-[500px]" clearable placeholder="请输入商户价" :readonly="false" />
-            </el-form-item>
-            <el-form-item label="会员价" prop="vip_price">
-                <el-input v-model="formData.vip_price" type="number" class="w-[500px]" clearable placeholder="请输入会员价" :readonly="false" />
-            </el-form-item>
-            <el-form-item label="终端零售价" prop="price">
-                <el-input v-model="formData.price" type="number" class="w-[500px]" clearable placeholder="请输入终端零售价" :readonly="false" />
-            </el-form-item>
-            <el-form-item label="起批量" prop="batch">
-                <el-input v-model="formData.batch" type="number" class="w-[500px]" clearable placeholder="请输入起批量" :readonly="false" />
-            </el-form-item>
-            <el-form-item label="厂家备注" prop="manufacturer_information">
-                <el-input v-model="formData.manufacturer_information" type="textarea" autosize class="w-[500px]" clearable :placeholder="`厂家名称\n联系人姓名\n联系电话`" :readonly="false" />
-            </el-form-item>
-            <!-- <el-form-item label="上浮比例" prop="rose">
+                <el-form-item label="供货价" prop="purchase">
+                    <el-input
+                        v-model="formData.purchase"
+                        type="number"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入供货价"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <el-form-item label="商户价" prop="cost">
+                    <el-input
+                        v-model="formData.cost"
+                        type="number"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入商户价"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <el-form-item label="会员价" prop="vip_price">
+                    <el-input
+                        v-model="formData.vip_price"
+                        type="number"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入会员价"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <el-form-item label="终端零售价" prop="price">
+                    <el-input
+                        v-model="formData.price"
+                        type="number"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入终端零售价"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <el-form-item label="起批量" prop="batch">
+                    <el-input
+                        v-model="formData.batch"
+                        type="number"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入起批量"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <el-form-item label="厂家备注" prop="manufacturer_information">
+                    <el-input
+                        v-model="formData.manufacturer_information"
+                        type="textarea"
+                        autosize
+                        class="w-[500px]"
+                        clearable
+                        :placeholder="`厂家名称\n联系人姓名\n联系电话`"
+                        :readonly="false"
+                    />
+                </el-form-item>
+                <!-- <el-form-item label="上浮比例" prop="rose">
                 <el-input v-model="formData.rose" type="number" class="w-[500px]" clearable placeholder="请输入上浮比例" :readonly="false" >
                     <template #suffix>%</template>
                 </el-input>
             </el-form-item> -->
-            <el-form-item label="退货" prop="is_return">
-                <el-radio-group v-model="formData.is_return">
-                    <el-radio :label="1">支持</el-radio>
-                    <el-radio :label="0">不支持</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="所属门店" prop="store_id" v-if="mode == 'add'">
-                <el-radio-group v-model="formData.is_store_all">
-                    <el-radio :label="1">全部门店</el-radio>
-                    <el-radio :label="0">部分门店</el-radio>
-                </el-radio-group>
-                <div class="w-full" style="color:#64748b">可选择将商品同步到哪些门店使用</div>
-                <div class="mb-2">
-                    <el-button type="primary" v-if="formData.is_store_all == 0" @click="showStore = true">添加门店</el-button>
-                </div>
-                <el-table :data="storeList" v-if="formData.is_store_all == 0">
-                    <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="门店名称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="手机号码" prop="phone" show-overflow-tooltip />
-                    <el-table-column label="详细地址" prop="detailed_address" show-overflow-tooltip />
-                    <el-table-column label="门店logo" prop="image" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-image :src="row.image" class="w-[50px] h-[50px]"  :preview-teleported="true"/>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="营业状态" prop="is_show" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.is_show ? '营业' : '打烊' }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button v-perms="['system_store.system_store/delete']" type="danger" link
-                                @click="handleDelete(row.id)">
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-form-item>
-            <el-form-item label="">
-                <el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
-            </el-form-item>
-        </el-form>
+                <el-form-item label="退货" prop="is_return">
+                    <el-radio-group v-model="formData.is_return">
+                        <el-radio :label="1">支持</el-radio>
+                        <el-radio :label="0">不支持</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="所属门店" prop="store_id" v-if="mode == 'add'">
+                    <el-radio-group v-model="formData.is_store_all">
+                        <el-radio :label="1">全部门店</el-radio>
+                        <el-radio :label="0">部分门店</el-radio>
+                    </el-radio-group>
+                    <div class="w-full" style="color: #64748b">可选择将商品同步到哪些门店使用</div>
+                    <div class="mb-2">
+                        <el-button
+                            type="primary"
+                            v-if="formData.is_store_all == 0"
+                            @click="showStore = true"
+                            >添加门店</el-button
+                        >
+                    </div>
+                    <el-table :data="storeList" v-if="formData.is_store_all == 0">
+                        <el-table-column label="ID" prop="id" show-overflow-tooltip />
+                        <el-table-column label="门店名称" prop="name" show-overflow-tooltip />
+                        <el-table-column label="手机号码" prop="phone" show-overflow-tooltip />
+                        <el-table-column
+                            label="详细地址"
+                            prop="detailed_address"
+                            show-overflow-tooltip
+                        />
+                        <el-table-column label="门店logo" prop="image" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-image
+                                    :src="row.image"
+                                    class="w-[50px] h-[50px]"
+                                    :preview-teleported="true"
+                                />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="营业状态" prop="is_show" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                {{ row.is_show ? '营业' : '打烊' }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作" width="120" fixed="right">
+                            <template #default="{ row }">
+                                <el-button
+                                    v-perms="['system_store.system_store/delete']"
+                                    type="danger"
+                                    link
+                                    @click="handleDelete(row.id)"
+                                >
+                                    删除
+                                </el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-form-item>
+                <el-form-item label="">
+                    <el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
+                </el-form-item>
+            </el-form>
         </div>
         <el-dialog v-model="showStore" title="选择门店" width="70%">
             <store-pop @onBindStore="onBindStore"></store-pop>
@@ -117,95 +216,92 @@
 </template>
 
 <script lang="ts" setup name="storeProductEdit">
-import { ElMessage, type FormInstance } from "element-plus";
-import useMultipleTabs from "@/hooks/useMultipleTabs";
-import {
-    apiStoreProductAdd,
-    apiStoreProductEdit,
-    apiStoreProductDetail,
-} from "@/api/store_product";
-import { timeFormat } from "@/utils/util";
-import type { PropType } from "vue";
-import { onMounted } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { apiStoreCategoryLists } from "@/api/store_category";
-import { apiStoreProductUnitLists } from "@/api/store_product_unit";
+import { ElMessage, type FormInstance } from 'element-plus'
+import useMultipleTabs from '@/hooks/useMultipleTabs'
+import { apiStoreProductAdd, apiStoreProductEdit, apiStoreProductDetail } from '@/api/store_product'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+import { onMounted } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
+import { apiStoreCategoryLists } from '@/api/store_category'
+import { apiStoreProductUnitLists } from '@/api/store_product_unit'
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
-        default: () => ({}),
-    },
-});
-const emit = defineEmits(["success", "close"]);
-const formRef = shallowRef<FormInstance>();
-const { removeTab } = useMultipleTabs();
-const mode = ref("add");
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const { removeTab } = useMultipleTabs()
+const mode = ref('add')
 
-const filterStockName = (e: any)=>{
-    let str = "库存";
-    if(e==1) str = "供销库存";
-    if(e==2) str = "兑换库存";
-    if(e==3) str = "赠品库存";
-    return str;
+const filterStockName = (e: any) => {
+    let str = '库存'
+    if (e == 1) str = '供销库存'
+    if (e == 2) str = '兑换库存'
+    if (e == 3) str = '赠品库存'
+    return str
 }
 
 // 表单数据
 const formData = reactive({
-    id: "",
-    image: "",
-    store_name: "",
-    bar_code: "",
-    store_info: "",
+    id: '',
+    image: '',
+    store_name: '',
+    bar_code: '',
+    store_info: '',
     product_type: 0,
     cate_arr: [],
-    cate_id: "",
-    price: "",
-    vip_price: "",
-    unit: "",
-    stock: "",
-    swap: "",
-    cost: "",
-    purchase: "",
-    batch: "",
-    manufacturer_information: "", 
-    rose: "0",
+    cate_id: '',
+    price: '',
+    vip_price: '',
+    unit: '',
+    stock: '',
+    swap: '',
+    cost: '',
+    purchase: '',
+    batch: '',
+    manufacturer_information: '',
+    rose: '0',
     is_return: 1, // 1支持退货,2不支持退货
-    is_store_all: 1, //门店类型 1 全部门店 2 部分门店
-});
+    is_store_all: 1 //门店类型 1 全部门店 2 部分门店
+})
 
 // 定义验证输入的函数
 const validateInput = () => {
-  // 获取输入框的当前值
-  const inputValue = formData.bar_code;
+    // 获取输入框的当前值
+    const inputValue = formData.bar_code
 
-  // 使用正则表达式仅保留英文和数字
-  const filteredValue = inputValue.replace(/[^a-zA-Z0-9]/g, '');
+    // 使用正则表达式仅保留英文和数字
+    const filteredValue = inputValue.replace(/[^a-zA-Z0-9]/g, '')
 
-  // 更新输入框的值
-  formData.bar_code = filteredValue;
-};
+    // 更新输入框的值
+    formData.bar_code = filteredValue
+}
 
-const showStore = ref(false); // 选择门店列表是否显示
+const showStore = ref(false) // 选择门店列表是否显示
 // 门店列表
-const storeList = ref([]);
+const storeList = ref([])
 // 删除已有门店
 const handleDelete = (id: number) => {
-    storeList.value = storeList.value.filter((item: any) => item.id !== id);
-};
+    storeList.value = storeList.value.filter((item: any) => item.id !== id)
+}
 // 选择门店
 const onBindStore = (e: any[]) => {
     e.forEach((item: any) => {
         if (!storeList.value.find((t: any) => t.id == item.id)) {
-            storeList.value.push(item);
+            storeList.value.push(item)
         }
-    });
-    showStore.value = false;
+    })
+    showStore.value = false
 }
 
-let resolves;
-let nodes;
-let flag = ref(false);
-let name;
+let resolves
+let nodes
+const flag = ref(false)
+let name
 onMounted(() => {
     // setTimeout(() => {
     //     let dom = document.getElementsByClassName('caser')[0]
@@ -223,26 +319,26 @@ const beforeFilter = (value) => {
     return false
 }
 const props = {
-    value: "id",
-    label: "name",
+    value: 'id',
+    label: 'name',
     lazy: true,
     lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve;
-        if (!nodes) nodes = node;
-        let pid = node.value || 0;
+        if (!resolves) resolves = resolve
+        if (!nodes) nodes = node
+        const pid = node.value || 0
         let data = {}
         if (flag.value) {
             data = { name: name }
             if (!name) {
                 data = {
                     pid: pid,
-                    page_size: 10000,
+                    page_size: 10000
                 }
             }
         } else {
             data = {
                 pid: pid,
-                page_size: 10000,
+                page_size: 10000
             }
         }
         apiStoreCategoryLists({
@@ -250,178 +346,182 @@ const props = {
         }).then((res) => {
             resolve(
                 res.lists.map((item: any) => {
-                    item.leaf = item.is_children == 0;
+                    item.leaf = item.is_children == 0
                     flag.value = false
-                    return item;
+                    return item
                 })
-            );
-        });
-    },
-};
+            )
+        })
+    }
+}
 
-const unitList = ref([]);
+const unitList = ref([])
 const getUnitList = () => {
     apiStoreProductUnitLists({}).then((res) => {
-        unitList.value = res.lists;
-    });
-};
-getUnitList();
+        unitList.value = res.lists
+    })
+}
+getUnitList()
 
 // 表单验证
 const formRules = reactive<any>({
     store_name: [
         {
             required: true,
-            message: "请输入商品名称",
-            trigger: ["blur"],
-        },
+            message: '请输入商品名称',
+            trigger: ['blur']
+        }
     ],
     bar_code: [
         {
             required: true,
-            message: "请输入商品条码",
-            trigger: ["blur"],
-        },
+            message: '请输入商品条码',
+            trigger: ['blur']
+        }
     ],
     store_info: [
         {
             required: true,
-            message: "请输入商品规格",
-            trigger: ["blur"],
-        },
+            message: '请输入商品规格',
+            trigger: ['blur']
+        }
     ],
     cate_id: [
         {
             required: true,
-            message: "请输入商品分类",
-            trigger: ["blur", "change"],
-        },
+            message: '请输入商品分类',
+            trigger: ['blur', 'change']
+        }
     ],
     cate_arr: [
         {
             required: true,
-            message: "请选择商品分类",
-            trigger: ["blur", "change"],
-        },
+            message: '请选择商品分类',
+            trigger: ['blur', 'change']
+        }
     ],
     price: [
         {
             required: true,
-            message: "请输入终端零售价",
-            trigger: ["blur"],
-        },
+            message: '请输入终端零售价',
+            trigger: ['blur']
+        }
     ],
     vip_price: [
         {
             required: true,
-            message: "请输入会员价",
-            trigger: ["blur"],
-        },
+            message: '请输入会员价',
+            trigger: ['blur']
+        }
     ],
     unit: [
         {
             required: true,
-            message: "请输入商品单位",
-            trigger: ["blur", "change"],
-        },
+            message: '请输入商品单位',
+            trigger: ['blur', 'change']
+        }
     ],
     stock: [
         {
             required: true,
-            message: "请输入售卖库存",
-            trigger: ["blur"],
-        },
+            message: '请输入售卖库存',
+            trigger: ['blur']
+        }
     ],
     swap: [
         {
             required: true,
-            message: "请输入兑换库存",
-            trigger: ["blur"],
-        },
+            message: '请输入兑换库存',
+            trigger: ['blur']
+        }
     ],
     cost: [
         {
             required: true,
-            message: "请输入门店零售",
-            trigger: ["blur"],
-        },
+            message: '请输入门店零售',
+            trigger: ['blur']
+        }
     ],
     purchase: [
         {
             required: true,
-            message: "请输入供货价",
-            trigger: ["blur"],
-        },
+            message: '请输入供货价',
+            trigger: ['blur']
+        }
     ],
     batch: [
         {
             required: true,
-            message: "请输入起批量",
-            trigger: ["blur"],
-        },
+            message: '请输入起批量',
+            trigger: ['blur']
+        }
     ],
     image: [
         {
             required: true,
-            message: "请输入商品图片",
-            trigger: ["blur", "change"],
-        },
-    ],
-});
+            message: '请输入商品图片',
+            trigger: ['blur', 'change']
+        }
+    ]
+})
 
 // 获取详情
 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];
+            formData[key] = data[key]
         }
     }
     if (formData.cate_arr[0]) {
-        formData.cate_arr = formData.cate_arr.map((item: any) => Number(item));
+        formData.cate_arr = formData.cate_arr.map((item: any) => Number(item))
     }
-    
-};
+}
 
 const getDetail = async (row: Record<string, any>) => {
     const data = await apiStoreProductDetail({
-        id: row.id,
-    });
-    setFormData(data);
-};
+        id: row.id
+    })
+    setFormData(data)
+}
+
+const router = useRouter()
+const route = useRoute()
 
-const router = useRouter();
-const route = useRoute();
 // 提交按钮
 const handleSubmit = async () => {
-    await formRef.value?.validate();
-    let data: any = { ...formData };
+    await formRef.value?.validate()
+    const data: any = { ...formData }
     if (formData.is_store_all == 0 && mode.value == 'add') {
-        data.store_arr = storeList.value.map((item: any) => item.id);
-    } else if (mode.value == 'edit') data.is_store_all = 0;
-    if(!data.cate_arr.length) return ElMessage.error('请选择商品分类');
-    data.cate_id = data.cate_arr[data.cate_arr.length - 1];
-    delete data.cate_arr;
-    mode.value == "edit"
-        ? await apiStoreProductEdit(data)
-        : await apiStoreProductAdd(data);
+        data.store_arr = storeList.value.map((item: any) => item.id)
+    } else if (mode.value == 'edit') data.is_store_all = 0
+    if (!data.cate_arr.length) return ElMessage.error('请选择商品分类')
+    data.cate_id = data.cate_arr[data.cate_arr.length - 1]
+    delete data.cate_arr
+    mode.value == 'edit' ? await apiStoreProductEdit(data) : await apiStoreProductAdd(data)
+    // tabsStore.removeTab('/store/store_product?page_no' + route.query.page, router)
 
-    removeTab();
+    // removeTab()
     router.push({
-        path: "/store/store_product",
-    });
-};
-
-if (route.query.id && route.query.mode == 'edit') {
-    mode.value = 'edit';
-    getDetail({
-        id: route.query.id,
+        path: '/store/store_product?=',
+        query: {
+            page_no: route.query.page
+        }
     })
 }
 
-
+if (route.query.id && route.query.mode == 'edit') {
+    mode.value = 'edit'
+    getDetail({
+        id: route.query.id
+    })
+}
 </script>
 
 <style>
-input::-webkit-outer-spin-button, input::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; }
-</style>
\ No newline at end of file
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+</style>
diff --git a/src/views/store/store_product/index.vue b/src/views/store/store_product/index.vue
index 91f1b082..ced359fc 100644
--- a/src/views/store/store_product/index.vue
+++ b/src/views/store/store_product/index.vue
@@ -3,11 +3,25 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="商品名称" prop="store_name">
-                    <el-input class="w-[280px]" @keydown.enter="resetPage" v-model="queryParams.store_name" clearable placeholder="请输入商品名称" />
+                    <el-input
+                        class="w-[280px]"
+                        @keydown.enter="resetPage"
+                        v-model="queryParams.store_name"
+                        clearable
+                        placeholder="请输入商品名称"
+                    />
                 </el-form-item>
                 <el-form-item label="商品分类" prop="store_name">
-                    <el-cascader  class="w-[280px]" v-model="queryParams.class_all" filterable clearable
-                    :before-filter="beforeFilter" :props="props" placeholder="请选择商品分类" @change="resetPage" />
+                    <el-cascader
+                        class="w-[280px]"
+                        v-model="queryParams.class_all"
+                        filterable
+                        clearable
+                        :before-filter="beforeFilter"
+                        :props="props"
+                        placeholder="请选择商品分类"
+                        @change="resetPage"
+                    />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -16,24 +30,31 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <router-link :to="{
-                path: 'store_product_edit',
-                query: { id: 0, mode: 'add' },
-            }" class="mr-4" v-perms="['store_product.store_product/add']">
-                <el-button type="primary" icon="Plus">
-                    新增
-                </el-button>
+            <router-link
+                :to="{
+                    path: 'store_product_edit',
+                    query: { id: 0, mode: 'add' }
+                }"
+                class="mr-4"
+                v-perms="['store_product.store_product/add']"
+            >
+                <el-button type="primary" icon="Plus"> 新增 </el-button>
             </router-link>
-            <el-button v-perms="['store_product.store_product/delete']" :disabled="!selectData.length"
-                @click="handleDelete(selectData)">
+            <el-button
+                v-perms="['store_product.store_product/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
                 删除
             </el-button>
-            <router-link :to="{
-                path: 'product_import',
-            }" class="ml-4" v-perms="['store_product.store_product/add']">
-                <el-button type="primary">
-                    导入商品到门店
-                </el-button>
+            <router-link
+                :to="{
+                    path: 'product_import'
+                }"
+                class="ml-4"
+                v-perms="['store_product.store_product/add']"
+            >
+                <el-button type="primary"> 导入商品到门店 </el-button>
             </router-link>
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
@@ -41,48 +62,118 @@
                     <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
                     <el-table-column label="商品图片" prop="image" min-width="80">
                         <template #default="{ row }">
-                            <el-image style="width: 50px; height: 50px" :src="row.image"  :preview-teleported="true"/>
+                            <el-image
+                                style="width: 50px; height: 50px"
+                                :src="row.image"
+                                :preview-teleported="true"
+                            />
                         </template>
                     </el-table-column>
-                    <el-table-column label="商品名称" prop="store_name" min-width="200" show-overflow-tooltip />
-                    <el-table-column label="分类" prop="cate_name" min-width="120" show-overflow-tooltip />
-                    <el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
-                    <el-table-column label="供货价" prop="purchase" min-width="100" show-overflow-tooltip />
-                    <el-table-column label="商户价" prop="cost" min-width="120" show-overflow-tooltip />
-                    <el-table-column label="会员价" prop="vip_price" min-width="120" show-overflow-tooltip />
-                    <el-table-column label="终端零售价" prop="price" min-width="120" show-overflow-tooltip />
-                    <el-table-column label="起批量" prop="batch" min-width="100" show-overflow-tooltip />
-                    <el-table-column label="售卖库存" prop="stock" min-width="100" show-overflow-tooltip />
-                    <el-table-column label="兑换库存" prop="swap" min-width="100" show-overflow-tooltip />
-                    <el-table-column label="销量" prop="sales" min-width="100" show-overflow-tooltip />
+                    <el-table-column
+                        label="商品名称"
+                        prop="store_name"
+                        min-width="200"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="分类"
+                        prop="cate_name"
+                        min-width="120"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="单位"
+                        prop="unit_name"
+                        min-width="80"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="供货价"
+                        prop="purchase"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="商户价"
+                        prop="cost"
+                        min-width="120"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="会员价"
+                        prop="vip_price"
+                        min-width="120"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="终端零售价"
+                        prop="price"
+                        min-width="120"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="起批量"
+                        prop="batch"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="售卖库存"
+                        prop="stock"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="兑换库存"
+                        prop="swap"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="销量"
+                        prop="sales"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
                     <!-- <el-table-column label="商品来源" prop="system_store_name" min-width="200" show-overflow-tooltip /> -->
                     <el-table-column label="状态" prop="is_show">
                         <template #default="{ row }">
-                            <el-tag type="success" v-if="row.is_show">
-                                上架
-                            </el-tag>
-                            <el-tag type="info" v-else>
-                                下架
-                            </el-tag>
+                            <el-tag type="success" v-if="row.is_show"> 上架 </el-tag>
+                            <el-tag type="info" v-else> 下架 </el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column label="条码" prop="bar_code" min-width="200" show-overflow-tooltip />
+                    <el-table-column
+                        label="条码"
+                        prop="bar_code"
+                        min-width="200"
+                        show-overflow-tooltip
+                    />
                     <el-table-column label="操作" width="180" fixed="right">
                         <template #default="{ row }">
-                            <router-link :to="{
-                                path: 'store_product_edit',
-                                query: { id: row.id, mode: 'edit' },
-                            }" class="mr-4" v-perms="['store_product.store_product/edit']">
-                                <el-button type="primary" link>
-                                    编辑
-                                </el-button>
+                            <router-link
+                                :to="{
+                                    path: 'store_product_edit',
+                                    query: { id: row.id, mode: 'edit', page: pager.page }
+                                }"
+                                class="mr-4"
+                                v-perms="['store_product.store_product/edit']"
+                            >
+                                <el-button type="primary" link> 编辑 </el-button>
                             </router-link>
-                            <el-button v-perms="['store_product.store_product/edit']" type="primary" link
-                                @click="handleDetail(row)">
+                            <el-button
+                                v-perms="['store_product.store_product/edit']"
+                                type="primary"
+                                link
+                                @click="handleDetail(row)"
+                            >
                                 详情
                             </el-button>
-                            <el-button v-perms="['store_product.store_product/delete']" type="danger" link
-                                @click="handleDelete(row.id)">
+                            <el-button
+                                v-perms="['store_product.store_product/delete']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                            >
                                 删除
                             </el-button>
                         </template>
@@ -98,64 +189,60 @@
 </template>
 
 <script lang="ts" setup name="storeProductLists">
-import { usePaging } from "@/hooks/usePaging";
-import { useDictData } from "@/hooks/useDictOptions";
-import {
-    apiStoreProductLists,
-    apiStoreProductDelete,
-} from "@/api/store_product";
-import { timeFormat } from "@/utils/util";
-import feedback from "@/utils/feedback";
-import Details from "./details.vue";
-import { apiStoreCategoryLists } from "@/api/store_category";
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiStoreProductLists, apiStoreProductDelete } from '@/api/store_product'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import Details from './details.vue'
+import { apiStoreCategoryLists } from '@/api/store_category'
+import { useRoute } from 'vue-router'
 
-const detailsRef = ref(null);
+const route = useRoute()
 
+const detailsRef = ref(null)
 // 查询条件
 const queryParams = reactive({
-    store_name: "",
-    class_all: "",
-});
+    store_name: '',
+    class_all: ''
+})
 
 // 选中数据
-const selectData = ref<any[]>([]);
+const selectData = ref<any[]>([])
 
 // 表格选择后回调事件
 const handleSelectionChange = (val: any[]) => {
-    console.log(val);
-    
-    selectData.value = val.map(({ id }) => id);
-};
-
+    selectData.value = val.map(({ id }) => id)
+}
 // 获取字典数据
-const { dictData } = useDictData("");
-
+const { dictData } = useDictData('')
 // 分页相关
+let page_no = 1
+if (route.query.page_no) {
+    page_no = parseInt(route.query.page_no)
+}
+
 const { pager, getLists, resetParams, resetPage } = usePaging({
+    page: page_no,
     fetchFun: apiStoreProductLists,
-    params: queryParams,
-});
-
+    params: queryParams
+})
 // 添加
-const handleAdd = async () => {
-
-};
+const handleAdd = async () => {}
 
 // 详情
 const handleDetail = async (data: any) => {
-    detailsRef.value?.open();
-    detailsRef.value?.setFormData(data);
-};
+    detailsRef.value?.open()
+    detailsRef.value?.setFormData(data)
+}
 
 // 编辑
-const handleEdit = async (data: any) => {
+const handleEdit = async (data: any) => {}
 
-};
-
-let resolves;
-let nodes;
-let flag = ref(false);
-let name;
+let resolves
+let nodes
+const flag = ref(false)
+let name
 const beforeFilter = (value) => {
     name = value
     flag.value = true
@@ -163,27 +250,27 @@ const beforeFilter = (value) => {
     return false
 }
 const props = {
-    value: "id",
-    label: "name",
+    value: 'id',
+    label: 'name',
     emitPath: false,
     lazy: true,
     lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve;
-        if (!nodes) nodes = node;
-        let pid = node.value || 0;
+        if (!resolves) resolves = resolve
+        if (!nodes) nodes = node
+        const pid = node.value || 0
         let data = {}
         if (flag.value) {
             data = { name: name }
             if (!name) {
                 data = {
                     pid: pid,
-                    page_size: 10000,
+                    page_size: 10000
                 }
             }
         } else {
             data = {
                 pid: pid,
-                page_size: 10000,
+                page_size: 10000
             }
         }
         apiStoreCategoryLists({
@@ -192,21 +279,21 @@ const props = {
             resolve(
                 res.lists.map((item: any) => {
                     // item.leaf = item.is_children == 0;
-                    item.leaf = true;
+                    item.leaf = true
                     flag.value = false
-                    return item;
+                    return item
                 })
-            );
-        });
-    },
-};
+            )
+        })
+    }
+}
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm("确定要删除？");
-    await apiStoreProductDelete({ id });
-    getLists();
-};
+    await feedback.confirm('确定要删除？')
+    await apiStoreProductDelete({ id })
+    getLists()
+}
 
-getLists();
+getLists()
 </script>
diff --git a/src/views/user/indexList.vue b/src/views/user/indexList.vue
index b6171cd4..9c2c7c37 100644
--- a/src/views/user/indexList.vue
+++ b/src/views/user/indexList.vue
@@ -3,16 +3,31 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="用户昵称" prop="nickname">
-                    <el-input class="w-[280px]" v-model="queryParams.nickname" @keydown.enter="resetPage" clearable
-                        placeholder="请输入用户昵称" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.nickname"
+                        @keydown.enter="resetPage"
+                        clearable
+                        placeholder="请输入用户昵称"
+                    />
                 </el-form-item>
                 <el-form-item label="用户账号" prop="account">
-                    <el-input class="w-[280px]" v-model="queryParams.account" @keydown.enter="resetPage" clearable
-                        placeholder="请输入用户账号" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.account"
+                        @keydown.enter="resetPage"
+                        clearable
+                        placeholder="请输入用户账号"
+                    />
                 </el-form-item>
                 <el-form-item label="用户电话" prop="mobile">
-                    <el-input class="w-[280px]" v-model="queryParams.mobile" @keydown.enter="resetPage" clearable
-                        placeholder="请输入用户电话" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.mobile"
+                        @keydown.enter="resetPage"
+                        clearable
+                        placeholder="请输入用户电话"
+                    />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -31,7 +46,7 @@
                     删除
                 </el-button> -->
             <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange" >
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <!-- <el-table-column type="selection" width="55" /> -->
                     <el-table-column label="ID" prop="id" min-width="55" />
                     <el-table-column label="头像" prop="avatar" show-overflow-tooltip>
@@ -44,14 +59,14 @@
                     <el-table-column label="用户账号" prop="account" min-width="100" />
                     <!-- <el-table-column label="用户密码" prop="password" /> -->
                     <el-table-column label="用户电话" prop="mobile" min-width="100" />
-                    <el-table-column label="用户性别" prop="sex">
+                    <!-- <el-table-column label="用户性别" prop="sex">
                         <template #default="{ row }">
                             <dict-value :options="dictData.sex" :value="row.sex" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="注册渠道" prop="channel" />
+                    <el-table-column label="注册渠道" prop="channel" /> -->
                     <el-table-column label="用户类型" prop="vip_name" />
-                    <el-table-column label="用户标签" prop="label_name" />
+                    <!-- <el-table-column label="用户标签" prop="label_name" /> -->
                     <el-table-column label="礼品券" prop="integral" />
                     <el-table-column label="返还金" prop="return_money">
                         <template #default="{ row }">
@@ -64,10 +79,20 @@
                     <el-table-column label="地址" prop="format_address" width="150" />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['user.user/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button
+                                v-perms="['user.user/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
                                 编辑
                             </el-button>
-                            <el-button v-perms="['user.user/detail']" type="primary" link @click="handleDetail(row)">
+                            <el-button
+                                v-perms="['user.user/detail']"
+                                type="primary"
+                                link
+                                @click="handleDetail(row)"
+                            >
                                 详情
                             </el-button>
                             <!-- <el-button v-perms="['user.user/delete']" type="danger" link @click="handleDelete(row.id)">
@@ -82,7 +107,13 @@
             </div>
         </el-card>
         <Details ref="detailsRef" :dict-data="dictData"></Details>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <edit-popup
+            v-if="showEdit"
+            ref="editRef"
+            :dict-data="dictData"
+            @success="getLists"
+            @close="showEdit = false"
+        />
     </div>
 </template>
 
@@ -93,15 +124,14 @@ import { apiUserLists, apiUserDelete } from '@/api/user'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
-import Details from "./details.vue";
+import Details from './details.vue'
 
-const detailsRef = ref(null);
+const detailsRef = ref(null)
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
-
 // 查询条件
 const queryParams = reactive({
     nickname: '',
@@ -143,10 +173,9 @@ const handleEdit = async (data: any) => {
 
 // 详情
 const handleDetail = async (data: any) => {
-    detailsRef.value?.open();
-    detailsRef.value?.setFormData(data);
-};
-
+    detailsRef.value?.open()
+    detailsRef.value?.setFormData(data)
+}
 
 // 删除
 const handleDelete = async (id: number | any[]) => {