diff --git a/src/views/order/index/components/detail.vue b/src/views/order/index/components/detail.vue
index 042af74..43fac24 100644
--- a/src/views/order/index/components/detail.vue
+++ b/src/views/order/index/components/detail.vue
@@ -296,6 +296,7 @@ export default {
reset() {
this.user = "";
this.allSelected = false;
+ this.$emit("close");
},
returnPayType(payType) {
if (!payType) {
@@ -375,7 +376,7 @@ export default {
if (item === "all") {
for (let i in this.detail.detailMap) {
this.detail.detailMap[i].map((v) => {
- if (v.checked) {
+ if (v.checked && v.selNumber) {
arr.push(v);
}
});
diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index 886238d..daa2d56 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -105,7 +105,7 @@
-
+
@@ -135,6 +135,11 @@ const {
handleFilterChange,
} = usePage();
+function refresh() {
+ console.log("refresh");
+ contentRef.value?.fetchPageData();
+}
+
//计算订单原金额
function returnOriginAmount(order: OrderInfoVo) {
let amount = 0;
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 792f3ed..14bb156 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -757,7 +757,7 @@ $pl: 30px;
display: flex;
max-height: calc(100vh - 256px);
.left {
- width: 1;
+ flex: 1;
padding-right: 14px;
box-sizing: border-box;
display: flex;
@@ -770,7 +770,7 @@ $pl: 30px;
}
}
.right {
- flex: 3;
+ flex: 4;
overflow-x: hidden;
overflow-y: scroll;
&::-webkit-scrollbar {