From 9c71fa12acfa3331152092def6a8063bc5f8bf18 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Fri, 15 Aug 2025 15:36:09 +0800
Subject: [PATCH] 1
---
src/page/list/tradingList/data.list.vue | 25 ++++++++++++++++---------
src/axios/api.url.js | 6 +++---
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index 367e904..e0a0750 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -1,7 +1,7 @@
// const ENV = process.env.NODE_ENV
export default {
// DOMAIN: "https://api.amcfcxn.org/",
- DOMAIN: "https://api.bycarlyle.com/",
+ DOMAIN: "https://api.stcarlyle.com/",
// DOMAIN: "https://api.coinbtcs.com/",
// baseURL: ENV == 'development'?'https://api.guosen.org/':'https://api.guosen.org/',
// baseURL: 'http://localhost:8070',
@@ -11,8 +11,8 @@
// 0311
// baseURL: "https://api.durocaspitall.com/",
// 本地
- // baseURL: "https://api.bycarlyle.com/",
- baseURL: "http://192.168.10.6:8092/",
+ baseURL: "https://api.stcarlyle.com/",
+ // baseURL: "http://192.168.10.6:8092/",
util: {
image: "/util/image.html" // 图片上传
}
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index a73ec09..a85b335 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -295,7 +295,8 @@
let pageNumVal = c || this.pageNumVal;
let opt = {
pageNum: pageNumVal,
- pageSize: 15 * this.num,
+ // pageSize: 15 * this.num,
+ pageSize: 15 ,
stockPlate: "",
keyWords: this.sousuo,
stockType: stockType,
@@ -320,6 +321,11 @@
if (data.status === 0) {
if (pageNumVal !== 1) {
this.listArr = [...this.listArr, ...data.data.list];
+ this.loadings = false;
+ // this.finished = true;
+ if (this.listArr.length < 15) {
+ this.finished = true;
+ }
} else {
this.listArr = []
if (this.active) {
@@ -327,14 +333,15 @@
this.listArr = data.data.list;
this.loadings = false;
// this.finished = true;
- if (this.listArr.length % 20) {
+ console.log(this.listArr.length%15);
+ if (this.listArr.length < 15) {
this.finished = true;
}
} else {
this.listArr = data.data.list;
this.loadings = false;
// this.finished = true;
- if (this.listArr.length % 20) {
+ if (this.listArr.length < 15) {
this.finished = true;
}
}
@@ -342,8 +349,8 @@
if (this.zxactive === data.data.stockType) {
this.listArr = data.data.list;
this.loadings = false;
- this.finished = true;
- if (this.listArr.length % 20) {
+ // this.finished = true;
+ if (this.listArr.length < 15) {
this.finished = true;
}
}
@@ -371,7 +378,7 @@
initWebSocket() {
console.log("initWebSocket");
this.Trade = new WhrWebSocket({
- path: `wss://wss.bycarlyle.com/websocket-server `,
+ path: `wss://ws.stcarlyle.com/websocket-server `,
onmessage: this.getTradeMessage,
});
@@ -390,9 +397,9 @@
onLoads() {
console.log("onLoads");
- // this.pageNumVal++;
- this.loadings = false;
- this.finished = true;
+ this.loadings = true;
+ // this.finished = true;
+ this.pageNumVal++;
if(this.listArr.length==0){
this.num = 1
}else{
--
Gitblit v1.9.3