From fa45ab2dbf9afe31bf6da14a3c4b95e9925623b2 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 6 Jan 2025 16:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                       |  2 +-
 pages.json                      |  6 ++++++
 pages/index/center.vue          | 12 +++++++++++-
 pages/index/index.vue           | 21 ++++++++++++---------
 pages_order/home/journalism.vue | 11 ++++++-----
 pages_order/home/newsDetail.vue |  2 +-
 6 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/config.js b/config.js
index 1660015..8ece511 100644
--- a/config.js
+++ b/config.js
@@ -6,7 +6,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
diff --git a/pages.json b/pages.json
index 0fa6b7f..009084e 100644
--- a/pages.json
+++ b/pages.json
@@ -87,6 +87,12 @@
 			{
 				"path": "home/introduce"
 			},
+			{
+				"path": "home/newsDetail"
+			},
+			{
+				"path": "home/journalism"
+			},
 			{
 				"path": "order/createOrder"
 			},
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 183fa9e..ba99b9c 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -131,6 +131,17 @@
 					<view class="title">帮助与反馈</view>
 				</view>
 			</view>
+
+			<view class="box">
+				<view class="boxs" @click="$utils.navigateTo('/pages_order/mine/address')">
+					<image src="@/static/image/center/5.png" mode="widthFix" />
+					<view class="title">我的地址</view>
+				</view>
+				<view class="boxs" @click="$store.commit('logout')">
+					<image src="@/static/image/center/6.png" mode="widthFix" />
+					<view class="title">退出登录</view>
+				</view>
+			</view>
 		</view>
 
 		<!-- 广告 -->
@@ -430,7 +441,6 @@
 			.box {
 				display: flex;
 				width: 100%;
-				justify-content: space-around;
 				margin-bottom: 20rpx;
 
 				.boxs {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 56964e9..2bf3ef8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -41,19 +41,18 @@
 					</view> -->
 				</view>
 				<view class="new-perple-top-right"
-				@click="$utils.navigateTo(`/pages_order/home/introduce`)">
+				@click="$utils.navigateTo(`/pages_order/home/journalism`)">
 					<image :src="configList.index_model" mode="aspectFill"></image>
 				</view>
 			</view>
 			<view class="new-perple-main">
 				
-				<view class="red-packet">
+				<!-- <view class="red-packet">
 					<image src="@/static/image/home/red-packet.png" mode="aspectFill"></image>
-				</view>
+				</view> -->
 				
 				<view v-for="(item, index) in adList" :key="item.id" 
-				v-if="index < 4"
-				@click="$utils.navigateTo(`/pages_order/home/notice?id=${item.id}`)" 
+				@click="$utils.navigateTo(`/pages_order/home/newsDetail?id=${item.id}`)" 
 				class="activity">
 					<image :src="item.icon" mode="aspectFill"></image>
 					<view class="title">{{ item.title }}</view>
@@ -204,7 +203,10 @@
 
 			//获取首页广告
 			getRiceAdList() {
-				this.$api('getRiceProductList', res => {
+				this.$api('getRiceProductList', {
+					pageNo: 1,
+					pageSize: 4,
+				}, res => {
 					if (res.code == 200) {
 						this.adList = res.result.records
 					}
@@ -349,13 +351,14 @@
 					flex-direction: column;
 					align-items: center;
 					justify-content: center;
-					width: 20%;
+					width: 25%;
 					background: white;
 					border-radius: 10px;
 
 					image {
-						width: 100rpx;
-						height: 100rpx;
+						width: 140rpx;
+						height: 140rpx;
+						border-radius: 10rpx;
 					}
 
 					.title {
diff --git a/pages_order/home/journalism.vue b/pages_order/home/journalism.vue
index f5a8f60..c1ea127 100644
--- a/pages_order/home/journalism.vue
+++ b/pages_order/home/journalism.vue
@@ -1,17 +1,18 @@
 <template>
 	<view class="page">
-		<navbar title="新闻中心" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="活动中心" leftClick @leftClick="$utils.navigateBack" />
 		<view class="card" 
 		@click="$utils.navigateTo('/pages_order/home/newsDetail?id=' + item.id)"
 			v-for="(item, index) in list" :key="item.id">
 			<view class="card-img">
-				<image :src="item.image && 
-				item.image.split(',')[0]" mode="aspectFill"></image>
+				<image :src="item.icon && 
+				item.icon.split(',')[0]" mode="aspectFill"></image>
 			</view>
 			<view>
 				{{ item.title }}
 			</view>
-			<view class="text">
+			<view class="text"
+			v-if="item.descValue">
 				{{ item.descValue }}
 			</view>
 		</view>
@@ -24,7 +25,7 @@
 		mixins: [mixinsList],
 		data() {
 			return {
-				mixinsListApi: 'getRiceNewsList',
+				mixinsListApi: 'getRiceProductList',
 
 			}
 		},
diff --git a/pages_order/home/newsDetail.vue b/pages_order/home/newsDetail.vue
index 869c1dc..d2883f4 100644
--- a/pages_order/home/newsDetail.vue
+++ b/pages_order/home/newsDetail.vue
@@ -23,7 +23,7 @@
 		methods: {
 			//公告信息-根据id查询公告信息
 			queryNewsById() {
-				this.$api('getRiceNewsDetail', {
+				this.$api('getRiceAdDetail', {
 					id: this.id
 				}, res => {
 					if (res.code == 200) {