|
|
@@ -1,37 +1,16 @@
|
|
|
<template>
|
|
|
<div class="app-main app-content">
|
|
|
- <app-tabs
|
|
|
- :tabs="tabs"
|
|
|
- :isFixed="true"
|
|
|
- :currentTab="tabIndex"
|
|
|
- :height="100"
|
|
|
- @change="change"
|
|
|
- itemWidth="20%"
|
|
|
- />
|
|
|
+ <app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" :height="100" @change="change" itemWidth="20%" />
|
|
|
<div class="list-wrap">
|
|
|
<block v-if="!$util.isEmpty(list.data)">
|
|
|
- <div
|
|
|
- class="list"
|
|
|
- v-for="(item, index) in list.data"
|
|
|
- :key="index"
|
|
|
- @click="pageTo({
|
|
|
- url: '/admin/order/detail',
|
|
|
- query: {
|
|
|
- id: item.id
|
|
|
- }
|
|
|
- })"
|
|
|
- >
|
|
|
+ <div class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({ url: '/admin/order/detail', query: { id: item.id } })" >
|
|
|
<div class="list-top flex-center-between">
|
|
|
<div class="app-color-3">编号:{{ item.sendNum }}</div>
|
|
|
<div :class="['app-price',{'app-green':item.status==5}]">{{ item.status | constantfilter('ORDER_STATUS') }}</div>
|
|
|
</div>
|
|
|
<div class="list-blo">
|
|
|
<block v-if="!$util.isEmpty(item.goodsInfoList)">
|
|
|
- <list-module
|
|
|
- v-for="(items, subIndex) in item.goodsInfoList"
|
|
|
- :key="subIndex"
|
|
|
- :info="items"
|
|
|
- />
|
|
|
+ <list-module v-for="(items, subIndex) in item.goodsInfoList" :key="subIndex" :info="items" />
|
|
|
</block>
|
|
|
</div>
|
|
|
<div class="list-bottom">
|
|
|
@@ -40,50 +19,25 @@
|
|
|
<span>金额:</span>
|
|
|
<span class="app-size-30 app-bold">¥{{ item.realPrice }}</span>
|
|
|
</div>
|
|
|
-
|
|
|
<div class="list-button">
|
|
|
-
|
|
|
<template v-if="item.status == 0">
|
|
|
- <div
|
|
|
- class="admin-button-com default"
|
|
|
- @click.stop
|
|
|
- >自取</div>
|
|
|
- <div
|
|
|
- class="admin-button-com default"
|
|
|
- @click.stop
|
|
|
- >发货</div>
|
|
|
+ <div class="admin-button-com default" @click.stop >自取</div>
|
|
|
+ <div class="admin-button-com default" @click.stop >发货</div>
|
|
|
</template>
|
|
|
<template v-else-if="item.status == 4"></template>
|
|
|
<template v-else-if="item.status == 6">
|
|
|
- <div
|
|
|
- v-if="item.sendType == 3"
|
|
|
- class="admin-button-com default"
|
|
|
- style="color: #dddddd;border-color:#dddddd;"
|
|
|
- >已退款</div>
|
|
|
+ <div v-if="item.sendType == 3" class="admin-button-com default" style="color: #dddddd;border-color:#dddddd;" >已退款</div>
|
|
|
</template>
|
|
|
<template v-else-if="item.status == 5">
|
|
|
- <div
|
|
|
- v-if="item.sendType != 1"
|
|
|
- class="admin-button-com default"
|
|
|
- @click.stop="seeSendFn(item)"
|
|
|
- >配送详情</div>
|
|
|
+ <div v-if="item.sendType != 1" class="admin-button-com default" @click.stop="seeSendFn(item)" >配送详情</div>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
<template v-if="item.currentFlow == 1">
|
|
|
- <div
|
|
|
- class="admin-button-com"
|
|
|
- @click.stop="freeShippingFn(item, index)"
|
|
|
- >自取</div>
|
|
|
- <div
|
|
|
- class="admin-button-com"
|
|
|
- @click.stop="pageTo({url: '/admin/order/ship',query: {id: item.id,pageStatus: 0}})"
|
|
|
- >发货</div>
|
|
|
+ <div class="admin-button-com" @click.stop="freeShippingFn(item, index)" >自取</div>
|
|
|
+ <div class="admin-button-com" @click.stop="pageTo({url: '/admin/order/ship',query: {id: item.id,pageStatus: 0}})" >发货</div>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- <div
|
|
|
- class="admin-button-com"
|
|
|
- @click.stop="pageTo({url: '/admin/order/ship',query: {id: item.id,pageStatus: 0}})"
|
|
|
- >发货</div>
|
|
|
+ <div class="admin-button-com" @click.stop="pageTo({url: '/admin/order/ship',query: {id: item.id,pageStatus: 0}})" >发货</div>
|
|
|
</template>
|
|
|
</template>
|
|
|
</div>
|
|
|
@@ -91,47 +45,21 @@
|
|
|
</div>
|
|
|
</block>
|
|
|
<block v-else>
|
|
|
- <app-wrapper-empty
|
|
|
- title="暂无数据"
|
|
|
- :is-empty="$util.isEmpty(list.data)"
|
|
|
- />
|
|
|
+ <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
|
|
|
</block>
|
|
|
</div>
|
|
|
<!-- 免发货弹窗 -->
|
|
|
- <modal-module
|
|
|
- :show="freeShipModal"
|
|
|
- @cancel="modalCancel"
|
|
|
- @click="freeShipModalClick"
|
|
|
- content="确认已自取?"
|
|
|
- color="#333"
|
|
|
- :size="32"
|
|
|
- padding="30upx 30upx"
|
|
|
- ></modal-module>
|
|
|
-
|
|
|
+ <modal-module :show="freeShipModal" @cancel="modalCancel" @click="freeShipModalClick" content="确认已自取?" color="#333" :size="32" padding="30upx 30upx" ></modal-module>
|
|
|
<!-- 选取分类 -->
|
|
|
- <modal-module
|
|
|
- :show="classifyModal"
|
|
|
- :maskClosable="false"
|
|
|
- @cancel="modalCancel"
|
|
|
- @click="confirmClassify"
|
|
|
- title="订单分类"
|
|
|
- padding="30upx 30upx"
|
|
|
- >
|
|
|
+ <modal-module :show="classifyModal" :maskClosable="false" @cancel="modalCancel" @click="confirmClassify" title="订单分类" padding="30upx 30upx" >
|
|
|
<template v-slot:content>
|
|
|
<div class="upload-confirm-wrap">
|
|
|
<!-- 选择分类 -->
|
|
|
<div class="sel-wrap">
|
|
|
<div class="sel-tit">类型</div>
|
|
|
<div class="sel-btn">
|
|
|
- <block
|
|
|
- v-for="(item, index) in categoryData"
|
|
|
- :key="index"
|
|
|
- >
|
|
|
- <button
|
|
|
- class="admin-button-com"
|
|
|
- :class="[classifyForm.categoryId == item.id ? '' : 'default']"
|
|
|
- @click="selCategoryFn(item)"
|
|
|
- >{{ item.categoryName || '暂无' }}</button>
|
|
|
+ <block v-for="(item, index) in categoryData" :key="index" >
|
|
|
+ <button class="admin-button-com" :class="[classifyForm.categoryId == item.id ? '' : 'default']" @click="selCategoryFn(item)" >{{ item.categoryName || '暂无' }}</button>
|
|
|
</block>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -139,15 +67,8 @@
|
|
|
<div class="sel-wrap">
|
|
|
<div class="sel-tit">用途</div>
|
|
|
<div class="sel-btn">
|
|
|
- <block
|
|
|
- v-for="(item, index) in usageData"
|
|
|
- :key="index"
|
|
|
- >
|
|
|
- <button
|
|
|
- class="admin-button-com"
|
|
|
- :class="[classifyForm.usageId == item.id ? '' : 'default']"
|
|
|
- @click="selUsageFn(item)"
|
|
|
- >{{ item.usageName || '暂无' }}</button>
|
|
|
+ <block v-for="(item, index) in usageData" :key="index" >
|
|
|
+ <button class="admin-button-com" :class="[classifyForm.usageId == item.id ? '' : 'default']" @click="selUsageFn(item)" >{{ item.usageName || '暂无' }}</button>
|
|
|
</block>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -156,7 +77,6 @@
|
|
|
</modal-module>
|
|
|
</div>
|
|
|
</template>
|
|
|
-
|
|
|
<script>
|
|
|
import AppTabs from "@/components/plugin/tabs";
|
|
|
import ListModule from "@/components/module/app-order-list";
|
|
|
@@ -180,36 +100,11 @@ export default {
|
|
|
return {
|
|
|
tabIndex: 0,
|
|
|
classifyModal: false,
|
|
|
- tabs: [
|
|
|
- {
|
|
|
- name: "全部",
|
|
|
- value: 0
|
|
|
- },
|
|
|
- {
|
|
|
- name: "待付款",
|
|
|
- value: 0
|
|
|
- },
|
|
|
- {
|
|
|
- name: "待配送",
|
|
|
- value: 0
|
|
|
- },
|
|
|
- {
|
|
|
- name: "配送中",
|
|
|
- value: 0
|
|
|
- },
|
|
|
- {
|
|
|
- name: "已完成",
|
|
|
- value: 0
|
|
|
- }
|
|
|
- ],
|
|
|
+ tabs: [ { name: "全部", value: 0 }, { name: "待付款", value: 0 }, { name: "待配送", value: 0 }, { name: "配送中", value: 0 }, { name: "已完成", value: 0 } ],
|
|
|
operateIndex: null,
|
|
|
operateData: {},
|
|
|
- // 免发货
|
|
|
freeShipModal: false,
|
|
|
- classifyForm: {
|
|
|
- categoryId: '',
|
|
|
- usageId: ''
|
|
|
- }
|
|
|
+ classifyForm: { categoryId: '', usageId: '' }
|
|
|
};
|
|
|
},
|
|
|
onPullDownRefresh () {
|
|
|
@@ -295,15 +190,8 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
- // 查看配送
|
|
|
seeSendFn (item) {
|
|
|
- this.$util.pageTo({
|
|
|
- url: "/admin/order/ship",
|
|
|
- query: {
|
|
|
- id: item.id,
|
|
|
- pageStatus: 5
|
|
|
- }
|
|
|
- });
|
|
|
+ this.$util.pageTo({ url: "/admin/order/ship", query: { id: item.id, pageStatus: 5 } })
|
|
|
},
|
|
|
// 关闭弹窗
|
|
|
modalCancel () {
|
|
|
@@ -336,10 +224,6 @@ export default {
|
|
|
}
|
|
|
};
|
|
|
</script>
|
|
|
-
|
|
|
-<style lang="scss" scoped>
|
|
|
-</style>
|
|
|
-
|
|
|
<style lang="scss" scoped>
|
|
|
.app-content {
|
|
|
padding-top: 120upx;
|
|
|
@@ -378,7 +262,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-// 弹窗
|
|
|
.upload-confirm-wrap {
|
|
|
max-height: 600upx;
|
|
|
overflow-y: auto;
|
|
|
@@ -393,7 +276,6 @@ export default {
|
|
|
font-size: 50upx;
|
|
|
}
|
|
|
}
|
|
|
- // 分类
|
|
|
.sel-wrap {
|
|
|
color: $fontColor2;
|
|
|
font-size: 32upx;
|
|
|
@@ -405,15 +287,11 @@ export default {
|
|
|
flex-wrap: wrap;
|
|
|
padding: 10upx 0 40upx;
|
|
|
.admin-button-com {
|
|
|
- // width: 170upx;
|
|
|
margin-right: 20upx;
|
|
|
margin-top: 20upx;
|
|
|
padding-top: 16upx;
|
|
|
padding-bottom: 16upx;
|
|
|
border-radius: 4upx;
|
|
|
- // &:nth-child(3n + 1) {
|
|
|
- // margin-left: 0;
|
|
|
- // }
|
|
|
}
|
|
|
}
|
|
|
}
|