From 4b10b9486d97e3f50e346754a5908d899ddab788 Mon Sep 17 00:00:00 2001
From: clay <209192278@qq.com>
Date: Tue, 17 Jan 2023 23:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8F=E8=A7=88=E8=AE=B0=E5=BD=95=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E9=97=AE=E9=A2=98=E5=8F=8A=E4=BB=A3=E7=A0=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/news/news.vue | 8 ++++---
components/productsBtn/productsBtn.vue | 2 +-
.../newProductRelease/newProductRelease.vue | 22 +++++++++++++++++++
.../newsDetail.vue} | 0
.../{news/news.vue => newsList/newsList.vue} | 2 --
pages.json | 13 +++++++++--
.../detail/productsDetail/productsDetail.vue | 18 +++++++--------
pages/report/report.vue | 8 +++++--
service/request.js | 20 ++++++++---------
9 files changed, 64 insertions(+), 29 deletions(-)
create mode 100644 packageReport/newProductRelease/newProductRelease.vue
rename packageReport/{xwDetail/xwDetail.vue => newsDetail/newsDetail.vue} (100%)
rename packageReport/{news/news.vue => newsList/newsList.vue} (99%)
diff --git a/components/news/news.vue b/components/news/news.vue
index 04c5dfe..f7b78c9 100644
--- a/components/news/news.vue
+++ b/components/news/news.vue
@@ -39,16 +39,18 @@
getNews() {
this.$apiServe.getNews().then(res => {
// console.log('行业新闻', res.data.data)
- for (const item of res.data.data) {
+ let newsData = res.data.data
+ for (const item of newsData) {
item.pub_time_str = dateFormat(item.pub_time_str)
}
- this.newsList = res.data.data
+ newsData = newsData.slice(0, 3)
+ this.newsList = newsData
}).finally(_ => {})
},
// 跳转到新闻详情页
clickNews(item) {
uni.navigateTo({
- url: '../../packageReport/xwDetail/xwDetail?id=' + item.id
+ url: '../../packageReport/newsDetail/newsDetail?id=' + item.id
})
},
}
diff --git a/components/productsBtn/productsBtn.vue b/components/productsBtn/productsBtn.vue
index 7c27b6b..a05fb37 100644
--- a/components/productsBtn/productsBtn.vue
+++ b/components/productsBtn/productsBtn.vue
@@ -18,7 +18,7 @@
- {{item.title}}
+ {{item.desc}}
+
+
+
+
+
+
+
+
diff --git a/packageReport/xwDetail/xwDetail.vue b/packageReport/newsDetail/newsDetail.vue
similarity index 100%
rename from packageReport/xwDetail/xwDetail.vue
rename to packageReport/newsDetail/newsDetail.vue
diff --git a/packageReport/news/news.vue b/packageReport/newsList/newsList.vue
similarity index 99%
rename from packageReport/news/news.vue
rename to packageReport/newsList/newsList.vue
index 8c7fe62..da2f81b 100644
--- a/packageReport/news/news.vue
+++ b/packageReport/newsList/newsList.vue
@@ -26,8 +26,6 @@
background: #FFFFFF;
}
-
-
.no-data {
text-align: center;
margin-top: 29rpx;
diff --git a/pages.json b/pages.json
index 64e0298..44b9936 100644
--- a/pages.json
+++ b/pages.json
@@ -155,7 +155,7 @@
{
"root": "packageReport",
"pages": [{
- "path": "news/news",
+ "path": "newsList/newsList",
"style": {
"navigationBarTitleText": "行内新闻",
"navigationBarTextStyle": "white",
@@ -171,7 +171,7 @@
"enablePullDownRefresh": false
}
}, {
- "path": "xwDetail/xwDetail",
+ "path": "newsDetail/newsDetail",
"style": {
"navigationBarTitleText": "行业新闻详情",
"navigationBarTextStyle": "white",
@@ -187,6 +187,15 @@
"navigationBarBackgroundColor": "#12CA64",
"enablePullDownRefresh": false
}
+ }, {
+ "path": "newProductRelease/newProductRelease",
+ "style": {
+ "navigationBarTitleText": "新品发布",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#12CA64",
+ "enablePullDownRefresh": false
+ }
+
}
]
}
diff --git a/pages/detail/productsDetail/productsDetail.vue b/pages/detail/productsDetail/productsDetail.vue
index fdc89d1..e2836f4 100644
--- a/pages/detail/productsDetail/productsDetail.vue
+++ b/pages/detail/productsDetail/productsDetail.vue
@@ -120,15 +120,15 @@
//收藏按钮
starTap() {
this.detailList.type = !this.detailList.type
- this.$apiServe.collect(this.id).then(res => {
- console.log('收藏成功', res.data)
- if (res.data.code == 1) {
- this.detailList.type = 1
- this.$toast.warn('收藏成功')
- } else {
- this.$toast.warn('收藏失败')
- }
- }).finally(_ => {})
+ // this.$apiServe.collect(this.id).then(res => {
+ // console.log('收藏成功', res.data)
+ // if (res.data.code == 1) {
+ // this.detailList.type = 1
+ // this.$toast.warn('收藏成功')
+ // } else {
+ // this.$toast.warn('收藏失败')
+ // }
+ // }).finally(_ => {})
},
//点赞按钮
heartTap() {
diff --git a/pages/report/report.vue b/pages/report/report.vue
index 8e96b33..f97c93f 100644
--- a/pages/report/report.vue
+++ b/pages/report/report.vue
@@ -28,7 +28,7 @@
新品发布
-
+
@@ -69,7 +69,11 @@
//点击行内新闻时
if (listIndex == 0) {
uni.navigateTo({
- url: '../../packageReport/news/news'
+ url: '../../packageReport/newsList/newsList'
+ })
+ } else if (listIndex == 1) {
+ uni.navigateTo({
+ url: '../../packageReport/newProductRelease/newProductRelease'
})
} else if (listIndex == 2) {
uni.navigateTo({
diff --git a/service/request.js b/service/request.js
index 4f5a7b9..79f89a4 100644
--- a/service/request.js
+++ b/service/request.js
@@ -244,7 +244,7 @@ const apiService = {
},
// 获取行业新闻
getNews() {
- const url = `/news/nlists/?pageSize=3&pageNum=1`
+ const url = `/news/nlists/?pageSize=50&pageNum=1`
return new Promise((resolve, reject) => {
resolve(service.get(url))
})
@@ -258,7 +258,7 @@ const apiService = {
},
// 获取认证厂家列表
getCertifiedCj() {
- const url = `/news/flists?pageSize=3&pageNum=1`
+ const url = `/news/flists?pageSize=50&pageNum=1`
return new Promise((resolve, reject) => {
resolve(service.get(url))
})
@@ -382,16 +382,16 @@ const apiService = {
})
},
postMobileByMnp(data) {
- const url = `/user/getMobileByMnp`
- return new Promise((resolve, reject) => {
- resolve(service.post(url, data))
- })
+ const url = `/user/getMobileByMnp`
+ return new Promise((resolve, reject) => {
+ resolve(service.post(url, data))
+ })
},
postImage(data) {
- const url = `/upload/image/`
- return new Promise((resolve, reject) => {
- resolve(service.post(url, data))
- })
+ const url = `/upload/image/`
+ return new Promise((resolve, reject) => {
+ resolve(service.post(url, data))
+ })
},
// 解密
decrypt(data) {