diff --git a/mallplusui-uniapp-app/manifest.json b/mallplusui-uniapp-app/manifest.json
index e9bb0ce..b503a51 100644
--- a/mallplusui-uniapp-app/manifest.json
+++ b/mallplusui-uniapp-app/manifest.json
@@ -19,7 +19,9 @@
             "Share" : {},
             "Contacts" : {},
             "iBeacon" : {},
-            "Maps" : {}
+            "Maps" : {},
+            "Camera" : {},
+            "Barcode" : {}
         },
         "distribute" : {
             "android" : {
diff --git a/mallplusui-uniapp-app/pages.json b/mallplusui-uniapp-app/pages.json
index 4be3ec2..1a5b1f2 100644
--- a/mallplusui-uniapp-app/pages.json
+++ b/mallplusui-uniapp-app/pages.json
@@ -757,12 +757,13 @@
 				}, {
 					"path": "notice/subjectList",
 					"style": {
-						"navigationBarTitleText": "秒杀列表",
-						"app-plus": {
-							"titleNView": {
-								"type": "transparent"
-							}
-						}
+						"navigationBarTitleText": "农机服务",
+						"enablePullDownRefresh": true
+						// "app-plus": {
+						// 	"titleNView": {
+						// 		"type": "transparent"
+						// 	}
+						// }
 					}
 				}, {
 					"path": "notice/subjectDetail",
diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue
index 7faee05..c9a9a35 100644
--- a/mallplusui-uniapp-app/pages/index/index.vue
+++ b/mallplusui-uniapp-app/pages/index/index.vue
@@ -33,28 +33,28 @@
 			</view>
 			<!-- 分类 -->
 			<view class="cate-section">
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupActivityList')">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
 					<image src="/static/temp//antFill-gift.png"></image>
-					<text>惠农套餐</text>
+					<text>农业物资</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isVip=1')">
 					<image src="/static/temp/fasfausers.png"></image>
-					<text>拼团特价</text>
+					<text>生活物资</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/giftList')">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
 					<image src="/static/temp/fabfa-dropbox.png"></image>
-					<text>税分兑换</text>
+					<text>拼团特价</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
-					<image src="/static/temp/fasfa-history.png"></image>
-					<text>限时抢购</text>
+				<view class="cate-item" @click="navToTabPage('/pagesU/notice/subjectList')">
+					<image src="/static/temp/antFill-home.png"></image>
+					<text>农机服务</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/build/communityList')">
+				<!-- 	<view class="cate-item" @click="navToTabPage('../../pagesA/build/communityList')">
 					<image src="/static/temp/antFill-home.png"></image>
 					<text>农村社区</text>
-				</view>
+				</view> -->
 			</view>
-			<view class="cate-section">
+			<!-- <view class="cate-section">
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
 					<image src="/static/temp/fasfa-sitemap.png"></image>
 					<text>分销商品</text>
@@ -75,7 +75,7 @@
 					<image src="/static/temp/fasfa-street.png"></image>
 					<text>卖家中心</text>
 				</view>
-			</view>
+			</view> -->
 
 			<!-- 秒杀楼层 https://s.click.taobao.com/Wds7c1w -->
 			<view class="seckill-section m-t"
@@ -204,7 +204,11 @@
 						<image :src="item.pic" mode="aspectFill"></image>
 					</view>
 					<text class="title clamp">{{ item.productName }}</text>
-					<text class="price">￥{{ item.price }}</text>
+					<view>
+						<text class="price">惠农价￥{{ item.price }}</text>
+						<text class="m-price"> 县区商超价￥{{ item.price }}</text>
+					</view>
+
 
 				</view>
 
@@ -226,7 +230,10 @@
 						<image :src="item.pic" mode="aspectFill"></image>
 					</view>
 					<text class="title clamp">{{ item.name }}</text>
-					<text class="price">￥{{ item.price }}</text>
+					<view>
+						<text class="price">惠农价￥{{ item.price }}</text>
+						<text class="m-price">县区商超价￥{{ item.price }}</text>
+					</view>
 
 				</view>
 
@@ -247,8 +254,8 @@
 						<image :src="item.pic" mode="aspectFill"></image>
 					</view>
 					<text class="title clamp">{{ item.name }}</text>
-					<text class="price">￥{{ item.price }}</text>
-					<text>【{{ item.storeName }}】</text>
+					<text class="label">【{{ item.storeName }}】</text>
+					<text class="price">惠农价￥{{ item.price }}</text>
 				</view>
 				<uni-load-more :status="loadingType"></uni-load-more>
 			</view>
@@ -318,7 +325,7 @@
 		},
 		onShareAppMessage() {},
 		onLoad(ops) {
-			
+
 			let isWeiXin = this.$common.isWeiXinBrowser();
 			this.getNewProductList('refresh');
 			if (ops.invitecode) {
@@ -454,8 +461,8 @@
 			async homeNewProduct() {
 				let params = {};
 				let groupHotGoodsList = await Api.apiCall('get', Api.index.homeNewProduct, params);
-				console.log(groupHotGoodsList)
 				if (groupHotGoodsList) {
+					console.log("新品推荐》》》》》",groupHotGoodsList.records)
 					this.homeNewProductList = groupHotGoodsList.records;
 				}
 
@@ -467,6 +474,7 @@
 			async homeRecommendProduct() {
 				let params = {};
 				let groupHotGoodsList = await Api.apiCall('get', Api.index.homeRecommendProduct, params);
+				console.log("人气推荐》》》》》",groupHotGoodsList.records)
 				this.homeRecommendProductList = groupHotGoodsList.records;
 			},
 			/**
@@ -491,7 +499,7 @@
 				let data = await Api.apiCall('get', Api.index.bannerList, params);
 				console.log("1111111", data)
 				if (data) {
-						console.log("122》》》》》》》》》》》》》》》》》》》》", data)
+					console.log("122》》》》》》》》》》》》》》》》》》》》", data)
 					this.carouselList = data || [];
 					this.swiperLength = this.carouselList.length;
 					this.titleNViewBackground = 'rgb(203, 87, 60)';
@@ -507,7 +515,7 @@
 				let data = await Api.apiCall('get', Api.index.selectNotRecive, params);
 				if (data) {
 					console.log("优惠券")
-					console.log("优惠券",data)
+					console.log("优惠券", data)
 					this.couponList = data || [];
 				}
 			},
@@ -1027,6 +1035,13 @@
 			.price {
 				color: $uni-color-primary;
 			}
+
+			.m-price {
+				font-size: $font-sm + 2upx;
+				text-decoration: line-through;
+				color: $font-color-light;
+				margin-left: 8upx;
+			}
 		}
 	}
 
@@ -1147,192 +1162,6 @@
 		}
 	}
 
-	/* 分类推荐楼层 */
-	.hot-floor {
-		width: 100%;
-		overflow: hidden;
-		margin-bottom: 20upx;
-
-		.floor-img-box {
-			width: 100%;
-			height: 320upx;
-			position: relative;
-
-			&:after {
-				content: '';
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100%;
-				height: 100%;
-				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
-			}
-		}
-
-		.floor-img {
-			width: 100%;
-			height: 100%;
-		}
-
-		.floor-list {
-			white-space: nowrap;
-			padding: 20upx;
-			padding-right: 50upx;
-			border-radius: 6upx;
-			margin-top: -140upx;
-			margin-left: 30upx;
-			background: #fff;
-			box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
-			position: relative;
-			z-index: 1;
-		}
-
-		.scoll-wrapper {
-			display: flex;
-			align-items: flex-start;
-		}
-
-		.floor-item {
-			width: 180upx;
-			margin-right: 20upx;
-			font-size: $font-sm + 2upx;
-			color: $font-color-dark;
-			line-height: 1.8;
-
-			image {
-				width: 180upx;
-				height: 180upx;
-				border-radius: 6upx;
-			}
-
-			.price {
-				color: $uni-color-primary;
-			}
-		}
-
-		.more {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-			flex-shrink: 0;
-			width: 180upx;
-			height: 180upx;
-			border-radius: 6upx;
-			background: #f3f3f3;
-			font-size: $font-base;
-			color: $font-color-light;
-
-			text:first-child {
-				margin-bottom: 4upx;
-			}
-		}
-	}
-
-	/* 单条商品 */
-	.goods-box-single {
-		display: flex;
-		padding: 20upx 0;
-
-		.goods-img {
-			display: block;
-			width: 120upx;
-			height: 120upx;
-		}
-
-		.right {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			padding: 0 30upx 0 24upx;
-			overflow: hidden;
-
-			.title {
-				font-size: $font-base + 2upx;
-				color: $font-color-dark;
-				line-height: 1;
-			}
-
-			.attr-box {
-				font-size: $font-sm + 2upx;
-				color: $font-color-light;
-				padding: 10upx 12upx;
-			}
-
-			.price {
-				font-size: $font-base + 2upx;
-				color: $font-color-dark;
-
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
-					margin: 0 2upx 0 8upx;
-				}
-			}
-		}
-	}
-
-	.price-box {
-		display: flex;
-		justify-content: flex-end;
-		align-items: baseline;
-		padding: 20upx 30upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-light;
-
-		.num {
-			margin: 0 8upx;
-			color: $font-color-dark;
-		}
-
-		.price {
-			font-size: $font-lg;
-			color: $font-color-dark;
-
-			&:before {
-				content: '￥';
-				font-size: $font-sm;
-				margin: 0 2upx 0 8upx;
-			}
-		}
-	}
-
-	.action-box {
-		display: flex;
-		justify-content: flex-end;
-		align-items: center;
-		height: 100upx;
-		position: relative;
-		padding-right: 30upx;
-	}
-
-	.action-btn {
-		width: 160upx;
-		height: 60upx;
-		margin: 0;
-		margin-left: 24upx;
-		padding: 0;
-		text-align: center;
-		line-height: 60upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-		background: #fff;
-		border-radius: 100px;
-
-		&:after {
-			border-radius: 100px;
-		}
-
-		&.recom {
-			background: #fff9f9;
-			color: $base-color;
-
-			&:after {
-				border-color: #f7bcc8;
-			}
-		}
-	}
-
 	/* 猜你喜欢 */
 	.guess-section {
 		display: flex;
@@ -1370,12 +1199,25 @@
 			line-height: 80upx;
 		}
 
+		.label {
+			margin-top: -10upx;
+			font-size: 30upx;
+			margin-left: -13upx;
+		}
+
 		.price {
-			font-size: $font-lg;
+			font-size: 18px;
 			color: $uni-color-primary;
 			line-height: 1;
 		}
 
+		.m-price {
+			font-size: $font-sm + 2upx;
+			text-decoration: line-through;
+			color: $font-color-light;
+			margin-left: 8upx;
+		}
+
 		.coupon_box {
 			width: 100%;
 			height: auto;
diff --git a/mallplusui-uniapp-app/pagesA/build/community.vue b/mallplusui-uniapp-app/pagesA/build/community.vue
index 9d3d019..a95515d 100644
--- a/mallplusui-uniapp-app/pagesA/build/community.vue
+++ b/mallplusui-uniapp-app/pagesA/build/community.vue
@@ -40,14 +40,15 @@
 					<image src="/static/temp/fasfausers.png"></image>
 					<text>社区团购</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('/pages/category/areaGoods')">
+				<!-- <view class="cate-item" @click="navToTabPage('/pages/category/areaGoods')"> -->
+				<view class="cate-item" @click="navToTabPage('/pages/index/lease')">
 					<image src="/static/temp/fasfa-truck.png"></image>
 					<text>社区特供</text>
 				</view>
 				<!-- <view class="cate-item" @click="navToTabPage('../../pagesA/product/paiMaiList')"> -->
-				<view class="cate-item" @click="navToTabPage('/pages/index/lease')">
+				<view class="cate-item" @click="navToTabPage('/pagesU/notice/subjectList')">
 					<image src="/static/temp/c8.png"></image>
-					<text>农机租赁</text>
+					<text>农机服务</text>
 				</view>
 			</view>
 
diff --git a/mallplusui-uniapp-app/pagesA/product/product.vue b/mallplusui-uniapp-app/pagesA/product/product.vue
index 34da6a0..de691be 100644
--- a/mallplusui-uniapp-app/pagesA/product/product.vue
+++ b/mallplusui-uniapp-app/pagesA/product/product.vue
@@ -11,12 +11,12 @@
 		<view class="introduce-section">
 			<text class="title">{{ goods.name }}</text>
 			<view class="price-box">
-				<text class="price-tip">¥</text>
-				<text class="price" v-if="goods.vipPrice && goods.vipPrice > 0">{{ (goods.price * goods.memberRate) / 10 }}</text>
-				<text class="price" v-else-if="!goods.vipPrice">{{ goods.price }}</text>
+				<!-- <text class="price-tip">惠农价</text> -->
+				<text class="price" v-if="goods.vipPrice && goods.vipPrice > 0">惠农价¥{{ (goods.price * goods.memberRate) / 10 }}</text>
+				<text class="price" v-else-if="!goods.vipPrice">惠农价¥{{ goods.price }}</text>
 				<text class="m-price" v-if="!goods.vipPrice">县区商超价{{ goods.originalPrice }}</text>
 				<text class="m-price" v-else-if="goods.vipPrice && goods.vipPrice > 0">¥{{ goods.price }}</text>
-				<text class="price" v-if="goods.isFenxiao == 1 && goods.fenxiaoPrice > 0">节省 ¥{{ goods.fenxiaoPrice }}</text>
+				<text class="price">优惠¥{{ goods.originalPrice- goods.price }}</text>
 				<text class="coupon-tip" v-if="goods.memberRate && goods.memberRate != 10">会员折扣{{ goods.memberRate }}折</text>
 			</view>
 			<view class="bot-row">
diff --git a/mallplusui-uniapp-app/pagesU/notice/subjectList.vue b/mallplusui-uniapp-app/pagesU/notice/subjectList.vue
index 328a500..f8c0a0a 100644
--- a/mallplusui-uniapp-app/pagesU/notice/subjectList.vue
+++ b/mallplusui-uniapp-app/pagesU/notice/subjectList.vue
@@ -1,31 +1,25 @@
 <template>
 	<view class="content">
-		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
-			<view class="nav-item" v-for="(item, index) in cateList" :key="index" :class="{ current: filterIndex === item.id }" @click="tabClick(item.id)">{{item.name}}</view>
-
-		</view>
 		<view class="goods-list">
 			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
-				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
-				<text class="title clamp">{{ item.title }}</text>
-				<view class="price-box">
-					<text>收藏量 {{ item.collectCount }}</text>
-					<text>浏览量 {{ item.readCount }}</text>
-				</view>
-			</view>
-		</view>
-		<uni-load-more :status="loadingType"></uni-load-more>
-
-		<view class="cate-mask" :class="cateMaskState === 0 ? 'none' : cateMaskState === 1 ? 'show' : ''" @click="toggleCateMask">
-			<view class="cate-content" @click.stop.prevent="stopPrevent" @touchmove.stop.prevent="stopPrevent">
-				<scroll-view scroll-y class="cate-list">
-					<view v-for="item in cateList" :key="item.id">
-						<view class="cate-item b-b two">{{ item.name }}</view>
-						<view v-for="tItem in item.child" :key="tItem.id" class="cate-item b-b" :class="{ active: tItem.id == cateId }" @click="changeCate(tItem)">
-							{{ tItem.name }}
+				<view class="listcard">
+					<view class="listcard-image">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
+					<view class="listcard-content">
+						<view class="listcard-content_title">
+							<text>{{item.title}}</text>
+							<text class="listcard-content_title_text">发布时间：{{item.createTime | formatCreateTime}}</text>
+						</view>
+						<view class="listcard-content_des">
+
+							<view class="listcard-content_des-label">
+								<view class="listcard-content_des-label-item">收藏{{item.collectCount}}</view>
+							</view>
+							<view class="listcard-content_des-browe">浏览{{item.readCount}}</view>
 						</view>
 					</view>
-				</scroll-view>
+				</view>
 			</view>
 		</view>
 
@@ -33,339 +27,239 @@
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-export default {
-	components: {
-    		mallplusCopyright,
-		uniLoadMore
-	},
-	data() {
-		return {
-			cateMaskState: 0, //分类面板展开状态
-			headerPosition: 'fixed',
-			headerTop: '0px',
-			categoryId: '',
-			loadingType: 'more', //加载更多状态
-			filterIndex: 0,
-			cateId: 0, //已选三级分类id
-			pageNum: 1,
-			cid: null,
-			priceOrder: 0, //1 价格从低到高 2价格从高到低
-			cateList: [],
-			goodsList: []
-		};
-	},
-
-	onLoad(options) {
-		// #ifdef H5
-		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
-		// #endif
-
-		this.cateId = options.sid;
-		this.loadCateList(options.fid, options.sid);
-		this.loadData();
-	},
-	onPageScroll(e) {
-		//兼容iOS端下拉时顶部漂移
-		if (e.scrollTop >= 0) {
-			this.headerPosition = 'fixed';
-		} else {
-			this.headerPosition = 'absolute';
-		}
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		this.pageNum = this.pageNum + 1;
-		this.loadData('refresh');
-	},
-	//加载更多
-	onReachBottom() {
-		this.pageNum = this.pageNum + 1;
-		this.loadData();
-	},
-	methods: {
-		//加载分类
-		async loadCateList() {
-			let params = {'showStatus':1};
-			let list = await Api.apiCall('get', Api.cms.subjectCategoryList, params);
-
-			this.cateList = list.records;
+	import Api from '@/common/api';
+	import {
+		formatDate
+	} from '@/common/date';
+	
+	export default {
+		data() {
+			return {
+				pageNum: 1,
+				goodsList: []
+			};
 		},
-		//加载商品 ，带下拉刷新和上滑加载
-		async loadData(type = 'add', loading) {
-			//没有更多直接返回
-			if (type === 'add') {
-				if (this.loadingType === 'nomore') {
-					return;
-				}
-				this.loadingType = 'loading';
-			} else {
-				this.loadingType = 'more';
-			}
-			let params;
 
-			if (this.categoryId) {
-				params = { pageNum: this.pageNum, categoryId: this.categoryId };
-			} else {
-				params = { pageNum: this.pageNum };
-			}
-
-			let list = await Api.apiCall('get', Api.cms.subjectList, params);
-			let goodsList = list.records;
-			// let goodsList = await this.$api.json('goodsList');
-			if (type === 'refresh') {
-				this.goodsList = [];
-			}
+		onLoad(options) {
+			// #ifdef H5
+			this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+			// #endif
 
-
-			this.goodsList = this.goodsList.concat(goodsList);
-
-			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
-			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
-			if (type === 'refresh') {
-				if (loading == 1) {
-					uni.hideLoading();
+			this.loadData();
+		},
+		onPageScroll(e) {
+			//兼容iOS端下拉时顶部漂移
+			// if (e.scrollTop >= 0) {
+			// 	this.headerPosition = 'fixed';
+			// } else {
+			// 	this.headerPosition = 'absolute';
+			// }
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			// this.pageNum = this.pageNum + 1;
+			this.loadData('refresh');
+		},
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
+			this.loadData();
+		},
+		filters: {
+			formatCreateTime(time) {
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+			},
+		},
+		methods: {
+			//加载商品 ，带下拉刷新和上滑加载
+			async loadData(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
 				} else {
-					uni.stopPullDownRefresh();
+					this.loadingType = 'more';
 				}
-			}
-		},
-		//筛选点击
-		tabClick(index) {
-		console.log('tab='+index);
-			this.pageNum = 1;
+				let params = {
+					pageNum: this.pageNum,
+					categoryId: 38
+				};
 
-			this.categoryId = index;
 
-			uni.pageScrollTo({
-				duration: 300,
-				scrollTop: 0
-			});
-			this.loadData('refresh', 1);
+				let list = await Api.apiCall('get', Api.cms.subjectList, params);
+				let goodsList = list.records;
+				// let goodsList = await this.$api.json('goodsList');
+				if (type === 'refresh') {
+					this.goodsList = [];
+				}
 
-		},
-		//显示分类面板
-		toggleCateMask(type) {
-			let timer = type === 'show' ? 10 : 300;
-			let state = type === 'show' ? 1 : 0;
-			this.cateMaskState = 2;
-			setTimeout(() => {
-				this.cateMaskState = state;
-			}, timer);
-		},
-		//分类点击
-		changeCate(item) {
-			this.pageNum = 1;
-			this.cateId = item.id;
-			this.toggleCateMask();
-			uni.pageScrollTo({
-				duration: 300,
-				scrollTop: 0
-			});
-			this.loadData('refresh', 1);
+				this.goodsList = this.goodsList.concat(goodsList);
 
-		},
-		//详情
-		navToDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
-			let groupId = item.groupId;
-			uni.navigateTo({
-				url: `../../pagesU/notice/subjectDetail?id=${id}`
-			});
-		},
-		stopPrevent() {}
-	}
-};
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+			},
+			//详情
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				let groupId = item.groupId;
+				uni.navigateTo({
+					url: `../../pagesU/notice/subjectDetail?id=${id}`
+				});
+			},
+			stopPrevent() {}
+		}
+	};
 </script>
 
 <style lang="scss">
-page,
-.content {
-	background: $page-color-base;
-}
-.content {
-	padding-top: 96upx;
-}
-
-.navbar {
-	position: fixed;
-	left: 0;
-	top: var(--window-top);
-	display: flex;
-	width: 100%;
-	height: 80upx;
-	background: #fff;
-	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
-	z-index: 10;
-	.nav-item {
-		flex: 1;
+	page,
+	.content {
+		background: $page-color-base;
+	}
+
+	.listcard {
 		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		font-size: 30upx;
-		color: $font-color-dark;
-		position: relative;
-		&.current {
-			color: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 120upx;
-				height: 0;
-				border-bottom: 4upx solid $base-color;
+		padding: 15px;
+		margin: 20px;
+		border-radius: 5px;
+		box-shadow: 0 0 5px 1px rgba($color:#000000, $alpha:0.1);
+		box-sizing: border-box;
+
+		.listcard-image {
+			flex-shrink: 0;
+			width: 80px;
+			height: 80px;
+			border-radius: 8px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
 			}
+
 		}
-	}
-	.p-box {
-		display: flex;
-		flex-direction: column;
-		.yticon {
+
+		.listcard-content {
 			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 30upx;
-			height: 14upx;
-			line-height: 1;
-			margin-left: 4upx;
-			font-size: 26upx;
-			color: #888;
-			&.active {
-				color: $base-color;
+			flex-direction: column;
+			padding-left: 10px;
+			width: 100%;
+			justify-content: space-between;
+
+			.listcard-content_title {
+				padding-right: 30px;
+				font-size: 14px;
+				color: #333;
+				font-weight: 400;
+				line-height: 1.2;
+				position: relative;
+
+				text {
+					font-size: 22px;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 1;
+					-webkit-box-orient: vertical;
+				}
+
+				.listcard-content_title_text {
+					margin-top: 5px;
+					font-size: 15px;
+					color: #999;
+				}
+
 			}
-		}
-		.xia {
-			transform: scaleY(-1);
-		}
-	}
-	.cate-item {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		width: 80upx;
-		position: relative;
-		font-size: 44upx;
-		&:after {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 50%;
-			transform: translateY(-50%);
-			border-left: 1px solid #ddd;
-			width: 0;
-			height: 36upx;
-		}
-	}
-}
-
-/* 分类 */
-.cate-mask {
-	position: fixed;
-	left: 0;
-	top: var(--window-top);
-	bottom: 0;
-	width: 100%;
-	background: rgba(0, 0, 0, 0);
-	z-index: 95;
-	transition: 0.3s;
-
-	.cate-content {
-		width: 630upx;
-		height: 100%;
-		background: #fff;
-		float: right;
-		transform: translateX(100%);
-		transition: 0.3s;
-	}
-	&.none {
-		display: none;
-	}
-	&.show {
-		background: rgba(0, 0, 0, 0.4);
 
-		.cate-content {
-			transform: translateX(0);
-		}
-	}
-}
-.cate-list {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-	.cate-item {
-		display: flex;
-		align-items: center;
-		height: 90upx;
-		padding-left: 30upx;
-		font-size: 28upx;
-		color: #555;
-		position: relative;
-	}
-	.two {
-		height: 64upx;
-		color: #303133;
-		font-size: 30upx;
-		background: #f8f8f8;
-	}
-	.active {
-		color: $base-color;
-	}
-}
-
-/* 商品列表 */
-.goods-list {
-	display: flex;
-	flex-wrap: wrap;
-	padding: 0 30upx;
-	background: #fff;
-	.goods-item {
-		display: flex;
-		flex-direction: column;
-		width: 48%;
-		padding-bottom: 40upx;
-		&:nth-child(2n + 1) {
-			margin-right: 4%;
+			.listcard-content_des {
+				display: flex;
+				justify-content: space-between;
+				font-size: 12px;
+
+				.listcard-content_des-label {
+					display: flex;
+
+					.listcard-content_des-label-item {
+						padding: 0 5px;
+						margin-right: 5px;
+						border-radius: 15px;
+						color: #f00;
+						border: 1px #f00 solid;
+					}
+				}
+
+				.listcard-content_des-browe {
+					color: #999;
+					font-size: 15px;
+					line-height: 1.5;
+				}
+			}
 		}
-	}
-	.image-wrapper {
-		width: 100%;
-		height: 330upx;
-		border-radius: 3px;
-		overflow: hidden;
-		image {
-			width: 100%;
-			height: 100%;
-			opacity: 1;
+
+		&.mode-column {
+			.list-content {
+				width: 100%;
+				padding-left: 0;
+			}
+
+			.listcard-image {
+				display: flex;
+				margin-top: 10px;
+				width: 100%;
+				height: 80px;
+
+				.listcard-image_item {
+					margin-left: 10px;
+					width: 100%;
+					border-radius: 5px;
+					overflow: hidden;
+
+					&:first-child {
+						margin-left: 0;
+					}
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+
+				}
+			}
+
+			.listcard-content_des {
+				margin-top: 10px;
+			}
 		}
-	}
-	.title {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		line-height: 80upx;
-	}
-	.price-box {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding-right: 10upx;
-		font-size: 24upx;
-		color: $font-color-light;
-	}
-	.price {
-		font-size: $font-lg;
-		color: $uni-color-primary;
-		line-height: 1;
-		&:before {
-			content: '￥';
-			font-size: 26upx;
+
+		&.mode-image {
+			flex-direction: column;
+
+			.listcard-image {
+				width: 100%;
+				height: 100px;
+			}
+
+			.listcard-content {
+				padding-left: 0;
+				margin-top: 10px;
+
+				.listcard-content_des {
+					display: flex;
+					align-items: center;
+					margin-top: 10px;
+				}
+			}
 		}
 	}
-}
 </style>
diff --git a/mallplusui-uniapp-app/static/ic_launcher.png b/mallplusui-uniapp-app/static/ic_launcher.png
deleted file mode 100644
index aa7d642..0000000
Binary files a/mallplusui-uniapp-app/static/ic_launcher.png and /dev/null differ
diff --git a/mallplusui-uniapp-app/static/logo.png b/mallplusui-uniapp-app/static/logo.png
index 8da6a9d..027dde9 100644
Binary files a/mallplusui-uniapp-app/static/logo.png and b/mallplusui-uniapp-app/static/logo.png differ
diff --git a/mallplusui-uniapp-app2/manifest.json b/mallplusui-uniapp-app2/manifest.json
index 7a98152..bdf7f14 100644
--- a/mallplusui-uniapp-app2/manifest.json
+++ b/mallplusui-uniapp-app2/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "汇融云链2",
+    "name" : "汇融云链",
     "appid" : "__UNI__557CCCF",
     "description" : "",
     "versionName" : "4.0.0.0",
diff --git a/mallplusui-uniapp-app2/pages.json b/mallplusui-uniapp-app2/pages.json
index 4be3ec2..ec6a1f5 100644
--- a/mallplusui-uniapp-app2/pages.json
+++ b/mallplusui-uniapp-app2/pages.json
@@ -757,12 +757,13 @@
 				}, {
 					"path": "notice/subjectList",
 					"style": {
-						"navigationBarTitleText": "秒杀列表",
-						"app-plus": {
-							"titleNView": {
-								"type": "transparent"
-							}
-						}
+						"navigationBarTitleText": "农机租赁",
+						"enablePullDownRefresh": true
+						// "app-plus": {
+						// 	"titleNView": {
+						// 		"type": "transparent"
+						// 	}
+						// }
 					}
 				}, {
 					"path": "notice/subjectDetail",
diff --git a/mallplusui-uniapp-app2/pages/index/index.vue b/mallplusui-uniapp-app2/pages/index/index.vue
index 7faee05..337d922 100644
--- a/mallplusui-uniapp-app2/pages/index/index.vue
+++ b/mallplusui-uniapp-app2/pages/index/index.vue
@@ -33,28 +33,28 @@
 			</view>
 			<!-- 分类 -->
 			<view class="cate-section">
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupActivityList')">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
 					<image src="/static/temp//antFill-gift.png"></image>
 					<text>惠农套餐</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isVip=1')">
 					<image src="/static/temp/fasfausers.png"></image>
 					<text>拼团特价</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/giftList')">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
 					<image src="/static/temp/fabfa-dropbox.png"></image>
-					<text>税分兑换</text>
-				</view>
-				<view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
-					<image src="/static/temp/fasfa-history.png"></image>
 					<text>限时抢购</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/build/communityList')">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/tag')">
+					<image src="/static/temp/fasfa-shopping.png"></image>
+					<text>甄选优品</text>
+				</view>
+			<!-- 	<view class="cate-item" @click="navToTabPage('../../pagesA/build/communityList')">
 					<image src="/static/temp/antFill-home.png"></image>
 					<text>农村社区</text>
-				</view>
+				</view> -->
 			</view>
-			<view class="cate-section">
+			<!-- <view class="cate-section">
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
 					<image src="/static/temp/fasfa-sitemap.png"></image>
 					<text>分销商品</text>
@@ -75,7 +75,7 @@
 					<image src="/static/temp/fasfa-street.png"></image>
 					<text>卖家中心</text>
 				</view>
-			</view>
+			</view> -->
 
 			<!-- 秒杀楼层 https://s.click.taobao.com/Wds7c1w -->
 			<view class="seckill-section m-t"