This commit is contained in:
13713575202 2025-06-11 10:38:08 +08:00
parent c76ceddd11
commit 24202a1e3d
11 changed files with 122 additions and 105 deletions

View File

@ -2,9 +2,9 @@
<section class="app-main"> <section class="app-main">
<router-view v-slot="{ Component, route }"> <router-view v-slot="{ Component, route }">
<transition name="fade-transform" mode="out-in"> <transition name="fade-transform" mode="out-in">
<keep-alive :include="tagsViewStore.cachedViews"> <!-- <keep-alive :include="tagsViewStore.cachedViews"> -->
<component v-if="!route.meta.link" :is="Component" :key="route.path" /> <component v-if="!route.meta.link" :is="Component" :key="route.path" />
</keep-alive> <!-- </keep-alive> -->
</transition> </transition>
</router-view> </router-view>
<iframe-toggle /> <iframe-toggle />
@ -13,24 +13,24 @@
</template> </template>
<script setup> <script setup>
import copyright from "./Copyright/index" import copyright from "./Copyright/index";
import iframeToggle from "./IframeToggle/index" import iframeToggle from "./IframeToggle/index";
import useTagsViewStore from '@/store/modules/tagsView' import useTagsViewStore from "@/store/modules/tagsView";
const route = useRoute() const route = useRoute();
const tagsViewStore = useTagsViewStore() const tagsViewStore = useTagsViewStore();
onMounted(() => { onMounted(() => {
addIframe() addIframe();
}) });
watchEffect(() => { watchEffect(() => {
addIframe() addIframe();
}) });
function addIframe() { function addIframe() {
if (route.meta.link) { if (route.meta.link) {
useTagsViewStore().addIframeView(route) useTagsViewStore().addIframeView(route);
} }
} }
</script> </script>
@ -86,4 +86,3 @@ function addIframe() {
border-radius: 3px; border-radius: 3px;
} }
</style> </style>

View File

@ -24,27 +24,27 @@
class="demo-form-inline" class="demo-form-inline"
:label-width="'auto'" :label-width="'auto'"
> >
<el-form-item label="商品名称" prop="goodName">
<el-input
v-model="formInline.goodName"
placeholder="请输入商品名称"
clearable
/>
</el-form-item>
<el-form-item label="订单编号" prop="goodName"> <el-form-item label="订单编号" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.orderNo"
placeholder="请输入订单编号" placeholder="请输入订单编号"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家名称" prop="goodName"> <el-form-item label="买家名称" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.receiverName"
placeholder="请输入买家名称" placeholder="请输入买家名称"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家电话" prop="goodName">
<el-input
v-model="formInline.receiverPhone"
placeholder="请输入买家电话"
clearable
/>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
@ -280,6 +280,8 @@ const formInline = reactive({
orderStatus: "7", orderStatus: "7",
current: 1, current: 1,
size: 10, size: 10,
receiverName: "",
receiverPhone: "",
}); });
const goodsCategoryList = ref([ const goodsCategoryList = ref([
{ name: "蔬菜", id: 1 }, { name: "蔬菜", id: 1 },

View File

@ -24,27 +24,27 @@
class="demo-form-inline" class="demo-form-inline"
:label-width="'auto'" :label-width="'auto'"
> >
<el-form-item label="商品名称" prop="goodName">
<el-input
v-model="formInline.goodName"
placeholder="请输入商品名称"
clearable
/>
</el-form-item>
<el-form-item label="订单编号" prop="goodName"> <el-form-item label="订单编号" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.orderNo"
placeholder="请输入订单编号" placeholder="请输入订单编号"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家名称" prop="goodName"> <el-form-item label="买家名称" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.receiverName"
placeholder="请输入买家名称" placeholder="请输入买家名称"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家电话" prop="goodName">
<el-input
v-model="formInline.receiverPhone"
placeholder="请输入买家电话"
clearable
/>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
@ -280,6 +280,8 @@ const formInline = reactive({
orderStatus: "8", orderStatus: "8",
current: 1, current: 1,
size: 10, size: 10,
receiverName: "",
receiverPhone: "",
}); });
const goodsCategoryList = ref([ const goodsCategoryList = ref([
{ name: "蔬菜", id: 1 }, { name: "蔬菜", id: 1 },

View File

@ -24,27 +24,27 @@
class="demo-form-inline" class="demo-form-inline"
:label-width="'auto'" :label-width="'auto'"
> >
<el-form-item label="商品名称" prop="goodName">
<el-input
v-model="formInline.goodName"
placeholder="请输入商品名称"
clearable
/>
</el-form-item>
<el-form-item label="订单编号" prop="goodName"> <el-form-item label="订单编号" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.orderNo"
placeholder="请输入订单编号" placeholder="请输入订单编号"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家名称" prop="goodName"> <el-form-item label="买家名称" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.receiverName"
placeholder="请输入买家名称" placeholder="请输入买家名称"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家电话" prop="goodName">
<el-input
v-model="formInline.receiverPhone"
placeholder="请输入买家电话"
clearable
/>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
@ -280,9 +280,11 @@ const router = useRouter();
const preserveExpanded = ref(true); const preserveExpanded = ref(true);
const formInline = reactive({ const formInline = reactive({
orderNo: "", orderNo: "",
orderStatus: 1, orderStatus: "1",
current: 1, current: 1,
size: 10, size: 10,
receiverName: "",
receiverPhone: "",
}); });
const goodsCategoryList = ref([ const goodsCategoryList = ref([
{ name: "蔬菜", id: 1 }, { name: "蔬菜", id: 1 },
@ -544,8 +546,8 @@ onBeforeUnmount(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.send-buttons-info { .send-buttons-info {
float: left; float: left;
width: 100%; width: 150px;
text-align: left; text-align: center;
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;

View File

@ -332,6 +332,8 @@ watch(
() => route.query.data, () => route.query.data,
(newSearch) => { (newSearch) => {
if (route.query.data) { if (route.query.data) {
console.log("有新值");
getOrderDetails(); getOrderDetails();
} }
} }

View File

@ -24,27 +24,27 @@
class="demo-form-inline" class="demo-form-inline"
:label-width="'auto'" :label-width="'auto'"
> >
<el-form-item label="商品名称" prop="goodName">
<el-input
v-model="formInline.goodName"
placeholder="请输入商品名称"
clearable
/>
</el-form-item>
<el-form-item label="订单编号" prop="goodName"> <el-form-item label="订单编号" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.orderNo"
placeholder="请输入订单编号" placeholder="请输入订单编号"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家名称" prop="goodName"> <el-form-item label="买家名称" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.receiverName"
placeholder="请输入买家名称" placeholder="请输入买家名称"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家电话" prop="goodName">
<el-input
v-model="formInline.receiverPhone"
placeholder="请输入买家电话"
clearable
/>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
@ -280,9 +280,11 @@ const router = useRouter();
const preserveExpanded = ref(true); const preserveExpanded = ref(true);
const formInline = reactive({ const formInline = reactive({
orderNo: "", orderNo: "",
orderStatus: 6, orderStatus: "6",
current: 1, current: 1,
size: 10, size: 10,
receiverName: "",
receiverPhone: "",
}); });
const goodsCategoryList = ref([ const goodsCategoryList = ref([
{ name: "蔬菜", id: 1 }, { name: "蔬菜", id: 1 },
@ -537,8 +539,8 @@ onBeforeUnmount(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.send-buttons-info { .send-buttons-info {
float: left; float: left;
width: 100%; width: 150px;
text-align: left; text-align: center;
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;

View File

@ -24,27 +24,27 @@
class="demo-form-inline" class="demo-form-inline"
:label-width="'auto'" :label-width="'auto'"
> >
<el-form-item label="商品名称" prop="goodName">
<el-input
v-model="formInline.goodName"
placeholder="请输入商品名称"
clearable
/>
</el-form-item>
<el-form-item label="订单编号" prop="goodName"> <el-form-item label="订单编号" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.orderNo"
placeholder="请输入订单编号" placeholder="请输入订单编号"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家名称" prop="goodName"> <el-form-item label="买家名称" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.receiverName"
placeholder="请输入买家名称" placeholder="请输入买家名称"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家电话" prop="goodName">
<el-input
v-model="formInline.receiverPhone"
placeholder="请输入买家电话"
clearable
/>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
@ -280,9 +280,11 @@ const router = useRouter();
const preserveExpanded = ref(true); const preserveExpanded = ref(true);
const formInline = reactive({ const formInline = reactive({
orderNo: "", orderNo: "",
orderStatus: 3, orderStatus: "3",
current: 1, current: 1,
size: 10, size: 10,
receiverName: "",
receiverPhone: "",
}); });
const goodsCategoryList = ref([ const goodsCategoryList = ref([
{ name: "蔬菜", id: 1 }, { name: "蔬菜", id: 1 },
@ -537,8 +539,8 @@ onBeforeUnmount(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.send-buttons-info { .send-buttons-info {
float: left; float: left;
width: 100%; width: 150;
text-align: left; text-align: center;
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;

View File

@ -24,27 +24,27 @@
class="demo-form-inline" class="demo-form-inline"
:label-width="'auto'" :label-width="'auto'"
> >
<el-form-item label="商品名称" prop="goodName">
<el-input
v-model="formInline.goodName"
placeholder="请输入商品名称"
clearable
/>
</el-form-item>
<el-form-item label="订单编号" prop="goodName"> <el-form-item label="订单编号" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.orderNo"
placeholder="请输入订单编号" placeholder="请输入订单编号"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家名称" prop="goodName"> <el-form-item label="买家名称" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.receiverName"
placeholder="请输入买家名称" placeholder="请输入买家名称"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家电话" prop="goodName">
<el-input
v-model="formInline.receiverPhone"
placeholder="请输入买家电话"
clearable
/>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
@ -218,10 +218,10 @@
<template #action="slotProps"> <template #action="slotProps">
<div> <div>
<div> <div>
<div @click="goSend(slotProps.row)" class="send-button"> <div @click="goSend(slotProps.row.id)" class="send-button">
同意退款 同意退款
</div> </div>
<div @click="goSend(slotProps.row)" class="send-buttons"> <div @click="goSend(slotProps.row.id)" class="send-buttons">
拒绝退款 拒绝退款
</div> </div>
</div> </div>
@ -289,9 +289,11 @@ const router = useRouter();
const preserveExpanded = ref(true); const preserveExpanded = ref(true);
const formInline = reactive({ const formInline = reactive({
orderNo: "", orderNo: "",
orderStatus: 10, orderStatus: "10",
current: 1, current: 1,
size: 10, size: 10,
receiverName: "",
receiverPhone: "",
}); });
const goodsCategoryList = ref([ const goodsCategoryList = ref([
{ name: "蔬菜", id: 1 }, { name: "蔬菜", id: 1 },

View File

@ -92,27 +92,27 @@
class="demo-form-inline" class="demo-form-inline"
:label-width="'auto'" :label-width="'auto'"
> >
<el-form-item label="商品名称" prop="goodName">
<el-input
v-model="formInline.goodName"
placeholder="请输入商品名称"
clearable
/>
</el-form-item>
<el-form-item label="订单编号" prop="goodName"> <el-form-item label="订单编号" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.orderNo"
placeholder="请输入订单编号" placeholder="请输入订单编号"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家名称" prop="goodName"> <el-form-item label="买家名称" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.receiverName"
placeholder="请输入买家名称" placeholder="请输入买家名称"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家电话" prop="goodName">
<el-input
v-model="formInline.receiverPhone"
placeholder="请输入买家电话"
clearable
/>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
@ -288,7 +288,7 @@
<div @click="upAddress(slotProps.row)" class="send-button"> <div @click="upAddress(slotProps.row)" class="send-button">
修改收货地址 修改收货地址
</div> </div>
<div @click="goSends(slotProps.row.id)" class="send-buttons-info"> <div @click="goSends(slotProps.row)" class="send-buttons-info">
查看详情 查看详情
</div> </div>
<!-- <el-tooltip effect="dark" placement="bottom-end"> <!-- <el-tooltip effect="dark" placement="bottom-end">
@ -355,9 +355,11 @@ let dialogVisible = ref(false);
let upid = ref(0); let upid = ref(0);
const formInline = reactive({ const formInline = reactive({
orderNo: "", orderNo: "",
orderStatus: 3, orderStatus: "3",
current: 1, current: 1,
size: 10, size: 10,
receiverName: "",
receiverPhone: "",
}); });
const goodsCategoryList = ref([ const goodsCategoryList = ref([
{ name: "蔬菜", id: 1 }, { name: "蔬菜", id: 1 },

View File

@ -142,7 +142,7 @@ const router = useRouter();
const tableData = ref([]); const tableData = ref([]);
const radio1 = ref("2"); const radio1 = ref("2");
onMounted(() => { onMounted(() => {
console.log(JSON.parse(route.query.data)); // console.log(JSON.parse(route.query.data));
tableData.value = JSON.parse(route.query.data).orderItemInfos; tableData.value = JSON.parse(route.query.data).orderItemInfos;
}); });

View File

@ -92,27 +92,27 @@
class="demo-form-inline" class="demo-form-inline"
:label-width="'auto'" :label-width="'auto'"
> >
<el-form-item label="商品名称" prop="goodName">
<el-input
v-model="formInline.goodName"
placeholder="请输入商品名称"
clearable
/>
</el-form-item>
<el-form-item label="订单编号" prop="goodName"> <el-form-item label="订单编号" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.orderNo"
placeholder="请输入订单编号" placeholder="请输入订单编号"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家名称" prop="goodName"> <el-form-item label="买家名称" prop="goodName">
<el-input <el-input
v-model="formInline.goodName" v-model="formInline.receiverName"
placeholder="请输入买家名称" placeholder="请输入买家名称"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="买家电话" prop="goodName">
<el-input
v-model="formInline.receiverPhone"
placeholder="请输入买家电话"
clearable
/>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
@ -357,9 +357,11 @@ const props = ref({
}); });
const formInline = reactive({ const formInline = reactive({
orderNo: "", orderNo: "",
orderStatus: 4, orderStatus: "4",
current: 1, current: 1,
size: 10, size: 10,
receiverName: "",
receiverPhone: "",
}); });
// let reciveAddress = ref(""); // let reciveAddress = ref("");
let formLabelAlign = reactive({ let formLabelAlign = reactive({
@ -642,8 +644,8 @@ onBeforeUnmount(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.send-buttons-info { .send-buttons-info {
float: left; float: left;
width: 100px; width: 150px;
text-align: left; text-align: center;
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;