From a37709dd65f6038eb4779d3a48c09634175ce0e9 Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Mon, 23 Oct 2023 18:31:23 +0800
Subject: [PATCH] feat: 首页列表联调

---
 api/infoMarketInformation.js          |  4 ++++
 common/config.js                      |  3 ++-
 components/news-list/news-list.vue    | 13 +++++++------
 pages/market/index.vue                | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 pages/market/newsDetails.vue          | 18 +++++++++++-------
 utils/request/responseInterceptors.js |  5 +++--
 6 files changed, 93 insertions(+), 25 deletions(-)
 create mode 100644 api/infoMarketInformation.js

diff --git a/api/infoMarketInformation.js b/api/infoMarketInformation.js
new file mode 100644
index 0000000..8e6fee7
--- /dev/null
+++ b/api/infoMarketInformation.js
@@ -0,0 +1,4 @@
+const { http } = uni.$u
+// 列表和条件筛选
+export const getInfoMarketInformationlist = params => http.get('/infoMarketInformation/list', { params })
+
diff --git a/common/config.js b/common/config.js
index 66cf4a9..ebe5e3a 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,6 +1,7 @@
 module.exports = {
   //后端接口地址
-  baseUrl: 'http://127.0.0.1:48080/app-api',
+  baseUrl: 'http://10.11.38.240:9001', //内网开发环境
+  // baseUrl: 'http://127.0.0.1:48080/app-api',
   // baseUrl: 'http://api-dashboard.yudao.iocoder.cn/app-api',
   // 超时
   timeout: 30000,
diff --git a/components/news-list/news-list.vue b/components/news-list/news-list.vue
index 06bb0d5..49fa762 100644
--- a/components/news-list/news-list.vue
+++ b/components/news-list/news-list.vue
@@ -3,13 +3,12 @@
     <view class="flex-box" @click="newsDetails">
       <view class="leftCss">
         <view class="topCss overflow-two-lines">
-          壳液牌发布最新版《液化天燃
-          气(LNS)前景》
+          {{newItem.title}}
         </view>
         <view class="bomCss overflow-one-lines">
-          <view class="overflow-one-lines"> 行业动态 </view>
+          <view class="overflow-one-lines"> {{ newItem.plate_name }} </view>
           <view class="">｜</view>
-          <view class="overflow-one-lines"> 中国燃气控股有限公司 </view>
+          <view class="overflow-one-lines"> {{newItem.organizeName}} </view>
         </view>
       </view>
       <view class="rightCss">
@@ -23,7 +22,9 @@
   export default {
     name: "news-list",
     props: {
-
+      newItem:{
+        type:Object
+      }
     },
     data() {
       return {
@@ -34,7 +35,7 @@
       newsDetails(){
         console.log("跳转");
         uni.navigateTo({
-          url:'/pages/market/newsDetails'
+          url:'/pages/market/newsDetails?detailsContent=' + JSON.stringify(this.newItem)
         })
       }
     }
diff --git a/pages/market/index.vue b/pages/market/index.vue
index c001f14..0d432d2 100644
--- a/pages/market/index.vue
+++ b/pages/market/index.vue
@@ -4,14 +4,22 @@
       <u-search placeholder="搜索感兴趣的内容" v-model="keyword" :show-action="false" margin="30rpx 34rpx 15rpx 34rpx"
         borderColor="rgb(230, 230, 230)" height="74rpx" bgColor="#F5F6FA" @search="search"></u-search>
       <u-tabs :list="tabList" :activeStyle="{'color': '#cf000d','font-weight':'bold'}" lineWidth="30rpx"
-        lineHeight="4rpx" lineColor="#cf000d" :current="current"></u-tabs>
+        lineHeight="4rpx" lineColor="#cf000d" @click="tabChange"></u-tabs>
     </u-sticky>
-    <newsList v-for="i in 10" :key="i"></newsList>
+    <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="NewsList.length <= 0"></u-empty>
+    <newsList v-for="(item,index) in NewsList" :key="index" :newItem="item" v-else></newsList>
   </view>
 </template>
 
 <script>
   import newsList from '@/components/news-list/news-list.vue'
+  import {
+    getInfoMarketInformationlist
+  } from '@/api/infoMarketInformation.js'
+  import {
+    listSimpleDictDatas
+  } from '@/api/dict.js'
+  import keyboard from '../../uni_modules/uview-ui/libs/config/props/keyboard'
   export default {
     components: {
       newsList
@@ -25,30 +33,79 @@
         current: 0,
         tabList: [{
           name: "全部",
-        }, {
-          name: "行业动态",
+          key: -1
         }, {
           name: "宏观经济",
-        }, {
-          name: "用户资讯",
+          key: 0
         }, {
           name: "产业政策",
+          key: 1
+        }, {
+          name: "行业动态",
+          key: 2
         }, {
           name: "友商动态",
+          key: 3
+        }, {
+          name: "用户资讯",
+          key: 4
         }, {
           name: "国际能源",
-        }]
+          key: 5
+        }],
+        NewsList: [],
+        queryParameter: {
+          keyword: "",
+          plate_name: ""
+        }
       }
     },
     computed: {
 
     },
     onLoad() {
-
+      this.initData()
     },
     methods: {
+      initData() {
+        // this.updateList()
+        getInfoMarketInformationlist().then(res => {
+          console.log(res);
+          if (res.code === 200) {
+            this.NewsList = res.rows
+            console.log(this.NewsList);
+          }
+        })
+      },
       search() {
         console.log("搜索");
+        if (this.keyword) {
+          this.updateList({
+            keyword: this.keyword
+          })
+        }
+      },
+      updateList() {
+        let Params
+        if (this.keyword && this.current !== -1) {
+          Params = {keyword: this.keyword,plateName: this.current}
+        } else if (this.keyword) {
+          Params = {keyword: this.keyword,}
+        } else if (this.current !== -1) {
+          Params = {plateName: this.current}
+        }
+        getInfoMarketInformationlist(Params).then(res => {
+          console.log(res);
+          if (res.code === 200) {
+            this.NewsList = res.rows
+            console.log(this.NewsList);
+          }
+        })
+      },
+      tabChange(e) {
+        console.log(e);
+        this.current = e.key
+        this.updateList()
       }
     }
   }
@@ -56,4 +113,4 @@
 
 <style lang="scss" scoped>
 
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/market/newsDetails.vue b/pages/market/newsDetails.vue
index 747e3ad..1fb1748 100644
--- a/pages/market/newsDetails.vue
+++ b/pages/market/newsDetails.vue
@@ -3,13 +3,13 @@
     <u-navbar class="navBarCss" title="资讯详情" :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}" leftClick="leftClick"
      :autoBack="true" safeAreaInsetTop placeholder />
     <view class="titleCss">
-      壳液牌发布最新版《液化天燃气(LNS)
-      前景》
+      {{ detailsContent.title }}
     </view>
     <view class="releaseTimeCss">
-      发布时间: 2023年09月21日 13:52:24
+      {{ detailsContent.publishTime}}
     </view>
-    <rich-text nodes="text内容"></rich-text>
+    <rich-text :nodes="detailsContent.details">
+    </rich-text>
 
   </view>
 </template>
@@ -22,14 +22,18 @@
     },
     data() {
       return {
-
+        detailsContent:{}
       }
     },
     computed: {
 
     },
-    onLoad() {
-
+    onLoad(data) {
+      console.log(data);
+      let resData = JSON.parse(data.detailsContent)
+      if(data){
+        this.detailsContent = resData;
+      }
     },
     methods: {
       leftClick() {
diff --git a/utils/request/responseInterceptors.js b/utils/request/responseInterceptors.js
index 1fa99d1..cb924f3 100644
--- a/utils/request/responseInterceptors.js
+++ b/utils/request/responseInterceptors.js
@@ -75,9 +75,10 @@ module.exports = vm => {
           // hard coding：忽略这个提示，直接登出
           console.log(msg)
         } else {
-          uni.$u.toast(msg)
+          // uni.$u.toast(msg)
         }
-        return Promise.reject(res)
+        return res.data
+        // return Promise.reject(res)
       } else {
         return res.data
       }
--
libgit2 0.21.2