From 35ad3050ecbfd706edc0130d94c259e7306d4690 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 19 Mar 2025 16:51:00 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/data/index.vue b/src/views/data/index.vue
index 5240352..b4cd673 100644
--- a/src/views/data/index.vue
+++ b/src/views/data/index.vue
@@ -222,7 +222,7 @@
             <div class="data_item_right">
               <div class="t">
                 <span>新增会员数</span>
-                <span class="n">{{ trade.newMemberCoun || 0 }}(人)</span>
+                <span class="n">{{ trade.newMemberCount || 0 }}(人)</span>
               </div>
               <div class="t">
                 <span>会员消费笔数</span>

From aa981c8d5b3193d7b345c79cb21640acfa5d67bb Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 20 Mar 2025 09:04:00 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E4=BB=8E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=A8=A1=E5=9D=97=E4=B8=8B?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=86=8D=E9=87=8D=E7=99=BB?=
 =?UTF-8?q?=E4=BC=9A=E8=B7=B3=E8=BD=AC404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 480c4bd..e85ecdb 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -36,7 +36,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       {
         path: "index",
         component: () => import("@/views/data/index.vue"),
-        name: "dataStatistics",
+        name: "",
         meta: {
           title: "数据统计",
           affix: false,
@@ -45,7 +45,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       },
       {
         path: "sales",
-        name: "salesStatistics",
+        name: "",
         component: () => import("@/views/data/sales.vue"),
         meta: {
           title: "销售统计",
@@ -55,7 +55,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       },
       {
         path: "table",
-        name: "tableStatistics",
+        name: "",
         component: () => import("@/views/data/table.vue"),
         meta: {
           title: "桌台统计",
@@ -65,7 +65,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       },
       {
         path: "credit",
-        name: "creditStatistics",
+        name: "",
         component: () => import("@/views/data/credit/index.vue"),
         meta: {
           title: "挂账管理",
@@ -76,7 +76,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       },
       {
         path: "credit-detail",
-        name: "creditDetail",
+        name: "",
         component: () => import("@/views/data/credit/detail.vue"),
         meta: {
           title: "挂账明细",
@@ -87,7 +87,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       },
       {
         path: "work",
-        name: "workStatistics",
+        name: "",
         component: () => import("@/views/data/work.vue"),
         meta: {
           title: "交班记录",

From d48199b99124b5d21036372de6edb702af6cceed Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 20 Mar 2025 09:16:06 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=A1=8C=E5=8F=B0?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=B7=B3=E8=BD=AC=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=A0=E5=8F=82=EF=BC=8C=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=9F=A5=E8=AF=A2=E5=8F=B0=E6=A1=8C?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAtableCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/index/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index 91dad2c..bafe668 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -154,7 +154,7 @@ function returnOriginAmount(order: OrderInfoVo) {
 const route = useRoute();
 onMounted(() => {
   const { orderNo, tableName, tableCode } = route.query;
-  handleQueryClick({ orderNo, tableName });
+  handleQueryClick({ orderNo, tableCode });
   searchRef.value?.setQueryValue("orderNo", orderNo);
   searchRef.value?.setQueryValue("tableCode", tableCode);
 });

From b76e67c207b7e28980dc43310050c13b42dd7bd6 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 20 Mar 2025 10:06:38 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=A1=8C=E5=8F=B0?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=B7=B3=E8=BD=AC=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=91=98=E5=B7=A5=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BF=80=E6=B4=BB=E7=A0=81=E4=B8=BA=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/index/config/search.ts        |  6 +-
 src/views/order/index/index.vue               |  5 +-
 src/views/shop/list/components/addShop.vue    |  2 +-
 src/views/shop/list/index.vue                 |  5 +-
 .../shop/staff/components/change-pwd.vue      | 78 +++++++++++++++++++
 src/views/shop/staff/config/content.ts        | 12 ++-
 src/views/shop/staff/index.vue                | 16 +++-
 7 files changed, 114 insertions(+), 10 deletions(-)
 create mode 100644 src/views/shop/staff/components/change-pwd.vue

diff --git a/src/views/order/index/config/search.ts b/src/views/order/index/config/search.ts
index 9978382..60dfbcb 100644
--- a/src/views/order/index/config/search.ts
+++ b/src/views/order/index/config/search.ts
@@ -41,10 +41,10 @@ const searchConfig: ISearchConfig = {
     },
     {
       type: "input",
-      label: "台桌编码",
-      prop: "tableCode",
+      label: "台桌名称",
+      prop: "tableName",
       attrs: {
-        placeholder: "请输入台桌编码",
+        placeholder: "请输入台桌名称",
         clearable: true,
         style: {
           width: "200px",
diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index bafe668..0c90556 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -154,9 +154,10 @@ function returnOriginAmount(order: OrderInfoVo) {
 const route = useRoute();
 onMounted(() => {
   const { orderNo, tableName, tableCode } = route.query;
-  handleQueryClick({ orderNo, tableCode });
+  handleQueryClick({ orderNo, tableCode, tableName });
   searchRef.value?.setQueryValue("orderNo", orderNo);
-  searchRef.value?.setQueryValue("tableCode", tableCode);
+  searchRef.value?.setQueryValue("tableName", tableName);
+  route;
 });
 
 // 新增
diff --git a/src/views/shop/list/components/addShop.vue b/src/views/shop/list/components/addShop.vue
index 977a042..44f3395 100644
--- a/src/views/shop/list/components/addShop.vue
+++ b/src/views/shop/list/components/addShop.vue
@@ -70,7 +70,7 @@
             <el-radio-button value="release">正式</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="激活码" prop="activateCode">
+        <el-form-item label="激活码">
           <el-input v-model="state.form.activateCode" placeholder="请输入激活码"></el-input>
           <div class="tips">注：输入有效激活码表示添加的同时直接激活该店铺。</div>
         </el-form-item>
diff --git a/src/views/shop/list/index.vue b/src/views/shop/list/index.vue
index 713238a..fe6c761 100644
--- a/src/views/shop/list/index.vue
+++ b/src/views/shop/list/index.vue
@@ -97,9 +97,12 @@
         </el-table-column>
         <el-table-column prop="createdAt" label="到期时间">
           <template v-slot="scope">
-            {{ dayjs(scope.row.expireAt).format("YYYY-MM-DD HH:mm:ss") }}
+            <span v-if="scope.row.expireTime">
+              {{ dayjs(scope.row.expireTime).format("YYYY-MM-DD HH:mm:ss") }}
+            </span>
           </template>
         </el-table-column>
+
         <el-table-column label="操作" width="150">
           <template v-slot="scope">
             <el-link @click="addShopShow(scope.row)">
diff --git a/src/views/shop/staff/components/change-pwd.vue b/src/views/shop/staff/components/change-pwd.vue
new file mode 100644
index 0000000..8f13c45
--- /dev/null
+++ b/src/views/shop/staff/components/change-pwd.vue
@@ -0,0 +1,78 @@
+<template>
+  <el-dialog title="修改密码" v-model="visible" width="400px" @close="reset">
+    <el-form :model="form" ref="refForm" :rules="rules">
+      <el-form-item label="新密码" prop="newPwd">
+        <el-input v-model="form.newPwd" show-password></el-input>
+      </el-form-item>
+      <el-form-item label="确认密码" prop="confirmPwd">
+        <el-input v-model="form.confirmPwd" show-password></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submit">提交</el-button>
+        <el-button @click="reset">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script setup>
+import sysUserApi from "@/api/account/sysUser";
+const visible = ref(false);
+const form = reactive({
+  oldPwd: "",
+  newPwd: "",
+  confirmPwd: "",
+});
+const rules = {
+  newPwd: [{ required: true, message: "请输入新密码", trigger: "blur" }],
+  confirmPwd: [
+    { required: true, message: "请再次输入新密码", trigger: "blur" },
+    {
+      validator: (rule, value, callback) => {
+        if (value !== form.newPwd) {
+          callback(new Error("两次输入密码不一致"));
+        } else {
+          callback();
+        }
+      },
+      trigger: "blur",
+    },
+  ],
+};
+const emit = defineEmits(["update:visible"]);
+function reset() {
+  visible.value = false;
+  form.oldPwd = "";
+  form.newPwd = "";
+  form.confirmPwd = "";
+  form.id = "";
+}
+const refForm = ref();
+function submit() {
+  refForm.value.validate((valid) => {
+    if (valid) {
+      sysUserApi
+        .pwd({
+          id: form.id,
+          checkPassword: form.confirmPwd,
+          password: form.confirmPwd,
+        })
+        .then(() => {
+          ElMessage.success("修改成功");
+          close();
+        });
+    }
+  });
+}
+function open(data) {
+  visible.value = true;
+  form.id = data.id;
+}
+function close() {
+  visible.value = false;
+}
+defineExpose({
+  open,
+  close,
+});
+</script>
\ No newline at end of file
diff --git a/src/views/shop/staff/config/content.ts b/src/views/shop/staff/config/content.ts
index 68e5eec..8966711 100644
--- a/src/views/shop/staff/config/content.ts
+++ b/src/views/shop/staff/config/content.ts
@@ -2,7 +2,7 @@ import ShopStaffApi, { type getListRequest } from "@/api/account/shopStaff";
 import type { PageShopStaff } from "@/api/account/shopStaff";
 import type { IContentConfig } from "@/components/CURD/types";
 
-const contentConfig = {
+const contentConfig: IContentConfig = {
   pageName: "sys:user",
   table: {
     border: true,
@@ -56,7 +56,15 @@ const contentConfig = {
       align: "center",
       fixed: "right",
       templet: "tool",
-      operat: ["edit", "delete"],
+      operat: ["edit", "delete",
+        {
+          name: "change_pwd",
+          auth: "password:reset",
+          icon: "refresh-left",
+          text: "修改密码",
+          type: "primary",
+        }
+      ],
     },
   ],
 };
diff --git a/src/views/shop/staff/index.vue b/src/views/shop/staff/index.vue
index eb2dada..852c5ea 100644
--- a/src/views/shop/staff/index.vue
+++ b/src/views/shop/staff/index.vue
@@ -66,10 +66,14 @@
         ></selectPermission>
       </template>
     </page-modal>
+
+    <!-- 修改密码 -->
+    <changePwd ref="changePwdRef" />
   </div>
 </template>
 
 <script setup lang="ts">
+import changePwd from "./components/change-pwd.vue";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./config/add";
@@ -183,8 +187,18 @@ function handleToolbarClick(name: string) {
     ElMessage.success("点击了自定义1按钮");
   }
 }
+
+const changePwdRef = ref();
+function changePwdRefShow(row: IObject) {
+  changePwdRef.value?.open(row);
+}
 // 其他操作列
-async function handleOperatClick(data: IOperatData) {}
+async function handleOperatClick(data: IOperatData) {
+  console.log(data);
+  if (data.name === "change_pwd") {
+    changePwdRefShow(data.row);
+  }
+}
 
 // 切换示例
 </script>

From 30f10bed938c432729c42c4e12e39f675f93eda3 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 20 Mar 2025 10:53:58 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE1=E5=85=83=E8=87=B3=E5=B0=91=E7=AD=89?=
 =?UTF-8?q?=E4=BA=8E1=E7=A7=AF=E5=88=86,=E4=BF=AE=E5=A4=8D=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E5=B9=BF=E5=91=8A=E9=A1=B5=E9=9D=A2=E5=90=8E?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E9=A1=B5=E9=9D=A2=E5=85=A8=E9=83=A8=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E8=B0=83=E6=95=B4crud=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue           | 302 +++++++++++++-----
 src/components/CURD/types.ts                  |   1 +
 src/views/admin/system/role/index.vue         |   6 +-
 .../application/list/advertisement/index.vue  |   8 +-
 .../points/pointsconfig/BasicSettings.vue     |  13 +-
 src/views/shop/staff/config/content.ts        |   2 +-
 6 files changed, 248 insertions(+), 84 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index aa59fcb..7d722ed 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -8,37 +8,58 @@
           <template v-if="typeof item === 'string'">
             <!-- 新增 -->
             <template v-if="item === 'add'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="primary" icon="plus"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="primary"
+                icon="plus"
+                @click="handleToolbar(item)"
+              >
                 新增
               </el-button>
             </template>
             <!-- 删除 -->
             <template v-else-if="item === 'delete'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="danger" icon="delete"
-                :disabled="removeIds.length === 0" @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="danger"
+                icon="delete"
+                :disabled="removeIds.length === 0"
+                @click="handleToolbar(item)"
+              >
                 删除
               </el-button>
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'import'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="upload"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="default"
+                icon="upload"
+                @click="handleToolbar(item)"
+              >
                 导入
               </el-button>
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'export'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="download"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="default"
+                icon="download"
+                @click="handleToolbar(item)"
+              >
                 导出
               </el-button>
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
-            <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon"
-              :type="item.type ?? 'default'" @click="handleToolbar(item.name)">
+            <el-button
+              v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+              :icon="item.icon"
+              :type="item.type ?? 'default'"
+              @click="handleToolbar(item.name)"
+            >
               {{ item.text }}
             </el-button>
           </template>
@@ -67,36 +88,68 @@
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'exports'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:export`]" icon="download" circle title="导出"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:export`]"
+                icon="download"
+                circle
+                title="导出"
+                @click="handleToolbar(item)"
+              />
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'imports'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:import`]" icon="upload" circle title="导入"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:import`]"
+                icon="upload"
+                circle
+                title="导入"
+                @click="handleToolbar(item)"
+              />
             </template>
             <!-- 搜索 -->
             <template v-else-if="item === 'search'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:query`]" icon="search" circle title="搜索"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:query`]"
+                icon="search"
+                circle
+                title="搜索"
+                @click="handleToolbar(item)"
+              />
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
             <template v-if="item.auth">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon" circle
-                :title="item.title" @click="handleToolbar(item.name)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+                :icon="item.icon"
+                circle
+                :title="item.title"
+                @click="handleToolbar(item.name)"
+              />
             </template>
             <template v-else>
-              <el-button :icon="item.icon" circle :title="item.title" @click="handleToolbar(item.name)" />
+              <el-button
+                :icon="item.icon"
+                circle
+                :title="item.title"
+                @click="handleToolbar(item.name)"
+              />
             </template>
           </template>
         </template>
       </div>
     </div>
     <!-- 列表 -->
-    <el-table ref="tableRef" v-loading="loading" v-bind="contentConfig.table" :data="pageData" :row-key="pk"
-      @selection-change="handleSelectionChange" @filter-change="handleFilterChange">
+    <el-table
+      ref="tableRef"
+      v-loading="loading"
+      v-bind="contentConfig.table"
+      :data="pageData"
+      :row-key="pk"
+      @selection-change="handleSelectionChange"
+      @filter-change="handleFilterChange"
+    >
       <template v-for="col in cols" :key="col">
         <el-table-column v-if="col.show" v-bind="col">
           <template #default="scope">
@@ -105,15 +158,24 @@
               <template v-if="col.prop">
                 <template v-if="Array.isArray(scope.row[col.prop])">
                   <template v-for="(item, index) in scope.row[col.prop]" :key="item">
-                    <el-image :src="item" :preview-src-list="scope.row[col.prop]" :initial-index="index"
-                      :preview-teleported="true" :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40
-                        }px`" />
+                    <el-image
+                      :src="item"
+                      :preview-src-list="scope.row[col.prop]"
+                      :initial-index="index"
+                      :preview-teleported="true"
+                      :style="`width: ${col.imageWidth ?? 40}px; height: ${
+                        col.imageHeight ?? 40
+                      }px`"
+                    />
                   </template>
                 </template>
                 <template v-else>
-                  <el-image :src="scope.row[col.prop]" :preview-src-list="[scope.row[col.prop]]"
+                  <el-image
+                    :src="scope.row[col.prop]"
+                    :preview-src-list="[scope.row[col.prop]]"
                     :preview-teleported="true"
-                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`" />
+                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`"
+                  />
                 </template>
               </template>
             </template>
@@ -135,20 +197,30 @@
             <template v-else-if="col.templet === 'switch'">
               <template v-if="col.prop">
                 <!-- pageData.length>0: 解决el-switch组件会在表格初始化的时候触发一次change事件 -->
-                <el-switch v-model="scope.row[col.prop]" :active-value="col.activeValue ?? 1"
-                  :inactive-value="col.inactiveValue ?? 0" :inline-prompt="true" :active-text="col.activeText ?? ''"
-                  :inactive-text="col.inactiveText ?? ''" :validate-event="false"
-                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)" @change="
+                <el-switch
+                  v-model="scope.row[col.prop]"
+                  :active-value="col.activeValue ?? 1"
+                  :inactive-value="col.inactiveValue ?? 0"
+                  :inline-prompt="true"
+                  :active-text="col.activeText ?? ''"
+                  :inactive-text="col.inactiveText ?? ''"
+                  :validate-event="false"
+                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
+                  @change="
                     pageData.length > 0 && handleModify(col.prop, scope.row[col.prop], scope.row)
-                    " />
+                  "
+                />
               </template>
             </template>
             <!-- 生成输入框组件 -->
             <template v-else-if="col.templet === 'input'">
               <template v-if="col.prop">
-                <el-input v-model="scope.row[col.prop]" :type="col.inputType ?? 'text'"
+                <el-input
+                  v-model="scope.row[col.prop]"
+                  :type="col.inputType ?? 'text'"
                   :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
-                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)" />
+                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)"
+                />
               </template>
             </template>
             <!-- 格式化为价格 -->
@@ -180,7 +252,7 @@
                 {{
                   scope.row[col.prop]
                     ? useDateFormat(scope.row[col.prop], col.dateFormat ?? "YYYY-MM-DD HH:mm:ss")
-                      .value
+                        .value
                     : ""
                 }}
               </template>
@@ -191,44 +263,82 @@
                 <template v-if="typeof item === 'string'">
                   <!-- 编辑/删除 -->
                   <template v-if="item === 'edit' || item === 'delete'">
-                    <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                      :type="item === 'edit' ? 'primary' : 'danger'" :icon="item" size="small" link @click="
+                    <el-button
+                      v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                      :type="item === 'edit' ? 'primary' : 'danger'"
+                      :icon="item"
+                      size="small"
+                      link
+                      @click="
                         handleOperat({
                           name: item,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                        ">
+                      "
+                    >
                       {{ item === "edit" ? "编辑" : "删除" }}
                     </el-button>
                   </template>
                 </template>
                 <!-- 其他 -->
                 <template v-else-if="typeof item === 'object'">
-                  <el-dropdown style="margin-top: 4px;">
-                    <el-button v-if="item.render === undefined || item.render(scope.row)" v-bind="item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
-                      " :icon="item.icon" :type="item.type ?? 'primary'" size="small" link @click="
+                  <el-button
+                    v-if="item.isBtn"
+                    v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+                    :icon="item.icon"
+                    :type="item.type ?? 'primary'"
+                    size="small"
+                    link
+                    @click="
+                      handleOperat({
+                        name: item.name,
+                        row: scope.row,
+                        column: scope.column,
+                        $index: scope.$index,
+                      })
+                    "
+                  >
+                    {{ item.text }}
+                  </el-button>
+
+                  <el-dropdown style="margin-top: 4px" v-else>
+                    <el-button
+                      v-if="item.render === undefined || item.render(scope.row)"
+                      v-bind="
+                        item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
+                      "
+                      :icon="item.icon"
+                      :type="item.type ?? 'primary'"
+                      size="small"
+                      link
+                      @click="
                         handleOperat({
                           name: item.name,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                        ">
+                      "
+                    >
                       {{ item.text }}
                     </el-button>
                     <template #dropdown v-if="item.options && item.options.length > 0">
                       <el-dropdown-menu>
-                        <el-dropdown-item @click="
-                          handleOperat({
-                            name: item.name,
-                            row: scope.row,
-                            column: scope.column,
-                            $index: scope.$index,
-                            command: opt.command ? opt.command : '',
-                          })
-                          " v-for="opt in item.options" :key="opt.value">
+                        <el-dropdown-item
+                          @click="
+                            handleOperat({
+                              name: item.name,
+                              row: scope.row,
+                              column: scope.column,
+                              $index: scope.$index,
+                              command: opt.command ? opt.command : '',
+                            })
+                          "
+                          v-for="opt in item.options"
+                          :key="opt.value"
+                        >
                           {{ opt.label }}
                         </el-dropdown-item>
                       </el-dropdown-menu>
@@ -249,18 +359,33 @@
     <template v-if="showPagination">
       <el-scrollbar>
         <div class="mt-[12px]">
-          <el-pagination v-bind="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <el-pagination
+            v-bind="pagination"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </div>
       </el-scrollbar>
     </template>
     <!-- 导出弹窗 -->
-    <el-dialog v-model="exportsModalVisible" :align-center="true" title="导出数据" width="600px" style="padding-right: 0"
-      @close="handleCloseExportsModal">
+    <el-dialog
+      v-model="exportsModalVisible"
+      :align-center="true"
+      title="导出数据"
+      width="600px"
+      style="padding-right: 0"
+      @close="handleCloseExportsModal"
+    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form ref="exportsFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          :model="exportsFormData" :rules="exportsFormRules">
+        <el-form
+          ref="exportsFormRef"
+          label-width="auto"
+          style="padding-right: var(--el-dialog-padding-primary)"
+          :model="exportsFormData"
+          :rules="exportsFormRules"
+        >
           <el-form-item label="文件名" prop="filename">
             <el-input v-model="exportsFormData.filename" clearable />
           </el-form-item>
@@ -270,10 +395,16 @@
           <el-form-item label="数据源" prop="origin">
             <el-select v-model="exportsFormData.origin">
               <el-option label="当前数据 (当前页的数据)" :value="ExportsOriginEnum.CURRENT" />
-              <el-option label="选中数据 (所有选中的数据)" :value="ExportsOriginEnum.SELECTED"
-                :disabled="selectionData.length <= 0" />
-              <el-option label="全量数据 (所有分页的数据)" :value="ExportsOriginEnum.REMOTE"
-                :disabled="contentConfig.exportsAction === undefined" />
+              <el-option
+                label="选中数据 (所有选中的数据)"
+                :value="ExportsOriginEnum.SELECTED"
+                :disabled="selectionData.length <= 0"
+              />
+              <el-option
+                label="全量数据 (所有分页的数据)"
+                :value="ExportsOriginEnum.REMOTE"
+                :disabled="contentConfig.exportsAction === undefined"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="字段" prop="fields">
@@ -294,17 +425,35 @@
       </template>
     </el-dialog>
     <!-- 导入弹窗 -->
-    <el-dialog v-model="importModalVisible" :align-center="true" title="导入数据" width="600px" style="padding-right: 0"
-      @close="handleCloseImportModal">
+    <el-dialog
+      v-model="importModalVisible"
+      :align-center="true"
+      title="导入数据"
+      width="600px"
+      style="padding-right: 0"
+      @close="handleCloseImportModal"
+    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form ref="importFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          :model="importFormData" :rules="importFormRules">
+        <el-form
+          ref="importFormRef"
+          label-width="auto"
+          style="padding-right: var(--el-dialog-padding-primary)"
+          :model="importFormData"
+          :rules="importFormRules"
+        >
           <el-form-item label="文件名" prop="files">
-            <el-upload ref="uploadRef" v-model:file-list="importFormData.files" class="w-full"
+            <el-upload
+              ref="uploadRef"
+              v-model:file-list="importFormData.files"
+              class="w-full"
               accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-              :drag="true" :limit="1" :auto-upload="false" :on-exceed="handleFileExceed">
+              :drag="true"
+              :limit="1"
+              :auto-upload="false"
+              :on-exceed="handleFileExceed"
+            >
               <el-icon class="el-icon--upload"><upload-filled /></el-icon>
               <div class="el-upload__text">
                 <span>将文件拖到此处，或</span>
@@ -313,8 +462,13 @@
               <template #tip>
                 <div class="el-upload__tip">
                   *.xlsx / *.xls
-                  <el-link v-if="contentConfig.importTemplate" type="primary" icon="download" :underline="false"
-                    @click="handleDownloadTemplate">
+                  <el-link
+                    v-if="contentConfig.importTemplate"
+                    type="primary"
+                    icon="download"
+                    :underline="false"
+                    @click="handleDownloadTemplate"
+                  >
                     下载模板
                   </el-link>
                 </div>
@@ -326,7 +480,11 @@
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
         <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button type="primary" :disabled="importFormData.files.length === 0" @click="handleImportSubmit">
+          <el-button
+            type="primary"
+            :disabled="importFormData.files.length === 0"
+            @click="handleImportSubmit"
+          >
             确 定
           </el-button>
           <el-button @click="handleCloseImportModal">取 消</el-button>
@@ -802,10 +960,10 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
     .indexAction(
       showPagination
         ? {
-          [request.pageName]: pagination.currentPage,
-          [request.limitName]: pagination.pageSize,
-          ...formData,
-        }
+            [request.pageName]: pagination.currentPage,
+            [request.limitName]: pagination.pageSize,
+            ...formData,
+          }
         : formData
     )
     .then((data) => {
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index e3698cd..6086710 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -214,6 +214,7 @@ export interface IContentConfig<T = any> {
         icon?: string;
         name: string;
         text: string;
+        isBtn?: boolean;
         type?: "primary" | "success" | "warning" | "danger" | "info";
         render?: (row: IObject) => boolean;
         options?: {
diff --git a/src/views/admin/system/role/index.vue b/src/views/admin/system/role/index.vue
index 8ec31c4..96a7dcb 100644
--- a/src/views/admin/system/role/index.vue
+++ b/src/views/admin/system/role/index.vue
@@ -21,9 +21,9 @@
     <el-card shadow="never">
       <div class="mb-10px">
         <el-button type="primary" icon="plus" @click="handleOpenDialog()">新增</el-button>
-        <el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()">
+        <!-- <el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()">
           删除
-        </el-button>
+        </el-button> -->
       </div>
 
       <el-table
@@ -34,7 +34,7 @@
         :border="true"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="角色名称" prop="name" />
         <el-table-column label="角色级别" prop="level" />
         <el-table-column label="描述" prop="description" />
diff --git a/src/views/application/list/advertisement/index.vue b/src/views/application/list/advertisement/index.vue
index ecf58e7..09d1853 100644
--- a/src/views/application/list/advertisement/index.vue
+++ b/src/views/application/list/advertisement/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <!-- 广告模块 -->
-  <div style="padding: 15px;">
+  <div style="padding: 15px">
+    <!-- 广告模块 -->
     <!-- 搜索 -->
     <Search></Search>
     <!-- 表格 -->
@@ -8,6 +8,6 @@
   </div>
 </template>
 <script setup>
-import Search from './indexconfig/Search.vue'
-import Content from './indexconfig/Content.vue'
+import Search from "./indexconfig/Search.vue";
+import Content from "./indexconfig/Content.vue";
 </script>
\ No newline at end of file
diff --git a/src/views/application/marketing/points/pointsconfig/BasicSettings.vue b/src/views/application/marketing/points/pointsconfig/BasicSettings.vue
index e2253b9..3ee2c16 100644
--- a/src/views/application/marketing/points/pointsconfig/BasicSettings.vue
+++ b/src/views/application/marketing/points/pointsconfig/BasicSettings.vue
@@ -43,10 +43,15 @@
     </el-form-item>
     <el-form-item label="下单抵扣积分比例">
       <el-col :span="7">
-        <el-input v-model="Elform.equivalentPoints" type="number" placeholder="">
-          <template #prepend>1元等于</template>
-          <template #append>积分</template>
-        </el-input>
+        <span class="color-999">1元等于</span>
+        <el-input-number
+          class="u-m-l-10 u-m-r-10"
+          v-model="Elform.equivalentPoints"
+          type="number"
+          placeholder=""
+          min="1"
+        ></el-input-number>
+        <span class="color-999">积分</span>
       </el-col>
     </el-form-item>
     <el-form-item label="开启积分商城">
diff --git a/src/views/shop/staff/config/content.ts b/src/views/shop/staff/config/content.ts
index 8966711..394edde 100644
--- a/src/views/shop/staff/config/content.ts
+++ b/src/views/shop/staff/config/content.ts
@@ -54,7 +54,6 @@ const contentConfig: IContentConfig = {
     {
       label: "操作",
       align: "center",
-      fixed: "right",
       templet: "tool",
       operat: ["edit", "delete",
         {
@@ -63,6 +62,7 @@ const contentConfig: IContentConfig = {
           icon: "refresh-left",
           text: "修改密码",
           type: "primary",
+          isBtn: true,
         }
       ],
     },