diff --git a/common/api.js b/common/api.js
index bdf224c..ea1b729 100644
--- a/common/api.js
+++ b/common/api.js
@@ -57,4 +57,17 @@ export const queryOrderList = (params) => http.get('/carrent-admin/api/order/que
 // 商品信息-车辆信息发布
 export const addGoods = (params) => http.post('/carrent-admin/api/goods/addGoods', params)
 
+// 轮播图信息-获取轮播图列表
+export const queryBannerList = (params) => http.get('/carrent-admin/api/banner/queryBannerList', {params:params})
+
+// 配置信息-获取商品一级分类列表
+export const queryCategoryOneList = (params) => http.get('/carrent-admin/api/config/queryCategoryOneList', {params:params})
+
+// 配置信息-获取商品二级分类列表
+export const queryCategoryTwoList = (params) => http.get('/carrent-admin/api/config/queryCategoryTwoList', {params:params})
+
+// 我的推荐-获取个人邀请码
+export const getInviteCode = (params) => http.get('/carrent-admin/api/recommend/getInviteCode', {params:params})
+// 我的推荐-获取推荐用户信息
+export const getInviteUser = (params) => http.get('/carrent-admin/api/recommend/getInviteUser', {params:params})
 
diff --git a/common/config.js b/common/config.js
index 79445c9..6484b90 100644
--- a/common/config.js
+++ b/common/config.js
@@ -2,4 +2,5 @@ module.exports = {
     // baseUrl: 'https://employadmin.augcl.com/employ-api',
 	// baseUrl: 'http://augcl.natapp1.cc/employ-api'
 	baseUrl:"https://carrentadmin.augcl.com"
+	// baseUrl:"http://augcl.natapp1.cc"
 }
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 457ec45..d00034e 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -25,7 +25,7 @@
 		</view>
 		<view class="se-pb-20 se-pt-40 se-zi-s">
 			<view class="se-px-20">
-				<u-swiper height="300rpx" style="background-color: transparent;height: 300rpx;" :list="swiperList" @click="swiperClick"></u-swiper>
+				<u-swiper height="300rpx" style="background-color: transparent;height: 300rpx;" keyName="image" :list="swiperList" @click="swiperClick"></u-swiper>
 			</view>
 			<!-- <view class="se-pt-10 se-bgc-white se-px-0 se-py-10 se-ta-l se-c-orange se-flex se-flex-ai-c se-fs-26">
 				<image class="se-a-80" src="@/static/image/aed60x.png" mode=""></image>
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-	import { getInfo,queryGoodsList } from "@/common/api.js"
+	import { getInfo,queryGoodsList,queryBannerList } from "@/common/api.js"
 	import QQMapWX from "@/util/qqmap-wx-jssdk.min.js"
 	export default{
 		components:{
@@ -122,6 +122,7 @@
 		onLoad(options) {
 			this.onPageList()
 			this.getLocation()
+			this.onQueryBannerList()
 		},
 		onPullDownRefresh() {
 			let that = this
@@ -177,6 +178,16 @@
 					}
 				})
 			},
+			onQueryBannerList(){
+				let that = this
+				let params={}
+				queryBannerList(params).then(response=>{
+					console.info("queryBannerList",response)
+					that.swiperList = response.result.records
+				}).catch(error=>{
+					
+				})
+			},
 			onPageList(){
 				let that = this
 				let params={
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 94e0307..a4ab780 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -2,10 +2,10 @@
 	<view class="u-page">
 		<view class="se-pt-50 se-pb-40 se-px-40 se-bgc-green se-c-white se-pos">
 			<view class="se-flex">
-				<image src="@/static/image/header.png" class="se-br-p-50 se-w-100 se-h-100" mode=""></image>
+				<image :src="user.cerImage" class="se-br-p-50 se-w-100 se-h-100 se-bgc-f5" mode=""></image>
 				<view class="se-ml-20 se-flex se-flex-v-sa se-flex-ai-fs">
 					<view class="se-flex">
-						<text class="se-fw-6 se-fs-30">热心小肖</text>
+						<text class="se-fw-6 se-fs-30">{{user.name}}</text>
 						<!-- <view class="se-flex se-flex-ai-c se-ml-20">
 							<image class="se-a-25 se-mr-10" src="@/static/image/pencil.png" mode=""></image>
 							<text class="se-fs-22">修改资料</text>
@@ -13,7 +13,7 @@
 					</view>
 					<view class="se-fs-24 se-display-ib">
 						<text>手机号:</text>
-						<text class="se-ml-20">13189698114</text>
+						<text class="se-ml-20">{{user.phone}}</text>
 					</view>
 				</view>
 			</view>
@@ -112,7 +112,7 @@
 				let that = this
 				getInfo({id:uni.getStorageSync('userInfo').id}).then(response=>{
 					console.info('resultresult',response)
-					that.user = response.data
+					that.user = response.result
 				}).catch(err=>{
 					
 				})
diff --git a/pages_subpack/category/index.vue b/pages_subpack/category/index.vue
index 7d2f5ef..6d5f1eb 100644
--- a/pages_subpack/category/index.vue
+++ b/pages_subpack/category/index.vue
@@ -2,15 +2,17 @@
 	<view>
 		<view class="se-pos-fixed se-pos-lt se-w-p-100">
 			<view class="se-p-20" style="background: linear-gradient(168deg,#669a32 0%, #669a32 100%);">
-				<u-search @click="onSearch()" :showAction="false" bgColor="#fff" placeholder="搜索" v-model="keyword"></u-search>
+				<u-search @click="onSearch()" @search="onSearch()" :showAction="false" bgColor="#fff" placeholder="搜索" v-model="goodsName"></u-search>
 			</view>
 			<view class="se-flex se-bgc-white se-fs-26 se-h-80 se-b-b">
-				<view class="se-flex-1 se-flex se-flex-h-c">
-					<text class="se-mr-10">分类</text>
+				<view class="se-flex-1 se-flex se-flex-h-c" @click="handleCategoryTwoChange()">
+					<text class="se-mr-10" v-if="categorytwoName">{{categorytwoName}}</text>
+					<text class="se-mr-10" v-else>分类</text>
 					<u-icon name="arrow-down-fill" color="#666666"></u-icon>
 				</view>
-				<view class="se-flex-1 se-b-l se-b-r  se-flex se-flex-h-c">
-					<text class="se-mr-10">时间</text>
+				<view class="se-flex-1 se-b-l se-b-r  se-flex se-flex-h-c" @click="showDate=true">
+					<text class="se-mr-10" v-if="goodsTime">{{goodsTime}}</text>
+					<text class="se-mr-10" v-else>时间</text>
 					<u-icon name="arrow-down-fill" color="#666666"></u-icon>
 				</view>
 				<view class="se-flex-1  se-flex se-flex-h-c">
@@ -21,26 +23,22 @@
 		</view>
 		
 		<view class="se-grid-2 se-pt-200">
-			<view class="items-box se-br-5 se-px-10" v-for="(items,indexs) in 10" :key="indexs" @click="onDetail(items)">
-				<image class="se-w-p-100 se-h-200  se-py-5" src="https://cdn.uviewui.com/uview/swiper/swiper1.png" mode=""></image>
+			<view class="items-box se-br-5 se-px-10" v-for="(items,indexs) in list" :key="indexs" @click="onDetail(items)">
+				<image class="se-w-p-100 se-h-200  se-py-5" :src="items.image" mode=""></image>
 				<view class="se-c-black se-fs-24 se-fw-6 se-mt-10">
-					HOUS环卫车
+					{{ items.goodsName }}
 				</view>
 				<view class="se-flex se-mt-10">
 					<view class="se-tag">
-						品牌名
+						{{items.cartypeId_dictText}}
 					</view>
 					<view class="se-tag">
-						品牌名
-					</view>
-					<view class="se-tag">
-						品牌名
+						{{items.categorytwoId_dictText}}
 					</view>
 				</view>
-				<view class="se-flex se-flex-h-sb se-w-p-100 se-pt-20" style="align-items: flex-end;">
-					<view class="se-fs-24  se-flex se-flex-v-c" style="align-items: flex-start;">
-						<text class="se-c-orange se-fs-30 se-fw-6 se-pb-10"><text class="se-fs-24">￥</text>6000<text class="se-fs-24">元</text></text>
-						<text class="se-c-66">浏览量999+</text>
+				<view class="se-flex se-flex-h-sb se-w-p-100 se-pt-20">
+					<view class="se-fs-24 se-display-ib">
+						<text class="se-c-orange se-fs-30 se-fw-6"><text class="se-fs-24">￥</text>{{items.price}}<text class="se-fs-24">元</text></text>
 					</view>
 					<view class="se-display-ib se-bgc-orange se-px-15 se-br-40 se-flex-h-c se-h-40 se-lh-40 se-ta-c se-fs-22 se-c-white se-b">
 						<text>查看详情</text>
@@ -48,22 +46,133 @@
 				</view>
 			</view>
 		</view>
+		<u-empty v-if="list && list.length==0" mode="list"></u-empty>
+		<u-action-sheet :actions="categoryTwoList" @select="selectCategoryTwoClick" title="分类" :show="categoryTwoShow" @close="categoryTwoClose"></u-action-sheet>
+		<u-datetime-picker
+				:show="showDate"
+				v-model="date"
+				mode="date"
+				@confirm="onConfirm"
+				@cancel="onCancel"
+		></u-datetime-picker>
 	</view>
 </template>
 
 <script>
+	import { queryGoodsList,queryCategoryTwoList } from "@/common/api.js"
 	export default{
 		data(){
 			return{
-				keyword:"",
+				showDate:false,
+				goodsName:null,
+				id:null,
+				goodsTime:null,
+				date:Number(new Date()),
+				categoryTwoShow:false,
+				categorytwoId:null,
+				categorytwoName:null,
+				categoryTwoList:[],
+				pageNo:1,
+				list:[],
 			}
 		},
+		onLoad(options) {
+			if(options.id){
+				this.id = options.id
+			}
+			this.onPageList()
+			this.onQueryCategoryTwoList()
+		},
+		onPullDownRefresh() {
+			let that = this
+			that.pageNo =  1
+			that.list = []
+			that.onPageList()
+		},
+		onReachBottom() {
+			let that = this
+			that.pageNo = that.pageNo + 1
+			that.onPageList()
+		},
 		methods:{
+			onCancel(){
+				this.goodsTime=""
+				this.showDate = false
+				this.onPageList()
+			},
+			onConfirm(e){
+				console.info('e',e)
+				const date = new Date(e.value);
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const day = String(date.getDate()).padStart(2, '0');
+				this.goodsTime = `${year}-${month}-${day}`;
+				this.showDate = false
+				this.pageNo =  1
+				this.onPageList()
+			},
+			handleCategoryTwoChange(){
+				console.info('handleCategoryTwoChange')
+				this.categoryTwoShow = true
+			},
+			categoryTwoClose(){
+				this.categorytwoId = null
+				this.categorytwoName = null
+				this.categoryTwoShow = false
+				this.pageNo =  1
+				this.onPageList()
+			},
+			selectCategoryTwoClick(event){
+				console.info("selectCategoryTwoClick",event)
+				this.categorytwoId = event.id
+				this.categorytwoName = event.name
+				this.categoryTwoShow = false
+				this.pageNo =  1
+				this.onPageList()
+			},
+			onQueryCategoryTwoList(){
+				let that = this
+				let params = {
+					categoryoneId:"1867039853005877250"
+				}
+				queryCategoryTwoList(params).then(response=>{
+					console.info("queryCategoryTwoList",response)
+					that.categoryTwoList = response.result.records
+				}).catch(error=>{
+					
+				})
+			},
+			onSearch(){
+				this.pageNo =  1
+				this.onPageList()
+			},
+			onPageList(){
+				let that = this
+				let params={
+					cartypeId:that.id,
+					categorytwoId:that.categorytwoId,
+					goodsTime:that.goodsTime,
+					goodsName:that.goodsName,
+					pageNo:that.pageNo,
+					pageSize:that.pageSize
+				}
+				queryGoodsList(params).then((response) => {
+					console.info('queryGoodsList',response)
+					if(that.pageNo==1){
+						that.list = response.result.records
+					}else{
+						that.list = that.list.concat(response.result.records) 
+					}
+					
+				}).catch((error) =>{
+					
+				})
+			},
 			onDetail(event){
 				uni.navigateTo({
-					url:"/pages_subpack/detail/index"
+					url:"/pages_subpack/detail/index?goodsId="+event.id
 				})
-			}
+			},
 		}
 	}
 </script>
diff --git a/pages_subpack/invite/index.vue b/pages_subpack/invite/index.vue
index e4ccb65..59b2357 100644
--- a/pages_subpack/invite/index.vue
+++ b/pages_subpack/invite/index.vue
@@ -15,6 +15,7 @@
 </template>
 
 <script>
+	import { getInviteCode } from "@/common/api.js"
 	export default {
 		data() {
 			return {
@@ -23,8 +24,20 @@
 		},
 		watch: {
 			
+		},
+		onLoad(options) {
+			this.onInviteCode()
 		},
 		methods: {
+			onInviteCode(){
+				let that = this
+				let params={}
+				getInviteCode(params).then(response=>{
+					console.info("getInviteCode",response)
+				}).catch(error=>{
+					
+				})
+			},
 			onSubmit(){
 				console.info("保存成功")
 			}
diff --git a/pages_subpack/news/index.vue b/pages_subpack/news/index.vue
index 25ea0b3..2001cf4 100644
--- a/pages_subpack/news/index.vue
+++ b/pages_subpack/news/index.vue
@@ -1,14 +1,15 @@
 <template>
 	<view >
 		<view class="se-flex se-bgc-white se-m-20 se-p-20 se-br-20" v-for="(items,indexs) in list" :key="indexs" @click="onDetail(items)">
-			<image class="se-w-240 se-h-180 se-br-20" src="https://cdn.uviewui.com/uview/swiper/swiper1.png" mode=""></image>
+			<image class="se-w-240 se-h-180 se-br-20" :src="items.image" mode=""></image>
 			<view class="se-flex se-flex-v se-flex-1 se-px-20">
 				<view class="se-c-black se-fw-6 se-fs-28 se-toe-1 se-pt-5">
 					{{items.title}}
 				</view>
 				<view class="se-c-33 se-fs-24 se-lh-40 se-toe-3 se-pt-10">
+					{{items.description}}
 					<!-- <u-parse :content="items.content"></u-parse> -->
-					我国将加快改善农村生活条件我国将加快改善农村生活条件我国将加快改善农村生活条件我国将加快改善农村生活条件我国将加快改善农村生活条件我国将加快改善农村生活条件
+					<!-- 我国将加快改善农村生活条件我国将加快改善农村生活条件我国将加快改善农村生活条件我国将加快改善农村生活条件我国将加快改善农村生活条件我国将加快改善农村生活条件 -->
 				</view>
 			</view>
 		</view>
diff --git a/pages_subpack/recommend/index.vue b/pages_subpack/recommend/index.vue
index 82ccf4a..8bb6549 100644
--- a/pages_subpack/recommend/index.vue
+++ b/pages_subpack/recommend/index.vue
@@ -23,6 +23,7 @@
 </template>
 
 <script>
+	import { getInviteUser } from "@/common/api.js"
 	export default {
 		data(){
 			return{
@@ -37,8 +38,20 @@
 		},
 		watch: {
 			
+		},
+		onLoad(options) {
+			this.onInviteUser()
 		},
 		methods:{
+			onInviteUser(){
+				let that = this
+				let params ={}
+				getInviteUser(params).then(response=>{
+					console.info("getInviteUser",response)
+				}).catch(error=>{
+					
+				})
+			},
 			onClick(index){
 				console.info(index)
 			}
diff --git a/pages_subpack/release/index.vue b/pages_subpack/release/index.vue
index b97a0b8..2e6ed85 100644
--- a/pages_subpack/release/index.vue
+++ b/pages_subpack/release/index.vue
@@ -6,11 +6,20 @@
 					请选择您要发布的车辆类型：
 				</view>
 				<view class="se-flex se-flex-ai-c se-flex-ff-rw">
-					<view class="se-py-10 se-px-30 se-fs-22 se-br-10 se-mr-15 se-mt-10" :class="item.id==form.cartypeId ? 'se-bgc-green se-c-white se-b-green' : 'se-b se-c-text'" @click="handleCartype(item)" v-for="(item,index) in actions" :key="index">
+					<view class="se-py-10 se-px-30 se-fs-22 se-br-10 se-mr-15 se-mt-10" :class="item.id==form.typeId ? 'se-bgc-green se-c-white se-b-green' : 'se-b se-c-text'" @click="handleCartype(item)" v-for="(item,index) in actions" :key="index">
 						{{item.name}}
 					</view>
 				</view>
 			</u-form-item>
+
+			<!-- <u-form-item label="一级分类" prop="cartypeId"  @click="handleCategoryOneChange()">
+				<u--input readonly v-model="form.cartypeName" placeholder="请选择一级分类" border="bottom"></u--input>
+				<u-icon slot="right" name="arrow-right"></u-icon>
+			</u-form-item> -->
+			<u-form-item label="二级分类" prop="categorytwoId"  @click="handleCategoryTwoChange()">
+				<u--input readonly v-model="form.categorytwoName" placeholder="请选择二级分类" border="bottom"></u--input>
+				<u-icon slot="right" name="arrow-right"></u-icon>
+			</u-form-item>
 			<u-form-item label="标题" prop="goodsName">
 				<view class="se-flex se-flex-h-c">
 					<u--input v-model="form.goodsName" type="text" class="se-w-200" placeholder="请填写标题"></u--input>
@@ -138,11 +147,13 @@
 				@confirm="onConfirm"
 				@cancel="onCancel"
 		></u-datetime-picker>
+		<u-action-sheet :actions="categoryOneList" @select="selectCategoryOneClick" title="分类" :show="categoryOneShow"  @close="categoryOneShow=false"></u-action-sheet>
+		<u-action-sheet :actions="categoryTwoList" @select="selectCategoryTwoClick" title="分类" :show="categoryTwoShow" @close="categoryTwoShow=false"></u-action-sheet>
 	</view>
 </template>
 
 <script>
-	import { queryTypeList,addGoods } from "@/common/api.js"
+	import { queryTypeList,addGoods,queryCategoryOneList,queryCategoryTwoList } from "@/common/api.js"
 	import QQMapWX from "@/util/qqmap-wx-jssdk.min.js"
 	export default {
 		components:{
@@ -154,9 +165,16 @@
 				showType:false,
 				showDate:false,
 				date:Number(new Date()),
-				
+				categoryOneShow:false,
+				categoryOneList:[],
+				categoryTwoShow:false,
+				categoryTwoList:[],
 				form: {
-					cartypeId:"",
+					typeId:"",//类型
+					cartypeId:"",//一级分类
+					cartypeName:"",//一级分类名称
+					categorytwoId:"",//二级分类
+					categorytwoName:"",//二级分类名称
 					goodsName:"驾驶式扫地机",//标题
 					brand:"大众",//品牌
 					model:"朗逸",//型号
@@ -224,6 +242,14 @@
 价格区间：可选项，适用于市场推广。`,//车辆介绍
 				},
 				rules: {
+					typeId:[
+						{
+							type: 'string',
+							required: true,
+							message: '请选择类型',
+							trigger: ['blur', 'change']
+						}
+					],
 					goodsName:[
 						{
 							type: 'string',
@@ -390,16 +416,60 @@
 		},
 		onLoad(options) {
 			this.onQueryTypeList()
+			this.onQueryCategoryOneList()
+			this.onQueryCategoryTwoList()
 		},
 		watch: {
 			
 		},
 		methods: {
+			handleCategoryOneChange(){
+				console.info('handleCategoryOneChange')
+				this.categoryOneShow = true
+			},
+			selectCategoryOneClick(event){
+				console.info(event)
+				this.form.cartypeId = event.id
+				this.form.cartypeName = event.name
+				this.categoryOneShow = false
+			},
+			onQueryCategoryOneList(){
+				let that = this
+				let params = {}
+				queryCategoryOneList(params).then(response=>{
+					console.info("queryCategoryOneList",response)
+					that.categoryOneList = response.result.records
+				}).catch(error=>{
+					
+				})
+			},
+			handleCategoryTwoChange(){
+				console.info('handleCategoryTwoChange')
+				this.categoryTwoShow = true
+			},
+			selectCategoryTwoClick(event){
+				console.info("selectCategoryTwoClick",event)
+				this.form.categorytwoId = event.id
+				this.form.categorytwoName = event.name
+				this.categoryTwoShow = false
+			},
+			onQueryCategoryTwoList(){
+				let that = this
+				let params = {
+					categoryoneId:"1867039853005877250"
+				}
+				queryCategoryTwoList(params).then(response=>{
+					console.info("queryCategoryTwoList",response)
+					that.categoryTwoList = response.result.records
+				}).catch(error=>{
+					
+				})
+			},
 			onQueryTypeList(){
 				queryTypeList({}).then(response=>{
 					console.info("queryTypeList",response)
 					this.actions = response.result.records
-					this.form.cartypeId = response.result.records[0].id
+					this.form.typeId = response.result.records[0].id
 				}).catch(error=>{
 					
 				})
@@ -449,7 +519,7 @@
 				// this.$refs.citySelectRef.open()
 			},
 			handleCartype(event){
-				this.form.cartypeId = event.id
+				this.form.typeId = event.id
 			},
 			// 照片
 			delCarFront(event) {
@@ -552,8 +622,10 @@
 			onAddGoods(){
 				let that = this
 				let params={
-					cartypeId:that.form.cartypeId,
+					// cartypeId:that.form.cartypeId,
 					// categorytwoId:"1867040891523936258",
+					cartypeId:that.form.typeId,
+					categorytwoId:that.form.categorytwoId,
 					goodsName:that.form.goodsName,//商品名称
 					brand:that.form.brand,//品牌
 					model:that.form.model,//型号