From 85ee5bb05d14599e8cd9849c6414981ca6bfefce Mon Sep 17 00:00:00 2001
From: zhouzhenyuan <zhouzhenyuan>
Date: Sat, 3 Feb 2024 14:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=83=8C=E6=99=AF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail.vue    |  2 +-
 pages/index/index.vue     |  6 ++--
 pages/sureOrder/index.vue |  2 +-
 pages/user/index.vue      | 60 ++++++++++++++++++++++++++-------------
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 34e021f..e5478d7 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -533,7 +533,7 @@
 
 	.goodsInfo {
 		width: 720rpx;
-		height: 484rpx;
+		max-height: 484rpx;
 		background: #FFFFFF;
 		border-radius: 6rpx 6rpx 6rpx 6rpx;
 		opacity: 1;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 40fb824..39fcf55 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -28,9 +28,9 @@
 						</view>
 					</view>
 					<view class="group_6">
-						<view class="text-wrapper_3">
+						<!-- <view class="text-wrapper_3">
 							<text lines="1" class="text_4">4</text>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view v-if="!sameCity">
@@ -615,7 +615,7 @@
 		overflow-y: auto;
 		display: flex;
 		flex-direction: column;
-		background-image: url('../../static/home/homeback.png');
+		background-image: url('https://www.saas.njrenzhou.com/static/home/homeback.png');
 		background-size: 100% 100%;
 	}
 
diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue
index dea2fee..07aa581 100644
--- a/pages/sureOrder/index.vue
+++ b/pages/sureOrder/index.vue
@@ -5,7 +5,7 @@
 				:background="background"></u-navbar>
 		</view>
 		<view class="buyType">
-			<view class="toDoor">
+			<view class="toDoor" :style="{'background':buyType=='sm'?'#fff':'rgba(255, 255, 255, 0.57)'}">
 				送货上门
 			</view>
 			<view class="bySelf">
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 86f32cd..7f151b8 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<view >
-			<u-navbar is-back="false" title=""  :background="background"></u-navbar>
+		<view>
+			<u-navbar is-back="false" title="" :background="background"></u-navbar>
 		</view>
 		<view class="section_1">
 			<view class="box_1">
@@ -35,7 +35,7 @@
 					<text lines="1" class="text_4">分销码</text>
 				</view>
 			</view>
-			<view class="plus" v-if="userInfo.user_type!=40&&userInfo.user_type!=10&&userInfo.effective_time" 
+			<view class="plus" v-if="userInfo.user_type!=40&&userInfo.user_type!=10&&userInfo.effective_time"
 				@click="goMember(userInfo.user_type==20?'hy':'fx')">
 				<view class="plusLeft">
 					<view class="leftTop">
@@ -390,13 +390,15 @@
 							我要找货
 						</view>
 					</view>
-					<view class="serveIcon" v-if="userInfo.user_type!=10&&userInfo.user_type!=20&&userInfo.user_type!=30">
+					<view class="serveIcon"
+						v-if="userInfo.user_type!=10&&userInfo.user_type!=20&&userInfo.user_type!=30">
 						<image src="/static/user/sj.png" mode="" class="icons"></image>
 						<view class="serveInfo">
 							数据统计
 						</view>
 					</view>
-					<view class="serveIcon" v-if="userInfo.user_type!=10&&userInfo.user_type!=20&&userInfo.user_type!=30">
+					<view class="serveIcon"
+						v-if="userInfo.user_type!=10&&userInfo.user_type!=20&&userInfo.user_type!=30">
 						<image src="/static/user/hygl.png" mode="" class="icons"></image>
 						<view class="serveInfo">
 							会员管理
@@ -418,22 +420,22 @@
 					<image src="/static/user/right.png" mode=""></image>
 				</view>
 				<view class="goodsList">
-					<view class="group_11" v-for="(item,index) in 8" :key="index" @click="goodsDetail(item)">
+					<view class="group_11" v-for="(item,index) in suggestGoodsList" :key="index" @click="goodsDetail(item)">
 						<view class="block_2">
-							<image src="/static/home/phone.jpg" class="image_3"></image>
+							<image :src="item.goods_image" class="image_3"></image>
 							<view class="box_6">
-								<view class="text-wrapper_4">
+								<!-- <view class="text-wrapper_4">
 									<text lines="1" class="text_12">自营</text>
-								</view>
-								<text lines="1" decode="true" class="text_13">iphone13&nbsp;绿色&nbsp;128GB</text>
+								</view> -->
+								<text lines="1" decode="true" class="text_13">{{item.goods_name}}</text>
 							</view>
 							<view class="text-wrapper_5">
 								<text lines="1" class="text_14">¥</text>
-								<text lines="1" class="text_15">7599</text>
+								<text lines="1" class="text_15">{{item.goods_price_min}}</text>
 								<text lines="1" class="text_16">到手价</text>
-								<text lines="1" class="text_17">¥7089</text>
+								<text lines="1" class="text_17">¥{{item.line_price_max}}</text>
 							</view>
-							<text lines="1" decode="true" class="text_18">200+条评论&nbsp;99%好评率</text>
+							<!-- <text lines="1" decode="true" class="text_18">200+条评论&nbsp;99%好评率</text> -->
 						</view>
 
 					</view>
@@ -461,7 +463,8 @@
 	import {
 		checkLogin
 	} from '@/core/app'
-	import * as UserApi from '@/api/user'
+	import * as UserApi from '@/api/user';
+	import * as Api from '@/api/goods'
 	export default {
 		data() {
 			return {
@@ -475,12 +478,23 @@
 				userInfo: {
 					user_type: 40
 				},
+				suggestGoodsList:[],
 			}
 		},
 		onShow(options) {
 			this.onRefreshPage()
+			this.getSuggest()
 		},
 		methods: {
+			getSuggest() {
+				// 获取推荐商品
+				const that = this
+				Api.recommended()
+					.then(res => {
+						that.suggestGoodsList = res.data.goodsList
+					})
+			
+			},
 			// 刷新页面
 			onRefreshPage() {
 				this.isLogin = checkLogin()
@@ -497,7 +511,7 @@
 						})
 						.then(result => {
 							that.userInfo = result.data.userInfo
-							uni.setStorageSync('userInfo',that.userInfo)
+							uni.setStorageSync('userInfo', that.userInfo)
 							resolve(that.userInfo)
 						})
 						.catch(err => {
@@ -511,14 +525,14 @@
 				})
 			},
 			toFuwu(type) {
-				if(!uni.getStorageSync('token')){
+				if (!uni.getStorageSync('token')) {
 					uni.navigateTo({
 						url: "/pages/login/index"
-					}) 
-					return ;
+					})
+					return;
 				}
 				uni.navigateTo({
-					url: "/pages/news/recycling/orderList?type="+type
+					url: "/pages/news/recycling/orderList?type=" + type
 				})
 			},
 			goLogin() {
@@ -582,6 +596,7 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: flex-end;
+
 	}
 
 	.section_1 {
@@ -592,6 +607,8 @@
 		display: flex;
 		flex-direction: column;
 		margin: -26rpx 0 0 -60rpx;
+		background: url('https://www.saas.njrenzhou.com/static/member/head.png') center -44px no-repeat;
+		background-size: 100% auto;
 	}
 
 
@@ -1425,6 +1442,9 @@
 			text-align: left;
 			white-space: nowrap;
 			line-height: 24rpx;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
 		}
 
 		.text-wrapper_5 {
@@ -1450,7 +1470,7 @@
 		}
 
 		.text_15 {
-			width: 86rpx;
+			// min-width: 86rpx;
 			height: 50rpx;
 			overflow-wrap: break-word;
 			color: rgba(242, 26, 28, 1.000000);