@@ -77,6 +78,7 @@ const close = () => {
show.value = false;
payType.value = null;
selectedIndex.value = null
+ loading.value = false
}
const init = async (code: any, psnNo: any) => {
retailOrder.value = await post("charge/getByCode", {code: code});
@@ -111,8 +113,12 @@ const completeSettlement = () => {
} else {
//其他结算
loading.value = true;
- post('charge/completeOrder', {id: retailOrder.value.id, payType: payType.value}).then((res: any) => {
+ post('charge/completeOrder', {id: retailOrder.value.id, payType: payType.value}, {catch_error:true}).then((res: any) => {
orderCompleted()
+ loading.value = false
+ }).catch((e)=>{
+ loading.value = false
+ ElMessage.error(e)
})
}
@@ -263,12 +269,14 @@ const btnsList = [
//color: #fff;
//background-color: #409EFF;
border: 1px solid #409EFF;
+ cursor: pointer;
}
}
.active {
color: #fff !important;
background-color: #409EFF;
+ cursor: pointer;
}
}
diff --git a/src/components/member/memberProfile/FlowingWater.vue b/src/components/member/memberProfile/FlowingWater.vue
index 7c0ae61..7790bca 100644
--- a/src/components/member/memberProfile/FlowingWater.vue
+++ b/src/components/member/memberProfile/FlowingWater.vue
@@ -1,8 +1,8 @@
-
-
+
-
-
+
{{ formatDate(scope.row.createTime) }}
-
-
-
-
+
+
+
+
@@ -63,37 +62,33 @@ const props = defineProps({
type: Object,
default: () => ({})
},
- id: {
- type: String || Number,
- default: ""
- }
})
const currentPage = ref(1)
const tableData: any = ref([])
const total = ref(0)
const emit = defineEmits(['close'])
const close = () => {
+ isFlowingWater.value = false
+ id.value = ""
emit('close')
}
-onMounted(() => {
- if (!props.id) return
- init()
-})
const changePage = (page: any) => {
const query = {
pageNum: page,
pageSize: 20,
- vipId: props.id
+ vipId: id.value
}
post('vip/integral/list', {query: query}).then((res: any) => {
tableData.value.splice(0, tableData.length, ...res.list)
})
}
-const init = () => {
+const id = ref('')
+const init = (id: any) => {
+ if (!id) return
const query = {
pageNum: 1,
pageSize: 10,
- vipId: props.id
+ vipId: id
}
post('vip/integral/list', {query: query}).then((res: any) => {
tableData.value.splice(0, tableData.length, ...res.list)
@@ -105,15 +100,18 @@ const formatDate = (isoStr: any) => {
const date = new Date(isoStr);
return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
}
+defineExpose({init})
\ No newline at end of file