From 553953ebaf6cdfd33bb35e4470cadd452492f08a Mon Sep 17 00:00:00 2001
From: scout <1134087124@qq.com>
Date: Tue, 7 May 2024 10:53:46 +0800
Subject: [PATCH] fixbug
---
http/interface.js | 10 ++----
locale/en.json | 1 +
locale/zh-Hans.json | 1 +
main.js | 6 ++--
pages/index/detail/detail.vue | 68 +++++++++++++++++++++++++----------
pages/index/index.vue | 4 +--
pages/mine/index.vue | 10 ++++--
pages/mine/usamine/index.vue | 20 ++++++++---
8 files changed, 83 insertions(+), 37 deletions(-)
diff --git a/http/interface.js b/http/interface.js
index cfd0020..c6df775 100644
--- a/http/interface.js
+++ b/http/interface.js
@@ -10,13 +10,9 @@ export default {
"Content-Type": "application/json;charset=UTF-8",
// 'Content-Type':'application/x-www-form-urlencoded'
"Accept-Language":
- navigator.language === "en"
- ? "en"
- : navigator.language === "zh-Hans"
- ? "zh-CN"
- : navigator.language === "zh-Hant"
- ? "zh-TW"
- : "zh-CN",
+ navigator.language === "zh-CN"
+ ? "zh-Hans"
+ : "en",
},
data: {},
method: "GET",
diff --git a/locale/en.json b/locale/en.json
index 2a42b34..d8a5808 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -14,6 +14,7 @@
"usa.copySuccess": "Copy successful!",
"usa.back": "Back",
"usa.backAndCopy": "Copy and back",
+ "series.play": "Play Collections Detail Video",
"usa.cancel": "Cancel",
"usa.confirm": "Confirm",
"usa.Password": "Password",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 7e08fe3..422b2de 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -14,6 +14,7 @@
"usa.copySuccess": "复制成功!",
"usa.back": "返回",
"usa.backAndCopy": "复制并返回",
+ "series.play": "播放视频详情",
"usa.cancel": "取消",
"usa.confirm": "确认",
"usa.Password": "密码",
diff --git a/main.js b/main.js
index d183241..2ce83b4 100644
--- a/main.js
+++ b/main.js
@@ -10,10 +10,12 @@ const messages = {
};
let i18nConfig = {
- locale: navigator.language === "en" ? "en" : "zh-Hans",
+ locale:
+ navigator.language === "zh-CN"
+ ? "zh-Hans"
+ : "en",
messages,
};
-
//弹出框禁止滑动
Vue.prototype.stopScroll = function () {
var mo = function (e) {
diff --git a/pages/index/detail/detail.vue b/pages/index/detail/detail.vue
index eee31ff..45485c7 100644
--- a/pages/index/detail/detail.vue
+++ b/pages/index/detail/detail.vue
@@ -13,12 +13,29 @@
+
+
+
+ {{
+ $t("series.play")
+ }}
{{ $t("basic.info") }}
-
+
{{ $t("series.name") }}
{{ collectionsDetail.seriesName }}
@@ -29,10 +46,10 @@
{{ $t("series.hash") }}
- {{ collectionsDetail.hash }}
+ {{ collectionsDetail.hash }}
-
+
{{ $t("collection.detail") }}
-
-
{
+ this.videoContext.requestFullScreen();
+ }, 500);
+ this.videoPlay = true; // 显示播放盒子
+ },
onPageScroll(e) {
- this.stickyShow = e.scrollTop > 5 ? true : false;
- },
-
+ this.stickyShow = e.scrollTop > 5 ? true : false;
+ },
+
back() {
let routesRecord = getCurrentPages();
if (routesRecord.length > 1) {
@@ -146,12 +176,12 @@ export default {
if (res.status === 0) {
this.collectionsDetail = res.data;
this.carouselFigureImg = this.collectionsDetail.carouselFigureList[0];
+ this.videoUrl = this.collectionsDetail.carouselFigureList[1] || '';
this.detailImgList = this.collectionsDetail.detailImgList;
} else {
uni.$u.toast(this.$t("load.failed"));
}
},
-
},
};
@@ -163,7 +193,9 @@ page {
background-attachment: fixed;
height: 100vh;
}
-
+.video-btn {
+ width: 92%;
+}
.active {
position: relative;
@@ -271,8 +303,6 @@ page {
image {
width: 100%;
height: 100%;
-
-
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d5b36f7..a010c6f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -97,7 +97,7 @@ page {
}
/deep/ .u-album__row__wrapper {
image {
- height: 160px !important;
+
border-radius: 4px;
}
}
@@ -117,7 +117,7 @@ page {
.collectionList {
margin-top: 15px;
overflow-y: scroll;
- height: 340px;
+ height: 130px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index d952553..f620930 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -559,9 +559,12 @@ page {
width: 75%;
color: #000000;
font-size: 34rpx;
+ // 超出一行显示省略号
overflow: hidden;
text-overflow: ellipsis;
- white-space: nowrap;
+ display: -webkit-box;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
}
.blockchain {
@@ -569,9 +572,12 @@ page {
font-size: 20rpx;
margin-top: 10rpx;
width: 75%;
+ // 超出一行显示省略号
overflow: hidden;
text-overflow: ellipsis;
- white-space: nowrap;
+ display: -webkit-box;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
}
}
}
diff --git a/pages/mine/usamine/index.vue b/pages/mine/usamine/index.vue
index e3c7865..2b5dc4c 100644
--- a/pages/mine/usamine/index.vue
+++ b/pages/mine/usamine/index.vue
@@ -18,7 +18,7 @@
>
{{ $t("usa.adress") }}：{{ seriesData.seriesAddress }}{{ $t("usa.adress") }}：{{ seriesData.seriesAddress }}
{{ $t("usa.remember") }}：{{ seriesData.seriesMem }}
@@ -300,6 +300,12 @@ page {
.name {
font-size: 16px;
color: #000000;
+ // 超出一行显示省略号
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
}
.intro {
font-size: 14px;
@@ -409,10 +415,14 @@ page {
color: #000000;
font-size: 24rpx;
margin-top: 10rpx;
-
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ display: flex;
+ a{
+ // 超出一行显示省略号
+ overflow: hidden;
+ text-overflow: ellipsis;
+width: 175px;
+ -webkit-box-orient: vertical;
+ }
}
.check {
color: #3e6944;