index.html

@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit" />
   <meta name="viewport"
     content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0" />
-  <title>智借还</title>
+  <title>借还柜</title>
   <link rel="icon" href="/favicon.ico" />
   <script>
     window.process = {};

public/serverConfig.json

@@ -1,6 +1,6 @@
 {
   "Version": "4.4.0",
-  "Title": "智借还",
+  "Title": "借还柜",
   "FixedHeader": true,
   "HiddenSideBar": false,
   "MultiTagsCache": false,

src/api/cabinet/cabinet-cell.ts

@@ -19,7 +19,6 @@ export interface CabinetCellDTO {
   goodsName?: string;
   price?: number;
   coverImg?: string;
-  stock?: number;
 }
 
 export interface AddCabinetCellCommand {
@@ -68,10 +67,4 @@ export const configureGoodsCells = (cellId: number, goodsId: number) => {
 };
 export const configureGoodsCellsStock = (cellId: number, goodsId: number, stock: number) => {
   return http.request<ResponseData<void>>('put', `/cabinet/cell/configureGoodsCellsStock/${cellId}/${goodsId}/${stock}`);
-};
-export const changeGoodsCellsStock = (cellId: number, stock: number) => {
-  return http.request<ResponseData<void>>('put', `/cabinet/cell/changeGoodsCellsStock/${cellId}/${stock}`);
-};
-export const clearGoodsCells = (cellId: number) => {
-  return http.request<ResponseData<void>>('put', `/cabinet/cell/clearGoodsCells/${cellId}`);
 };

src/api/shop/goods.ts

@@ -5,48 +5,26 @@ export interface GoodsQuery extends BasePageQuery {
   categoryId?: number;
   status?: number;
   goodsId?: number;
-  autoApproval?: number;
 }
 
 /** 商品DTO */
 export interface GoodsDTO {
-  /** 商品ID */
   goodsId?: number;
-  /** 商品名称 */
   goodsName: string;
-  /** 商品分类ID */
   categoryId: number;
-  /** 商品价格 */
   price: number;
-  /** 库存数量 */
   stock: number;
-  /** 商品状态（0下架 1上架） */
   status: number;
-  /** 自动审批开关（0关闭 1开启） */
-  autoApproval: number;
-  /** 商品封面图 */
   coverImg: string;
-  /** 商品详情（富文本） */
   goodsDetail: string;
-  /** 创建人ID */
   creatorId?: number;
-  /** 创建时间 */
   createTime?: Date;
-  /** 更新人ID */
   updaterId?: number;
-  /** 更新时间 */
   updateTime?: Date;
-  /** 备注信息 */
   remark?: string;
-  /** 删除标志（0存在 1删除） */
   deleted?: number;
-  /** 所属货柜名称 */
   cabinetName?: string;
-  /** 货柜单元格编号 */
   cellNo?: number;
-  /** 单元格编号（字符串形式） */
-  cellNoStr?: string;
-  /** 总库存量（含所有仓库） */
   totalStock?: number;
 }
 
@@ -57,7 +35,6 @@ export interface GoodsRequest {
   price: number;
   stock: number;
   status: number;
-  autoApproval: number;
   coverImg?: string;
   goodsDetail: string;
   remark?: string;

src/api/shop/order.ts

@@ -1,37 +0,0 @@
-import { http } from "@/utils/http";
-
-export interface OrderQuery extends BasePageQuery {
-  orderNumber?: string;
-  status?: number;
-  payStatus?: number;
-  startTime?: string;
-  endTime?: string;
-}
-
-export interface OrderDTO {
-  orderId: number;
-  ucid?: string;
-  openid?: string;
-  tradeId?: string;
-  mobile?: string;
-  userid?: string;
-  name?: string;
-  isInternal?: number;
-  bizOrderId?: string;
-  totalAmount: number;
-  status: number;
-  payStatus: number;
-  paymentMethod?: string;
-  payTime?: string;
-}
-
-export const getOrderListApi = (params?: OrderQuery) => {
-  return http.request<ResponseData<PageDTO<OrderDTO>>>("get", "/shop/order/list", {
-    params: {
-      ...params,
-      // 处理时间范围参数格式
-      startTime: params?.startTime ? new Date(params.startTime).toISOString() : undefined,
-      endTime: params?.endTime ? new Date(params.endTime).toISOString() : undefined
-    }
-  });
-};

src/layout/components/sidebar/horizontal.vue

@@ -36,7 +36,7 @@ nextTick(() => {
 <template>
   <div v-loading="usePermissionStoreHook().wholeMenus.length === 0" class="horizontal-header">
     <div class="horizontal-header-left" @click="backTopMenu">
-      <img src="/logo.png" alt="logo" />
+      <img src="/logo.svg" alt="logo" />
       <span>{{ title }}</span>
     </div>
     <el-menu router ref="menuRef" mode="horizontal" class="horizontal-header-menu" :default-active="defaultActive">

src/layout/components/sidebar/logo.vue

@@ -12,13 +12,24 @@ const { title } = useNav();
 <template>
   <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
     <transition name="sidebarLogoFade">
-      <router-link v-if="props.collapse" key="props.collapse" :title="title" class="sidebar-logo-link"
+      <router-link
-        :to="getTopMenu()?.path ?? '/'">
+        v-if="props.collapse"
-        <img src="/logo.png" alt="logo" />
+        key="props.collapse"
+        :title="title"
+        class="sidebar-logo-link"
+        :to="getTopMenu()?.path ?? '/'"
+      >
+        <img src="/logo.svg" alt="logo" />
         <span class="sidebar-title">{{ title }}</span>
       </router-link>
-      <router-link v-else key="expand" :title="title" class="sidebar-logo-link" :to="getTopMenu()?.path ?? '/'">
+      <router-link
-        <img src="/logo.png" alt="logo" />
+        v-else
+        key="expand"
+        :title="title"
+        class="sidebar-logo-link"
+        :to="getTopMenu()?.path ?? '/'"
+      >
+        <img src="/logo.svg" alt="logo" />
         <span class="sidebar-title">{{ title }}</span>
       </router-link>
     </transition>

src/views/shop/approval/index.vue

@@ -9,10 +9,6 @@ import Refresh from "@iconify-icons/ep/refresh";
 import View from "@iconify-icons/ep/view";
 import { ElMessage, ElMessageBox } from "element-plus";
 
-defineOptions({
-  name: "Approval"
-});
-
 const formRef = ref();
 const tableRef = ref();
 

src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue

@@ -59,14 +59,6 @@ const handleConfigure = async (row: GoodsDTO) => {
       }
     );
 
-    if (!value) {
-      ElMessage.warning('请输入库存数量');
-      return;
-    }
-    if (Number(value) > row.stock - row.totalStock) {
-      ElMessage.warning('分配数量不能超过剩余库存');
-      return;
-    }
     await configureGoodsCellsStock(props.cellId, row.goodsId!, Number(value));
     ElMessage.success('配置成功');
     emit('refresh');
@@ -126,6 +118,9 @@ defineExpose({ getList });
           </el-button>
         </template>
       </el-table-column>
+      <div class="dialog-footer" style="margin-top: 20px; text-align: right">
+        <el-button @click="closeModal">取消</el-button>
+      </div>
     </el-table>
 
     <el-pagination v-model:current-page="pagination.currentPage" v-model:page-size="pagination.pageSize"

src/views/shop/cabinet-goods/index.vue

@@ -3,7 +3,7 @@ import { ref, onMounted } from "vue";
 import { PureTableBar } from "@/components/RePureTableBar";
 import { onBeforeRouteUpdate, useRoute } from "vue-router";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { getCabinetCellList, deleteCabinetCell, CabinetCellDTO, changeGoodsCellsStock, clearGoodsCells } from "@/api/cabinet/cabinet-cell";
+import { getCabinetCellList, deleteCabinetCell, CabinetCellDTO } from "@/api/cabinet/cabinet-cell";
 import { allCabinets, SmartCabinetDTO } from "@/api/cabinet/smart-cabinet";
 import EditPen from "@iconify-icons/ep/edit-pen";
 import Delete from "@iconify-icons/ep/delete";
@@ -154,40 +154,6 @@ const switchCellType = (cellType: number) => {
   }
 };
 
-const handleStockConfig = async (row: CabinetCellDTO) => {
-  try {
-    const { value } = await ElMessageBox.prompt(
-      `请输入${row.goodsName || '未配置商品'}的库存数量`,
-      '配置库存',
-      {
-        inputPattern: /^0$|^[1-9]\d*/,
-        inputValue: row.stock?.toString(),
-        inputErrorMessage: '库存必须大于等于0'
-      }
-    );
-
-    await changeGoodsCellsStock(row.cellId!, Number(value));
-    ElMessage.success('库存更新成功');
-    getList();
-  } catch (error) {
-    console.error('库存配置取消或失败', error);
-  }
-};
-
-const handleClearGoods = async (row: CabinetCellDTO) => {
-  try {
-    await ElMessageBox.confirm(
-      `确认要下架${row.goodsName || '未配置商品'}吗？`,
-      '警告',
-      { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
-    );
-    await clearGoodsCells(row.cellId!);
-    ElMessage.success('商品下架成功');
-    getList();
-  } catch (error) {
-    console.error('操作取消或失败', error);
-  }
-};
 </script>
 
 <template>
@@ -252,17 +218,19 @@ const handleClearGoods = async (row: CabinetCellDTO) => {
         </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template #default="{ row }">
+            <el-button type="primary" link :icon="useRenderIcon(EditPen)" @click="handleEdit(row)">
+              编辑
+            </el-button>
             <el-button type="success" link :icon="useRenderIcon(AddFill)" @click="handleConfigure(row)">
               配置商品
             </el-button>
-            <el-button v-if="row.goodsId" type="warning" link :icon="useRenderIcon(EditPen)"
+            <el-popconfirm :title="`确认删除【${row.cellNo}】号单元格？`" @confirm="handleDelete(row)">
-              @click="handleStockConfig(row)">
+              <template #reference>
-              配置库存
+                <el-button type="danger" link :icon="useRenderIcon(Delete)">
-            </el-button>
+                  删除
-            <el-button v-if="row.goodsId" type="danger" link :icon="useRenderIcon(Delete)"
+                </el-button>
-              @click="handleClearGoods(row)">
+              </template>
-              下架商品
+            </el-popconfirm>
-            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -270,9 +238,7 @@ const handleClearGoods = async (row: CabinetCellDTO) => {
         :page-sizes="[10, 20, 50]" layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
         @size-change="onSizeChange" @current-change="onCurrentChange" />
     </PureTableBar>
-    <el-dialog v-model="configVisible" title="配置商品" width="80%">
+    <CabinetGoodsConfigModal v-model="configVisible" :cell-id="currentCellId" @refresh="getList" />
-      <CabinetGoodsConfigModal v-model="configVisible" :cell-id="currentCellId" @refresh="getList" />
-    </el-dialog>
   </div>
 </template>
 

src/views/shop/goods/goods-edit-modal.vue

@@ -29,7 +29,6 @@ const formData = reactive<GoodsDTO>({
   price: 0,
   stock: 0,
   status: 1,
-  autoApproval: 0,
   categoryId: 0,
   goodsDetail: "",
   coverImg: ""
@@ -155,10 +154,6 @@ watch(
         </el-select>
       </el-form-item>
 
-      <el-form-item label="自动审批" prop="autoApproval">
-        <el-switch v-model="formData.autoApproval" :active-value="1" :inactive-value="0" active-text="启用"
-          inactive-text="关闭" />
-      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio :label="1">上架</el-radio>

src/views/shop/goods/goods-form-modal.vue

@@ -2,7 +2,7 @@
 import { ref, reactive, onMounted, watch } from "vue";
 import { ElMessage, FormRules } from "element-plus";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { addGoodsApi, GoodsDTO } from "@/api/shop/goods";
+import { addGoodsApi } from "@/api/shop/goods";
 import { CategoryDTO, getCategoryAllApi } from "@/api/shop/category";
 import Confirm from "@iconify-icons/ep/check";
 import Upload from "@iconify-icons/ep/upload";
@@ -18,12 +18,11 @@ const props = defineProps({
 const emit = defineEmits(["update:visible", "refresh"]);
 
 const formRef = ref();
-const formData = reactive<GoodsDTO>({
+const formData = reactive({
   goodsName: "",
   price: 0,
   stock: 0,
   status: 1,
-  autoApproval: 0,
   categoryId: 0,
   goodsDetail: "",
   coverImg: ""
@@ -124,11 +123,6 @@ const beforeAvatarUpload = (rawFile) => {
         </el-select>
       </el-form-item>
 
-      <el-form-item label="自动审批" prop="autoApproval">
-        <el-switch v-model="formData.autoApproval" :active-value="1" :inactive-value="0" active-text="启用"
-          inactive-text="关闭" />
-      </el-form-item>
-
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio :label="1">上架</el-radio>

src/views/shop/goods/index.vue

@@ -38,7 +38,7 @@ const pagination = ref({
 
 // 加载数据
 const loading = ref(false);
-const dataList = ref<GoodsDTO[]>([]);
+const dataList = ref([]);
 const multipleSelection = ref<number[]>([]);
 const editVisible = ref(false);
 const configVisible = ref(false);
@@ -181,16 +181,9 @@ const handleEdit = (row: GoodsDTO) => {
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="自动审批" prop="autoApproval" width="120">
-          <template #default="{ row }">
-            <el-tag :type="row.autoApproval === 1 ? 'success' : 'info'">
-              {{ row.autoApproval === 1 ? '启用' : '关闭' }}
-            </el-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="柜口" prop="cellNo" width="120">
           <template #default="{ row }">
-            {{ !row.cellNoStr ? '未配置' : row.cabinetName + ' 格口' + row.cellNoStr }}
+            {{ !row.cellNo ? '未配置' : row.cabinetName + ' 格口' + row.cellNo }}
           </template>
         </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
@@ -198,10 +191,10 @@ const handleEdit = (row: GoodsDTO) => {
             <el-button type="primary" link :icon="useRenderIcon(EditPen)" @click="handleEdit(row)" class="right-btn">
               编辑
             </el-button>
-            <!-- <el-button type="warning" link :icon="useRenderIcon(Setting)" class="right-btn"
+            <el-button type="warning" link :icon="useRenderIcon(Setting)" class="right-btn"
               @click="currentRow = row; configVisible = true">
               配置格口
-            </el-button> -->
+            </el-button>
             <el-popconfirm :title="`确认删除【${row.goodsName}】？`" @confirm="handleDelete(row)">
               <template #reference>
                 <el-button type="danger" link :icon="useRenderIcon(Delete)" class="right-btn">

src/views/shop/order/index.vue

@@ -1,161 +0,0 @@
-<script setup lang="ts">
-import { ref } from "vue";
-import { PureTableBar } from "@/components/RePureTableBar";
-import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { getOrderListApi, type OrderDTO } from "@/api/shop/order";
-import Search from "@iconify-icons/ep/search";
-import Refresh from "@iconify-icons/ep/refresh";
-import { ElMessage } from "element-plus";
-
-defineOptions({
-  name: "ShopOrder"
-});
-
-const formRef = ref();
-const tableRef = ref();
-
-const searchFormParams = ref({
-  orderNumber: "",
-  status: null,
-  payStatus: null,
-  startTime: "",
-  endTime: ""
-});
-
-const pagination = ref({
-  pageSize: 10,
-  currentPage: 1,
-  total: 0
-});
-
-const loading = ref(false);
-const dataList = ref<OrderDTO[]>([]);
-
-const getList = async () => {
-  try {
-    loading.value = true;
-    const { data } = await getOrderListApi({
-      ...searchFormParams.value,
-      pageSize: pagination.value.pageSize,
-      pageNum: pagination.value.currentPage
-    });
-    dataList.value = data.rows;
-    pagination.value.total = data.total;
-  } finally {
-    loading.value = false;
-  }
-};
-
-const onSearch = () => {
-  pagination.value.currentPage = 1;
-  getList();
-};
-
-const resetForm = () => {
-  formRef.value.resetFields();
-  onSearch();
-};
-
-const onSizeChange = (val: number) => {
-  pagination.value.pageSize = val;
-  getList();
-};
-
-const onCurrentChange = (val: number) => {
-  pagination.value.currentPage = val;
-  getList();
-};
-
-getList();
-</script>
-
-<template>
-  <div class="main">
-    <el-form ref="formRef" :inline="true" :model="searchFormParams"
-      class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]">
-      <el-form-item label="时间范围：">
-        <el-date-picker v-model="searchFormParams.startTime" type="datetime" placeholder="开始时间"
-          value-format="YYYY-MM-DD HH:mm:ss" class="!w-[200px]" />
-        <span class="mx-2">至</span>
-        <el-date-picker v-model="searchFormParams.endTime" type="datetime" placeholder="结束时间"
-          value-format="YYYY-MM-DD HH:mm:ss" class="!w-[200px]" />
-      </el-form-item>
-      <el-form-item label="订单编号：" prop="orderNumber">
-        <el-input v-model="searchFormParams.orderNumber" placeholder="请输入订单编号" clearable class="!w-[200px]" />
-      </el-form-item>
-      <el-form-item label="订单状态：" prop="status">
-        <el-select v-model="searchFormParams.status" placeholder="请选择状态" clearable class="!w-[180px]">
-          <el-option label="待付款" :value="1" />
-          <el-option label="已付款" :value="2" />
-          <el-option label="已发货" :value="3" />
-          <el-option label="已完成" :value="4" />
-          <el-option label="已取消" :value="5" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="支付状态：" prop="payStatus">
-        <el-select v-model="searchFormParams.payStatus" placeholder="请选择支付状态" clearable class="!w-[180px]">
-          <el-option label="未支付" :value="1" />
-          <el-option label="已支付" :value="2" />
-          <el-option label="退款中" :value="3" />
-          <el-option label="已退款" :value="4" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" :icon="useRenderIcon(Search)" @click="onSearch">
-          搜索
-        </el-button>
-        <el-button :icon="useRenderIcon(Refresh)" @click="resetForm">
-          重置
-        </el-button>
-      </el-form-item>
-    </el-form>
-
-    <PureTableBar title="订单列表" @refresh="getList">
-      <el-table ref="tableRef" v-loading="loading" :data="dataList" row-key="orderId" border>
-        <el-table-column label="订单ID" prop="orderId" width="120" />
-        <el-table-column label="用户id" prop="userid" width="120" />
-        <el-table-column label="姓名" prop="name" width="120" />
-        <el-table-column label="手机号" prop="mobile" width="120" />
-        <el-table-column label="订单金额" prop="totalAmount" width="120">
-          <template #default="{ row }">{{ row.totalAmount }}元</template>
-        </el-table-column>
-        <el-table-column label="订单状态" prop="status" width="120">
-          <template #default="{ row }">
-            <el-tag :type="row.status === 2 ? 'success' : row.status === 5 ? 'danger' : 'info'">
-              {{ { 1: '待付款', 2: '已付款', 3: '已发货', 4: '已完成', 5: '已取消' }[row.status] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="支付状态" prop="payStatus" width="120">
-          <template #default="{ row }">
-            <el-tag :type="row.payStatus === 2 ? 'success' : 'info'">
-              {{ { 1: '未支付', 2: '已支付', 3: '退款中', 4: '已退款' }[row.payStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="支付方式" prop="paymentMethod" width="120" />
-        <el-table-column label="支付时间" prop="payTime" width="180">
-          <template #default="{ row }">
-            {{ row.payTime ? new Date(row.payTime).toLocaleString() : '-' }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="操作" width="100" fixed="right">
-          <template #default="{ row }">
-            <el-button type="primary" link @click="handleDetail(row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column> -->
-      </el-table>
-      <el-pagination v-model:current-page="pagination.currentPage" v-model:page-size="pagination.pageSize"
-        :page-sizes="[10, 20, 50]" layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
-        @size-change="onSizeChange" @current-change="onCurrentChange" />
-    </PureTableBar>
-  </div>
-</template>
-
-<style scoped>
-.right-btn {
-  margin: 0;
-}
-</style>