diff --git a/App.vue b/App.vue
index 7810340..0e40d43 100644
--- a/App.vue
+++ b/App.vue
@@ -248,7 +248,7 @@ export default {
 		setMenuHeight() {
 		  uni.getSystemInfo({
 		    success: res => {
-					// console.log(res,'resaaaaa')
+					console.log(res,'resaaaaa')
 		      this.globalData.navTopHeight = res.statusBarHeight;
 		      this.globalData.CustomBar = res.statusBarHeight + 45;
 		      this.globalData.systemInfo = res;
@@ -259,11 +259,10 @@ export default {
 		    }
 		  });
 		  let menuButtonObj = uni.getMenuButtonBoundingClientRect();
-			// console.log(menuButtonObj,'menuButtonObj')
+			console.log(menuButtonObj,'menuButtonObj')
 		 this.globalData.menuTop = menuButtonObj.top;
 		 this.globalData.menuHeight = menuButtonObj.height;
 		 this.globalData.topHeight = menuButtonObj.top + menuButtonObj.height;
-		 this.globalData.topLeft = menuButtonObj.left;
 		 this.globalData.navHeight = menuButtonObj.top;
 		},
 		
diff --git a/components/CustomNavigator.vue b/components/CustomNavigator.vue
index ef60374..16d69b4 100644
--- a/components/CustomNavigator.vue
+++ b/components/CustomNavigator.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="pageTitle-box" :class="isFixed ? 'showPageTitle' : ''"
-		:style="{'padding-top':navTopHeight + 'px',height:navHeight*2+ 'px'}">
+		:style="{'padding-top':menuTop + 'px',height: menuHeight+ 'px'}">
 		<view class="top-logo acea-row row-center"
-			:style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">
+			:style="'height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">
 			{{title}}
 		</view>
 	</view>
@@ -24,9 +24,7 @@
 		data() {
 			return {
 				menuHeight: app.globalData.menuHeight,
-				navHeight: app.globalData.navHeight,
 				menuTop: app.globalData.menuTop,
-				navTopHeight: app.globalData.navTopHeight,
 			};
 		},
 		methods:{
@@ -53,6 +51,7 @@
 	font-weight: normal;
 	.top-logo {
 		color: #000;
+		background-color: #fff;
 	}
 }
 .page-top-box {
diff --git a/config/index.js b/config/index.js
index 947f5ca..6a93295 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,7 +1,7 @@
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'
 // export const VUE_APP_API_URL = 'http://192.168.0.112:8092/api'
-   // export const VUE_APP_API_URL = 'http://10.11.32.103:8092/api'
+   // export const VUE_APP_API_URL = 'http://192.168.68.126:8092/api'
 export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api'
  // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'
diff --git a/pages.json b/pages.json
index aaf063c..7e9dd64 100644
--- a/pages.json
+++ b/pages.json
@@ -297,12 +297,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/release/index2",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/release/personAuth/index",
 			"style": {
diff --git a/pages/demandHall/business/index.vue b/pages/demandHall/business/index.vue
index 59a340c..bfd2f4a 100644
--- a/pages/demandHall/business/index.vue
+++ b/pages/demandHall/business/index.vue
@@ -9,11 +9,11 @@
 		<!-- 供需大厅 企业服务 项目投融 -->
 		<view class="acea-row row-around pa40">
 			<view class="img1">
-				<image src="../../../static/images/business-img1.png" @tap="toSupplyHall"></image>
+				<image src="https://download.cyjyyjy.com/business-img1.png" @tap="toSupplyHall"></image>
 			</view>
 			<view class="img2 acea-row row-column-between">
-				<image src="../../../static/images/business-img2.png" @tap="toEnterpriseServer"></image>
-				<image src="../../../static/images/business-img3.png" @tap="toDemoInvestment"></image>
+				<image src="https://download.cyjyyjy.com/business-img2.png" @tap="toEnterpriseServer"></image>
+				<image src="https://download.cyjyyjy.com/business-img3.png" @tap="toDemoInvestment"></image>
 			</view>
 		</view>
 
@@ -30,7 +30,7 @@
 				<view class="news-con acea-row row-middle">
 					<image src="../../../static/images/rem-icon.png"></image>
 					<view class="notice-swiper">
-						<NewsSwiper :list="isRecommend" :interval="4000" @toArticleDetail="toArticleDetail">
+						<NewsSwiper :list="isRecommend" :interval="6000" @toArticleDetail="toArticleDetail">
 						</NewsSwiper>
 					</view>
 				</view>
@@ -46,17 +46,17 @@
 				</view>
 			</view>
 			<scroll-view class="scroll-view_H acea-row" scroll-x="true">
-				<view class="company-list" v-for="(item,index) in enterpriseList" :key="index">
+				<view class="company-list" v-for="(item,index) in enterpriseList" :key="index" @click="toCompanyDetail(item.id)">
 					<view class="title line1">{{item.enterpriseName}}</view>
 					<view class="category-box acea-row">
 						<view class="tag" :class="index%2 == 0 ? 'tag-item-b' : 'tag-item-y' ">{{item.cname}}</view>
 						<!-- <view class="tag-item-y tag">财务规范</view>
 						<view class="tag-item-p tag">零负债</view> -->
 					</view>
-					<view class="title-s line1">{{item.enterpriseTitle}}</view>
+					<view class="title-s line1">{{item.resourceIntroduction}}</view>
 					<view class="acea-row">
 						<image :src="item.enterpriseLogo" class="company-logo" mode="aspectFill"></image>
-						<view class="todetails" @click="toCompanyDetail(item.id)">了解详情</view>
+						<view class="todetails">了解详情</view>
 					</view>
 
 				</view>
@@ -93,7 +93,7 @@
 						<!-- <view class="tips-item">房屋装修</view> -->
 					</view>
 				</view>
-				<view class="tolearn acea-row row-center-wrapper">查看更多</view>
+				<view class="tolearn acea-row row-center-wrapper" @click="toEnterpriseServer">查看更多</view>
 			</view>
 		</view>
 
@@ -168,7 +168,7 @@
 				})
 			},
 			toResourcesDetail(id){
-				return
+				console.log(id,'idid')
 				if(id){
 					this.$yrouter.push({
 						 path: '/pages/demandHall/resourcesDetail/index',
diff --git a/pages/demandHall/enterpriseServer/index.vue b/pages/demandHall/enterpriseServer/index.vue
index 6209c4d..1d8fbd1 100644
--- a/pages/demandHall/enterpriseServer/index.vue
+++ b/pages/demandHall/enterpriseServer/index.vue
@@ -26,7 +26,7 @@
 						{{item.enterpriseType == 1 ? '企业' : '个人'}}
 					</view>
 					<view class="enterprise-con acea-row">
-						<image :src="item.resourceImgs[0]" class="enterprise-img"></image>
+						<image :src="item.resourceImgs[0]" class="enterprise-img" mode="aspectFill"></image>
 						<view class="content-right acea-row row-column-between">
 							<view class="line2">{{item.title}}</view>
 							<view class="category-box acea-row">
@@ -37,7 +37,7 @@
 					</view>
 					<view class="user-info acea-row row-middle">
 						<image :src="item.enterpriseDto.enterpriseLogo" mode="" class="head-logo"></image>
-						<view class="user-name">{{item.enterpriseName}}</view>
+						<view class="user-name lin1">{{item.enterpriseName}}</view>
 					</view>
 					<view class="todetails" >查看详情</view>
 				</view>
@@ -451,6 +451,7 @@
 
 	.enterprise-list {
 		width: 670rpx;
+		padding: 0 20rpx 20rpx;
 		background: #FFFFFF;
 		margin: 0 auto;
 		margin-top: 32rpx;
@@ -466,8 +467,12 @@
 	.head-logo {
 		width: 72rpx;
 		height: 72rpx;
+		margin-right: 12rpx;
+	}
+	
+	.user-name{
+		width: calc(100% - 84rpx);
 	}
-
 	.enterprise-con {
 		width: 100%;
 		height: 192rpx;
@@ -481,7 +486,7 @@
 	}
 
 	.content-right {
-		width: 456rpx;
+		width: calc(100% - 180rpx);
 	}
 
 	.content-right>.supply-screen {
@@ -500,7 +505,7 @@
 		margin-top: 32rpx;
 		border-radius: 12rpx;
 		position: relative;
-		padding-bottom: 12rpx;
+		padding: 0 20rpx 20rpx;
 	}
 
 	.business-lable {
@@ -518,14 +523,13 @@
 	}
 	.business-con {
 		width: 100%;
-		margin: 8rpx 20rpx 16rpx 20rpx;
 		.logo-img {
 			width: 154rpx;
 			height: 154rpx;
 			margin-right: 20rpx;
 		}
 		.con-right{
-			width: 450rpx;
+			width: calc(100% - 174rpx);
 			.title-h {
 				width: 100%;
 				height: 44rpx;
@@ -548,7 +552,7 @@
 	.business-img {
 		width: 630rpx;
 		height: 176rpx;
-		margin: 0 20rpx;
+		margin: 20rpx 0rpx 0rpx 0rpx;
 		overflow: hidden;
 	}
 
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 57c72b3..44bb896 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -125,11 +125,11 @@
 			<u-waterfall v-model="productDtos" ref="uWaterfall">
 				
 				<template v-slot:left="{leftList}">
-					<view class="radio">
+					<!-- <view class="radio">
 						<video src=""></video>
-					</view>
-					<view class="warter">
-						<image src="../../static/images/collect.png" mode="" class="enterprise-img"></image>
+					</view> -->
+					<!-- <view class="warter">
+						<image src="../../static/images/collect.png" mode="aspectFill" class="enterprise-img"></image>
 						<view class="label">企业</view>
 						<view class="title line1">楚象科技有限公司</view>
 						<view class="category-box acea-row">
@@ -138,13 +138,13 @@
 						</view>
 					</view>
 					<view class="warter">
-						<image src="../../static/images/business-img1.png" mode="" class="shop-img"></image>
+						<image src="../../static/images/business-img1.png" mode="aspectFill" class="shop-img"></image>
 						<view class="title line1">楚象科技有限公司</view>
 						<view class="shopinfo acea-row row-between-wrapper">
 							<view class="torush">立即抢</view>
 							<view class="surplus">剩余10张</view>
 						</view>
-					</view>
+					</view> -->
 					<view class="warter" v-for="(item, index) in leftList" :key="index" @tap="toGoodsDetail(item.id)">
 						<image class="warter-img" :src="item.image" :index="index" mode="widthFix"></image>
 						<view class="goodsinfo-box">
@@ -205,10 +205,6 @@
 				navActive: 0,
 				search: "",
 				lock: false,
-				menuHeight: app.globalData.menuHeight,
-				navHeight: app.globalData.navHeight,
-				menuTop: app.globalData.menuTop,
-				navTopHeight: app.globalData.navTopHeight,
 				currentTabIndex: 0,
 				flowList: [],
 				isFixed: false,
diff --git a/pages/home/index2.vue b/pages/home/index2.vue
deleted file mode 100644
index 114badf..0000000
--- a/pages/home/index2.vue
+++ /dev/null
@@ -1,759 +0,0 @@
-<template>
-<view class="home-page">
-  <view class="top-bg-box" @tap="toGuidePage">
-    <image src="https://download.cyjyyjy.com/index-top-bg2.png"></image>
-  </view>
-
-  <!-- <view class="page-top-box">
-    <image src="../../images/home/top-bg.png" class="top-bg"></image>
-    <view class="page-title" style="top:{{menuTop}}px;height:{{menuHeight}}px;line-height: {{menuHeight}}px;">禅意云生态</view>
-    <view class="top-box-content" style="top: {{CustomBar + menuHeight}}rpx;">
-      <view class="search-box acea-row row-between-wrapper">
-        <view class="localtion-box acea-row row-middle">
-          <image src="../../images/home/localtion.png"></image>
-          <text>{{city}}</text>
-        </view>
-        <view class="search acea-row row-middle">
-          <image src="../../images/home/search.png"></image>
-          <text>大家都在搜 APP开发</text>
-        </view>
-        <image class="message-icon" src="../../images/home/message.png"></image>
-      </view>
-      <view class="home-menu-box">
-        <view class="menu-list acea-row row-between">
-          <view class="menu-item acea-row row-column row-middle" wx:for="{{menuList}}" wx:key="index">
-            <image src="{{item.icon}}"></image>
-            <text>{{item.text}}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view> -->
-  <!-- 招商会 -->
-  <view class="investment-box">
-    <view class="investment-title-box acea-row row-between-wrapper">
-      <view class="acea-row">
-        <text class="fz32">热门活动</text>
-        <view class="hot">热</view>
-      </view>
-      <!-- <view class="more acea-row row-middle">
-        <text>全部</text>
-        <image src="/static/images/home/arrow-r.png"></image>
-      </view> -->
-    </view>
-    <view class="investement-list">
-      <scroll-view class="scroll-view_H" scroll-x="true">
-        <view v-for="(item, index) in recommendActivity" :key="index" class="investment-item" @tap="toActiveDetail" :data-id="item.id">
-          <image class="item-bg" :src="item.images" mode="aspectFill"></image>
-          <view class="tips-box acea-row row-right">
-            <view v-for="(flag, index2) in spl.spl(item.flag)" :key="index2" :class="'tips-item ' + (index2%2 == 0 ? 'bg2' : '' )" v-if="index2 < 3">{{flag}}</view>
-          </view>
-          <view class="item-info-box acea-row row-column row-center">
-            <view class="address-box line1">
-              <image src="/static/images/home/localtion.png"></image>
-              <text>{{item.address}}</text>
-            </view>
-            <view class="time-box">
-              <image src="/static/images/home/time.png"></image>
-              <text>{{item.activityStartTime}}</text>
-            </view>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-  </view>
-  <!-- 尊享福利 -->
-  <!-- <view class="welfare-box">
-    <view class="welfare-title">尊享福利</view>
-    <view class="welfare-list-box">
-      <scroll-view class="scroll-view_H" scroll-x="true">
-        <view class="welfare-item" wx:for="{{3}}" wx:key="index">
-          <view class="item-box acea-row">
-            <image src="../../images/home/welfare1.png"></image>
-            <view class="welfare-info-box acea-row row-column row-between">
-              <view>
-                <view class="w-name">保时捷Porsche-Panamera 4S E-Hybrid 行政加长版</view>
-                <view class="w-address">武汉光谷保时捷中心</view>
-              </view>
-              <view>
-                <view class="w-price">140万</view>
-                <view class="w-oldPrice">市场价约为￥157万</view>
-              </view>
-            </view>
-            <view class="buy-btn">立即抢购</view>
-          </view>
-          <view class="item-box acea-row">
-            <image src="../../images/home/welfare1.png"></image>
-            <view class="welfare-info-box acea-row row-column row-between">
-              <view>
-                <view class="w-name">保时捷Porsche-Panamera 4S E-Hybrid 行政加长版</view>
-                <view class="w-address">武汉光谷保时捷中心</view>
-              </view>
-              <view>
-                <view class="w-price">140万</view>
-                <view class="w-oldPrice">市场价约为￥157万</view>
-              </view>
-            </view>
-            <view class="buy-btn">立即抢购</view>
-          </view>
-      data-i  </view>
-      </scroll-view>
-    </view>
-  </view> -->
-  <!-- 供需模块 -->
-  <view class="demandhall-box">
-    <view class="tabs-box acea-row row-around">
-      <view :class="'tab-item ' + (active == 1 ? 'tab-item-a' : '')" data-i="1" @tap="tabClick">最新供应</view>
-      <view :class="'tab-item ' + (active == 2 ? 'tab-item-a' : '')" data-i="2" @tap="tabClick">需求广场</view>
-      <!-- <view class="tab-item {{active == 3 ? 'tab-item-a' : ''}}" data-i="3" bindtap="tabClick">金牌投资人</view> -->
-    </view>
-    <view class="list-box" v-if="active == 1">
-      <view v-for="(item, index) in resourcesList" :key="index" class="item">
-        <view class="item-top">
-          <view class="project-name line1">{{item.title}}</view>
-          <view class="tag">{{item.cname}}</view>
-          <view class="desc line2">{{item.detailedDescription}}</view>
-          <view class="buy-btn" @tap="toResourcesDetail" :data-id="item.id">了解详情</view>
-        </view>
-        <view class="company-box acea-row">
-          <image :src="item.enterpriseDto.enterpriseLogo" class="logo"></image>
-          <view class="company-info acea-row row-column row-between">
-            <view class="company-name line1 fz28">{{item.enterpriseDto.enterpriseName}}</view>
-            <view class="company-name line2 fz24">{{item.enterpriseDto.enterpriseTitle}}</view>
-            <view class="tags-box acea-row">
-              <!-- <view class="tag-item fz20">网站建设</view> -->
-              <view class="tag-item fz20 bgG">{{item.cname}}</view>
-              <!-- <view class="tag-item fz20 bgO">网站建设</view> -->
-            </view>
-          </view>
-          <view class="into-btn acea-row row-center-wrapper" @tap="toCompanyDetail" :data-id="item.enterpriseId">
-            <image src="/static/images/home/company-icon.png"></image>
-            <text>进入企业</text>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="list-box" v-if="active == 2">
-      <view v-for="(item, index) in demandList" :key="index" class="item" @tap="toNeedDetail" :data-id="item.id">
-        <view class="item-top">
-          <view class="project-name">{{item.title}}</view>
-          <view class="desc line2">{{item.detailedDescription}}</view>
-          <view class="tags-box tags-box2 acea-row">
-              <view class="tag-item fz20">{{item.enterpriseDto.cname}}</view>
-              <!-- <view class="tag-item fz20 bgG">网站建设</view>
-              <view class="tag-item fz20 bgO">网站建设</view> -->
-            </view>
-          <view class="price">{{item.capital}}</view>
-       </view>
-      </view>
-    </view>
-  </view>
-  <view class="to-demandhall acea-row row-center row-middle" @tap="toTab2">
-    <text>更多内容去供需大厅</text>
-    <image src="/static/images/home/arrow-r.png"></image>
-  </view>
-  <!-- <tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar> -->
-</view>
-</template>
-
-<script module="spl" lang="wxs" src="../../utils/subutil.wxs"></script>
-
-<script>
-// index.js
-// 获取应用实例
-const app = getApp();
-import util from '../../utils/util';
-var QQMapWX = require("../../utils/qqmap-wx-jssdk.min.js");
-var qqmapsdk;
-import tabbar from "../../tabbarComponent/tabbar";
-
-export default {
-  data() {
-    return {
-      menuList: [
-				{
-					icon: "/static/images/home/menu1.png",
-					text: 'IT制作'
-				}, {
-					icon: "/static/images/home/menu2.png",
-					text: 'logo设计'
-				}, {
-					icon: "/static/images/home/menu3.png",
-					text: '文案策划'
-				}, {
-					icon: "/static/images/home/menu4.png",
-					text: 'app开发'
-				}, {
-					icon: "/static/images/home/menu5.png",
-					text: '装修服务'
-				}, {
-					icon: "/static/images/home/menu6.png",
-					text: '软件定制'
-				}, {
-					icon: "/static/images/home/menu7.png",
-					text: '法律服务'
-				}, {
-					icon: "/static/images/home/menu8.png",
-					text: '小程序'
-				}, {
-					icon: "/static/images/home/menu9.png",
-					text: '网络营销'
-				}, {
-					icon: "/static/images/home/menu10.png",
-					text: '全部分类'
-				},
-			],
-      CustomBar: app.globalData.CustomBar,
-      menuHeight: app.globalData.menuHeight,
-      navHeight: app.globalData.navHeight,
-      menuTop: app.globalData.menuTop,
-      active: 1,
-      recommendActivity: [],
-      demandList: [],
-      resourcesList: [],
-      province: '',
-      city: '',
-      cagetoryList: "",
-      latitude: "",
-      longitude: "",
-			currentTabIndex: 0
-    };
-  },
-
-  components: {
-    tabbar
-  },
-  props: {},
-	onShareAppMessage: function(res) {
-		return {
-			title: '禅易云生态',
-			path: '/pages/home/index',
-		}
-	},
-  onLoad() {
-		// uni.hideTabBar();
-    // app.globalData.editTabbar();
-		this.pagePath = '/pages/home/index'
-    this.getCagetoryList();
-    qqmapsdk = new QQMapWX({
-      key: 'UVEBZ-M3VRS-CO4OH-6F5QZ-X7FB7-SVFOX' //这里自己的key秘钥进行填充
-
-    });
-    this.getLocation();
-  },
-  onPullDownRefresh: function () {
-    //调用刷新时将执行的方法
-    this.getCagetoryList();
-  },
-  methods: {
-		tabBarClick(index){
-			// console.log('返回tabBar索引：' + index)
-			this.currentTabIndex = index
-		},
-    toGuidePage() {
-      uni.navigateTo({
-        url: '/pages/guide/index'
-      });
-    },
-
-    toActiveDetail(e) {
-      let id = e.currentTarget.dataset.id;
-      uni.navigateTo({
-        url: '/pages/activity/detail/index?id=' + id
-      });
-    },
-
-    tabClick(e) {
-      this.setData({
-        active: e.currentTarget.dataset.i
-      });
-    },
-
-    toTab2() {
-      uni.switchTab({
-        url: '/pages/demandHall/index'
-      });
-    },
-
-    getCagetoryList() {
-      uni.showNavigationBarLoading();
-      app.http('get', 'index').then(res => {
-        if (res.data.success) {
-          res.data.data.recommendActivity.content.forEach(item => {
-            item.activityStartTime = util.getWeek(item.activityStartTime);
-          });
-          this.setData({
-            demandList: res.data.data.demandList,
-            resourcesList: res.data.data.resourcesDtos,
-            cagetoryList: res.data.data.cagetoryDtos,
-            recommendActivity: res.data.data.recommendActivity.content
-          }); //隐藏导航条加载动画
-          uni.hideNavigationBarLoading(); //停止下拉刷新
-          uni.stopPullDownRefresh();
-        }
-      });
-    },
-
-    toResourcesDetail(e) {
-      let id = e.currentTarget.dataset.id;
-      uni.navigateTo({
-        url: '/pages/demandHall/resourcesDetail/index?id=' + id
-      });
-    },
-
-    toCompanyDetail(e) {
-      let id = e.currentTarget.dataset.id;
-      uni.navigateTo({
-        url: '/pages/demandHall/companyDetail/index?id=' + id
-      });
-    },
-
-    toNeedDetail(e) {
-      let id = e.currentTarget.dataset.id;
-      uni.navigateTo({
-        url: '/pages/demandHall/needsDetail/index?id=' + id
-      });
-    },
-
-    getLocation() {
-      let vm = this;
-      uni.getLocation({
-        type: 'wgs84',
-        success: function (res) {
-          // console.log(JSON.stringify(res))
-          var latitude = res.latitude;
-          var longitude = res.longitude;
-          var speed = res.speed;
-          var accuracy = res.accuracy;
-          vm.getLocal(latitude, longitude);
-        },
-        fail: function (res) {
-          console.log('fail' + JSON.stringify(res));
-        }
-      });
-    },
-
-    // 获取当前地理位置
-    getLocal: function (latitude, longitude) {
-      let vm = this;
-      qqmapsdk.reverseGeocoder({
-        location: {
-          latitude: latitude,
-          longitude: longitude
-        },
-        success: function (res) {
-          // console.log(JSON.stringify(res));
-          let province = res.result.ad_info.province;
-          let city = res.result.ad_info.city;
-          vm.setData({
-            province: province,
-            city: city,
-            latitude: latitude,
-            longitude: longitude
-          }); // console.log(city)
-        },
-        fail: function (res) {
-          console.log(res);
-        },
-        complete: function (res) {// console.log(res);
-        }
-      });
-    }
-  }
-};
-</script>
-<style>
-
-.home-page{
-  padding-bottom: 190rpx;
-}
-.top-bg-box{
-  width: 750rpx;
-  height: 420rpx;
-}
-.top-bg-box image{
-  width: 100%;
-  height: 100%;
-}
-.page-top-box{
-  width: 100%;
-  height: 598rpx;
-  position: relative;
-}
-.page-title{
-  width: 100%;
-  color: #fff;
-  text-align: center;
-  position: relative;
-}
-.top-bg{
-  width: 100%;
-  height: 598rpx;
-  position: absolute;
-}
-.top-box-content{
-  position: relative;
-}
-.search-box{
-  color: #fff;
-  font-size: 32rpx;
-  padding: 0 60rpx 0 40rpx;
-}
-.localtion-box image{
-  width: 26rpx;
-  height: 31rpx;
-  margin-right: 10rpx;
-}
-.search{
-  width: 448rpx;
-  height: 68rpx;
-  font-size: 28rpx;
-  padding: 16rpx 20rpx;
-  background: rgba(255, 255, 255, 0.38);
-  border-radius: 8rpx;
-}
-.search image{
-  width: 35rpx;
-  height: 35rpx;
-  margin-right: 16rpx;
-}
-.message-icon{
-  width: 36rpx;
-  height: 36rpx;
-}
-.home-menu-box{
-  width: 670rpx;
-  height: 286rpx;
-  background: #FFFFFF;
-  box-shadow: 0px 6rpx 20rpx rgba(151, 69, 34, 0.28);
-  border-radius: 12rpx;
-  margin: 28rpx auto 0;
-  padding: 42rpx;
-}
-.menu-list{
-  color: #1D1D1D;
-  font-size: 24rpx;
-}
-.menu-item{
-  width: 20%;
-  /* margin-right:16rpx; */
-  margin-bottom: 34rpx;
-}
-.menu-item:nth-child(5n){
-  margin-right: 0;
-}
-.menu-item image{
-  width: 52rpx;
-  height: 52rpx;
-}
-
-.investment-box{
-  width: 100%;
-  padding: 40rpx 0 0 40rpx;
-}
-.investment-title-box{
-  width: 100%;
-  padding-right: 40rpx;
-}
-.fz32{
-  font-size: 32rpx;
-  color: #1D1D1D;
-}
-.hot{
-  width: 26rpx;
-  height: 26rpx;
-  text-align: center;
-  line-height: 26rpx;
-  background: linear-gradient(147deg, #FB7E4A 0%, #FF5100 100%);
-  border-radius: 8rpx 0px 8rpx 0px;
-  font-size: 18rpx;
-  color: #fff;
-  margin-left: 16rpx;
-}
-.more{
-  font-size: 24rpx;
-  color: #999999;
-}
-.more image{
-  width: 9rpx;
-  height: 16rpx;
-  margin-left: 12rpx;
-  margin-top: 2rpx;
-}
-.investement-list{
-  width: 100%;
-  margin-top: 34rpx;
-}
-.scroll-view_H{
-  white-space: nowrap;
-  width: 100%;
-}
-.investment-item{
-  display: inline-block;
-  width: 324rpx;
-  height: 408rpx;
-  margin-right:20rpx;
-  box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
-  position: relative;
-}
-.investment-item .item-bg{
-  width: 324rpx;
-  height: 408rpx;
-  position: absolute;
-	border-radius: 8rpx;
-}
-.tips-box{
-  position: relative;
-  top: 20rpx;
-}
-.tips-item{
-  padding: 6rpx 10rpx;
-  line-height: 28rpx;
-  font-size: 20rpx;
-  color: #fff;
-  background: rgba(255, 81, 0, 0.63);
-  border-radius: 8rpx;
-  margin-right: 14rpx;
-}
-.bg2{
-  background: rgba(255, 170, 0, 0.63);
-}
-.item-info-box{
-  width: 300rpx;
-  height: 102rpx;
-  background: rgba(255, 255, 255, 0.8);
-  box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.2);
-  border-radius: 8rpx;
-  position: absolute;
-  bottom: 18rpx;
-  left: 50%;
-  margin-left: -150rpx;
-  font-size: 22rpx;
-  color: #404040;
-}
-.item-info-box image{
-  width: 14rpx;
-  height: 17rpx;
-  margin: 0 12rpx 0 12rpx;
-}
-
-.welfare-box{
-  width: 100%;
-  padding-left: 40rpx;
-  margin-top: 52rpx;
-}
-.welfare-title{
-  font-size: 32rpx;
-  color: #1D1D1D;
-  margin-bottom: 38rpx;
-}
-.welfare-list-box{
-  width: 100%;
-}
-.welfare-item{
-  display: inline-block;
-  margin-right: 6rpx;
-  padding: 12rpx;
-}
-.item-box{
-  width: 650rpx;
-  height: 248rpx;
-  background: #FFFFFF;
-  box-shadow: 0px 0rpx 12rpx rgba(0, 0, 0, 0.16);
-  padding: 22rpx 16rpx;
-  border-radius: 12rpx;
-  margin-bottom: 20rpx;
-  position: relative;
-}
-.buy-btn{
-  width: 144rpx;
-  height: 52rpx;
-  text-align: center;
-  line-height: 52rpx;
-  background: linear-gradient(315deg, #FB966C 0%, #FFC2AA 100%);
-  border-radius: 12rpx;
-  color: #fff;
-  font-size: 24rpx;
-  position: absolute;
-  bottom: 30rpx;
-  right: 30rpx;
-}
-.item-box image{
-  width: 198rpx;
-  height: 204rpx;
-  margin-right: 12rpx;
-}
-.welfare-info-box{
-  width: 394rpx;
-}
-.w-name{
-  width: 390rpx;
-  font-size: 28rpx;
-  line-height: 40rpx;
-  color: #1D1D1D;
-  overflow: hidden;
-  text-overflow: ellipsis; 
-  display: -webkit-box;
-  -webkit-line-clamp: 3;
-  -webkit-box-orient: vertical;
-}
-.w-address{
-  font-size: 24rpx;
-  line-height: 34rpx;
-  color: #707070;
-  margin: 8rpx 0 14rpx;
-}
-.w-price{
-  font-size: 28rpx;
-  font-weight: bold;
-  line-height: 40rpx;
-  color: #FF7942;
-}
-.w-oldPrice{
-  font-size: 20rpx;
-  color: #BCBCBC;
-  text-decoration: line-through;
-}
-
-.demandhall-box{
-  width: 100%;
-  padding: 40rpx;
-}
-.tabs-box{
-  padding-left: 30rpx;
-  padding-right: 12rpx;
-}
-.tab-item{
-  font-size: 28rpx;
-  color: #9C9C9C;
-  padding-bottom: 8rpx;
-}
-.tab-item-a{
-  color: #1D1D1D;
-  border-bottom: 4rpx solid #FF7942;
-}
-.list-box{
-  width: 100%;
-  margin-top: 36rpx;
-}
-.item{
-  width: 670rpx;
-  background: #FFFFFF;
-  box-shadow: 0px 6rpx 12rpx rgba(190, 190, 190, 0.3);
-  border-radius: 12rpx;
-  padding: 28rpx 20rpx 18rpx;
-  margin-bottom: 32rpx;
-}
-.item-top{
-  padding-bottom: 24rpx;
-  position: relative;
-}
-.item-top .buy-btn{
-  right: 0;
-}
-.project-name{
-  width: 400rpx;
-  font-size: 32rpx;
-  font-weight: 500;
-  line-height: 58rpx;
-  color: #1D1D1D;
-}
-.tags-box2{
-  margin-top: 12rpx;
-}
-.price{
-  color: #FF5100;
-  font-size: 28rpx;
-  position: absolute;
-  top: 0;
-  right: 0rpx;
-}
-.tag{
-  color: #74BDF7;
-  font-size: 20rpx;
-  line-height: 28rpx;
-  margin: 12rpx 0 20rpx;
-}
-.desc{
-  font-size: 24rpx;
-  line-height: 34rpx;
-  color: #666666;
-  margin-top: 8rpx;
-}
-.company-box{
-  padding-top: 12rpx;
-  position: relative;
-  border-top: 2rpx solid #ECECEC;
-}
-.company-box image{
-  width: 128rpx;
-  height: 128rpx;
-  border-radius: 8rpx;
-}
-.company-info{
-	width: calc(100% - 298rpx);
-	margin-left: 12rpx;
-}
-.fz28{
-  font-size: 28rpx;
-  line-height: 40rpx;
-  color: #1D1D1D;
-}
-.fz24{
-  font-size: 24rpx;
-  line-height: 34rpx;
-}
-.fz20{
-  font-size: 20rpx;
-  line-height: 28rpx;
-}
-.item-top .buy-btn{
-  top: 0;
-}
-.into-btn{
-  font-size: 20rpx;
-  color: #FF5100;
-  width: 144rpx;
-  height: 40rpx;
-  border: 1rpx solid #FF5100;
-  opacity: 1;
-  border-radius: 20rpx;
-  position: absolute;
-  top: 18rpx;
-  right: 0rpx;
-}
-.into-btn image{
-  width: 21rpx;
-  height: 19rpx;
-  margin-right: 6rpx;
-}
-.tag-item{
-  width: 112rpx;
-  height: 36rpx;
-  line-height: 34rpx;
-  text-align: center;
-  border: 1rpx solid #FFAA00;
-  color: #FFAA00;
-  border-radius: 4rpx;
-  margin-right: 8rpx;
-}
-.bgG{
-  border: 1rpx solid #3A9EFA;
-  color: #3A9EFA;
-}
-.bgO{
-  border: 1rpx solid #FC9367;
-  color: #FC9367;
-}
-.to-demandhall{
-  font-size: 28rpx;
-  color: #A7A7A7;
-  margin-bottom: 28rpx;
-}
-.to-demandhall image{
-  width: 13rpx;
-  height: 23rpx;
-  margin-left: 15rpx;
-}
-
-</style>
\ No newline at end of file
diff --git a/pages/information/index.vue b/pages/information/index.vue
index d33f794..704b7f0 100644
--- a/pages/information/index.vue
+++ b/pages/information/index.vue
@@ -66,7 +66,7 @@
 						<view class="follow-h line2">{{item.title}}</view>
 						<view class="follow-title-l acea-row row-between">
 							<view>{{item.author}}</view>
-							<view>{{item.createTime}}</view>
+							<view>{{item.createTime.split(' ')[0]}}</view>
 							<view class="acea-row row-middle">
 								<text>{{item.visit}}</text>
 								<image src="../../static/images/eye.png" mode="aspectFill"></image>
diff --git a/pages/life/addGoods/index.vue b/pages/life/addGoods/index.vue
index 2537788..b723782 100644
--- a/pages/life/addGoods/index.vue
+++ b/pages/life/addGoods/index.vue
@@ -434,7 +434,7 @@
 				console.log(form.slider_image[0])
 				if(form.store_name == ''){
 					return this.alertMessage('请填写商品名称','none')
-				} else if(form.slider_image[0]){
+				} else if(!form.slider_image[0]){
 					return this.alertMessage('请至少上传一张商品图片','none')
 				} else if(form.description == ''){
 					return this.alertMessage('请填写商品详情','none')
diff --git a/pages/life/articleList/index.vue b/pages/life/articleList/index.vue
index 36653db..4a50485 100644
--- a/pages/life/articleList/index.vue
+++ b/pages/life/articleList/index.vue
@@ -18,7 +18,7 @@
 				<view class="list-item acea-row row-between row-middle" v-for="(item,index) in articleList" :key="index"
 					@click="toDetail(item.id)">
 					<view class="item-l">
-						<view class="title-box acea-row row-middle">
+						<view class="title-box acea-row-nowrap">
 							<image src="../../../static/images/hot.png" v-if="item.isHot"></image>
 							<view class="title line2">{{item.title}}</view>
 						</view>
@@ -63,8 +63,8 @@
 		onLoad(option) {
 		},
 		mounted() {
+			let active =  this.$yroute.query.active;
 			this.getArticleCategort().then(()=>{
-				this.active= this.$yroute.query.active;
 				this.getArticleList()
 			})
 		},
@@ -73,36 +73,27 @@
 			this.getArticleList()
 		},
 		methods: {
-			getArticleCategort(){
-				return new Promise((reslove)=>{
-					articleCategory().then((res)=>{
-						this.categortList = res.data
-						this.active = this.categortList[0].id
-						reslove()
-					})
-				})
+			async getArticleCategort(){
+				let result = await articleCategory()
+				this.categortList = result.data
+				this.$yroute.query.active ? this.active= this.$yroute.query.active : this.active = this.categortList[0].id
 			},
-			getArticleList() {
+			async getArticleList() {
 				if(!this.isLoading) return 
 				uni.showLoading({
 					title: '加载中...'
 				})
 				this.loadStatus = '加载中...'
-				getArticleList({
-					page: this.page,
-					size: this.size,
-					cid: this.active
-				}).then((res) => {
-					if(res.data.content.length < this.size){
-						this.isLoading = false
-						this.loadStatus = '没有更多了...'
-					} else{
-						this.isLoading = true
-						this.loadStatus = '上拉加载更多...'
-					}
-					this.articleList = this.articleList.concat(res.data.content)
-					uni.hideLoading()
-				})
+				let result = await getArticleList({ page: this.page, size: this.size, cid: this.active})
+				if(result.data.content.length < this.size){
+					this.isLoading = false
+					this.loadStatus = '没有更多了...'
+				} else{
+					this.isLoading = true
+					this.loadStatus = '上拉加载更多...'
+				}
+				this.articleList = this.articleList.concat(result.data.content)
+				uni.hideLoading()
 			},
 			toDetail(id) {
 				this.$yrouter.push({
@@ -163,7 +154,7 @@
 					line-height: 68rpx;
 					text-align: center;
 					color: #fff;
-					border-radius: 8rpx;
+					border-radius:0 8rpx 8rpx 0;
 					margin-left: auto;
 				}
 			}
@@ -234,14 +225,14 @@
 						font-size: 32rpx;
 						color: #4A4A4A;
 						margin-bottom: 25rpx;
-
 						image {
 							width: 20rpx;
 							height: 22rpx;
 							margin-right: 10rpx;
+							margin-top: 10rpx;
 						}
-
 						.title {
+							width: calc(100% - 30rpx);
 						}
 					}
 
diff --git a/pages/life/index.vue b/pages/life/index.vue
index b6abdf1..4577976 100644
--- a/pages/life/index.vue
+++ b/pages/life/index.vue
@@ -67,6 +67,7 @@
         <template v-slot:right="{ rightList }">
           <view
             class="warter"
+						style="margin-left: 30rpx;"
             v-for="(item, index) in rightList"
             :key="index"
             @tap="toGoodsDetail(item.id)"
@@ -336,12 +337,18 @@ export default {
   width: 100%;
   height: 108rpx;
   line-height: 108rpx;
-  padding-left: 30rpx;
   // margin-bottom: 30rpx;
-  padding-top: 190rpx;
+  padding-top: 160rpx;
+	position: relative;
   .scroll-view_H {
-    white-space: nowrap;
     width: 100%;
+		position: fixed;
+		top: 160rpx;
+		left: 0;
+		padding-left: 30rpx;
+		z-index: 999;
+		background: #fff;
+		white-space: nowrap;
     .category-item {
       display: inline-block;
       font-size: 28rpx;
diff --git a/pages/release/index.vue b/pages/release/index.vue
index 3ff7899..3263e76 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -130,7 +130,7 @@ export default {
 			// 	});
 			// }
 			uni.switchTab({
-			  url: '/pages/user/index'
+			  url: '/pages/demandHall/business/index'
 			});
     },
 		// 个人认证
diff --git a/pages/release/index2.vue b/pages/release/index2.vue
deleted file mode 100644
index ea82244..0000000
--- a/pages/release/index2.vue
+++ /dev/null
@@ -1,358 +0,0 @@
-<template>
-	<!--pages/release/index.wxml-->
-	<view class="release-page">
-		<view class="auth-btn-box acea-row row-column row-middle">
-			<view class="auth-btn" @tap="toCompanyAuth" v-if="authStatus == 0 || authStatus == 3">企业认证<image
-					src="/static/images/back.png"></image>
-			</view>
-			<view class="auth-btn bgG" @tap="toPersonlAuth" v-if="authStatus == 0 || authStatus == 3">个人认证<image
-					src="/static/images/back.png"></image>
-			</view>
-		</view>
-		<view :class="'posi ' + (authStatus == 1 || authStatus == 2 ? 'top30' : '')">
-			<view class="tips-box">
-				<view class="tips acea-row-nowrap row-middle" v-if="authStatus == 0 || authStatus == 3">
-					<!-- <view class="icon">!</view> -->
-					<view>注：完成企业认证后可以发布资源及需求，个人认证后只可发布需求</view>
-				</view>
-				<view class="tips acea-row row-middle" v-if="authStatus == 0">
-					<view class="icon">!</view>
-					<view>请先完成认证</view>
-				</view>
-				<view class="tips acea-row row-middle" v-if="authStatus == 1">
-					<view class="icon">!</view>
-					<view>{{authType == 1 ? '企业信息审核中，请耐心等待！' : '个人信息审核中， 请耐心等待'}}</view>
-				</view>
-				<view class="tips acea-row row-middle" v-if="authStatus == 2">
-					<view class="icon">!</view>
-					<view>{{authType == 1 ? '企业信息审核通过，可以发布资源和需求！' : '个人信息审核通过，可以发布需求'}}</view>
-				</view>
-				<view class="tips acea-row row-middle" v-if="authStatus == 3">
-					<view class="icon">!</view>
-					<view>{{authType == 1 ? '企业信息未审核通过， 请重新提交审核信息！' : '个人信息未审核通过， 请重新提交审核信息！'}}</view>
-					<view>未通过理由：{{reason}}</view>
-				</view>
-			</view>
-			<view class="btn-box acea-row row-between">
-				<view :class="'btn ' + (authStatus == 2 && authType == 1 ? 'auth' : '' )" @tap="toResources">
-					<view class="tip">我能提供...</view>
-					<image :class="authStatus == 2  && authType == 1 ? '' : 'default'" src="/static/images/yrz1.png">
-					</image>
-				</view>
-				<view :class="'btn ' + (authStatus == 2 ? 'auth' : '' )" @tap="toNeeds">
-					<view class="tip">我有需求...</view>
-					<image :class="authStatus == 2 ? '' : 'default'" src="/static/images/yrz2.png"></image>
-				</view>
-			</view>
-			<view class="close" @tap="back">
-				<image src="/static/images/fabu-close.png"></image>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	// pages/release/index.js
-	const app = getApp();
-
-	export default {
-		data() {
-			return {
-				userInfo: {},
-				authStatus: 0,
-				authType: null,
-				completeState: null,
-				authInfo: {}
-			};
-		},
-
-		components: {},
-		props: {},
-
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		onLoad: function(options) {},
-
-		/**
-		 * 生命周期函数--监听页面显示
-		 */
-		onShow: function() {
-			this.isAuthentication();
-		},
-
-		/**
-		 * 生命周期函数--监听页面隐藏
-		 */
-		onHide: function() {},
-
-		/**
-		 * 生命周期函数--监听页面卸载
-		 */
-		onUnload: function() {},
-
-		/**
-		 * 页面相关事件处理函数--监听用户下拉动作
-		 */
-		onPullDownRefresh: function() {},
-
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom: function() {},
-
-		/**
-		 * 用户点击右上角分享
-		 */
-		onShareAppMessage: function() {},
-		methods: {
-			back() {
-				let pages = getCurrentPages();
-				console.log(pages)
-				// let pagePath = '/' + pages[pages.length - 2].route;
-				// if(pagePath){
-				// 	uni.navigateTo({
-				// 	  url: pagePath
-				// 	});
-				// } else{
-				// 	uni.switchTab({
-				// 	  url: '/pages/home/index'
-				// 	});
-				// }
-				uni.switchTab({
-					url: '/pages/user/index'
-				});
-			},
-
-			toPersonlAuth() {
-				if (this.authStatus == 0) {
-					uni.navigateTo({
-						url: '/pages/release/personAuth/index'
-					});
-				} else if (this.authStatus == 3) {
-					let authInfo = encodeURIComponent(JSON.stringify(this.authInfo));
-					uni.navigateTo({
-						url: '/pages/release/personAuth/index?authInfo=' + authInfo
-					});
-				} else if (this.authStatus == 1) {
-					uni.showToast({
-						title: '认证申请审核中，请等待！',
-						icon: 'none'
-					});
-				}
-			},
-
-			toCompanyAuth() {
-				if (this.authStatus == 0) {
-					uni.navigateTo({
-						url: '/pages/release/companyAuth/index'
-					});
-				} else if (this.authStatus == 3) {
-					let authInfo = encodeURIComponent(JSON.stringify(this.authInfo));
-					uni.navigateTo({
-						url: '/pages/release/companyAuth/index?authInfo=' + authInfo
-					});
-				} else if (this.authStatus == 1) {
-					uni.showToast({
-						title: '认证申请审核中，请等待！',
-						icon: 'none'
-					});
-				}
-			},
-
-			isAuthentication() {
-				app.http('get', 'user/isAuthentication').then(res => {
-					if (res.data.success) {
-						this.setData({
-							authStatus: res.data.data.authenticationState,
-							authType: res.data.data.authorizationType,
-							completeState: res.data.data.completeState,
-							authInfo: res.data.data.authInfo,
-							reason: res.data.data.authInfo.reason
-						});
-					}
-				});
-			},
-
-			toResources() {
-				let that = this;
-				console.log(this.authStatus, 'authStatus');
-				console.log(this.authType, 'authType');
-				console.log(this.completeState, 'completeState');
-
-				if (this.authStatus == 2 && this.authType == 1 && this.completeState == true) {
-					uni.navigateTo({
-						url: '/pages/user/editNeeds/index?type=1'
-					});
-				} else if (this.authStatus == 2 && this.authType == 1 && this.completeState == false) {
-					uni.showModal({
-						title: '提示！',
-						content: '您还未完善企业信息，点击确定去完善吧~',
-
-						success(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/pages/release/perfectCompanyInfo/index'
-								});
-							}
-						}
-
-					});
-				} else if (this.authStatus == 0 && (this.authType == 1 || this.authType == 0) && this.completeState ==
-					false) {
-					uni.showModal({
-						title: '提示！',
-						content: '您还未完成企业认证，点击确定去认证吧~',
-
-						success(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/pages/release/companyAuth/index'
-								});
-							}
-						}
-
-					});
-				}
-			},
-
-			toNeeds() {
-				if (this.authStatus == 2 && (this.authType == 2 || this.authType == 1) && this.completeState == true) {
-					uni.navigateTo({
-						url: '/pages/user/editNeeds/index?type=2'
-					});
-				} else if (this.authStatus == 2 && (this.authType == 2 || this.authType == 0) && this.completeState ==
-					false) {
-					uni.showModal({
-						title: '提示！',
-						content: '您还未完善个人信息，点击确定去完善吧~',
-
-						success(res) {
-							uni.navigateTo({
-								url: '/pages/release/perfectPersonInfo/index'
-							});
-						}
-
-					});
-				} else if (this.authStatus == 0 && (this.authType == 2 || this.authType == 0) && this.completeState ==
-					false) {
-					uni.showModal({
-						title: '提示！',
-						content: '您还未完成认证，点击上方按钮去认证吧！'
-					});
-				}
-			}
-
-		}
-	};
-</script>
-<style>
-	/* pages/release/index.wxss */
-
-	.auth-btn-box {
-		width: 100%;
-		margin-top: 300rpx;
-	}
-
-	.auth-btn {
-		width: 310rpx;
-		height: 101rpx;
-		background: linear-gradient(137deg, #FFCDB8 0%, #FF9060 100%);
-		border-radius: 12rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #fff;
-		margin-bottom: 50rpx;
-	}
-
-	.auth-btn image {
-		width: 32rpx;
-		height: 32rpx;
-		transform: rotate(180deg);
-	}
-
-	.bgG {
-		background: linear-gradient(137deg, #BFD7F9 0%, #A8C8F6 100%);
-	}
-
-	.posi {
-		position: absolute;
-		width: 100%;
-		bottom: 100rpx;
-	}
-
-	.top30 {
-		bottom: 30%;
-	}
-
-	.tips-box {
-		/* margin-top: 15%; */
-	}
-
-	.tips {
-		color: #FF0000;
-		font-size: 26rpx;
-		padding-left: 54rpx;
-		margin-bottom: 10rpx;
-	}
-
-	.icon {
-		width: 26rpx;
-		height: 26rpx;
-		border: 1rpx solid #FF0000;
-		text-align: center;
-		line-height: 22rpx;
-		border-radius: 50%;
-		font-size: 20rpx;
-		margin-right: 10rpx;
-	}
-
-	.btn-box {
-		width: 100%;
-		padding: 0 36rpx;
-		margin-top: 28rpx;
-	}
-
-	.btn {
-		width: 320rpx;
-		height: 378rpx;
-		position: relative;
-	}
-
-	.btn-box image {
-		width: 320rpx;
-		height: 378rpx;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
-
-	.btn-box .default {
-		filter: grayscale(1);
-	}
-
-	.btn .tip {
-		color: #9C9C9C;
-		font-weight: 500;
-		font-size: 32rpx;
-		position: relative;
-		left: 0;
-		top: 70rpx;
-		text-align: center;
-		z-index: 3;
-	}
-
-	.btn .auth {
-		color: #1D1D1D;
-	}
-
-	.close {
-		text-align: center;
-	}
-
-	.close image {
-		width: 88rpx;
-		height: 88rpx;
-	}
-</style>
diff --git a/pages/shop/GoodSearch/index.vue b/pages/shop/GoodSearch/index.vue
index 0c6cf6a..820cb20 100644
--- a/pages/shop/GoodSearch/index.vue
+++ b/pages/shop/GoodSearch/index.vue
@@ -2,11 +2,11 @@
   <view>
     <view class="searchGood">
       <view class="search acea-row row-between-wrapper">
-        <view class="input acea-row row-between-wrapper">
+        <view class="input acea-row row-between-wrapper" @click="submit">
           <!-- <text class="iconfont icon-sousuo2"></text> -->
           <!-- <form @submit.prevent="submit"></form> -->
           <input type="text" placeholder="大家都在搜APP开发" v-model="search" />
-					<view class="bnt" @click="submit">搜索</view>
+					<view class="bnt">搜索</view>
         </view>
         
       </view>
@@ -55,7 +55,9 @@ export default {
   },
   methods: {
     submit() {
+			console.log('ddaas')
       const search = trim(this.search) || "";
+			console.log(search)
       if (!search) return;
       this.toSearch(search);
     },
@@ -84,11 +86,14 @@ export default {
 				border-radius: 8rpx;
 				background: rgba(255, 255, 255, 0.39);
 				padding: 0 0 0 20rpx;
+				input{
+					width: calc(100% - 150rpx);
+				}
 				.bnt{
 					width: 132rpx;
 					height: 68rpx;
 					background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
-					border-radius: 8rpx;
+					border-radius:0 8rpx 8rpx 0;
 					position: absolute;
 					right: 40rpx;
 					color: #fff;
diff --git a/pages/shop/GoodsClass/index.vue b/pages/shop/GoodsClass/index.vue
index 5245e4d..573b3fa 100644
--- a/pages/shop/GoodsClass/index.vue
+++ b/pages/shop/GoodsClass/index.vue
@@ -10,16 +10,6 @@
         </view>
       </view>
     </div>
-		<!-- <view class="banner-box">
-			<swiper class="swiper-box" :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000">
-				<swiper-item>
-					<view class="swiper-item">1</view>
-				</swiper-item>
-				<swiper-item>
-					<view class="swiper-item">2</view>
-				</swiper-item>
-			</swiper>
-		</view> -->
 		<view class="userInfo-box acea-row row-between row-middle">
 			<view class="userInfo-l acea-row row-center-wrapper">
 				<image :src="userInfo.avatar"></image>
@@ -51,35 +41,9 @@
 							<view class="buy-count">已出售{{goods.sales}}{{goods.unitName}}</view>
 						</view>
 					</view>
-					<!-- <view class="goods-item">
-						<image src="../../../static/img1.png"></image>
-						<view class="goods-desc-box">
-							<view class="goods-name">禅易香囊 纯手工制作提神…</view>
-							<view class="price">199元+100积分</view>
-							<view class="buy-count">51人购买</view>
-						</view>
-					</view>
-					<view class="goods-item">
-						<image src="../../../static/img1.png"></image>
-						<view class="goods-desc-box">
-							<view class="goods-name">禅易香囊 纯手工制作提神…</view>
-							<view class="price">199元+100积分</view>
-							<view class="buy-count">51人购买</view>
-						</view>
-					</view>
-					<view class="goods-item">
-						<image src="../../../static/img1.png"></image>
-						<view class="goods-desc-box">
-							<view class="goods-name">禅易香囊 纯手工制作提神…</view>
-							<view class="price">199元+100积分</view>
-							<view class="buy-count">51人购买</view>
-						</view>
-					</view> -->
 				</view>
 			</view>
 		</view>
-    <!-- <view style="height:100rpx;"></view> -->
-		<!-- <tabbar :pagePath="pagePath"></tabbar> -->
   </view>
 </template>
 <script>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 89cc4c5..470d137 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -5,9 +5,9 @@
     <!-- <view class="page-title" :style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">禅易云生态</view> -->
 		<CustomNav :title="'禅易云生态'" :isFixed="isFixed"></CustomNav>
 		
-    <view class="top-box-content" :style="'top: ' + (CustomBar + 10) + 'rpx;'">
+    <view class="top-box-content" :style="'top: '+ (menuTop) + 'px;' + 'padding-top:4px;'">
       <view class="top-set-box acea-row row-between row-middle">
-        <view class="set-box-l" v-if="authType == 1 || authType == 2" @tap="toAuthInfo">{{authType == 1 ? '企业' : '个人'}}中心</view>
+        <view class="set-box-l" v-if="authType == 1 || authType == 2" @click="toAuthInfo">{{authType == 1 ? '企业' : '个人'}}中心</view>
         <view v-else></view>
         <view class="set-box-r acea-row">
           <!-- <image src="../../images/user/set-icon.png" class="setIcon"></image> -->
@@ -22,10 +22,10 @@
             <image src="/static/images/user/tyg-tag.png" class="tyg-tag" v-if="userInfo.isVip"></image>
           </view>
           <view class="auth-tips acea-row row-middle">
-            <text v-if="authStatus == 0" @tap="toAuth">完成信息认证，享受更多服务，去认证</text>
+            <text v-if="authStatus == 0" @click="toAuth">完成信息认证，享受更多服务，去认证</text>
             <text v-if="authStatus == 1">信息认证审核中</text>
             <text v-if="authStatus == 2">已完成信息认证</text>
-            <text v-if="authStatus == 3" @tap="toAuth">认证失败，重新认证</text>
+            <text v-if="authStatus == 3" @click="toAuth">认证失败，重新认证</text>
             <image src="/static/images/back.png" v-if="authStatus == 0 || authStatus == 3"></image>
           </view>
           <!-- <view class="img-tags acea-row row-middle">
@@ -35,7 +35,7 @@
         </view>
       </view>
       <view class="my-reminds-box acea-row row-around ">
-        <view class="remind-item" @tap="toResourcesOrder">
+        <view class="remind-item" @click="toResourcesOrder">
           <view class="count">{{demandCounts}}</view>
           <view>资源订单</view>
         </view>
@@ -43,12 +43,12 @@
           <view class="count">0</view>
           <view>我的审核</view>
         </view> -->
-        <view class="remind-item" @tap="toNeedsOrder">
+        <view class="remind-item" @click="toNeedsOrder">
           <view class="count">{{supplyCounts}}</view>
           <view>需求订单</view>
         </view>
       </view>
-      <view class="to-tyg-box" @tap="toMine">
+      <view class="to-tyg-box" @click="toMine">
         <image src="https://download.cyjyyjy.com/tyg-img.png"></image>
       </view>
     </view>
@@ -64,7 +64,7 @@
         <view>需求管理</view>
       </view>
       <view class="menu-list acea-row row-between">
-        <view class="menu-item acea-row row-column row-center-wrapper" @tap="toNeedsManage" data-type="1">
+        <view class="menu-item acea-row row-column row-center-wrapper" @click="toNeedsManage" data-type="1">
           <image src="/static/images/user/xuqiu1.png"></image>
           <text>发布中</text>
         </view>
@@ -82,7 +82,7 @@
         </view>
       </view>
       <view class="torelease-img" @tap="toRelease(1)">
-        <image src="/static/images/user/fbxq.png"></image>
+        <image src="https://download.cyjyyjy.com/fbxq.png"></image>
         <view class="to-btn">发布需求</view>
       </view>
     </view>
@@ -110,7 +110,7 @@
         </view>
       </view>
       <view class="torelease-img" @tap="toRelease(0)">
-        <image src="/static/images/user/fbzy.png"></image>
+        <image src="https://download.cyjyyjy.com/fbzy.png"></image>
         <view class="to-btn">发布供应</view>
       </view>
     </view>
@@ -119,7 +119,7 @@
 		</view>
 		<!-- 电商管理 -->
 		<view class="needs-menu-list">
-			<view class="mask-box" v-if="userInfo.isVip == false"  @tap="toMine">
+			<view class="mask-box" v-if="userInfo.isVip == false"  @click="toMine">
 				<text>成为首席体验官，立即开店！</text>
 			</view>
 		  <view class="title-box acea-row row-between-wrapper">
@@ -232,7 +232,7 @@ export default {
     return {
       tabbar: {},
       userInfo: {},
-      CustomBar: app.globalData.CustomBar,
+      navTopHeight: app.globalData.navTopHeight,
       menuHeight: app.globalData.menuHeight,
       menuTop: app.globalData.menuTop,
       demandCounts: 0,
@@ -307,7 +307,9 @@ export default {
 			})
 		},
     toAuthInfo() {
+			console.log('112111')
       let type = this.authType;
+			console.log(type,'type')
       if (type == 1) {
         uni.navigateTo({
           url: '/pages/release/perfectCompanyInfo/index?isEdit=' + 1
@@ -387,45 +389,44 @@ export default {
         },
       })
     },
-		//发布商品
-		toReleaseGoods(){
-			if(this.userInfo.store !== null){
-				this.$yrouter.push({
-				  path: '/pages/life/addGoods/index'
-				})
-			} else{
-				uni.showToast({
-					title: '请先点最右边按钮去开店！',
-					icon: 'none',
-					duration: 2000
-				})
-			}
-		},
 		//跳转到退款售后订单
 		goReturnList() {
-			if(this.userInfo.store !== null){
-				this.$yrouter.push('/pages/order/ReturnList/index')
-			} else{
-				uni.showToast({
-					title: '请先点最右边按钮去开店！',
-					icon: 'none',
-					duration: 2000
-				})
-			}
+			this.$yrouter.push('/pages/order/ReturnList/index')
+		},
+		//发布商品
+		toReleaseGoods(){
+			this.storeStatus('/pages/life/addGoods/index')
 		},
 		toGoodsManage(){
-			if(this.userInfo.store !== null){
-				this.$yrouter.push('/pages/user/goodsManage/index')
-			} else{
-				uni.showToast({
-					title: '请先点最右边按钮去开店！',
-					icon: 'none',
-					duration: 2000
-				})
-			}
+			this.storeStatus('/pages/user/goodsManage/index')
 		},
 		toOrderManage(){
-			this.$yrouter.push('/pages/user/orderManage/index')
+			this.storeStatus('/pages/user/orderManage/index')
+		},
+		storeStatus(path){
+			if(this.userInfo.store == null){   //没有创建店铺
+				uni.showModal({
+					title: '提示！',
+					content: '您还未创建店铺，点击确认按钮立即开店！',
+					success: (res)=>{
+						if(res.confirm){
+							this.$yrouter.push({
+							  path: '/pages/user/openStore/index'
+							})
+						}
+					}
+				})
+			} else if(this.userInfo.store !== null && this.userInfo.store.status === 0){  //店铺审核中
+				uni.showModal({
+					title: '提示！',
+					content: '店铺正在审核中，请耐心等待。',
+					showCancel: false
+				})
+			} else if(this.userInfo.store !== null && this.userInfo.store.status !== 0){ //审核通过
+				this.$yrouter.push({
+				  path: path
+				})
+			}
 		},
 		toOpenShop(){
 			this.$yrouter.push('/pages/user/openStore/index')
@@ -450,7 +451,7 @@ export default {
 }
 .page-top-box{
   width: 100%;
-  height: 575rpx;
+  // height: 575rpx;
   position: relative;
 }
 .page-title{
@@ -468,6 +469,7 @@ export default {
   position: relative;
   padding: 0 40rpx;
   color: #fff;
+	z-index: 999;
 }
 .top-set-box{
 
diff --git a/pages/user/mine/index.vue b/pages/user/mine/index.vue
index 189fdf9..e71c284 100644
--- a/pages/user/mine/index.vue
+++ b/pages/user/mine/index.vue
@@ -44,7 +44,7 @@
 					</view>
 				</view>
 				<view class="income-box">
-					<image src="/static/images/income-bg.png"></image>
+					<image src="https://download.cyjyyjy.com/income-bg.png"></image>
 					<view class="income-l acea-row row-column row-middle row-around">
 						<view class="t">累计邀请</view>
 						<view class="num">{{pageData.inviterCount}}人</view>
@@ -64,11 +64,11 @@
 			<view class="list-box">
 				<view class="medal-box acea-row row-center">
 					<view class="medal medal2">
-						<image src="/static/images/no2-bg.png" class="medal-bg"></image>
-						<image src="/static/images/no2.png" class="medal-icon"></image>
+						<image src="https://download.cyjyyjy.com/no2-bg.png" class="medal-bg"></image>
+						<image src="https://download.cyjyyjy.com/no2.png" class="medal-icon"></image>
 						<view class="medal-content">
 							<view class="user-header">
-								<image :src="pageData.userProfitList[1].avatar || '/static/images/no2.png'"></image>
+								<image :src="pageData.userProfitList[1].avatar || 'https://download.cyjyyjy.com/no2.png'"></image>
 							</view>
 							<view class="user-name line2">{{pageData.userProfitList[1].nickname || '暂无'}}</view>
 							<view>已邀请{{pageData.userProfitList[1].inviterCount || 0}}人</view>
@@ -77,11 +77,11 @@
 						</view>
 					</view>
 					<view class="medal medal1" v-if="pageData.userProfitList.length > 0">
-						<image src="/static/images/no1-bg.png" class="medal-bg"></image>
-						<image src="/static/images/no1.png" class="medal-icon"></image>
+						<image src="https://download.cyjyyjy.com/no1-bg.png" class="medal-bg"></image>
+						<image src="https://download.cyjyyjy.com/no1.png" class="medal-icon"></image>
 						<view class="medal-content">
 							<view class="user-header">
-								<image :src="pageData.userProfitList[0].avatar || '/static/images/no1.png'"></image>
+								<image :src="pageData.userProfitList[0].avatar || 'https://download.cyjyyjy.com/no1.png'"></image>
 							</view>
 							<view class="user-name line2">{{pageData.userProfitList[0].nickname}}</view>
 							<view>已邀请{{pageData.userProfitList[0].inviterCount}}人</view>
@@ -90,11 +90,11 @@
 						</view>
 					</view>
 					<view class="medal medal3">
-						<image src="/static/images/no3-bg.png" class="medal-bg"></image>
-						<image src="/static/images/no3.png" class="medal-icon"></image>
+						<image src="https://download.cyjyyjy.com/no3-bg.png" class="medal-bg"></image>
+						<image src="https://download.cyjyyjy.com/no3.png" class="medal-icon"></image>
 						<view class="medal-content">
 							<view class="user-header">
-								<image :src="pageData.userProfitList[2].avatar || '/static/images/no3.png'"></image>
+								<image :src="pageData.userProfitList[2].avatar || 'https://download.cyjyyjy.com/no3.png'"></image>
 							</view>
 							<view class="user-name line2">{{pageData.userProfitList[2].nickname || '暂无'}}</view>
 							<view>已邀请{{pageData.userProfitList[2].inviterCount || 0}}人</view>
@@ -123,7 +123,7 @@
 			</view>
 		</view>
 		<button class="share-btn" open-type="share" v-if="shareFlag">
-			<image src="/static/images/share-btn.png"></image>
+			<image src="https://download.cyjyyjy.com/share-btn.png"></image>
 		</button>
 	</view>
 </template>
@@ -141,31 +141,31 @@
 				rankList: [],
 				menuList: [{
 					name: '需求优先',
-					icon: "/static/images/menu1.png"
+					icon: "https://download.cyjyyjy.com/menu1.png"
 				}, {
 					name: '收益分成',
-					icon: "/static/images/menu2.png"
+					icon: "https://download.cyjyyjy.com/menu2.png"
 				}, {
 					name: '上架特权',
-					icon: "/static/images/menu3.png"
+					icon: "https://download.cyjyyjy.com/menu3.png"
 				}, {
 					name: '活动特权',
-					icon: "/static/images/menu4.png"
+					icon: "https://download.cyjyyjy.com/menu4.png"
 				}, {
 					name: '精品项目',
-					icon: "/static/images/menu5.png"
+					icon: "https://download.cyjyyjy.com/menu5.png"
 				}, {
 					name: '专属推荐码',
-					icon: "/static/images/menu6.png"
+					icon: "https://download.cyjyyjy.com/menu6.png"
 				}, {
 					name: '会员特价',
-					icon: "/static/images/menu7.png"
+					icon: "https://download.cyjyyjy.com/menu7.png"
 				}, {
 					name: '专属活动',
-					icon: "/static/images/menu8.png"
+					icon: "https://download.cyjyyjy.com/menu8.png"
 				}, {
 					name: '增值收益',
-					icon: "/static/images/menu9.png"
+					icon: "https://download.cyjyyjy.com/menu9.png"
 				}],
 				shareFlag: false,
 				CustomBar: app.globalData.CustomBar
diff --git a/pagesB/pages/shop/GoodsList/index.vue b/pagesB/pages/shop/GoodsList/index.vue
index 78f6893..a470d6d 100644
--- a/pagesB/pages/shop/GoodsList/index.vue
+++ b/pagesB/pages/shop/GoodsList/index.vue
@@ -212,6 +212,7 @@ export default {
       var that = this
       this.setWhere()
       // if (to.name !== "GoodsList") return;
+			console.log(s,'ss')
       const { s = '', id = 0, title = '' } = this.$yroute.query
       if (s !== this.where.keyword || id !== this.where.sid) {
         this.loadend = false
@@ -251,8 +252,8 @@ export default {
       let that = this
       switch (index) {
         case 0:
-          return that.$yrouter.push({
-            path: '/pages/shop/GoodsClass/index',
+          return uni.switchTab({
+          	url: '/pages/life/index'
           })
         case 1:
           if (that.price === 0) that.price = 1
diff --git a/static/images/business-img1.png b/static/images/business-img1.png
deleted file mode 100644
index 8584827..0000000
Binary files a/static/images/business-img1.png and /dev/null differ
diff --git a/static/images/business-img2.png b/static/images/business-img2.png
deleted file mode 100644
index b989238..0000000
Binary files a/static/images/business-img2.png and /dev/null differ
diff --git a/static/images/business-img3.png b/static/images/business-img3.png
deleted file mode 100644
index e2c7a6b..0000000
Binary files a/static/images/business-img3.png and /dev/null differ
diff --git a/static/images/income-bg.png b/static/images/income-bg.png
deleted file mode 100644
index f8d9087..0000000
Binary files a/static/images/income-bg.png and /dev/null differ
diff --git a/static/images/life-icon1.png b/static/images/life-icon1.png
deleted file mode 100644
index 2312630..0000000
Binary files a/static/images/life-icon1.png and /dev/null differ
diff --git a/static/images/life-icon2.png b/static/images/life-icon2.png
deleted file mode 100644
index 3e1ee03..0000000
Binary files a/static/images/life-icon2.png and /dev/null differ
diff --git a/static/images/life-icon3.png b/static/images/life-icon3.png
deleted file mode 100644
index 9c28e66..0000000
Binary files a/static/images/life-icon3.png and /dev/null differ
diff --git a/static/images/life-icon4.png b/static/images/life-icon4.png
deleted file mode 100644
index ade1503..0000000
Binary files a/static/images/life-icon4.png and /dev/null differ
diff --git a/static/images/menu1.png b/static/images/menu1.png
deleted file mode 100644
index ec2c22c..0000000
Binary files a/static/images/menu1.png and /dev/null differ
diff --git a/static/images/menu2.png b/static/images/menu2.png
deleted file mode 100644
index 6a2f3b7..0000000
Binary files a/static/images/menu2.png and /dev/null differ
diff --git a/static/images/menu3.png b/static/images/menu3.png
deleted file mode 100644
index 78877ec..0000000
Binary files a/static/images/menu3.png and /dev/null differ
diff --git a/static/images/menu4.png b/static/images/menu4.png
deleted file mode 100644
index dfb1905..0000000
Binary files a/static/images/menu4.png and /dev/null differ
diff --git a/static/images/menu5.png b/static/images/menu5.png
deleted file mode 100644
index f743682..0000000
Binary files a/static/images/menu5.png and /dev/null differ
diff --git a/static/images/menu6.png b/static/images/menu6.png
deleted file mode 100644
index 228a8fd..0000000
Binary files a/static/images/menu6.png and /dev/null differ
diff --git a/static/images/menu7.png b/static/images/menu7.png
deleted file mode 100644
index d629bef..0000000
Binary files a/static/images/menu7.png and /dev/null differ
diff --git a/static/images/menu8.png b/static/images/menu8.png
deleted file mode 100644
index 35e19c2..0000000
Binary files a/static/images/menu8.png and /dev/null differ
diff --git a/static/images/menu9.png b/static/images/menu9.png
deleted file mode 100644
index da8d1fb..0000000
Binary files a/static/images/menu9.png and /dev/null differ
diff --git a/static/images/no1-bg.png b/static/images/no1-bg.png
deleted file mode 100644
index 67c698f..0000000
Binary files a/static/images/no1-bg.png and /dev/null differ
diff --git a/static/images/no1.png b/static/images/no1.png
deleted file mode 100644
index d51e10f..0000000
Binary files a/static/images/no1.png and /dev/null differ
diff --git a/static/images/no2-bg.png b/static/images/no2-bg.png
deleted file mode 100644
index fb091d8..0000000
Binary files a/static/images/no2-bg.png and /dev/null differ
diff --git a/static/images/no2.png b/static/images/no2.png
deleted file mode 100644
index 3a0748c..0000000
Binary files a/static/images/no2.png and /dev/null differ
diff --git a/static/images/no3-bg.png b/static/images/no3-bg.png
deleted file mode 100644
index ddd63c1..0000000
Binary files a/static/images/no3-bg.png and /dev/null differ
diff --git a/static/images/no3.png b/static/images/no3.png
deleted file mode 100644
index 69ddb3a..0000000
Binary files a/static/images/no3.png and /dev/null differ
diff --git a/static/images/user/fbxq.png b/static/images/user/fbxq.png
deleted file mode 100644
index abffd27..0000000
Binary files a/static/images/user/fbxq.png and /dev/null differ
diff --git a/static/images/user/fbzy.png b/static/images/user/fbzy.png
deleted file mode 100644
index 3d08351..0000000
Binary files a/static/images/user/fbzy.png and /dev/null differ