From d1bb68d9f9054bbf87cd84956d3240c71d8e370c Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期二, 25 六月 2024 16:55:44 +0800
Subject: [PATCH] update 商品管理和花农的

---
 pages/home/farmer-home.vue |   82 +++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/pages/home/farmer-home.vue b/pages/home/farmer-home.vue
index a78575b..56a6f9e 100644
--- a/pages/home/farmer-home.vue
+++ b/pages/home/farmer-home.vue
@@ -5,27 +5,22 @@
 		</view> -->
 		<!-- 背景图 -->
 		<view class="top-bg" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
-			<view class="title" style="position: relative;"  >
-				我<uni-icons type="settings"></uni-icons>
- 
+			<view class="title" style="position: relative;">
+				首页
+
 			</view>
-			<view class="icons">
-				<image class="icon1" src="../../static/imgs/user/usr-icon1.png" mode="aspectFit"></image>
-				<image class="icon2" src="../../static/imgs/home/home-shop-top-icon.png" mode="aspectFit"></image>
-			</view>
-			<view class="flex m-20 user-info" @click="goto('/pages/user/user-info/user-info',true)"
-				v-if="currentInfo&&(currentInfo.id)">
+			<view class="flex m-t-20 user-info" v-if="currentInfo&&(currentInfo.id)">
 				<!-- 头像 -->
 				<image class="user-icon" v-if="!currentInfo.picture" src="../../static/imgs/home/home-shop-top-icon.png"
 					mode="aspectFit"></image>
 				<image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>
 
-				<view class="name">
-					{{currentInfo.nickName || '-'}}
+				<view class="name" style="margin-top: 12rpx;">
+					<view class="t1">{{currentInfo.nickName || '-'}}</view>
+					<view class="t2 m-t-12">{{currentInfo.tel || '暂无电话'}}</view>
 				</view>
-				<uni-icons class="right-icon" type="right"></uni-icons>
 			</view>
- 
+
 
 		</view>
 		<view class="item-container">
@@ -84,54 +79,53 @@
 				</view>
 			</view>
 		</view>
-		<view class="item-container">
-			<view class="view">
+		<view class="item-container flex m-t-20" style="padding: 34rpx 44rpx;">
+			<view class="rate-view flex1" style="max-width: 140rpx;">
 				<view class="title">售后率</view>
 				<view class="title" style="color: red;">0.02%</view>
 			</view>
-			<view class="tj-panel green">
+			<view class="tj-panel green flex1">
 				<view class="name">今日待配送</view>
 				<view class="title">12扎</view>
 			</view>
-			<view class="tj-panel pink">
-				<view class="name">今日配送汇总</view>
+			<view class="tj-panel pink flex1">
+				<view class="name pink">今日配送汇总</view>
 				<view class="title">12扎</view>
 			</view>
 		</view>
-		<view class="p10">
-			<uni-notice-bar @click="getNoticeMore" class="notice-bar"
-				color="#333" background-color="#fff" show-get-more show-icon :scrollable="scrollable"
-				:text="currentNotice.title" :key="currentNotice.id" />
+		<view class="m-t-12" @click="getNoticeMore" >
+			<uni-notice-bar class="notice-bar" color="#333" background-color="#fff" show-get-more
+				show-icon :scrollable="scrollable" :text="currentNotice.title" :key="currentNotice.id" />
 			<span v-if="!currentNotice||!currentNotice.id">&nbsp;</span>
 		</view>
 		<view class="item-container">
 			<view class="title">常用功能</view>
 			<view class="flex order-icons m-t-12">
-				<view class="nav row margin-tb" @click="goto('/pages/farmer/order-settlement',true)">
+				<view class="nav row margin-tb" @click="goto('/pages/farmer/order-settlement/order-settlement',true)">
 					<view class="img-c">
-						<image class="icon margin-bottom order-icon zdjs" src="/static/images/farmer/user/user-icon-kkjl.png"
-							mode="scaleToFill" />
+						<image class="icon margin-bottom order-icon zdjs"
+							src="/static/images/farmer/user/user-icon-kkjl.png" mode="scaleToFill" />
 					</view>
 					<view class="order-desc tg">账单结算</view>
 				</view>
-				<view class="nav row margin-tb" @click="goto('/pages/farmer/flower-manage',true)">
+				<view class="nav row margin-tb" @click="goto('/pages/farmer/flower-manage/flower-manage',true)">
 					<view class="img-c">
-						<image class="icon margin-bottom order-icon spgl" src="/static/images/farmer/user/user-icon-spgl.png"
-							mode="scaleToFill" />
+						<image class="icon margin-bottom order-icon spgl"
+							src="/static/images/farmer/user/user-icon-spgl.png" mode="scaleToFill" />
 					</view>
 					<view class="order-desc cqw">商品管理</view>
 				</view>
-				<view class="nav row margin-tb" @click="goto('/pages/farmer/order-sale',true)">
+				<view class="nav row margin-tb" @click="goto('/pages/farmer/order-sale/order-sale',true)">
 					<view class="img-c">
-						<image class="icon margin-bottom order-icon shlp" src="/static/images/farmer/user/user-icon-shlp.png"
-							mode="scaleToFill" />
+						<image class="icon margin-bottom order-icon shlp"
+							src="/static/images/farmer/user/user-icon-shlp.png" mode="scaleToFill" />
 					</view>
 					<view class="order-desc syst">售后理赔</view>
 				</view>
-				<view class="nav row margin-tb" @click="goto('/pages/farmer/order-records',true)">
+				<view class="nav row margin-tb" @click="goto('/pages/farmer/order-records/order-records',true)">
 					<view class="img-c">
-						<image class="icon margin-bottom order-icon kkjl" src="/static/images/farmer/user/user-icon-kkjl.png"
-							mode="scaleToFill" />
+						<image class="icon margin-bottom order-icon kkjl"
+							src="/static/images/farmer/user/user-icon-kkjl.png" mode="scaleToFill" />
 					</view>
 					<view class="order-desc wbsp">扣款记录</view>
 				</view>
@@ -142,7 +136,7 @@
 		</view>
 		<farmer-footer flg="0"></farmer-footer>
 
-	 
+
 	</view>
 </template>
 
@@ -155,25 +149,25 @@
 				tcode: '',
 				inviterName: '',
 				// StatusBar:0,
-				
+
 				//公告的
 				noticeList: [],
 				currentNoticeIndex: 0,
 				currentNotice: {
-				
+
 				},
 				scrollable: false,
-				
+
 			};
 		},
- 
+
 		onLoad(options) {
 			const url = options.q ? decodeURIComponent(options.q) : '';
-			const urlcode = options.url&&decodeURIComponent(options.url) || ''
+			const urlcode = options.url && decodeURIComponent(options.url) || ''
 		},
 		created() {
 			//公告
-			this.$http.request('get', '/api/ua/announcement/list', {
+			this.$http.request('get', '/api/announcement/page', {
 				params: {
 					size: 5,
 					status: 'A'
@@ -221,14 +215,16 @@
 				})
 			},
 
-		
 
-	
+
+
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	@import "../user/user.scss";
+
 	@import "./home.scss";
 </style>
 

--
Gitblit v1.9.3