src/layout/components/Aside.vue

@@ -1,8 +1,8 @@
 <template>
-  <el-aside :width="sideWidth + 'px'" style="position: sticky; bottom: 0; left: 0; height: auto; background-color: rgb(170, 113, 81); box-shadow: rgba(0, 21, 155, 0.35) 2px 0 6px">
+  <el-aside :width="sideWidth + 'px'" style="background-color: rgb(238, 241, 246); box-shadow: rgba(0, 21, 155, 0.35) 2px 0 6px">
    <el-aside :style="AsideObj">
         <el-menu
-            style=" overflow-y: auto; overflow-x: hidden"
+            style="height: 100vh; overflow-x: hidden"
             background-color="rgb(170, 113, 81)"
             :collapse="isCollapse"
             :collapse-transition="false"
@@ -98,11 +98,6 @@
               <el-icon><Menu /></el-icon>
               <span slot="title">实体商品订单列表</span>
             </el-menu-item>
-
-            <el-menu-item index="/ServiceOrderList">
-              <el-icon><Menu /></el-icon>
-              <span slot="title">服务类商品订单列表</span>
-            </el-menu-item>
           </el-sub-menu>
           <el-sub-menu index="6">
             <template #title>
@@ -144,19 +139,6 @@
           </el-sub-menu>
 
           
-          <el-sub-menu index="7">
-            <template #title>
-              <el-icon><Switch /></el-icon>
-              <span>退款管理</span>
-            </template>
-
-            <el-menu-item index="/refund">
-              <el-icon><Operation /></el-icon>
-              <span slot="title">退款中心</span>
-            </el-menu-item>
-
-          </el-sub-menu>
-          
         </el-menu>
       </el-aside>
     </el-aside>

src/layout/components/calendarUtil.vue

@@ -8,6 +8,7 @@
           ]"
             @click="handleDateClick(data.day)"
             class="calendar-date-cell"
+        
         >
           {{ data.day.split('-').slice(1).join('-') }}
           {{ data.isSelected ? '✔️' : '' }}
@@ -17,7 +18,7 @@
   </el-calendar>
   <el-drawer v-model="drawer" :title="'当前选择的日期是：' + periodObj.specificDate" :with-header="true" @open="drawerOpen" @closed="drawerClean">
     <div style="margin-bottom: 20px;">选择当天时间段和人数</div>
-    <div class="timebox" v-for="(item,index) in periodObj.timePeriodAddRequestList" style="margin-bottom: 40px">
+    <div class="timebox" v-for="(item,index) in periodObj.timePeriodAddRequestList">
       <span>选择时间段</span>
       <el-time-picker
       v-model="timePickArr[index]"
@@ -27,23 +28,18 @@
       start-placeholder="开始"
       end-placeholder="结束"
       value-format="HH:mm"
-      :style="{ width: '236px' , marginLeft: '20px'}"
+      :style="{ width: '236px' }"
       @change="saveTime(index)"
     />
-      <div style="margin-top: 15px;">
+      <div>
-        <div style="display: flex; align-items: center">
+        <span>最小人数:</span>
-          <div style="margin-bottom: 15px"><span>最小人数:</span></div>
+        <el-select v-model="periodObj.timePeriodAddRequestList[index].minNumber" style="width: 100px" @change="minNum(index)">
-          <el-select v-model="periodObj.timePeriodAddRequestList[index].minNumber" style="width: 100px; margin: 0 0 15px 30px" @change="minNum(index)">
+          <el-option v-for="item in minArr" :label="item" :value="item" />
-            <el-option v-for="item in minArr" :label="item" :value="item" />
+        </el-select>
-          </el-select><br>
+        <span>最大人数:</span>
-        </div>
+        <el-select v-model="periodObj.timePeriodAddRequestList[index].maxNumber" style="width: 100px" @change="maxNum(index)">
-
+          <el-option v-for="item in maxArr" :label="item" :value="item" />
-        <div style="display: flex; align-items: center; margin-bottom: 15px;">
+        </el-select>
-          <div><span>最大人数:</span></div>
-          <el-select v-model="periodObj.timePeriodAddRequestList[index].maxNumber" style="width: 100px; margin: 0 15px 0 30px" @change="maxNum(index)">
-            <el-option v-for="item in maxArr" :label="item" :value="item" />
-          </el-select>
-        </div>
         <el-button circle @click="addList(index)"><el-icon>
             <Plus />
           </el-icon></el-button>
@@ -52,12 +48,10 @@
           </el-icon></el-button>
       </div>
     </div>
-    <div style="display: flex; align-items: center">
+    <el-checkbox v-model="isBook"  label="这天可预约"  style="margin-left: 10px;"/>
-      <el-checkbox v-model="isBook"  label="可否预约" size="large" style="margin-right: 15px"/>
+    <el-button type="success" round @click="saveInfo">保存</el-button>
-      <el-button type="success" round @click="saveInfo">保存</el-button>
+    <el-button type="danger" round @click="closeForm">取消</el-button>
-      <el-button type="danger" round @click="closeForm">取消</el-button>
+    <el-button type="primary" round @click="resetForm">重置</el-button>
-      <el-button type="primary" round @click="resetForm">重置</el-button>
-    </div>
   </el-drawer>
   <el-button type="success" round @click="emittValue" style="margin-left: 100px;">保存</el-button>
 </template>
@@ -65,7 +59,6 @@
 <script setup lang="ts">
 import { ref , onMounted , defineEmits} from 'vue'
 import { ElMessage } from 'element-plus';
-import emitter from "@/utils/emitter";
 const Selectdate = ref('')
 //日期1.20
 const selectedDates = ref<string[]>([])  //选中的日期
@@ -194,9 +187,6 @@ const emittValue =()=>{  //点击保存后将值传给父组件
   appointmentDateAddRequestList.value.splice(0,appointmentDateAddRequestList.value.length)  //防止用户狂点
   periodMap.forEach(mapFun)
   emit('calendar-Info',appointmentDateAddRequestList.value)
-  emitter.on('clear', () => {
-    periodMap.clear()
-  })
 }
 const mapFun =(value:any ,key:any ,map:any)=>{  //遍历map的统一函数
   if(periodMap.has(key)) {

src/router/routes.ts

@@ -50,11 +50,6 @@ export const routes = [
                 name: '订单列表',
                 component: ()=> import("../views/Orders/OrderList.vue")
             },
-            {
-                path: '/ServiceOrderList',
-                name: '服务类订单列表',
-                component: ()=> import("../views/Orders/ServiceOrderList.vue")
-            },
             {
                 path: '/AddCoupons',
                 name:'添加优惠券',
@@ -114,12 +109,7 @@ export const routes = [
                 path: '/TimeCenter',
                 name: '预约时间中心',
                 component: ()=> import("../views/CostumeAppointments/TimeCenter.vue")
-            },
+            }
-            {
-                path: '/refund',
-                name:'退款管理',
-                component: ()=> import("../views/Refund/Refund.vue")
-            },
         ]
     },
     {

src/views/Orders/OrderList.vue

@@ -15,37 +15,37 @@
         {{ $index + 1 }}
       </template>
     </el-table-column>
-    <el-table-column prop="orderNumber" label="订单编号" width="300"></el-table-column>
+    <el-table-column prop="orderNumber" label="订单编号" width="180"></el-table-column>
     <el-table-column prop="createTime" label="下单时间" width="180"></el-table-column>
-    <el-table-column prop="userName" label="用户名" width="120"></el-table-column>
+    <el-table-column prop="userName" label="用户名" width="80"></el-table-column>
     <el-table-column label="所购买的商品" width="100">
       <el-table-column label="展开所有商品" type="expand" width="100">
         <template #default="props">
           <el-table :data="props.row.orderItemList">
-            <el-table-column label="商品名称" prop="goodSnapshot.name" width="200"/>
+            <el-table-column label="商品名称" prop="goodSnapshot.name" />
-            <el-table-column label="商品图片" prop="goodSnapshot.goodImg" width="200">
+            <el-table-column label="商品图片" prop="goodSnapshot.goodImg">
               <template #default="scope">
                 <div>
                   <img :src="scope.row.goodSnapshot.goodImg.split(';')[0]" alt="" style="height: 50px;">
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="类别" prop="goodSnapshot.type"  width="200"/>
+            <el-table-column label="类别" prop="goodSnapshot.type" />
-            <el-table-column label="商品单价" prop="goodSnapshot.price" width="200" />
+            <el-table-column label="商品单价" prop="goodSnapshot.price" />
-            <!--            <el-table-column label="是否是限定商品" prop="goodSnapshot.festivalOrder" width="150"/>-->
+            <el-table-column label="是否是限定商品" prop="goodSnapshot.festivalOrder" />
-            <el-table-column label="数量" prop="quantity" width="200"/>
+            <el-table-column label="数量" prop="quantity" />
-            <el-table-column label="总价" prop="itemTotalAmount" width="200"/>
+            <el-table-column label="总价" prop="itemTotalAmount" />
           </el-table>
         </template>
       </el-table-column>
     </el-table-column>
-    <el-table-column label="地址信息" width="180">
+    <el-table-column label="地址信息快照" width="180">
       <el-table-column prop="addressSnapshot.name" label="收货人" />
       <el-table-column prop="addressSnapshot.phone" label="手机号" width="180"/>
       <el-table-column prop="addressSnapshot.region" label="地区" width="180"/>
       <el-table-column prop="addressSnapshot.detailAddress" label="详细地址" width="180"/>
     </el-table-column>
-    <el-table-column label="优惠卷信息" width="50">
+    <el-table-column label="优惠卷信息快照" width="50">
       <el-table-column prop="couponSnapshot.name" label="优惠卷名称" />
       <el-table-column prop="couponSnapshot.conditionAmount" label="优惠金额" />
     </el-table-column>
@@ -57,7 +57,7 @@
         <el-button size="small" @click="showDetail(scope.$index, scope.row)">
           详情
         </el-button>
-        <el-button :disabled="!['待发货'].includes(scope.row.orderStatus)" size="small" @click="openShipmentDialog(scope.row.id)"  > <!--   @click="deliverGoods(scope.row)"-->
+     <el-button :disabled="!['待发货'].includes(scope.row.orderStatus)" size="small" @click="openShipmentDialog(scope.row.id)"  > <!--   @click="deliverGoods(scope.row)"-->
           发货
         </el-button>
         <el-button :disabled="!['待支付'].includes(scope.row.orderStatus)" size="small" @click="cancelOrder(scope.row)" type="warning" plain>
@@ -80,61 +80,43 @@
   <el-dialog title="订单详情信息" v-model="DialogVisible" width="60%">
     <el-form label-width="100px" size="default" :model="editForm" :disabled="disabled">
       <div style="display: flex">
-        <el-form-item label="订单编号" style="width: 400px">
+        <el-form-item label="订单编号" style="width: 200px">
-          <el-input v-model="editForm.orderNumber" autocomplete="off"></el-input>
+          <el-input v-model="editForm.addressSnapshot" autocomplete="off"></el-input>
         </el-form-item>
-      </div>
+        <el-form-item label="用户名称" style="width: 300px">
-
-      <div style="display: flex">
-        <el-form-item label="收货人姓名" style="width: 300px">
           <el-input v-model="editForm.addressSnapshot.name" autocomplete="off"></el-input>
         </el-form-item>
-
+      </div>
-        <el-form-item label="手机号" style="width: 300px">
+      <div style="display: flex">
+        <el-form-item label="收货手机" style="width: 200px">
           <el-input v-model="editForm.addressSnapshot.phone" autocomplete="off"></el-input>
         </el-form-item>
-      </div>
+        <el-form-item label="收货地址" style="width: 400px">
-
-      <div style="display: flex">
-        <el-form-item label="收货地址" style="width: 300px">
           <el-input v-model="editForm.addressSnapshot.region" autocomplete="off"></el-input>
         </el-form-item>
-
+      </div>
-        <el-form-item label="详细地址">
+      <!-- 这里的商品明细就不放图片了 -->
+      <div style="display: flex">
+        <el-form-item label="商品明细">
           <el-input v-model="editForm.addressSnapshot.detailAddress" autocomplete="off"></el-input>
         </el-form-item>
-      </div>
+        <el-form-item label="订单总金额" style="width: 250px">
-
+          <el-input v-model="editForm.totalAmount" autocomplete="off"></el-input>
-      <!-- 这里的商品明细就不放图片了 -->
+        </el-form-item>
-      <div style="display: flex"></div>
         <el-form-item label="订单状态" style="width: 250px">
           <el-input v-model="editForm.orderStatus" autocomplete="off"></el-input>
         </el-form-item>
-
-      <div style="display: flex">
-        <el-form-item label="订单总金额" style="width: 250px">
-          <el-input v-model="totalAmount" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="优惠价格" style="width: 250px">
-          <el-input v-model="couponAmount" autocomplete="off"></el-input>
-        </el-form-item>
       </div>
-
+      <el-form-item label="快递单号" style="width: 300px">
-        <el-form-item label="订单实付金额" style="width: 250px">
+        <el-input v-model="editForm.trackingNumber" autocomplete="off"></el-input>
-          <el-input v-model="editForm.totalAmount" autocomplete="off"></el-input>
+      </el-form-item>
-        </el-form-item>
-
-        <el-form-item label="快递单号" style="width: 300px">
-          <el-input v-model="editForm.trackingNumber" autocomplete="off"></el-input>
-        </el-form-item>
-
       <div style="display: flex">
-        <el-form-item label="下单时间"  style="width: 300px;">
+        <el-form-item label="创建时间"  style="width: 300px;">
           <el-input v-model="editForm.createTime" autocomplete="off"></el-input>
         </el-form-item>
-<!--        <el-form-item label="更新时间" style="width: 300px;">-->
+        <el-form-item label="更新时间" style="width: 300px;">
-<!--          <el-input v-model="editForm.updateTime" autocomplete="off"></el-input>-->
+          <el-input v-model="editForm.updateTime" autocomplete="off"></el-input>
-<!--        </el-form-item>-->
+        </el-form-item>
       </div>
     </el-form>
     <template #footer>
@@ -144,7 +126,7 @@
       </div>
     </template>
   </el-dialog>
-  <!--  发货弹窗-->
+<!--  发货弹窗-->
   <el-dialog title="发货" v-model="shipments" width="60%">
     <el-form label-width="100px" size="default"  >
       <el-form-item label="快递单号" style="width: 300px;">
@@ -154,7 +136,7 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button style="height: 30px;" @click=" shipments = false">取消</el-button>
-        <el-button style="height: 30px" type="primary" @click="deliverGoods">确认</el-button>
+        <el-button style="height: 30px" type="primary" @click="deliverGoods ">确认</el-button>
       </div>
     </template>
   </el-dialog>
@@ -180,8 +162,7 @@ const searchParams: any = ref({ //封装分页
   current: 1, //当前页码
   pageSize: 5, //每页显示条数
   sortField: "id",  //根据ID分类
-  sortOrder: "descend", //降序
+  sortOrder: "descend" //降序
-  orderType: "product"
 })
 const loading = ref(false)
 onMounted(() => {
@@ -219,17 +200,11 @@ const getOrderList = async () => {
   }
 }
 //查看订单详情
-const totalAmount = ref(0)
-const couponAmount = ref(0)
 const showDetail = (index: number, row: any) => {
   title.value = "订单详情"
   DialogVisible.value = true;
-  if (row.couponSnapshot !== null) {
-    couponAmount.value = row.couponSnapshot.conditionAmount;
-  }
-  totalAmount.value = row.totalAmount + couponAmount.value;
-    console.log('editForm--->',editForm.value);
   editForm.value = row;
+  console.log('editForm--->',editForm.value);
 };
 //发货方法
 const currentId = ref<number | null>(null);

src/views/Orders/ServiceOrderList.vue

@@ -1,271 +0,0 @@
-<template>
-  <div>
-    <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入订单编号"
-              v-model="name"></el-input>
-    <el-button class="ml-5" type="primary" @click="load" style="height: 25px;">搜索</el-button>
-    <el-button type="warning" @click="reset" style="height:25px">重置</el-button>
-  </div>
-  <!-- 数据展示层 -->
-  <el-table v-loading="loading" :data="tableData" border stripe header-cell-class-name="headerBg"
-            :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
-            :header-cell-style="{ 'text-align': 'center' }">
-    <el-table-column type="selection" width="55" fixed="left"></el-table-column>
-    <el-table-column prop="id" label="订单序号" width="80">
-      <template #default="{ $index }">
-        {{ $index + 1 }}
-      </template>
-    </el-table-column>
-    <el-table-column prop="orderNumber" label="订单编号" width="300"></el-table-column>
-    <el-table-column prop="createTime" label="下单时间" width="180"></el-table-column>
-    <el-table-column prop="userName" label="用户名" width="120"></el-table-column>
-    <el-table-column label="所购买的商品" width="100">
-      <el-table-column label="展开所有商品" type="expand" width="100">
-        <template #default="props">
-          <el-table :data="props.row.orderItemList">
-            <el-table-column label="商品名称" prop="goodSnapshot.name" width="200"/>
-            <el-table-column label="商品图片" prop="goodSnapshot.goodImg" width="200">
-              <template #default="scope">
-                <div>
-                  <img :src="scope.row.goodSnapshot.goodImg.split(';')[0]" alt="" style="height: 50px;">
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column label="类别" prop="goodSnapshot.type"  width="200"/>
-            <el-table-column label="商品单价" prop="goodSnapshot.price" width="200" />
-<!--            <el-table-column label="是否是限定商品" prop="goodSnapshot.festivalOrder" width="150"/>-->
-            <el-table-column label="数量" prop="quantity" width="200"/>
-            <el-table-column label="总价" prop="itemTotalAmount" width="200"/>
-            <el-table-column label="预约日期" prop="reservationDate" width="200"></el-table-column>
-            <el-table-column label="预约时间段" prop="timeSlot" width="200"></el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-    </el-table-column>
-    <el-table-column label="联系人信息" width="180">
-      <el-table-column prop="contactsSnapshot.name" label="姓名" />
-      <el-table-column prop="contactsSnapshot.phone" label="手机号" width="180"/>
-    </el-table-column>
-    <el-table-column label="优惠卷信息" width="50">
-      <el-table-column prop="couponSnapshot.name" label="优惠卷名称" />
-      <el-table-column prop="couponSnapshot.conditionAmount" label="优惠金额" />
-    </el-table-column>
-    <el-table-column prop="totalAmount" label="订单总金额"></el-table-column>
-    <el-table-column prop="orderStatus" label="订单状态"></el-table-column>
-    <el-table-column label="操作" width="220px" fixed="right">
-      <template #default="scope">
-        <el-button size="small" @click="showDetail(scope.$index, scope.row)">
-          详情
-        </el-button>
-        <el-button :disabled="!['待发货'].includes(scope.row.orderStatus)" size="small" @click="openShipmentDialog(scope.row.id)"  > <!--   @click="deliverGoods(scope.row)"-->
-          发货
-        </el-button>
-        <el-button :disabled="!['待支付'].includes(scope.row.orderStatus)" size="small" @click="cancelOrder(scope.row)" type="warning" plain>
-          取消订单
-        </el-button>
-        <el-button :disabled="!['待发货'].includes(scope.row.orderStatus)" size="small" @click="deleteOrder(scope.row)" type="danger" plain>
-          退款
-        </el-button>
-      </template>
-    </el-table-column>
-  </el-table>
-  <!-- 分页器 -->
-  <div style="padding: 10px 0">
-    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                   :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
-                   :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
-                   :total="total" />
-  </div>
-  <!--  弹窗-->
-  <el-dialog title="订单详情信息" v-model="DialogVisible" width="60%">
-    <el-form label-width="100px" size="default" :model="editForm" :disabled="disabled">
-      <div style="display: flex">
-        <el-form-item label="订单编号" style="width: 400px">
-          <el-input v-model="editForm.orderNumber" autocomplete="off"></el-input>
-        </el-form-item>
-      </div>
-      <div style="display: flex">
-        <el-form-item label="联系人姓名" style="width: 300px">
-          <el-input v-model="editForm.contactsSnapshot.name" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="手机号" style="width: 300px">
-          <el-input v-model="editForm.contactsSnapshot.phone" autocomplete="off"></el-input>
-        </el-form-item>
-      </div>
-      <!-- 这里的商品明细就不放图片了 -->
-      <div style="display: flex">
-        <el-form-item label="订单总金额" style="width: 250px">
-          <el-input v-model="totalAmount" autocomplete="off"></el-input>
-        </el-form-item>
-
-        <el-form-item label="优惠价格" style="width: 250px">
-          <el-input v-model="editForm.couponSnapshot.conditionAmount" autocomplete="off"></el-input>
-        </el-form-item>
-
-      </div>
-
-      <el-form-item label="订单实付金额" style="width: 250px">
-        <el-input v-model="editForm.totalAmount" autocomplete="off"></el-input>
-      </el-form-item>
-
-      <el-form-item label="订单状态" style="width: 250px">
-        <el-input v-model="editForm.orderStatus" autocomplete="off"></el-input>
-      </el-form-item>
-
-      <div style="display: flex">
-        <el-form-item label="下单时间"  style="width: 300px;">
-          <el-input v-model="editForm.createTime" autocomplete="off"></el-input>
-        </el-form-item>
-<!--        <el-form-item label="更新时间" style="width: 300px;">-->
-<!--          <el-input v-model="editForm.updateTime" autocomplete="off"></el-input>-->
-<!--        </el-form-item>-->
-      </div>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button style="height: 30px;" @click="DialogVisible = false">取消</el-button>
-        <el-button style="height: 30px" type="primary" @click="DialogVisible = false" >确认</el-button>
-      </div>
-    </template>
-  </el-dialog>
-  <!--  发货弹窗-->
-  <el-dialog title="发货" v-model="shipments" width="60%">
-    <el-form label-width="100px" size="default"  >
-      <el-form-item label="快递单号" style="width: 300px;">
-        <el-input v-model="shipment.trackingNumber"></el-input>
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button style="height: 30px;" @click=" shipments = false">取消</el-button>
-        <el-button style="height: 30px" type="primary" @click="deliverGoods ">确认</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, ref } from "vue";
-import myAxios from "@/api/myAxios";
-import { ElMessage } from "element-plus";
-import { SuccessInfo , ErrorInfo } from "@/utils/messageInfo";
-const tableData: any = ref([]);  //表单展示数据
-const total = ref(0);
-const title = ref('')
-const disabled = ref(true)
-const editForm: any = ref({});//编辑表单
-const shipment:any = ref({
-  trackingNumber: null
-})//物流单号
-const DialogVisible = ref(false); //详情展示
-const shipments = ref(false)
-const name = ref('')
-const searchParams: any = ref({ //封装分页 
-  current: 1, //当前页码
-  pageSize: 5, //每页显示条数
-  sortField: "id",  //根据ID分类
-  sortOrder: "descend", //降序
-  orderType: 'service'
-})
-const loading = ref(false)
-onMounted(() => {
-  getOrderList()  //页面加载获取订单列表
-})
-const handleSizeChange = (newSize: any) => {
-  searchParams.value.pageSize = newSize //新的页面数
-  getOrderList()
-}
-const handleCurrentChange = (Current: any) => {
-  searchParams.value.current = Current
-  getOrderList()
-}
-const handleSelectionChange = (row: any) => {
-  // id.value = JSON.parse(JSON.stringify(row));
-}
-//获取订单列表
-const getOrderList = async () => {
-  try {
-    const res = await myAxios.post('/order/list/page', { ...searchParams.value });
-    // console.log('订单信息--->', res.data.data);
-    if (res.data.code === 1) {
-      tableData.value = res.data.data.records;
-      total.value = parseInt(res.data.data.total)
-      console.log('表单信息--->', tableData.value);
-    } else {
-      ElMessage({
-        message: '获取数据失败',
-      });
-    }
-  } catch (error) {
-    ElMessage({
-      message: '发生错误',
-    });
-  }
-}
-
-const totalAmount = ref(0)
-const couponAmount = ref(0)
-//查看订单详情
-const showDetail = (index: number, row: any) => {
-  title.value = "订单详情"
-  DialogVisible.value = true;
-  if (row.couponSnapshot !== null) {
-    couponAmount.value = row.couponSnapshot.conditionAmount;
-  }
-  totalAmount.value = row.totalAmount + couponAmount.value;
-  editForm.value = row;
-  console.log('editForm--->',editForm.value);
-};
-//发货方法
-const currentId = ref<number | null>(null);
-const openShipmentDialog = (id: number) => {
-  shipments.value = true;
-  currentId.value = id;
-}
-const deliverGoods = async () => {  //发货方法
-  if (currentId.value) {
-    const res = await myAxios.post('/order/update', {
-      id: currentId.value,
-      trackingNumber: shipment.value.trackingNumber
-    })
-    if (res.data.code === 1) {
-      ElMessage({
-        type: 'success',
-        message: '发货成功'
-      })
-      getOrderList();
-    }
-  } else {
-    ElMessage.error('更新失败，请检查字段')
-  }
-  shipments.value = false;
-}
-const deleteOrder = async (row : any) => {  //微信退款
-  loading.value = true
-  console.log('row-->',row)
-  const res = await myAxios.post('/wechat/refund/create', { id: row.id })   //传入订单号取消订单并退款
-  console.log(res)
-  setTimeout(()=>{
-    if(res.data.code === 1) {
-      SuccessInfo('退款成功')
-      getOrderList()
-      loading.value = false
-    }
-  },10000)
-}
-const reset = () => {  //重置搜索框
-  name.value = '';
-};
-const load = () => { }  //搜索的方法
-const cancelOrder = async (row:any)=>{  //取消订单的方法(未支付能取消)
-  console.log('点击的这一行--->',row);
-  const res = await myAxios.post('/order/cancel/id',{ id: row.id })
-  if(res.data.code === 1) {
-    getOrderList()
-    SuccessInfo('取消订单成功')
-  } else {
-    ErrorInfo('请求错误')
-  }
-}
-</script>
-
-<style lang="scss" scoped></style>

src/views/Refund/Refund.vue

@@ -1,117 +0,0 @@
-<template>
-  <!-- 修改前请注释以前的 -->
-  <!-- 搜索 -->
-  <div>
-    <el-input style="width: 240px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入商户单号"
-              v-model="outTradeNo"></el-input>
-    <el-button class="ml-5" type="primary" @click="onSearch(outTradeNo)" style="height: 25px; margin-right: 10px;">搜索</el-button>
-
-    <el-button type="warning" @click="reset" style="height:25px">重置</el-button>
-  </div>
-  <div style="margin: 15px 0">
-
-  </div>
-  <!-- 数据展示 -->
-  <el-table :data="tableData" border stripe header-cell-class-name="headerBg"
-            :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
-            :header-cell-style="{ 'text-align': 'center' }">
-    <el-table-column prop="id" label="退款编号" width="80">
-      <template #default="{ $index }">
-        {{ $index + 1 }}
-      </template>
-    </el-table-column>
-    <el-table-column prop="outTradeNo" label="商户单号"></el-table-column>
-    <el-table-column prop="outRefundNo" label="退款单号"></el-table-column>
-    <el-table-column prop="refundAmount" label="退款金额" width="180">
-      <template #default="scope">
-        <div>
-          {{ scope.row.refundAmount }} 元
-        </div>
-      </template>
-    </el-table-column>
-    <el-table-column prop="createTime" label="创建时间"></el-table-column>
-
-  </el-table>
-  <!-- 分页器 -->
-  <div style="padding: 10px 0">
-    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                   :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
-                   :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
-                   :total="total" />
-  </div>
-  <!-- 编辑/详情表单 -->
-
-</template>
-
-<script setup lang="ts">
-import { ElMessage , type UploadProps , genFileId ,type UploadRawFile } from 'element-plus';
-import { ref, onMounted, inject } from 'vue';
-import myAxios from "@/api/myAxios";
-import { handleChange, removePic, handleRemove,Exceed_ProductImg, ImgArr ,editForm} from '@/utils/entityProduct/picUpload';
-const total = ref(0); //总页数
-const outTradeNo = ref('');
-const searchParams: any = ref({ //封装分页
-  current: 1, //当前页码
-  pageSize: 5, //每页显示条数
-  sortField: "id",  //根据ID分类
-  sortOrder: "descend", //降序
-  outTradeNo: outTradeNo.value
-})
-//表单变量
-const tableData : any= ref([]);  //实体类商品表格
-const reload : any = inject("reload")  //页面重新刷新
-onMounted(() => { //页面加载时获取商品列表和分类页表
-  getProductList()
-})
-const getProductList = async () => {
-  try {
-    const res = await myAxios.post('/refund/list', { ...searchParams.value });
-    console.log('res--->',res.data)
-    if (res.data.code === 1) {
-      tableData.value = res.data.data.records;
-      total.value = parseInt(res.data.data.total)  //总数据量，用于分页
-    } else {
-      ElMessage({
-        message: '获取数据失败',
-      });
-      return;
-    }
-  } catch (error) {
-    ElMessage({
-      message: '发生错误',
-    });
-  }
-}
-
-
-//详情或编辑
-
-//处理行数大小变化
-const handleSizeChange = (newSize: any) => {
-  searchParams.value.pageSize = newSize //新的页面数
-  getProductList()
-}
-//处理当前表格变化
-const handleCurrentChange = (Current: any) => {
-  searchParams.value.current = Current
-  getProductList()
-}
-//重置按钮
-const reset = () => {
-  reload()
-};
-
-const onSearch = (data : String)=>{ //搜索按钮方法
-  searchParams.value.outTradeNo = data
-  searchParams.value.current = 1
-  getProductList()
-}
-
-const handleSelectionChange =()=>{}
-</script>
-
-<style scoped>
-.headerBg {
-  background-color: #eee !important;
-}
-</style>

src/views/ServiceType/AddServiceProduct.vue

@@ -102,7 +102,6 @@ const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
 const onSubmit = async () => {  
   const values = Object.values(form.value);
   // 使用some()方法来检查是否有任何值为空
-  console.log(form.value.appointmentDateAddRequestList)
   if (values.some(value => value === null || value === undefined || value === '') || form.value.appointmentDateAddRequestList.length == 0) {
     ElMessage({
       type: 'warning',

src/views/ServiceType/ProductCenter.vue

@@ -4,8 +4,8 @@
   <div>
     <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入课程名称"
       v-model="productName"></el-input>
-    <el-form-item label="" style="width: 200px; min-height: 24px; margin-right: 10px;display: inline-block">
+    <el-form-item label="商品状态" style="width: 200px;margin-right: 10px;display: inline-block">
-      <el-select v-model="state" placeholder="商品状态" @change="(event: any) => searchByState(event)">
+      <el-select v-model="state" placeholder="请选择" @change="(event: any) => searchByState(event)">
         <el-option label="已上架" value="1" />
         <el-option label="已下架" value="0" />
       </el-select>
@@ -47,11 +47,7 @@
         <!-- 放后端传来的预约时间 -->
         <el-table :data="appointmentDateArr[$index]" :header-cell-style="{ 'text-align': 'center' }"
           :cell-style="{ 'text-align': 'center' }">
-          <el-table-column label="是否可预约" prop="isAvailable">
+          <el-table-column label="是否可预约" prop="isAvailable" />
-            <template #default="{ row  }">
-              {{ row.isAvailable == 1 ? "是" : "否" }}
-            </template>
-          </el-table-column>
           <el-table-column label="日期" prop="specificDate" />
           <el-table-column label="操作">
             <template v-slot="scope">
@@ -168,39 +164,32 @@
     :title="'当前日期：'+drawerDate.specificDate + '&emsp;课程名称：' + className"
     direction="ltr"
     @closed="closedDrawer">
-  <div style="margin-bottom: 20px">选择当天时间段和人数</div>
+  <div style="margin-bottom: 20px;">选择当天时间段和人数</div>
-    <div v-for="(item,index) in drawerDate.timePeriodVOList" style="margin-bottom: 40px">
+    <div v-for="(item,index) in drawerDate.timePeriodVOList">
-        <div style="margin-bottom: 15px"><span>时间段</span></div>
+      <span>选择时间段</span>
-        <el-time-picker
+      <el-time-picker
-            v-model="timePickArr[index]"
+      v-model="timePickArr[index]"
-            format='HH:mm'
+      format='HH:mm'
-            is-range="true"
+      is-range="true"
-            range-separator="到"
+      range-separator="到"
-            start-placeholder="开始"
+      start-placeholder="开始"
-            end-placeholder="结束"
+      end-placeholder="结束"
-            value-format="HH:mm"
+      value-format="HH:mm"
-            :style="{ width: '236px', marginBottom: '15px' }"
+      :style="{ width: '236px' }"
-            @change="saveTime(index)"
+      @change="saveTime(index)"
-            :disabled="timeAbleArr[index]"
+      :disabled="timeAbleArr[index]"
-        />
+    />
-
+      <div>
-      <div style="margin-bottom:15px">
+        <span>最小人数:</span>
-        <div style="display: flex; align-items: center; margin-bottom: 15px">
+        <el-select v-model="InfoArr[index].minNumber" style="width: 50px" @change="minNum(index)" :disabled="numAbleArr[index]">
-          <div style="margin-right: 15px"><span>最小人数:</span></div>
+          <el-option v-for="item in minArr" :label="item" :value="item" />
-          <el-select v-model="InfoArr[index].minNumber" style="width: 50px" @change="minNum(index)" :disabled="numAbleArr[index]">
+        </el-select>
-            <el-option v-for="item in minArr" :label="item" :value="item" />
+        <span>最大人数:</span>
-          </el-select>
+        <el-select v-model="InfoArr[index].maxNumber" style="width: 50px" @change="maxNum(index)" :disabled="numAbleArr[index]">
-        </div>
+          <el-option v-for="item in maxArr" :label="item" :value="item" />
-
+        </el-select>
-        <div style="display: flex; align-items: center; margin-bottom: 15px">
-          <div style="margin-right: 15px"><span>最大人数:</span></div>
-          <el-select v-model="InfoArr[index].maxNumber" style="width: 50px" @change="maxNum(index)" :disabled="numAbleArr[index]">
-            <el-option v-for="item in maxArr" :label="item" :value="item" />
-          </el-select>
-        </div>
-
         <el-button type="primary" @click="UpdateNum(item,index)" v-if="timeAbleArr[index]">{{ btnText[index] }}</el-button>
-        <el-button type="danger" @click="subList(item, index)" v-if="index > 0">删除</el-button>
+        <el-button type="danger" @click="subList(index)" v-if="index > 0">删除</el-button>
       </div>
     </div>
     <el-button type="success" @click="addList">{{ addbtnText }}</el-button>
@@ -211,7 +200,7 @@
     title="添加日期" 
     width="800"
     >
-    <calendarUtil @calendar-info="handleCalendarInfo"></calendarUtil>
+    <calendarUtil></calendarUtil>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="addDateVisible = false">取消</el-button>
@@ -225,10 +214,9 @@
 
 <script setup lang="ts">
 import { ElMessage , type UploadProps , genFileId ,type UploadRawFile  } from 'element-plus';
-import {ref, onMounted, inject, toRaw} from 'vue';
+import { ref, onMounted, inject } from 'vue';
 import myAxios from "@/api/myAxios";
 import calendarUtil from '@/layout/components/calendarUtil.vue';
-import emitter from "@/utils/emitter";
 const total = ref(0); //总页数
 const idList = ref([]);  //用于批量删除
 const searchParams: any = ref({ //封装分页
@@ -274,14 +262,6 @@ onMounted(() => { //页面加载时获取商品列表和分类页表
     maxArr.value[i] = 6+i
   }
 })
-
-const appointmentDateAddRequestList = ref({})
-
-const handleCalendarInfo = (data:any) => {
-  appointmentDateAddRequestList.value = data
-  console.log(data)
-}
-
 const getProductList = async () => {
   try {
     const res = await myAxios.post('/goods/service/list/page', { ...searchParams.value });
@@ -505,27 +485,7 @@ const addList = async ()=>{
   console.log(res.data);
   addbtnText.value = '添加时间段'
 }
-const subList = async (item:any, index: number)=> {
+const subList =(index: number)=>{}
-  console.log(index, '->', item)
-  if (item.id !== 0) {
-    const res = await myAxios.post('/appointmentDate/del/time/id', {
-      id: item.id,
-    })
-    if (res.data.code === 1) {
-      ElMessage({
-        type: 'success',
-        message: '删除成功'
-      })
-    } else {
-      ElMessage({
-        type: 'error',
-        message: '删除失败'
-      })
-    }
-  }
-  drawerDate.value.timePeriodVOList.pop()
-  addbtnText.value = '添加时间段'
-}
 const UpdateNum = async (item: any,index:number)=>{  //修改具体日期某时间段的人数
   btnText.value[index] === '修改' ? btnText.value[index] = '保存' : btnText.value[index] = '修改'
   btnText.value[index] === '保存' ? numAbleArr.value[index] = false : numAbleArr.value[index] = true
@@ -556,7 +516,7 @@ const updateDay = async (row:any)=>{  //修改今天是否可以预约
       message: '修改成功'
     });
   }
-  await getProductList()
+  getProductList()
 }
 const judgeNull =(List : any)=>{  //时间段和人数统一判空方法
   console.log('List--->',List);
@@ -595,22 +555,12 @@ const deleteDate = async (id: number)=>{  //删除当前日期方法
     })
   }
 }
-let goodId = 0
 const addDate = ( obj : any ) => { //添加日期方法
   console.log('obj--->',obj);
   addDateVisible.value = true
-  goodId = obj.goodId
 }
-const submitDate = async ()=> {  //提交日期方法
+const submitDate =()=> {  //提交日期方法
-  appointmentDateAddRequestList.value.forEach((item:any,index:number)=>{
+
-    Object.assign(item, {goodId:goodId})
-  })
-  const res = await myAxios.post("/appointmentDate/addBatch", appointmentDateAddRequestList.value)
-  console.log(res)
-  await getProductList();
-  addDateVisible.value = false
-  appointmentDateAddRequestList.value = []
-  emitter.emit('clear')
 }
 </script>