Web/operation-system
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Web:ed6dcdeaefeb76b9614f5fba25e91de314d02ce3
Branches Tags
Web:main
..
compare: Web:182b981c632502f9d760730fbd09832819de14bb
Branches Tags
Web:main

No commits in common. "ed6dcdeaefeb76b9614f5fba25e91de314d02ce3" and "182b981c632502f9d760730fbd09832819de14bb" have entirely different histories.
ed6dcdeaef ... 182b981c63

11 changed files with 105 additions and 122 deletions
Show Stats Expand all files Collapse all files

27
src/layout/components/AppMain.vue
View File

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

20
src/views/order/cancelled.vue
View File

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

20
src/views/order/completed.vue
View File

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

26
src/views/order/obligation.vue
View File

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

4
src/views/order/orderDetails.vue
View File

@ -281,7 +281,7 @@
v-if="detailsData.orderStatus == '10'"
class="button-bottoms"
@click="refuse('拒绝')"
>
>
拒绝退款
</div>
<!-- <div class="button-bottoms" @click="reAddress()">修改地址</div>
@ -332,8 +332,6 @@ watch(
() => route.query.data,
(newSearch) => {
if (route.query.data) {
console.log("有新值");
getOrderDetails();
}
}

26
src/views/order/receivedGoods.vue
View File

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

26
src/views/order/refunded.vue
View File

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

26
src/views/order/salesService.vue
View File

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

24
src/views/order/sendGoods.vue
View File

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

2
src/views/order/sendGoodsInfo.vue
View File

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

26
src/views/order/shipped.vue
View File

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