admin1/jiangchengfeiyi-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web

Browse Source
This commit is contained in:
yuanteng 2025-02-27 13:40:52 +08:00
commit 113ba7f7d3
4 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layout/components/calendarUtil.vue
View File

@ -59,7 +59,7 @@
<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>
<el-button type="success" round @click="emittValue" style="margin: 50px 0 0 50px;">保存</el-button>
</template>
<script setup lang="ts">

14
src/views/Orders/OrderList.vue
View File

@ -18,8 +18,8 @@
<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">
<el-table-column label="所购买的商品" width="150">
<el-table-column label="展开" type="expand" width="150">
<template #default="props">
<el-table :data="props.row.orderItemList" border :cell-style="{ 'text-align': 'center', 'font-size': '14px'}">
<el-table-column label="商品名称" prop="goodSnapshot.name" width="200"/>
@ -45,11 +45,11 @@
<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 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 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 prop="trackingNumber" label="快递单号"></el-table-column>
<el-table-column label="操作" width="220px" fixed="right">

14
src/views/Orders/ServiceOrderList.vue
View File

@ -18,8 +18,8 @@
<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">
<el-table-column label="所购买的商品" width="150">
<el-table-column label="展开" type="expand" width="150">
<template #default="props">
<el-table :data="props.row.orderItemList" border :cell-style="{ 'text-align': 'center', 'font-size': '14px'}">
<el-table-column label="商品名称" prop="goodSnapshot.name" width="200"/>
@ -45,11 +45,11 @@
<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 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">

20
src/views/ServiceType/ProductCenter.vue
View File

@ -1,17 +1,19 @@
<template>
<!-- 修改前请注释以前的 -->
<!-- 搜索 -->
<div>
<div style="display: flex; align-items: center">
<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-select v-model="state" placeholder="商品状态" @change="(event: any) => searchByState(event)">
<el-option label="已上架" value="1" />
<el-option label="已下架" value="0" />
</el-select>
</el-form-item>
<el-button class="ml-5" type="primary" @click="onSearch(productName)" style="height: 25px;">搜索</el-button>
<el-button type="warning" @click="reset" style="height:25px">重置</el-button>
<div>
<el-form-item label="" style="width: 200px; margin: 3px 10px 0 0;display: inline-block;">
<el-select size="default" v-model="state" placeholder="商品状态" @change="(event: any) => searchByState(event)">
<el-option label="已上架" value="1" />
<el-option label="已下架" value="0" />
</el-select>
</el-form-item>
</div>
<el-button class="ml-5" type="primary" @click="onSearch(productName)" style="height: 30px;">搜索</el-button>
<el-button type="warning" @click="reset" style="height:30px">重置</el-button>
</div>
<div style="margin: 15px 0">
<el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"