From d89bfb8607f99d82aeaa572a766912e71f0fa5c8 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Fri, 22 Sep 2023 19:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/member.js       |  4 ++++
 app.js              |  8 ++++----
 pages/base/home.vue | 14 ++++++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/api/member.js b/api/member.js
index c29ab1f..68d248b 100644
--- a/api/member.js
+++ b/api/member.js
@@ -124,6 +124,10 @@ class Member {
     static serviceDetail(data) {
         return server.get(`/article/detail`, data);
     }
+    // 移动端公告
+    static notice(data){
+        return server.get('/notice',data)
+    }
 }
 
 export default Member;
diff --git a/app.js b/app.js
index ffb2938..b4f317e 100644
--- a/app.js
+++ b/app.js
@@ -3,12 +3,12 @@ let config = {};
 if (process.env.NODE_ENV == 'production'||true) { //生产环境
     config = {
         // ajax地址
-        baseUrl: 'https://netatt.bihucloud.com',
+        baseUrl: 'https://api.gcfac855.com',
         // 图片地址 （暂时无用）
-        imgUrl: 'https://netatt.bihucloud.com/storage',
+        imgUrl: 'https://api.gcfac855.com/storage',
         // socket地址
-        socketUrl: 'wss://netatt.bihucloud.com/ws1',
-        socketUrl1: 'wss://netatt.bihucloud.com/ws2',
+        socketUrl: 'wss://api.gcfac855.com/ws1',
+        socketUrl1: 'wss://api.gcfac855.com/ws2',
         // pc端地址
         pcUrl:'https://www.xtzcoin.net',
         // app名称
diff --git a/pages/base/home.vue b/pages/base/home.vue
index 0b17a3b..d0a71f4 100644
--- a/pages/base/home.vue
+++ b/pages/base/home.vue
@@ -293,7 +293,7 @@
 			</div> -->
 
 			<!-- 公告 -->
-			<!-- <v-notice-bar
+			<v-notice-bar
                     v-if="notice.length"
                     class="m-t-md m-x-md bg-panel-1 box-shadow rounded-sm"
                 >
@@ -315,7 +315,7 @@
                             <van-icon name="wap-nav"/>
                         </view>
                     </template>
-                </v-notice-bar> -->
+                </v-notice-bar>
 			<!-- 次一级导航 -->
 			<!-- <view class="nav2 p-x-md m-t-ms d-flex justify-around fn-center">
                   <v-link tag="div" to="/pages/assets/recharge" class="item">
@@ -764,6 +764,11 @@
 					console.log(res.data);
 				})
 			},
+			getNotice(){
+				Member.notice({page: 1}).then(res => {
+					this.notice = res.data;
+				})
+			},
 			goMine() {
 				this.show = false
 				this.tabChange("mine")
@@ -821,7 +826,7 @@
 				})
 				ajax.then((res) => {
 					this.home = res.data.bannerList
-					this.notice = res.data.noticeList
+					// this.notice = res.data.noticeList
 					this.indexList = res.data.brokenLine
 					this.marketList = res.data.marketList
 					// this.infoActive = 1;
@@ -1045,7 +1050,8 @@
 			}
 		},
 		mounted() {
-			this.getCollegeList()
+			this.getCollegeList();
+			this.getNotice();
 			this.onRefresh()
 			this.indexData()
 			this.indexMarketList()