diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 56dae703..d31a3012 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -6,8 +6,9 @@ const config = {
// host: 'h5api',
// #endif
// #ifndef H5
- host: 'http://91f.xyz:8080',
- // host: 'http://liuyd.cpolar.top ',
+ // host: 'http://91f.xyz:8080',
+ // host: 'http://liuyd.cpolar.top',
+ host: 'http://w7cega.natappfree.cc',
// #endif
// 是否vivo显示
showVivo: true,
diff --git a/jiuyi2/components/mine/pushHistory.vue b/jiuyi2/components/mine/pushHistory.vue
new file mode 100644
index 00000000..ecb3670d
--- /dev/null
+++ b/jiuyi2/components/mine/pushHistory.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jiuyi2/pages/index/dataCenter/pushHistory.vue b/jiuyi2/pages/index/dataCenter/pushHistory.vue
index d7c8beda..fed55103 100644
--- a/jiuyi2/pages/index/dataCenter/pushHistory.vue
+++ b/jiuyi2/pages/index/dataCenter/pushHistory.vue
@@ -65,7 +65,10 @@
if (list.pageNum == 1) list.data.length = 0
// 合并
list.data.push(...rs.rows.map(node => {
- return node.video
+ return {
+ pushId: node.id,
+ ...node.video,
+ }
}))
console.log('list', list)
// 总数
@@ -91,7 +94,7 @@
-
+
diff --git a/jiuyi2/pages/index/integral.vue b/jiuyi2/pages/index/integral.vue
index e52eb9e1..16fb9741 100644
--- a/jiuyi2/pages/index/integral.vue
+++ b/jiuyi2/pages/index/integral.vue
@@ -57,7 +57,7 @@
total.value = result.total
// 卷轴列表
dataList.value = result.dataList.map(item => {
- item.formatHash = item.scrollHash.replace(/(\d{4})\d*(\d{4})/, "$1****$2")
+ item.formatHash = item.scrollHash.replace(/([\d|\D]{4})[\d|\D]*([\d|\D]{4})/, "$1****$2")
// item.style = {
// '1级卷轴': 'scroll1',
// '2级卷轴': 'scroll2',
@@ -151,7 +151,7 @@
卷轴哈希: {{item.formatHash}}
-
+
diff --git a/jiuyi2/pages/index/integralDetail.vue b/jiuyi2/pages/index/integralDetail.vue
index 144d4161..1df04e20 100644
--- a/jiuyi2/pages/index/integralDetail.vue
+++ b/jiuyi2/pages/index/integralDetail.vue
@@ -63,7 +63,7 @@
}).then(rs => {
if (rs.code == 200) {
const result = rs.data
- result.formatHash = result.scrollHash.replace(/(\d{4})\d*(\d{4})/, "$1****$2")
+ result.formatHash = result.scrollHash.replace(/([\d|\D]{4})[\d|\D]*([\d|\D]{4})/, "$1****$2")
detail.value = result
return
}
diff --git a/jiuyi2/pages/mine/homepage.vue b/jiuyi2/pages/mine/homepage.vue
index 0bc74a16..c091d84f 100644
--- a/jiuyi2/pages/mine/homepage.vue
+++ b/jiuyi2/pages/mine/homepage.vue
@@ -45,6 +45,8 @@
import like from '@/components/mine/like.vue';
// 我的历史
import history from '@/components/mine/history.vue';
+ // 推流历史
+ import pushHistory from '@/components/mine/pushHistory.vue';
// 是否显示顶部遮罩
const headerShow = ref(false)
@@ -72,6 +74,7 @@
},
{
name: '投流历史',
+ ref: 'pushHistoryRef',
load: false,
}
])
@@ -276,7 +279,8 @@
账号:{{userinfo.account}}
-
+
我的产品
@@ -358,6 +362,10 @@
+
+
+
+
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index 4cea80b8..adb22a04 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -3,8 +3,9 @@ import {
} from 'vite';
import uni from '@dcloudio/vite-plugin-uni';
-let target = 'http://91f.xyz:8080'
+// let target = 'http://91f.xyz:8080'
// let target = 'http://liuyd.cpolar.top '
+let target = 'http://w7cega.natappfree.cc'
export default defineConfig({
plugins: [uni()],