省艺术协会小程序最新代码

3 years ago · b20f0a9f04
149 changed files with 2827 additions and 6434 deletions
--- a/App.vue
+++ b/App.vue
@ -2,21 +2,17 @@
 import {
 		VUE_APP_API_URL
 	} from "@/config";
+import Vue from 'vue'
 export default {
  onLaunch: function (e) {
    var that = this; //获取设备信息
-    this.setMenuHeight();
+    this.setAppInfo();
    this.autoUpdate();
 		// uni.hideTabBar()
  },
  globalData: {
    baseURL: VUE_APP_API_URL+ '/',
    userInfo: null,
-    navHeight: 0,
-    navTopHeight: 0,
-    menuTop: 0,
-    menuHeight: 0,
-    CustomBar: 0,
    isIphoneX: false,
    inviterId: null,
    //分享码
@ -54,157 +50,6 @@ export default {
  },

  methods: {
-		sceneInfo(s) {
-			console.log(s,'sssssssssssss')
-			var scene = [];
-			switch (s) {
-				case 1001:
-					scene.push(s, "发现栏小程序主入口");
-					break;
-				case 1005:
-					scene.push(s, "顶部搜索框的搜索结果页");
-					break;
-				case 1006:
-					scene.push(s, "发现栏小程序主入口搜索框的搜索结果页");
-					break;
-				case 1007:
-					scene.push(s, "单人聊天会话中的小程序消息卡片");
-					break;
-				case 1008:
-					scene.push(s, "群聊会话中的小程序消息卡片");
-					break;
-				case 1011:
-					scene.push(s, "扫描二维码");
-					break;
-				case 1012:
-					scene.push(s, "长按图片识别二维码");
-					break;
-				case 1014:
-					scene.push(s, "手机相册选取二维码");
-					break;
-				case 1017:
-					scene.push(s, "前往体验版的入口页");
-					break;
-				case 1019:
-					scene.push(s, "微信钱包");
-					break;
-				case 1020:
-					scene.push(s, "公众号profile页相关小程序列表");
-					break;
-				case 1022:
-					scene.push(s, "聊天顶部置顶小程序入口");
-					break;
-				case 1023:
-					scene.push(s, "安卓系统桌面图标");
-					break;
-				case 1024:
-					scene.push(s, "小程序profile页");
-					break;
-				case 1025:
-					scene.push(s, "扫描一维码");
-					break;
-				case 1026:
-					scene.push(s, "附近小程序列表");
-					break;
-				case 1027:
-					scene.push(s, "顶部搜索框搜索结果页“使用过的小程序”列表");
-					break;
-				case 1028:
-					scene.push(s, "我的卡包");
-					break;
-				case 1029:
-					scene.push(s, "卡券详情页");
-					break;
-				case 1031:
-					scene.push(s, "长按图片识别一维码");
-					break;
-				case 1032:
-					scene.push(s, "手机相册选取一维码");
-					break;
-				case 1034:
-					scene.push(s, "微信支付完成页");
-					break;
-				case 1035:
-					scene.push(s, "公众号自定义菜单");
-					break;
-				case 1036:
-					scene.push(s, "App分享消息卡片");
-					break;
-				case 1037:
-					scene.push(s, "小程序打开小程序");
-					break;
-				case 1038:
-					scene.push(s, "从另一个小程序返回");
-					break;
-				case 1039:
-					scene.push(s, "摇电视");
-					break;
-				case 1042:
-					scene.push(s, "添加好友搜索框的搜索结果页");
-					break;
-				case 1044:
-					scene.push(s, "带shareTicket的小程序消息卡片");
-					break;
-				case 1047:
-					scene.push(s, "扫描小程序码");
-					break;
-				case 1048:
-					scene.push(s, "长按图片识别小程序码");
-					break;
-				case 1049:
-					scene.push(s, "手机相册选取小程序码");
-					break;
-				case 1052:
-					scene.push(s, "卡券的适用门店列表");
-					break;
-				case 1053:
-					scene.push(s, "搜一搜的结果页");
-					break;
-				case 1054:
-					scene.push(s, "顶部搜索框小程序快捷入口");
-					break;
-				case 1056:
-					scene.push(s, "音乐播放器菜单");
-					break;
-				case 1058:
-					scene.push(s, "公众号文章");
-					break;
-				case 1059:
-					scene.push(s, "体验版小程序绑定邀请页");
-					break;
-				case 1064:
-					scene.push(s, "微信连Wifi状态栏");
-					break;
-				case 1067:
-					scene.push(s, "公众号文章广告");
-					break;
-				case 1068:
-					scene.push(s, "附近小程序列表广告");
-					break;
-				case 1072:
-					scene.push(s, "二维码收款页面");
-					break;
-				case 1073:
-					scene.push(s, "客服消息列表下发的小程序消息卡片");
-					break;
-				case 1074:
-					scene.push(s, "公众号会话下发的小程序消息卡片");
-					break;
-				case 1089:
-					scene.push(s, "微信聊天主界面下拉");
-					break;
-				case 1090:
-					scene.push(s, "长按小程序右上角菜单唤出最近使用历史");
-					break;
-				case 1092:
-					scene.push(s, "城市服务入口");
-					break;
-				default:
-					scene.push("未知入口");
-					break;
-			}
-			return scene;
-		},
 		autoUpdate: function () {
 		  // console.log(new Date());
 		  var self = this; // 获取小程序更新机制兼容
@ -245,54 +90,36 @@ export default {
 		  }
 		},
 		
-		setMenuHeight() {
+		// 获取系统栏高度
+		async setAppInfo() {
+		  let that = this
+		  return new Promise((resolve, reject) => {
 		    uni.getSystemInfo({
-		    success: res => {
-					console.log(res,'resaaaaa')
-		      this.globalData.navTopHeight = res.statusBarHeight;
-		      this.globalData.CustomBar = res.statusBarHeight + 45;
-		      this.globalData.systemInfo = res;
-		      let model = res.model;
-		      if (/iphone\sx/i.test(model) || /iphone/i.test(model) && /unknown/.test(model) || /iphone\s11/i.test(model) || /iphone\s12/i.test(model) || /iphone\s13/i.test(model)) {
-		        this.globalData.isIphoneX = true;
-		      }
-		    }
-		  });
-		  let menuButtonObj = uni.getMenuButtonBoundingClientRect();
-			console.log(menuButtonObj,'menuButtonObj')
-		 this.globalData.menuTop = menuButtonObj.top;
-		 this.globalData.menuHeight = menuButtonObj.height;
-		 this.globalData.topHeight = menuButtonObj.top + menuButtonObj.height;
-		 this.globalData.navHeight = menuButtonObj.top;
-		},
+		      success: function (e) {
+		        Vue.prototype.StatusBar = e.statusBarHeight
+		        // #ifdef H5
+		        Vue.prototype.CustomBar = e.statusBarHeight + 45
+		        // #endif
 		
-		getInfo() {
-		  this.http('get', 'userinfo').then(res => {
-		    if (res.data.success) {
-		      uni.setStorageSync('userInfo', res.data.data);
-		      var pages = getCurrentPages().pop(); //当前页面
-		
-		      if (pages.getUser) {
-		        pages.getUser();
-		      }
+		        // #ifdef APP-PLUS
+		        if (e.platform == 'android') {
+		          Vue.prototype.CustomBar = e.statusBarHeight + 50
 		        } else {
-		      uni.showToast({
-		        title: res.data.msg,
-		        icon: 'none',
-		        duration: 2000
-		      });
-		      setTimeout(() => {
-		        // uni.navigateTo({
-		        //   url: '/pages/login/index'
-		        // });
-						uni.navigateTo({
-						  url: '/pages/authorization/index'
-						});
-		      }, 2000);
+		          Vue.prototype.CustomBar = e.statusBarHeight + 45
 		        }
-		  });
+		        // #endif
+		
+		        // #ifdef MP-WEIXIN
+		        let custom = wx.getMenuButtonBoundingClientRect()
+		        Vue.prototype.Custom = custom
+		        Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight
+		        // #endif
+		      },
+		    })
+		  })
 		},
 		
+		
 		http(mathods, url, params) {
 		  var that = this;
 		  var header = {
@ -316,10 +143,6 @@ export default {
 		        uni.hideLoading(); // console.log(res)
 		        //判断token是否过期 res.data.code == 40001
 		        if (!res.data.success && res.data.status == 401) {
-		          // console.log('登陆失效')
-		          // uni.navigateTo({
-		          //   url: '/pages/login/index'
-		          // });
 							var pages = getCurrentPages().pop(); //当前页面
 							console.log(pages.$page.fullPath)
 							uni.setStorageSync('redirect',pages.$page.fullPath) //当前路由存起来，用于登录后自动跳转
@ -353,158 +176,35 @@ export default {
@import './assets/css/base.less';
@import './assets/css/reset.less';
@import './assets/css/style.less';
-view,
-scroll-view,
-swiper,
-button,
-input,
-textarea,
-label,
-navigator,
-image {
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
-image{
-  /* border-radius: 8rpx; */
-}
-/* layout */
-.acea-row-nowrap {
-  display: flex;
-  /* 辅助类 */
-}
-.acea-row {
-  display: flex;
-  flex-wrap: wrap;
-  /* 辅助类 */
-}
-.acea-row.row-middle,.acea-row-nowrap.row-middle{
-  align-items: center;
-}
-.acea-row.row-top,.acea-row-nowrap.row-top {
-  align-items: flex-start;
-}
-.acea-row.row-bottom {
-  align-items: flex-end;
-}
-.acea-row.row-center,.acea-row-nowrap.row-center {
-  justify-content: center;
-}
-.acea-row.row-right,.acea-row-nowrap.row-right {
-  justify-content: flex-end;
-}
-.acea-row.row-left,.acea-row-nowrap.row-left {
-  justify-content: flex-start;
-}
-.acea-row.row-between,.acea-row-nowrap.row-between {
-  justify-content: space-between;
-}
-.acea-row.row-around, .acea-row-nowrap.row-around{
-  justify-content: space-around;
-}
-.acea-row.row-column-around,.acea-row-nowrap.row-column-around {
-  flex-direction: column;
-  justify-content: space-around;
-}
-.acea-row.row-column {
-  flex-direction: column;
-}
-.acea-row.row-column-between,.acea-row-nowrap.row-column-between {
-  flex-direction: column;
-  justify-content: space-between;
-}
-/* 上下左右垂直居中 */
-.acea-row.row-center-wrapper,.acea-row-nowrap.row-center-wrapper {
-  align-items: center;
-  justify-content: center;
-}
-/* 上下两边居中对齐 */
-.acea-row.row-between-wrapper,.acea-row-nowrap.row-between-wrapper {
-  align-items: center;
-  justify-content: space-between;
-}
-.line1{
-	overflow:hidden;
-	text-overflow:ellipsis;
-	white-space:nowrap;
-	width: 100%;
-}
-.line2{
-	word-break:break-all;
-	display:-webkit-box;
-	-webkit-line-clamp:2;
-	-webkit-box-orient:vertical;
-	overflow:hidden;
-}

-.back-btn{
-  width: 36rpx;
-  height: 36rpx;
-  position: fixed;
-  left: 40rpx;
-  text-align: center;
-  line-height: 36rpx;
-  z-index: 99;
-}
-.back-btn image{
-  width: 100%;
-  height: 100%;
-} 
-
-
-
-radio .wx-radio-input.wx-radio-input-checked {
-  border-color: #FF5100;
-  background: #FF5100;
+radio .wx-radio-input.wx-radio-input-checked,
+checkbox .wx-checkbox-input.wx-checkbox-input-checked
+{
+  border-color: #1d1d1d;
+  background: #1d1d1d;
 }
 radio .wx-radio-input {
-  height: 33rpx;
-  width: 33rpx;
-  margin-top: -4rpx;
-  border-radius: 50%;
-  border: 2rpx solid #999;
-  background: transparent;
-}
-radio .wx-radio-input.wx-radio-input-checked::before {
-  border-radius: 50%; /* 圆角 */
-  width: 35rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
-  height: 35rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
-  line-height: 35rpx;
-  text-align: center;
-  font-size: 28rpx; /* 对勾大小 30rpx */
-  color: #fff; /* 对勾颜色 白色 */
-  background: #FF5100;
-  border: 2rpx solid #FF5100;
-  transform: translate(-50%, -50%) scale(1);
-  -webkit-transform: translate(-50%, -50%) scale(1);
-}
-
-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  border-color: #F99C10;
-  background: #F99C10;
-}
-checkbox .wx-checkbox-input {
-  height: 40rpx;
-  width: 40rpx;
-  margin-top: -4rpx;
+  height: 32rpx;
+  width: 32rpx;
+  margin-top: -4rpx !important;
  border-radius: 50%;
  border: 2rpx solid #999;
  background: transparent;
 }
-checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+radio .wx-radio-input.wx-radio-input-checked::before,
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
  border-radius: 50%; /* 圆角 */
-  width: 40rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
-  height: 40rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
-  line-height: 40rpx;
+  width: 32rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+  height: 32rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+  line-height: 32rpx;
  text-align: center;
-  font-size: 28rpx; /* 对勾大小 30rpx */
+  font-size: 26rpx; /* 对勾大小 30rpx */
  color: #fff; /* 对勾颜色 白色 */
-  background: #F99C10;
-  border: 2rpx solid #F99C10;
+  background: #1d1d1d;
+  border: 2rpx solid #1d1d1d;
  transform: translate(-50%, -50%) scale(1);
  -webkit-transform: translate(-50%, -50%) scale(1);
 }
-
 .no-list{
  display: flex;
  flex-direction: column;
@ -523,7 +223,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
  height: 88rpx;
  line-height: 88rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 44rpx;
  font-size: 40rpx;
  color: #fff;
--- a/api/home.js
+++ b/api/home.js
@ -21,3 +21,26 @@ export function getArticle(q) {
 export function getArticleDetail(q) {
 	return request.get("/article/details/" + q.id);
 }
+
+/*
+ * 活动列表
+ * */
+export function getActivityList(data) {
+	return request.post("/activity/activityList",data);
+}
+/*
+ * 活动列表
+ * */
+export function getActivityInfo(data) {
+	return request.get("/activity/activityInfo/" + data);
+}
+
+/*
+ * 专家列表
+ * */
+export function getListExperts(data) {
+	return request.get("/expert/listExperts", data);
+}
+
+
+ 
--- a/app.css
+++ b/app.css
@ -1,151 +0,0 @@
-/**app.wxss**/
-view,
-scroll-view,
-swiper,
-button,
-input,
-textarea,
-label,
-navigator,
-image {
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
-image{
-  /* border-radius: 8rpx; */
-}
-/* layout */
-.acea-row-nowrap {
-  display: flex;
-  /* 辅助类 */
-}
-.acea-row {
-  display: flex;
-  flex-wrap: wrap;
-  /* 辅助类 */
-}
-.acea-row.row-middle,.acea-row-nowrap.row-middle{
-  align-items: center;
-}
-.acea-row.row-top,.acea-row-nowrap.row-top {
-  align-items: flex-start;
-}
-.acea-row.row-bottom {
-  align-items: flex-end;
-}
-.acea-row.row-center,.acea-row-nowrap.row-center {
-  justify-content: center;
-}
-.acea-row.row-right,.acea-row-nowrap.row-right {
-  justify-content: flex-end;
-}
-.acea-row.row-left,.acea-row-nowrap.row-left {
-  justify-content: flex-start;
-}
-.acea-row.row-between,.acea-row-nowrap.row-between {
-  justify-content: space-between;
-}
-.acea-row.row-around, .acea-row-nowrap.row-around{
-  justify-content: space-around;
-}
-.acea-row.row-column-around,.acea-row-nowrap.row-column-around {
-  flex-direction: column;
-  justify-content: space-around;
-}
-.acea-row.row-column {
-  flex-direction: column;
-}
-.acea-row.row-column-between,.acea-row-nowrap.row-column-between {
-  flex-direction: column;
-  justify-content: space-between;
-}
-/* 上下左右垂直居中 */
-.acea-row.row-center-wrapper,.acea-row-nowrap.row-center-wrapper {
-  align-items: center;
-  justify-content: center;
-}
-/* 上下两边居中对齐 */
-.acea-row.row-between-wrapper,.acea-row-nowrap.row-between-wrapper {
-  align-items: center;
-  justify-content: space-between;
-}
-.line1{
-	overflow:hidden;
-	text-overflow:ellipsis;
-	white-space:nowrap;
-	width: 100%;
-}
-.line2{
-	word-break:break-all;
-	display:-webkit-box;
-	-webkit-line-clamp:2;
-	-webkit-box-orient:vertical;
-	overflow:hidden;
-}
-
-.back-btn{
-  width: 36rpx;
-  height: 36rpx;
-  position: fixed;
-  left: 40rpx;
-  text-align: center;
-  line-height: 36rpx;
-  z-index: 99;
-}
-.back-btn image{
-  width: 100%;
-  height: 100%;
-} 
-
-
-
-radio .wx-radio-input.wx-radio-input-checked {
-  border-color: #cc0000;
-  background: #cc0000;
-}
-radio .wx-radio-input {
-  height: 33rpx;
-  width: 33rpx;
-  margin-top: -4rpx;
-  border-radius: 50%;
-  border: 2rpx solid #999;
-  background: transparent;
-}
-radio .wx-radio-input.wx-radio-input-checked::before {
-  border-radius: 50%; /* 圆角 */
-  width: 35rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
-  height: 35rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
-  line-height: 35rpx;
-  text-align: center;
-  font-size: 28rpx; /* 对勾大小 30rpx */
-  color: #fff; /* 对勾颜色 白色 */
-  background: #FF5100;
-  border: 2rpx solid #FF5100;
-  transform: translate(-50%, -50%) scale(1);
-  -webkit-transform: translate(-50%, -50%) scale(1);
-}
-
-.no-list{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  font-size: 46rpx;
-  color: #D8D8D8;
-  font-weight: 500;
-  padding-top: 20%;
-}
-.no-list image{
-  width: 536rpx;
-  height: 490rpx;
-}
-.no-list .to-btn{
-  width: 458rpx;
-  height: 88rpx;
-  line-height: 88rpx;
-  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
-  border-radius: 44rpx;
-  font-size: 40rpx;
-  color: #fff;
-  margin-top: 160rpx;
-}
--- a/assets/css/base.less
+++ b/assets/css/base.less
@ -4,17 +4,17 @@
 */

 .font-color-red {
-  color: #F99C10 !important;
+  color: #292929 !important;
 }
 .bg-color-red {
-  background-color: #F99C10 !important;
+  background-color: #292929 !important;
 }
 .icon-color {
-  color: #F99C10;
+  color: #292929;
 }
 .cart-color {
-  color: #F99C10 !important;
-  border: 1px solid #F99C10 !important;
+  color: #292929 !important;
+  border: 1px solid #292929 !important;
 }
 /* padding20 */
 .padding20 {
--- a/assets/css/style.less
+++ b/assets/css/style.less
@ -11,7 +11,7 @@ image {
 }

 page {
-  // background: #f5f5f5;
+  background: #f5f5f5;
  height: 100%;
 }

--- a/components/CustomNavigator.vue
+++ b/components/CustomNavigator.vue
@ -1,89 +0,0 @@
-<template>
-	<view class="pageTitle-box" :class="isFixed ? 'showPageTitle' : ''"
-		:style="{'padding-top':menuTop + 'px',height: menuHeight+ 'px'}">
-		<view class="top-logo acea-row row-center"
-			:style="'height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">
-			{{title}}
-		</view>
-	</view>
-</template>
-
-<script>
-	const app = getApp();
-	export default {
-		props: {
-			isFixed: {
-				type: Boolean,
-				default: false
-			},
-			title: {
-				type: String ,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				menuHeight: app.globalData.menuHeight,
-				menuTop: app.globalData.menuTop,
-			};
-		},
-		methods:{
-			
-		}
-	}
-</script>
-
-<style lang="less">
-	
-.pageTitle-box {
-	width: 100%;
-	position: fixed;
-	top: 0;
-	z-index: 99;
-	color: #fff;
-	transition: all .5s;
-}
-
-.showPageTitle {
-	background: #fff;
-	color: #000000 !important;
-	opacity: 1;
-	font-weight: normal;
-	.top-logo {
-		color: #000;
-		background-color: #fff;
-	}
-}
-.page-top-box {
-	width: 100%;
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 99;
-	background: #fff;
-	padding: 0 30rpx 20rpx;
-	box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
-	.top-box {
-		.top-box-l {
-			font-size: 32rpx;
-			color: #000;
-			font-weight: 500;
-
-			image {
-				width: 26rpx;
-				height: 30rpx;
-				display: block;
-				margin-right: 10rpx;
-			}
-		}
-	}
-}
-.top-logo {
-	position: absolute;
-	width: 100%;
-	color: #fff;
-	font-weight: 600;
-	font-size: 32rpx;
-	transition: all .5s cubic-bezier(.25, .5, .5, .9);
-}
-</style>
--- a/components/colorui/components/cu-custom.vue
+++ b/components/colorui/components/cu-custom.vue
@ -37,7 +37,7 @@
 		props: {
 			bgColor: {
 				type: String,
-				default: ''
+				default: '#fff'
 			},
 			isBack: {
 				type: [Boolean, String],
@ -59,12 +59,14 @@
 </script>

 <style>
+@import url("../animation.css");
+@import url("../icon.css");
+@import url("../main.css");
 .fixed{
 	position: fixed;
 	top:0;
 	left:0;
 	right:0;
 	z-index: 99;
-	
 }
 </style>
--- a/components/colorui/main.css
+++ b/components/colorui/main.css
@ -10,7 +10,7 @@
        初始化
 ==================== */
 body {
-	background-color: #f1f1f1;
+	background-color: #fff;
 	font-size: 28upx;
 	color: #333333;
 	font-family: Helvetica Neue, Helvetica, sans-serif;
@ -132,8 +132,8 @@ switch.checked::before {
 /* #ifndef MP-ALIPAY */
 radio::before,
 checkbox::before {
-	font-family: "cuIcon";
-	content: "\e645";
+	/* font-family: "cuIcon"; */
+	/* content: "\e645"; */
 	position: absolute;
 	color: #ffffff !important;
 	top: 50%;
--- a/config/index.js
+++ b/config/index.js
@ -1,8 +1,8 @@
 // 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://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://192.168.68.125:8200/api'
+export const VUE_APP_API_URL = 'https://artcloud.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'
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
--- a/manifest.json
+++ b/manifest.json
@ -1,5 +1,5 @@
 {
-    "name" : "zhaoshangMiniApp",
+    "name" : "sysxh-uniapp",
    "appid" : "",
    "description" : "",
    "versionName" : "1.0.0",
@ -49,9 +49,12 @@
    },
    "quickapp" : {},
    "mp-weixin" : {
-        "appid" : "wx5348e39dcbbefe1e",
+        "appid" : "wx88e2a1d36fc0aa2f",
        "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "es6" : true,
+            "minified" : true,
+            "postcss" : true
        },
        "usingComponents" : true,
        "permission" : {
--- a/pages.json
+++ b/pages.json
@ -6,16 +6,15 @@
 		{
 		  "path": "pages/Loading/index",
 		  "style": {
-		    "navigationBarTitleText": " ",
-				"navigationBarBackgroundColor": "#FE915D",
-				"navigationBarTextStyle": "white"
+		    "navigationStyle": "custom"
 		  }
 		},
 		{
 			"path": "pages/home/index",
 			"style": {
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "dark"
 			}
 		},
 		{
@ -25,6 +24,13 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/home/activityDetail/index",
+			"style": {
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path": "pages/user/index",
 			"style": {
@ -411,25 +417,19 @@
 		{
 			"path": "pages/activity/signIn/index",
 			"style": {
-				"navigationBarTitleText": "报名信息填写",
-				"navigationBarBackgroundColor": "#EBB672",
-				"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "报名信息填写"
 			}
 		},
 		{
 			"path": "pages/activity/signIn/confirm/index",
 			"style": {
-				"navigationBarTitleText": "信息确认",
-				"navigationBarBackgroundColor": "#EBB672",
-				"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "信息确认"
 			}
 		},
 		{
 			"path": "pages/activity/signIn/paymentSuccess/index",
 			"style": {
-				"navigationBarTitleText": "支付",
-				"navigationBarBackgroundColor": "#EBB672",
-				"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "支付"
 			}
 		},
    {
@ -502,27 +502,22 @@
      "path": "pages/information/index",
      "style": {
        "navigationBarTitleText": "资讯广场",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
      }
    }
 	],
 	"tabBar": {
 		"backgroundColor": "#ffffff",
 		"color": "#D4D4D4",
-		"selectedColor": "#FF6F34",
+		"selectedColor": "#000",
 		"list": [
 			{
 				"pagePath": "pages/home/index",
 				"text": "首页",
-				"iconPath": "/static/tabbarComponent/icon/home.png",
-				"selectedIconPath": "/static/tabbarComponent/icon/home-a.png"
+				"iconPath": "/static/tabbarComponent/icon/tab1.png",
+				"selectedIconPath": "/static/tabbarComponent/icon/tab1-a.png"
 			},
-			// {
-			// 	"pagePath": "pages/demandHall/index",
-			// 	"text": "供需大厅",
-			// 	"iconPath": "/static/tabbarComponent/icon/tab2.png",
-			// 	"selectedIconPath": "/static/tabbarComponent/icon/tab2-a.png"
-			// },
 			{
 				"pagePath": "pages/demandHall/business/index",
 				"text": "商业",
@ -539,14 +534,14 @@
 			{
 				"pagePath": "pages/information/index",
 				"text": "资讯",
-				"iconPath": "/static/tabbarComponent/icon/tab5.png",
-				"selectedIconPath": "/static/tabbarComponent/icon/tab5-a.png"
+				"iconPath": "/static/tabbarComponent/icon/tab4.png",
+				"selectedIconPath": "/static/tabbarComponent/icon/tab4-a.png"
 			},
 			{
 				"pagePath": "pages/user/index",
 				"text": "我的",
-				"iconPath": "/static/tabbarComponent/icon/tab4.png",
-				"selectedIconPath": "/static/tabbarComponent/icon/tab4-a.png"
+				"iconPath": "/static/tabbarComponent/icon/tab5.png",
+				"selectedIconPath": "/static/tabbarComponent/icon/tab5-a.png"
 			}
 		]
 	},
@ -560,7 +555,7 @@
 	"globalStyle": {
 		"backgroundTextStyle": "dark",
 		"navigationBarBackgroundColor": "#fff",
-		"navigationBarTitleText": "禅易云生态",
+		"navigationBarTitleText": "湖北省艺术设计协会",
 		"navigationBarTextStyle": "black"
 	},
 	"subPackages": [
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@ -1,8 +1,7 @@
 <template>
  <view class="lottie-bg">
    <view id="lottie">
-			<image src="https://download.cyjyyjy.com/miniappLogo.png" mode="aspectFill"></image>
-			<text>海量资源与福利尽在云生态~</text>
+			<image src="https://download.cyjyyjy.com/sysxh-logo.png"></image>
      <!-- <image src="@/static/live-logo.gif" rel="preload" mode="widthFix" style="width: 100%" /> -->
 			<!-- <image src="../../static/images/loading.gif" class="loading" mode=""></image> -->
    </view>
@ -93,29 +92,28 @@ export default {
  position: fixed;
  left: 0;
  top: 0;
-  background-color: #FE915D;
  width: 100%;
  height: 100%;
  z-index: 999;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-align-items: center;
-  align-items: center;
-  -webkit-justify-content: center;
-  justify-content: center;
 }

 #lottie {
 	width: 100%;
 	height: 100%;
+	background: url('https://download.cyjyyjy.com/sysxh-loading-bg.png') no-repeat;
+	background-size: 100% 100%;
 	color: #fff;
 	font-size: 32rpx;
 	text-align: center;
+	position: relative;
 	image{
-		width: 233rpx;
-		height: 209rpx;
+		width: 440rpx;
+		height: 440rpx;
 		display: block;
-		margin: 300rpx auto 40rpx;
+		position: absolute;
+		top: 250rpx;
+		left: 50%;
+		margin-left: -220rpx;
 	}
 	.loading{
 		width: 68rpx;
--- a/pages/activity/detail/index.vue
+++ b/pages/activity/detail/index.vue
@ -39,15 +39,6 @@
      </view>
    </view>
  </view>
-  <!-- <view class="company-info-box acea-row row-middle">
-    <view class="company-logo">
-      <image src="{{activityDetail.publisherVo.image}}"></image>
-    </view>
-    <view class="company-info">
-      <view class="company-name">{{activityDetail.publisherVo.name}}</view>
-      <view class="company-des line2">{{activityDetail.publisherVo.desc}}</view>
-    </view>
-  </view> -->
  <view class="activity-des-box">
    <view class="title2">活动简介</view>
    <text class="line2">{{activityDetail.desc}}</text>
@ -126,36 +117,6 @@ export default {
    }
  },

-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {},
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {},
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {},
-
  /**
   * 用户点击右上角分享
   */
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@ -70,26 +70,6 @@ export default {
    this.getActivityList();
  },

-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {},
-
  /**
   * 用户点击右上角分享
   */
--- a/pages/activity/signIn/confirm/index.css
+++ b/pages/activity/signIn/confirm/index.css
@ -1,82 +0,0 @@
-/* pages/activity/signIn/confirm/index.wxss */
-.confirm-page{
-  width: 100%;
-  min-height: 100%;
-  background: #f2f2f2;
-}
-.userInfo-box{
-  box-sizing: border-box;
-  padding: 56rpx 32rpx;
-  background: #fff;
-  margin-bottom: 32rpx;
-
-}
-.title-box{
-  font-size: 32rpx;
-  color: #333;
-  margin-bottom: 38rpx;
-}
-.edit-box{
-  font-size:24rpx;
-}
-.edit-box image{
-  width: 24rpx; 
-  height: 24rpx;
-  margin-right: 4rpx;
-}
-.info-box{
-  font-size: 28rpx;
-}
-.phone{
-  margin-left: 300rpx;
-}
-.name view:nth-child(1){
-  color: #868686;
-  margin-bottom: 16rpx;
-}
-
-.activity-info-box{
-  width: 100%;
-  background: #fff;
-  padding: 32rpx;
-  box-sizing: border-box;
-}
-.title{
-  font-size: 32rpx;
-  color: #333;
-  line-height: 48rpx;
-  font-weight: bold;
-  margin-bottom: 40rpx;
-}
-.activity-info{
-  display: flex;
-  justify-content: space-between;
-  font-size: 28rpx;
-  margin-bottom: 24rpx;
-}
-.address{
-  overflow:hidden;
-  white-space: pre-wrap;
-  width: 80%;
-  text-align: right;
-}
-.settle-box{
-  font-size: 32rpx;
-  font-weight: 600;
-  margin-top: 60rpx;
-}
-.money{
-  color: #EBB672;
-}
-.pay-btn{
-  position: fixed;
-  bottom: 60rpx;
-  left: 0;
-  width: 100%;
-  height: 76rpx;
-  background: #EBB672;
-  color: #FFF;
-  font-size: 32rpx;
-  line-height: 76rpx;
-  text-align: center;
-}
--- a/pages/activity/signIn/confirm/index.vue
+++ b/pages/activity/signIn/confirm/index.vue
@ -72,36 +72,6 @@ export default {
    console.log(this.payInfo);
  },

-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {},
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {},
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {},
-
  /**
   * 用户点击右上角分享
   */
@ -135,15 +105,16 @@ export default {
                this.setData({
                  canClick: true
                });
-                uni.showToast({
-                  title: '支付成功！',
-                  duration: 1500
-                });
-                setTimeout(() => {
-                  uni.navigateTo({
-                    url: '../paymentSuccess/index'
-                  });
-                }, 1500);
+								uni.showModal({
+									title: '提示',
+									content: '支付成功！',
+									showCancel: false
+								})
+                // setTimeout(() => {
+                //   uni.navigateTo({
+                //     url: '../paymentSuccess/index'
+                //   });
+                // }, 1500);
              },
              fail: response => {
                this.setData({
@ -232,12 +203,10 @@ export default {
  color: #EBB672;
 }
 .pay-btn{
-  position: fixed;
-  bottom: 60rpx;
-  left: 0;
-  width: 100%;
+  width: 670rpx;
  height: 76rpx;
-  background: #EBB672;
+	margin: 100rpx auto 0;
+  background: #292929;
  color: #FFF;
  font-size: 32rpx;
  line-height: 76rpx;
--- a/pages/activity/signIn/index.vue
+++ b/pages/activity/signIn/index.vue
@ -9,7 +9,7 @@
    <form @submit="toConfirm">
      <view class="form-item">
        <view class="form-label">昵称<text style="color:#FF3B30;">*</text></view>
-        <input type="text" placeholder="请输入姓名" name="name">
+        <input type="text" name="name" placeholder="请输入姓名" />
      </view>
      <view class="form-item">
        <view class="form-label">手机号<text style="color:#FF3B30;">*</text></view>
@ -63,37 +63,6 @@ export default {
      activityId: options.id
    });
  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {},
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {},
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {},
-
  /**
   * 用户点击右上角分享
   */
@ -182,39 +151,26 @@ export default {
  margin-top: 46rpx;
 }
 .form-item input[type="text"]{
-  padding: 26rpx 0 32rpx;
+	display: block;
+  height: 68rpx;
+	line-height: 68rpx;
  border-bottom: 2px solid #F4F4F4;
  font-size: 28rpx;
 }
 .input-box input[type="text"]{
  width: calc(100% - 310rpx);
 }
-.form-item input[type="button"]{
-  width: 175rpx;
-  height:78rpx;
-  line-height: 78rpx;
-  text-align: center;
-  color: #fff;
-  background: #EBB672;
-  padding: 0 10rpx;
-  border-radius: 8rpx;
-  font-size: 28rpx;
-  margin-left: 12rpx;
-}

 .submit-btn{
-  width: 100% !important;
-  position: fixed;
-  bottom: 60rpx;
-  left: 0;
-  width: 100%;
+  width: 672rpx !important;
  height: 76rpx !important;
-  background: #EBB672;
+  background: #292929;
  color: #FFF;
  font-size: 32rpx;
  line-height: 76rpx !important;
  padding: 0 !important;
  text-align: center;
  border-radius: 0 !important;
+	margin: 100rpx auto 0;
 }
 </style>
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@ -206,8 +206,7 @@ export default {
    .author-btn {
      width: 630rpx;
      height: 80rpx;
-      background: linear-gradient(to right, #f35447 0%, #ff8e3c 100%);
-      background: -moz-linear-gradient(to right, #f35447 0%, #ff8e3c 100%);
+      background: #212121;
      // box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
      border-radius: 40rpx;
      font-size: 30rpx;
@ -221,12 +220,11 @@ export default {
      height: 80rpx;
      margin-top: 30rpx;
      border-radius: 40rpx;
-      border: 2rpx solid #eb3729;
+      border: 4rpx solid #141414;
      background: none;
      font-size: 30rpx;
-      font-family: PingFang SC;
      font-weight: 500;
-      color: #eb3729;
+      color: #141414;
    }
  }
 }
--- a/pages/demandHall/business/index.vue
+++ b/pages/demandHall/business/index.vue
@ -8,12 +8,15 @@
 		</view>
 		<!-- 供需大厅 企业服务 项目投融 -->
 		<view class="acea-row row-around pa40">
-			<view class="img1">
-				<image src="https://download.cyjyyjy.com/business-img1.png" @tap="toSupplyHall"></image>
+			<view class="img1" @tap="toSupplyHall">
+				<image src="../../../static/images/gongxu-bg.png"></image>
+				<view>供需大厅</view>
+				<view class="tit-s">海量资源等你来</view>
 			</view>
-			<view class="img2 acea-row row-column-between">
-				<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 class="img1" @tap="toEnterpriseServer">
+				<image src="../../../static/images/qiye-bg.png"></image>
+				<view>企业服务</view>
+				<view class="tit-s">提供优质服务</view>
 			</view>
 		</view>

@ -24,105 +27,105 @@
 				<view class="news-con acea-row row-middle">
 					<image src="../../../static/images/hot-icon.png"></image>
 					<view class="notice-swiper">
-						<NewsSwiper :list="isHotList" :interval="4000" @toArticleDetail="toArticleDetail"></NewsSwiper>
+						<NewsSwiper :list="isHotList" :interval="4650" @toArticleDetail="toArticleDetail"></NewsSwiper>
 					</view>
 				</view>
 				<view class="news-con acea-row row-middle">
 					<image src="../../../static/images/rem-icon.png"></image>
 					<view class="notice-swiper">
-						<NewsSwiper :list="isRecommend" :interval="6000" @toArticleDetail="toArticleDetail">
+						<NewsSwiper :list="isRecommend" :interval="6320" @toArticleDetail="toArticleDetail">
 						</NewsSwiper>
 					</view>
 				</view>
 			</view>
 		</view>
-
-		<!-- 优质企业 -->
-		<view class="company-box">
+		<!-- 优质供需 -->
+		<view class="rec-box">
 			<view class="title-con acea-row">
-				<image src="../../../static/images/business-title1.png" class="title-img"></image>
-				<view class="update-icon acea-row row-center-wrapper" @click="replaceClick">
-					<image src="../../../static/images/update-icon.png" :class="showCirc ? 'circ' : ''"></image>换一批
+				<view class="title">优质供需</view>
 			</view>
+			<view class="rec-switch">
+				<view class="rec-title acea-row">
+					<view class="rec-l " @click="tabClick(1)">
+						<image src="../../../static/images/rec-bg.png" class="rec-bg" v-show="active == 1"></image>
+						<view class="rec-t acea-row row-center-wrapper">
+							<image src="../../../static/images/rec-icon1.png"></image>
+							<view>需求</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" @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.resourceIntroduction}}</view>
-					<view class="acea-row">
-						<image :src="item.enterpriseLogo" class="company-logo" mode="aspectFill"></image>
-						<view class="todetails">了解详情</view>
+					<view class="rec-r " @click="tabClick(2)">
+						<image src="../../../static/images/rec-bg.png" class="rec-bg" v-show="active == 2"></image>
+						<view class="rec-t acea-row row-center-wrapper">
+							<image src="../../../static/images/rec-icon2.png"></image>
+							<view>资源</view>
 						</view>
-
 					</view>
-			</scroll-view>
 				</view>
-
-		<!-- 推荐服务 -->
-		<view class="service-box">
-			<view class="title-con acea-row row-middle">
-				<image src="../../../static/images/business-title2.png" class="title-img"></image>
-				<image src="../../../static/images/fabu-close.png" class="toadd" @tap="toAuthentication"></image>
+				<view class="rec-switch-a">
+					<view class="list-box" v-if="active == 1">
+						<view class="nolist" v-if="demandList.length == 0">暂无数据...</view>
+						<view class="rec-list" v-else v-for="(item,index) in demandList" :key="index" @click="toNeedDetail(item.id)">
+							<view class="acea-row row-middle">
+								<image src="../../../static/images/rec-icon1.png" mode="aspectFill"></image>
+								<view class="rec-name line1">{{item.title}}</view>
+								<!-- <view class="rec-address">武汉</view> -->
+								<view class="rec-end acea-row row-right">{{item.resourceEndTime}}截止报名</view>
 							</view>
-			<view class="service-top acea-row row-between">
-				<view class="service-nub-left acea-row row-column-between" @click="toResourcesDetail(supplyList[0].id)">
-					<view class="tips line1">{{supplyList[0].title}}</view>
-					<view class="tips-item line1">{{supplyList[0].detailedDescription}}</view>
-					<image :src="supplyList[0].resourceImgs[0]" mode="aspectFill"></image>
+							<view class="rec-message line1">{{item.detailedDescription}}</view>
 						</view>
-				<view class="acea-row row-between service-nub-right" @click="toResourcesDetail(supplyList[1].id)">
-					<view class="acea-row row-center-wrapper module-nub">
-						<view class="tips line1">{{supplyList[1].title}}</view>
-						<view class="tips-item line1">{{supplyList[1].detailedDescription}}</view>
 					</view>
-					<view class="acea-row row-center-wrapper module-nub" @click="toResourcesDetail(supplyList[2].id)">
-						<view class="tips">{{supplyList[2].title || '广告位招租'}}</view>
-						<view class="tips-item">{{supplyList[2].detailedDescription}}</view>
+					<view class="list-box" v-if="active == 2">
+						<view class="nolist" v-if="resourcesList.length == 0">暂无数据...</view>
+						<view class="rec-list" v-for="(item,index) in resourcesList" :key="index" @click="toResourcesDetail(item.id)">
+							<view class="acea-row row-middle">
+								<image src="../../../static/images/rec-icon2.png" mode=""></image>
+								<view class="rec-name line1">{{item.title}}</view>
+								<!-- <view class="rec-address">{{item.cname}}</view> -->
+								<view class="rec-end acea-row row-right">{{item.resourceEndTime}}截止报名</view>
 							</view>
+							<view class="rec-message line1">{{item.detailedDescription}}</view>
 						</view>
 					</view>
-			<view class="service-bottom acea-row row-between">
-				<view v-for="(item,index) in cagetoryList" :key="index" @click="toEnterpriseServer(item.id)">
-					<view class="module-box bg-red acea-row row-center-wrapper" v-if="index <= 2 ">
-						<view class="tips">{{item.cagetoryName}}</view>
-						<!-- <view class="tips-item">房屋装修</view> -->
 				</view>
 			</view>
-				<view class="tolearn acea-row row-center-wrapper" @click="toEnterpriseServer">查看更多</view>
 		</view>
+		<!-- 优质企业 -->
+		<view class="company-box">
+			<view class="title-con acea-row">
+				<view class="title">优质企业</view>
+				<view class="update-icon acea-row row-center-wrapper" @click="replaceClick">
+					<image src="../../../static/images/update-icon.png" :class="showCirc ? 'circ' : ''"></image>换一批
 				</view>
-
-		<!-- 优质项目 -->
-		<!-- <view class="project-box">
-			<image src="../../../static/images/business-title3.png" class="title-img"></image>
-			<view class="project-list acea-row" v-for="(item,index) in 3" :key="index">
-				<image src="../../../static/images/business-img1.png" mode="" class="project-img"></image>
-				<view class="right-con acea-row row-column-between">
-					<view class="acea-row row-middle title">
-						<image src="../../../static/images/new-icon.png" mode="" class="new-icon">
-						</image>
-						<view class="title-h line1">富硒产品</view>
 			</view>
-					<view class="title-s line1">农业项目、国家扶贫、乡村振兴、国家红利</view>
+			<scroll-view class="scroll-view_H acea-row" scroll-x="true">
+				<view class="nolist" v-if="enterpriseList.length == 0">暂无数据...</view>
+				<view class="company-list" v-else 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-item-y tag">持续盈利</view>
-						<view class="tag-item-b tag">财务规范</view>
+						<view class="tag" :class="index%2 == 0 ? 'tag-item-b' : 'tag-item-y' ">{{item.cname}}</view>
 					</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">了解详情</view>
 					</view>
 				</view>
-		</view> -->
+			</scroll-view>
+		</view>
 	</view>

 </template>

 <script>
-	import { getArticle } from "@/api/home";
-	import { briefing, supply, listResourcesCagetory, listEnterprise } from  "@/api/business"
+	import {
+		getIndexData
+	} from "@/api/home";
+	import {
+		briefing,
+		supply,
+		listResourcesCagetory,
+		listEnterprise
+	} from "@/api/business"
 	import NewsSwiper from "@/components/newsSwiper.vue"
 	export default {
 		components: {
@ -135,55 +138,45 @@
 				isRecommend: [],
 				supplyList: [],
 				cagetoryList: [],
-				enterpriseList: []
+				enterpriseList: [],
+				active: 1,
+				demandList: [],
+				resourcesList: []
 			};
 		},
 		mounted() {
-			this.getArticleList()
-			this.getSupplyList()
-			this.getCagetoryList()
+			//获取新闻和供需
+			this.getIndexData()
+			//获取企业列表
 			this.getEnterpriseList()
 		},
 		methods: {
-			//获取资讯
-			getArticleList() {
-				briefing().then((res) => {
-					const articleList = res.data
-					this.isHotList = articleList.filter(item => item.isHot == 1)
-					this.isRecommend = articleList.filter(item => item.isRecommend == 1)
-				})
+			tabClick(i) {
+				this.active = i
 			},
-			toArticleDetail(id){
-				this.$yrouter.push({
-					 path: '/pages/life/articleDetail/index',
-					 query: {
-						 id: id
-					 }
+			// 获取供需.新闻
+			getIndexData() {
+				uni.showLoading({
+					title: '正在加载...'
 				})
-			},
-			//获取供应
-			getSupplyList() {
-				supply().then((res) => {
-					this.supplyList = res.data
+				uni.showNavigationBarLoading();
+				getIndexData().then(res => {
+					this.isHotList = res.data.articleList.filter(item => item.isHot == 1)
+					this.isRecommend = res.data.articleList.filter(item => item.isRecommend == 1)
+					this.demandList = res.data.demandList
+					this.resourcesList = res.data.resourcesDtos
+					this.showSkeleton = false
+					uni.hideLoading()
+					uni.hideNavigationBarLoading();
 				})
 			},
-			toResourcesDetail(id){
-				console.log(id,'idid')
-				if(id){
+			toArticleDetail(id) {
 				this.$yrouter.push({
-						 path: '/pages/demandHall/resourcesDetail/index',
+					path: '/pages/life/articleDetail/index',
 					query: {
 						id: id
 					}
 				})
-				}
-				
-			},
-			//获取分类
-			getCagetoryList() {
-				listResourcesCagetory().then((res) => {
-					this.cagetoryList = res.data
-				})
 			},
 			//获取企业
 			getEnterpriseList() {
@ -194,7 +187,7 @@
 			},
 			toCompanyDetail(id) {
 				uni.navigateTo({
-					url:"/pages/demandHall/companyDetail/index?id=" + id
+					url: "/pages/demandHall/companyDetail/index?id=" + id
 				})
 			},
 			//换一批
@ -205,32 +198,21 @@
 				}
 			},
 			// 供需大厅
-			toSupplyHall(id){
+			toSupplyHall(id) {
 				uni.navigateTo({
 					url: "/pages/demandHall/supplyHall/index"
 				})
 			},
 			// 企业服务
-			toEnterpriseServer(id){
+			toEnterpriseServer(id) {
 				uni.navigateTo({
-					url:"/pages/demandHall/enterpriseServer/index?typeId="+ id
-				})
-			},
-			// 项目投融
-			toDemoInvestment(e) {
-				uni.showModal({
-					title: '提示！',
-					content: '模块开发中，请等待...',
-					showCancel: false
+					url: "/pages/demandHall/enterpriseServer/index?typeId=" + id
 				})
-				// uni.navigateTo({
-				// 	url:"/pages/demandHall/demoInvestment/index"
-				// })
 			},
 			// 认证
 			toAuthentication(e) {
 				uni.navigateTo({
-					url:"/pages/release/index"
+					url: "/pages/release/index"
 				})
 			}
 		},
@ -241,16 +223,17 @@
 <style lang="less">
 	.business-page {
 		width: 100%;
-		height: auto;
+		min-height: 100vh;
 		background: #fff;
 		font-size: 24rpx;
-		margin-bottom: 100rpx;
+		padding-top: 24rpx;
 	}

 	.category-box {
 		width: 100%;
 		height: 36rpx;
 		overflow: hidden;
+
 		.tag {
 			width: auto;
 			padding: 0 10rpx;
@ -263,8 +246,8 @@
 		}

 		.tag-item-b {
-			border: 1rpx solid #3A9EFA;
-			color: #3A9EFA;
+			border: 1rpx solid #292929;
+			color: #292929;
 		}

 		.tag-item-y {
@ -282,15 +265,15 @@
 	.search-box {
 		width: 670rpx;
 		height: 68rpx;
-		border: 2rpx solid #FF5100;
+		border: 2rpx solid #000;
 		border-radius: 8rpx;
-		margin: 24rpx auto;
+		margin: 0rpx auto 24rpx;
 		position: relative;

 		.search-icon {
 			width: 35rpx;
 			height: 35rpx;
-			margin: 0 29rpx 0 52rpx;
+			margin: 0 30rpx 0 52rpx;
 		}

 		.search {
@ -299,8 +282,8 @@
 			right: -2rpx;
 			width: 132rpx;
 			height: 68rpx;
-			background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
-			border-radius: 8rpx;
+			background: #000;
+			border-radius: 0 8rpx 8rpx 0;
 			color: #fff;
 		}
 	}
@ -310,24 +293,172 @@
 		padding: 0 35rpx;

 		.img1 {
-			width: 312rpx;
-			height: 208rpx;
+			width: 326rpx;
+			height: 160rpx;
+			position: relative;
+
+			image {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
 			}

-		.img1 image {
-			width: 312rpx;
-			height: 208rpx;
+			view {
+				position: absolute;
+				top: 32rpx;
+				left: 24rpx;
+				z-index: 2;
+				font-size: 28rpx;
+				font-weight: 500;
 			}

-		.img2 {
-			width: 342rpx;
-			height: 208rpx;
+			.tit-s {
+				font-size: 22rpx;
+				top: 80rpx;
+			}
+		}
 	}

-		.img2 image {
-			width: 342rpx;
-			height: 96rpx;
+	// 推荐供需
+	.rec-box {
+		width: 100%;
+		padding: 40rpx;
+		position: relative;
 	}
+	.nolist{
+		text-align: center;
+		margin-top: 32rpx;
+	}
+	.rec-switch {
+		width: 100%;
+		height: 423rpx;
+		margin-top: 18rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
+		border-radius: 20rpx;
+		overflow: hidden;
+	}
+
+	.rec-bg {
+		width: 100%;
+		height: 423rpx;
+	}
+
+	.rec-title {
+		width: 100%;
+		height: 80rpx;
+		position: relative;
+
+	}
+
+	.rev-bg {
+		width: 376rpx;
+		height: 80rpx;
+		position: absolute;
+		left: 0;
+	}
+
+	.rev-bg2 {
+		width: 376rpx;
+		height: 80rpx;
+		position: absolute;
+		left: 0;
+		background-image: url(../../../static/images/rec-bg.png);
+	}
+
+	.rec-l,
+	.rec-r {
+		width: 50%;
+		z-index: 2;
+		position: relative;
+	}
+
+	.rec-l .rec-bg,
+	.rec-r .rec-bg {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+
+	.rec-r .rec-bg {
+		transform: rotate(180deg);
+	}
+
+	.rec-t {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		z-index: 3;
+	}
+
+	.rec-l image {
+		width: 37rpx;
+		height: 37rpx;
+		margin-right: 8rpx;
+	}
+
+	.rec-r image {
+		width: 42rpx;
+		height: 43rpx;
+		margin-right: 8rpx;
+	}
+
+	.rec-switch-a {
+		width: 100%;
+		height: 330rpx;
+	}
+
+	.list-box {
+		width: 100%;
+		height: 330rpx;
+	}
+
+	.rec-list {
+		position: relative;
+		height: 165rpx;
+		padding: 33rpx 40rpx 0 40rpx;
+	}
+
+	.rec-list image {
+		width: 64rpx;
+		height: 64rpx;
+	}
+
+	.rec-name {
+		width: 340rpx;
+		font-size: 28rpx;
+		color: #1D1D1D;
+		margin-left: 16rpx;
+	}
+
+	.rec-address {
+		width: 80rpx;
+		height: 34rpx;
+		font-size: 24rpx;
+		line-height: 34rpx;
+		color: #FFFFFF;
+		background: #FF5100;
+		border-radius: 16px;
+		text-align: center;
+	}
+
+	.rec-end {
+		font-size: 24rpx;
+		color: #707070;
+		position: absolute;
+		right: 22rpx;
+	}
+
+	.rec-message {
+		width: 582rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		color: #1D1D1D;
+		margin-top: 15rpx;
 	}

 	// 商业简报
@ -337,13 +468,13 @@
 		background: #FFFFFF;
 		box-shadow: 0rpx 2rpx 12rpx rgba(0, 0, 0, 0.16);
 		border-radius: 16rpx;
-		margin: 32rpx auto;
+		margin: 32rpx auto 0;
 		color: #6E6E6E;

 		.news-img {
 			width: 64rpx;
 			height: 78rpx;
-			margin-left: 18rpx;
+			margin-left: 36rpx;
 		}

 		.news-con-box {
@ -370,18 +501,19 @@
 		.news-con image {
 			width: 32rpx;
 			height: 34rpx;
-			margin: 0 26rpx 0 40rpx;
+			margin: 0 26rpx 0rpx;
 		}
 	}

 	// 优质企业
 	.title-con {
-		padding: 0 40rpx;
+		// padding: 0 40rpx;
 	}

-	.title-img {
-		width: 134rpx;
-		height: 46rpx;
+	.title {
+		font-size: 36rpx;
+		color: #232323;
+		font-weight: bold;
 	}

 	@keyframes doCric {
@ -397,6 +529,10 @@
 	.company-box {
 		height: 380rpx;

+		.title-con {
+			padding: 0 40rpx;
+		}
+
 		.update-icon {
 			width: 118rpx;
 			height: 48rpx;
@ -461,8 +597,8 @@
 					width: 148rpx;
 					height: 52rpx;
 					line-height: 52rpx;
-					background: linear-gradient(315deg, #FF6D31 0%, #FFC2AA 100%);
-					border-radius: 12rpx;
+					background: #1D1D1D;
+					// border-radius: 12rpx;
 					text-align: center;
 					color: #fff;
 					margin-left: auto;
@ -595,6 +731,7 @@

 			.right-con {
 				width: 510rpx;
+
 				.title {
 					font-weight: 800;
 					height: 35rpx;
@ -605,6 +742,7 @@
 						height: 24rpx;
 						margin-right: 8rpx;
 					}
+
 					.title-h {
 						width: 450rpx;
 						height: 35rpx;
--- a/pages/demandHall/companyDetail/index.css
+++ b/pages/demandHall/companyDetail/index.css
@ -237,7 +237,7 @@ box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
 .toMore-btn{
  width: 164rpx;
  height: 54rpx;
-  background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
+  background: linear-gradient(141deg, #FFA782 0%, #000 100%);
  border-radius: 8rpx;
  font-size: 28rpx;
  font-weight: bold;
--- a/pages/demandHall/companyDetail/index.vue
+++ b/pages/demandHall/companyDetail/index.vue
@ -360,8 +360,9 @@ export default {
  line-height: 36rpx;
  text-align: center;
  font-size: 20rpx;
-  background: linear-gradient(312deg, #FFB788 0%, #F9C8A7 100%);
-  color: #fff;
+  /* border: 1rpx solid #292929; */
+  color: #292929;
+	background-color: #fff;
  border-radius: 4rpx;
  margin-right: 8rpx;
 }
@ -402,7 +403,7 @@ box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
  width: 100%;
  height: 8rpx;
  border-radius: 8rpx;
-  background: #FF5100;
+  background: #292929;
  position: absolute;
  bottom: -22rpx;
  left: 50%;
@ -412,7 +413,7 @@ box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
  transition: all .2s ease,opacity .15s ease;
 }
 .tab-a{
-  color: #FF7942;
+  color: #292929;
 }
 .tab-a::after{
  opacity: 1;
@ -435,7 +436,7 @@ box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
 .col-line{
  width: 8rpx;
  height: 36rpx;
-  background: #FF7942;
+  background: #292929;
  border-radius: 4rpx;
  margin-right: 14rpx;
 }
@ -522,7 +523,7 @@ box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
 .r-price{
  font-size: 28rpx;
  line-height: 40rpx;
-  color: #FF680C;
+  color: #292929;
  margin-top: 24rpx;
 }
 .r-tips{
@ -553,7 +554,7 @@ box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
 .toMore-btn{
  width: 164rpx;
  height: 54rpx;
-  background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
+  background: linear-gradient(141deg, #FFA782 0%, #000 100%);
  border-radius: 8rpx;
  font-size: 28rpx;
  font-weight: bold;
@ -594,8 +595,8 @@ box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
  line-height: 34rpx;
  text-align: center;
  font-size: 20rpx;
-  border: 1rpx solid #FFAA00;
-  color: #FFAA00;
+  border: 1rpx solid #292929;
+  color: #292929;
  background: #fff;
  border-radius: 4rpx;
  margin-right: 8rpx;
--- a/pages/demandHall/createProject/index.css
+++ b/pages/demandHall/createProject/index.css
@ -83,8 +83,8 @@
  margin-right: 0;
 }
 .mode-item-a{
-  border-color: #FF6D31;
-  color: #FF6D31;
+  border-color: #000;
+  color: #000;
 }
 .mode-detail{
  width: 670rpx;
--- a/pages/demandHall/createProject/index.vue
+++ b/pages/demandHall/createProject/index.vue
@ -486,8 +486,8 @@ export default {
  margin-right: 0;
 }
 .mode-item-a{
-  border-color: #FF6D31;
-  color: #FF6D31;
+  border-color: #000;
+  color: #000;
 }
 .mode-detail{
  width: 670rpx;
--- a/pages/demandHall/demoInvestment/index.vue
+++ b/pages/demandHall/demoInvestment/index.vue
@ -507,7 +507,7 @@
 	}
 	.screen-item .item-active{
 	  color: #fff;
-	  background: #FF6D31;
+	  background: #000;
 	}
 	.across-line{
 	  width: 44rpx;
--- a/pages/demandHall/enterpriseServer/index.vue
+++ b/pages/demandHall/enterpriseServer/index.vue
@ -269,7 +269,7 @@
 	.search-box {
 		width: 670rpx;
 		height: 68rpx;
-		border: 2rpx solid #FF5100;
+		border: 2rpx solid #292929;
 		border-radius: 8rpx;
 		margin: 0 auto;
 		position: relative;
@ -288,8 +288,8 @@
 		/* margin-left: auto; */
 		width: 132rpx;
 		height: 66rpx;
-		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
-		border-radius: 8rpx;
+		background: #292929;
+		border-radius: 0 8rpx 8rpx 0;
 		color: #fff;
 		position: absolute;
 		right: -2rpx;
@ -320,7 +320,7 @@
 		width: 80rpx;
 		height: 8rpx;
 		border-radius: 8rpx;
-		background: #FF5100;
+		background: #292929;
 		position: absolute;
 		bottom: 0rpx;
 		left: 50%;
@ -331,7 +331,7 @@
 	}

 	.tab-a {
-		color: #FF5100;
+		color: #292929;
 	}

 	.tab-a::after {
@ -348,7 +348,7 @@
 	}

 	.screen-result {
-		color: #FF5100;
+		color: #292929;
 	}

 	.screen image {
@ -429,8 +429,8 @@
 	}

 	.tag-item-p {
-		color: #FC9367;
-		border: 1px solid #FC9367;
+		color: #292929;
+		border: 1px solid #292929;
 	}
 	.enterprise-name{
 		max-width: 382rpx;
@ -442,7 +442,7 @@
 		width: 148rpx;
 		height: 44rpx;
 		line-height: 44rpx;
-		background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
+		background: #292929;
 		border-radius: 8rpx;
 		text-align: center;
 		color: #fff;
@ -461,7 +461,7 @@
 	.enterprise-price {
 		height: 40rpx;
 		font-size: 28rpx;
-		color: #FF5100;
+		color: #292929;
 	}

 	.head-logo {
@ -505,7 +505,7 @@
 		margin-top: 32rpx;
 		border-radius: 12rpx;
 		position: relative;
-		padding: 0 20rpx 20rpx;
+		padding: 20rpx 20rpx;
 	}

 	.business-lable {
@ -516,10 +516,14 @@
 		color: #fff;
 		text-align: center;
 		font-size: 20rpx;
+		position: absolute;
+		top: 20rpx;
+		left: 20rpx;
+		z-index: 2;
 	}

 	.bg2 {
-		background: rgba(255, 170, 0, 0.63);
+		background: #292929;
 	}
 	.business-con {
 		width: 100%;
@ -637,9 +641,9 @@

 	.screen-item .item-active {
 		line-height: 44rpx;
-		border: 2rpx solid #FF6E33;
-		color: #FE7D26;
-		background: #FDEFE6;
+		border: 2rpx solid #292929;
+		color: #292929;
+		background: #fff;
 	}

 	.across-line {
@ -684,7 +688,7 @@
 	}

 	.submit-box .finish {
-		background: #FF660C;
+		background: #292929;
 		color: #fff;
 	}
 </style>
--- a/pages/demandHall/index.css
+++ b/pages/demandHall/index.css
@ -1,322 +0,0 @@
-/* pages/demandHall/index.wxss */
-image{
-  border-radius: 8rpx;
-}
-.dmandhall-page{
-  padding-bottom: 130rpx;
-  min-height: 100vh;
-  font-size: 28rpx;
-  background: #F5F5F5;
-}
-.top-box{
-  width: 100%;
-  padding: 0 40rpx;
-  background: #fff;
-}
-.tab-item{
-  width: 162rpx;
-  height: 40rpx;
-  line-height: 40rpx;
-  text-align: center;
-  margin-right: 12rpx;
-  font-size: 28rpx;
-  color: #BFBFBF;
-}
-.tab-item-a{
-  font-size: 36rpx;
-  color: #FF5100;
-}
-.top-r-box image{
-  width: 36rpx;
-  height: 36rpx;
-  margin-left: 30rpx;
-}
-.resource-tabs{
-  width: 100%;
-  padding-top: 40rpx;
-  background: #fff;
-  border-bottom: 2rpx solid #EEEEEE;
-}
-.tab{
-  width: 162rpx;
-  padding: 26rpx 0;
-  font-size: 28rpx;
-  color: #BFBFBF;
-  position: relative;
-}
-.tab::after{
-  display: block;
-  content: '';
-  width: 50rpx;
-  height: 16rpx;
-  border-radius: 8rpx;
-  background: #FF5100;
-  position: absolute;
-  bottom: -8rpx;
-  left: 50%;
-  margin-left: -50rpx;
-  opacity: 0;
-  transform:scaleX(0);
-  transition: all .2s cubic-bezier(.18,.89,.17,.88),opacity .15s ease;
-}
-.tab-a{
-  color: #333;
-}
-.tab-a::after{
-  opacity: 1;
-  transform: scaleX(1);
-}
-
-.screen-box{
-  width: 100%;
-  height: 94rpx;
-  padding: 0 38rpx;
-  color: #666;
-  background: #fff;
-}
-.screen-result{
-  font-size: 28rpx;
-  color: #FF5100;
-}
-.screen image{
-  width: 27rpx;
-  height: 27rpx;
-  margin-left: 6rpx;
-}
-
-.resource-list{
-  width: 100%;
-  padding: 24rpx 40rpx;
-}
-.resource-item{
-  width: 100%;
-  min-height: 302rpx;
-  background: #fff;
-  border-radius: 12rpx;
-  padding: 20rpx;
-  margin-bottom: 20rpx;
-  position: relative;
-}
-.resource-item image{
-  width: 154rpx;
-  height: 154rpx;
-  margin-right: 20rpx;
-}
-.resource-info{
-  width: calc(100% - 170rpx);
-}
-.resource-item .title{
-  font-size: 32rpx;
-  font-weight: 500;
-  line-height: 44rpx;
-  color: #1D1D1D;
-}
-.desc{
-  font-size: 24rpx;
-  color: #666666;
-  line-height: 34rpx;
-}
-.price{
-  color: #FF5100;
-  line-height: 40rpx;
-  font-weight: 600;
-  margin: 10rpx 0 40rpx;
-}
-.company-info{
-  color: #A7A7A7;
-  font-size: 24rpx;
-}
-.company-info text{
-  display: inline-block;
-  margin-right: 18rpx;
-}
-.tags-box{
-  margin: 6rpx 0 10rpx;
-}
-.tag-item{
-  width: 112rpx;
-  height: 36rpx;
-  display: inline-block;
-  line-height: 34rpx;
-  text-align: center;
-  font-size: 20rpx;
-  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;
-}
-.toMore-btn{
-  width: 164rpx;
-  height: 44rpx;
-  background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
-  border-radius: 8rpx;
-  font-size: 28rpx;
-  font-weight: bold;
-  line-height: 40rpx;
-  color: #FFFFFF;
-  text-align: center;
-  line-height: 44rpx;
-  position: absolute;
-  right: 20rpx;
-  bottom: 20rpx;
-}
-.anli-list{
-  font-size: 24rpx;
-  color: #666;
-  margin: 24rpx 0 20rpx;
-}
-.anli-item image{
-  width: 220rpx;
-  height: 136rpx;
-  margin-right: 8rpx;
-}
-.comment{
-  font-size: 20rpx;
-  color: #FF6D31;
-}
-.company-list-box{
-  width: 100%;
-  background: #fff;
-}
-.company-list{
-  width: 100%;
-  border-top: 2rpx solid #EEEEEE;
-}
-.company-item{
-  width: 100%;
-  padding: 40rpx;
-  border-bottom: 2rpx solid #EEEEEE;
-}
-.title-box .title{
-  width: 550rpx;
-}
-.title-box .price{
-  margin: 0;
-}
-.company-item .tags-box{
-  margin: 20rpx 0;
-}
-.btn-box{
-  margin-top: 20rpx;
-  font-size: 24rpx;
-  color: #707070;
-}
-.btn-box .toMore-btn{
-  position: static;
-}
-
-.mask-box{
-  width: 100%;
-  height: 100vh;
-  background: rgba(0,0,0,.6);
-  position:fixed;
-  top: 0;/*  #ifdef  H5  */
-  top: calc(88rpx + constant(safe-area-inset-top));
-  top: calc(88rpx + env(safe-area-inset-top));/*  #endif  */
-  left: 0;
-  z-index: 9999;
-}
-.screen-dialog-box{
-  width: 602rpx;
-  height: 100%;
-  /* padding-bottom: 160rpx; */
-  overflow-y: scroll;
-  background-color: #fff;
-  position: absolute;
-  top: 0;
-  right: 0rpx;
-  animation: move 200ms ease;
-}
-/* .move{
-  right: 0rpx;
-} */
-@keyframes move{
-  0%{
-    transform: translateX(800rpx);
-  }
-  100%{
-    transform: translateX(0rpx);
-  }
-}
-.screen-item{
-  width: 100%;
-  padding: 0 38rpx;
-  padding-bottom: 22rpx;
-  border-bottom: 2rpx solid #EEEEEE;
-}
-.screen-title{
-  font-size: 24rpx;
-  color: #000;
-  margin-bottom: 32rpx;
-}
-.screen-item{
-  padding-top: 40rpx;
-}
-
-.screen-item .item{
-  width: 162rpx;
-  height: 48rpx;
-  line-height: 48rpx;
-  text-align: center;
-  font-size: 24rpx;
-  color: #666666;
-  background: #F6F6F6;
-  border-radius: 4rpx;
-  margin-bottom: 20rpx;
-  margin-right: 20rpx;
-}
-.screen-item .item:nth-child(3n){
-  margin-right: 0;
-}
-.screen-item .item-active{
-  border: 2rpx solid #FF6E33;
-  color: #FE7D26;
-  background: #FDEFE6;
-}
-.across-line{
-  width: 44rpx;
-  height: 2rpx;
-  background: #ACABAB;
-  margin: 0 12rpx;
-}
-.low-price{
-  width: 228rpx;
-  height: 60rpx;
-  background: #F6F5F5;
-  border-radius: 4rpx;
-}
-.low-price input{
-  width: 100%;
-  height: 100%;
-  text-align: center;
-}
-.fz20{
-  font-size: 20rpx;
-  color: #393939;
-}
-.submit-box{
-  width: 602rpx;
-  height: 100rpx;
-  box-shadow: 2rpx 0px 12rpx rgba(0, 0, 0, 0.16);
-  position: fixed;
-  bottom: 0;
-  right: 0;
-}
-.submit-box .btn{
-  width: 50%;
-  height: 100%;
-  line-height: 100rpx;
-  text-align: center;
-}
-.submit-box .finish{
-  background: #FF660C;
-  color: #fff;
-}
--- a/pages/demandHall/index.vue
+++ b/pages/demandHall/index.vue
@ -617,7 +617,7 @@
 	.toMore-btn {
 		width: 164rpx;
 		height: 44rpx;
-		background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
+		background: linear-gradient(141deg, #FFA782 0%, #000 100%);
 		border-radius: 8rpx;
 		font-size: 28rpx;
 		font-weight: bold;
@ -644,7 +644,7 @@

 	.comment {
 		font-size: 20rpx;
-		color: #FF6D31;
+		color: #000;
 	}

 	.company-list-box {
--- a/pages/demandHall/needsContact/index.css
+++ b/pages/demandHall/needsContact/index.css
@ -163,7 +163,7 @@
  height: 88rpx;
  line-height: 88rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  font-size: 32rpx;
  color: #fff;
--- a/pages/demandHall/needsContact/index.vue
+++ b/pages/demandHall/needsContact/index.vue
@ -161,7 +161,7 @@ export default {
  line-height: 36rpx;
  text-align: center;
  font-size: 20rpx;
-  background: linear-gradient(314deg, #FF5100 0%, #FF8800 100%);
+  background: #292929;
  color: #fff;
  border-radius: 8rpx;
  margin-right: 8rpx;
@ -211,7 +211,7 @@ export default {
 }
 .n-title-a .dot{
  position: relative;
-  border-color: #FF7E42;
+  border-color: #292929;
 }
 .n-title-a .dot::before{
  content: '';
@ -219,14 +219,14 @@ export default {
  width: 20rpx;
  height: 20rpx;
  border-radius: 50%;
-  border-color: #FF7E42;
-  background: #FF7E42;
+  border-color: #292929;
+  background: #292929;
  position: absolute;
  top: 2rpx;
  left: 2rpx;
 }
 .n-title-a{
-  color: #FF7E42;
+  color: #292929;
 }
 .price{
  font-size: 28rpx;
@ -281,7 +281,7 @@ export default {
  height: 88rpx;
  line-height: 88rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  font-size: 32rpx;
  color: #fff;
--- a/pages/demandHall/needsDetail/index.css
+++ b/pages/demandHall/needsDetail/index.css
@ -1,198 +0,0 @@
-/* pages/demandHall/needsDetail/index.wxss */
-.needsDetail-box{
-  padding-bottom: 190rpx;
-}
-.top-box{
-  width: 100%;
-  padding: 40rpx 40rpx;
-  background: linear-gradient(180deg, #FF5100 0%, #FFA782 100%);
-}
-.count-down-box{
-  text-align: right;
-  color: #FFFFFF;
-  font-size: 24rpx;
-  padding: 30rpx 0;
-}
-.needs-info{
-  width: 100%;
-  padding: 24rpx 20rpx;
-  background: #fff;
-  font-size: 28rpx;
-  color: #1D1D1D;
-  line-height: 34rpx;
-  border-radius: 12rpx;
-}
-.info-item{
-  display: flex;
-  align-items: top;
-  margin-bottom: 20rpx;
-}
-.item-l{
-  color: #707070;
-}
-.item-r{
-  width: 484rpx;
-  margin-left: 16rpx;
-}
-.content-box{
-  width: 100%;
-  padding: 40rpx 0;
-}
-.company-info-box{
-  padding: 0 40rpx;
-}
-.add-content-box{
-  padding-left: 40rpx;
-}
-.tag{
-  width: 216rpx;
-  height: 48rpx;
-  line-height: 48rpx;
-  text-align: center;
-  font-size: 24rpx;
-  color: #fff;
-  background: linear-gradient(314deg, #FF5100 0%, #FF8800 100%);
-  border-radius: 8rpx;
-  margin: 16rpx 0;
-}
-.col-line{
-  width: 8rpx;
-  height: 36rpx;
-  background: #FF7942;
-  border-radius: 4rpx;
-  margin-right: 14rpx;
-}
-
-.colG{
-  font-size: 28rpx;
-  line-height: 40rpx;
-  color: #707070;
-  margin-left: 20rpx;
-}
-.mt40{
-  margin-top: 40rpx;
-}
-.company-card-box {
-  padding: 30rpx 12rpx;
-  margin-top: 34rpx;
-  box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.2);
-}
-.company-logo{
-  width: 150rpx;
-  height: 150rpx;
-  margin-right: 20rpx;
-  border-radius: 8rpx;
-}
-.name{
-  font-size: 32rpx;
-  line-height: 44rpx;
-}
-.slogan{
-  font-size: 24rpx;
-  line-height: 34rpx;
-  color: #666;
-  margin: 4rpx 0 12rpx;
-}
-.tags-box{
-  margin: 6rpx 0 10rpx;
-}
-.tag-item{
-  width: 112rpx;
-  height: 36rpx;
-  display: inline-block;
-  line-height: 36rpx;
-  text-align: center;
-  font-size: 20rpx;
-  background: linear-gradient(312deg, #FFB788 0%, #F9C8A7 100%);
-  color: #fff;
-  border-radius: 4rpx;
-  margin-right: 8rpx;
-}
-.bgG{
-  background: linear-gradient(134deg, #AEC8F6 0%, #76A6FA 100%);
-}
-.user-name{
-
-}
-.header-img{
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 50%;
-  margin-right: 20rpx;
-}
-.user-name image{
-  width: 134rpx;
-  height: 38rpx;
-  margin-left: 12rpx;
-}
-.user-name .tyg-tag{
-  width: 164rpx;
-}
-.btn-box{
-  width: 100%;
-  height: 150rpx;
-  line-height: 150rpx;
-  align-self: center;
-  background: #fff;
-  border-top: 1rpx solid #ececec;
-  text-align: right;
-  padding-right: 52rpx;
-  position: fixed;
-  bottom: 0;
-}
-.contact-btn{
-  display: inline-block;
-  width: 240rpx;
-  height: 88rpx;
-  text-align: center;
-  line-height: 88rpx;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
-  border-radius: 12rpx;
-  font-size: 32rpx;
-  color: #fff;
-}
-
-.scroll-view_H{
-  white-space: nowrap;
-  width: 100%;
-  margin-top: 28rpx;
-}
-.scroll-view_H view{
-  display: inline-block;
-  width: 216rpx;
-  height: 216rpx;
-  margin-right: 10rpx;
-}
-.scroll-view_H view image{
-  width: 100%;
-  height: 100%;
-  border-radius: 8rpx;
-}
-
-.swiper-block {
-  height: 300rpx;
-  width: 100%;
-}
-.swiper-item {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: flex-start;
-  overflow: unset;
-}
-.slide-image {
-  height: 250rpx;
-  width: 520rpx;
-  border-radius: 9rpx;
-  margin: 0rpx 30rpx;
-  z-index: 1;
-}
-.active {
-  /* transform: scale(1.14);
-  transition: all 0.2s ease-in 0s;
-  z-index: 20; */
-}
-
-.answer-box{
-  padding: 0 40rpx;
-}
--- a/pages/demandHall/needsDetail/index.vue
+++ b/pages/demandHall/needsDetail/index.vue
@ -360,7 +360,7 @@ export default {
  height: 88rpx;
  text-align: center;
  line-height: 88rpx;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  font-size: 32rpx;
  color: #fff;
--- a/pages/demandHall/newProject/index.vue
+++ b/pages/demandHall/newProject/index.vue
@ -124,7 +124,7 @@
 	}

 	.asterisk {
-		color: #FF6D31;
+		color: #000;
 	}

 	.toright {
--- a/pages/demandHall/projectDetail/index.vue
+++ b/pages/demandHall/projectDetail/index.vue
@ -250,7 +250,7 @@
 				.authentication-btn {
 					width: 148rpx;
 					height: 52rpx;
-					background: linear-gradient(315deg, #FF6D31 0%, #FFC2AA 100%);
+					background: linear-gradient(315deg, #000 0%, #FFC2AA 100%);
 					border-radius: 12rpx;
 					font-size: 24rpx;
 					font-weight: 600;
@ -290,7 +290,7 @@
 		.update-box {
 			width: auto;
 			height: 48rpx;
-			color: #FF6D31;
+			color: #000;
 			font-size: 24rpx;
 			margin: 0rpx 32rpx 26rpx 32rpx;

--- a/pages/demandHall/projectManage/index.vue
+++ b/pages/demandHall/projectManage/index.vue
@ -290,7 +290,7 @@
 						width: 150rpx;
 						height: 56rpx;
 						line-height: 56rpx;
-						background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+						background: #000;
 						border-radius: 12rpx;
 						font-weight: 600;
 						color: #fff;
--- a/pages/demandHall/resourcesContact/index.css
+++ b/pages/demandHall/resourcesContact/index.css
@ -160,7 +160,7 @@
  height: 88rpx;
  line-height: 88rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  font-size: 32rpx;
  color: #fff;
--- a/pages/demandHall/resourcesContact/index.vue
+++ b/pages/demandHall/resourcesContact/index.vue
@ -299,7 +299,7 @@ export default {
  height: 88rpx;
  line-height: 88rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  font-size: 32rpx;
  color: #fff;
--- a/pages/demandHall/resourcesDetail/index.css
+++ b/pages/demandHall/resourcesDetail/index.css
@ -21,7 +21,7 @@
  height: 88rpx;
  text-align: center;
  line-height: 88rpx;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  font-size: 32rpx;
  color: #fff;
--- a/pages/demandHall/resourcesDetail/index.vue
+++ b/pages/demandHall/resourcesDetail/index.vue
@ -166,7 +166,7 @@ export default {
  height: 88rpx;
  text-align: center;
  line-height: 88rpx;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  font-size: 32rpx;
  color: #fff;
--- a/pages/demandHall/supplyHall/index.vue
+++ b/pages/demandHall/supplyHall/index.vue
@ -276,7 +276,7 @@
 	.search-box {
 		width: 670rpx;
 		height: 68rpx;
-		border: 2rpx solid #FF5100;
+		border: 2rpx solid #000;
 		border-radius: 8rpx;
 		margin: 0 auto;
 		position: relative;
@ -292,8 +292,8 @@
 		// margin-left: auto;
 		width: 132rpx;
 		height: 68rpx;
-		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
-		border-radius: 8rpx;
+		background: #000;
+		border-radius: 0 8rpx 8rpx 0;
 		color: #fff;
 		position: absolute;
 		right: -2rpx;
@ -324,7 +324,7 @@
 		width: 80rpx;
 		height: 8rpx;
 		border-radius: 8rpx;
-		background: #FF5100;
+		background: #000;
 		position: absolute;
 		bottom: 0rpx;
 		left: 50%;
@ -335,7 +335,7 @@
 	}

 	.tab-a {
-		color: #FF5100;
+		color: #000;
 	}

 	.tab-a::after {
@ -352,7 +352,7 @@
 	}

 	.screen-result {
-		color: #FF5100;
+		color: #000;
 	}

 	.screen image {
@ -392,7 +392,7 @@
 	}

 	.bg2 {
-		background: linear-gradient(141deg, #FF6D31 0%, #FFA782 100%);
+		background: #000;
 	}

 	.info-box {
@ -417,7 +417,7 @@
 		width: 80rpx;
 		height: 28rpx;
 		line-height: 28rpx;
-		background: #FF5100;
+		background: #000;
 		border-radius: 16rpx;
 		font-size: 24rpx;
 		color: #FFFFFF;
@ -428,7 +428,7 @@
 		position: absolute;
 		right: 58rpx;
 		height: 40rpx;
-		color: #FF5100;
+		color: #000;
 		font-weight: 600;
 	}

@ -460,13 +460,13 @@
 		}
 		
 		.tag-item-y {
-			border: 1px solid #FFAA00;
-			color: #FFAA00;
+			border: 1px solid #000;
+			color: #000;
 		}
 		
 		.tag-item-p {
-			color: #FC9367;
-			border: 1px solid #FC9367;
+			color: #E70012;
+			border: 1px solid #E70012;
 		}
 	}
 	
@ -481,9 +481,10 @@
 		width: 148rpx;
 		height: 44rpx;
 		line-height: 44rpx;
-		background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
+		background: #000000;
 		border-radius: 8rpx;
 		margin-left: auto;
+		margin-right: 20rpx;
 		text-align: center;
 		color: #fff;
 	}
@ -516,7 +517,7 @@
 		height: 30rpx;
 		line-height: 30rpx;
 		font-size: 28rpx;
-		color: #FF5100;
+		color: #000;
 	}
 	.enterprise-name{
 		max-width: 382rpx;
@ -562,7 +563,7 @@

 	.e-price {
 		height: 40rpx;
-		color: #FF5100;
+		color: #000;
 		font-weight: 600;
 	}

@ -648,10 +649,8 @@

 	.screen-item .item-active {
 		line-height: 44rpx;
-		border: 2rpx solid #FF6E33;
-		color: #FE7D26;
-		background: #FDEFE6;
-		
+		border: 2rpx solid #000;
+		color: #000;
 	}

 	.across-line {
@ -696,7 +695,7 @@
 	}

 	.submit-box .finish {
-		background: #FF660C;
+		background: #000;
 		color: #fff;
 	}
 </style>
--- a/pages/home/activityCenter/index.vue
+++ b/pages/home/activityCenter/index.vue
@ -1,10 +1,13 @@
 <template>
 	<view class="activityCenter-page">
 		<image src="https://download.cyjyyjy.com/center-img.png" class="top-bg"></image>
-		<view class="page-title"
-			:style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">
-			<image src="../../../static/images/back.png" @click="backClick"></image>
-			活动中心</view>
+		<view class="head_box">
+		  <cu-custom :isBack="true" :bgImage="'https://download.cyjyyjy.com/center-img.png'">
+		    <block slot="backText">
+		      <text class="">活动中心</text>
+		    </block>
+		  </cu-custom>
+		</view>
 		<view class="activity-box">
 			<view class="activity-list acea-row" v-for="(item,index) in activity" :key="index" @tap="toActiveDetail"
 				:data-id="item.id">
@ -42,10 +45,6 @@
 	export default {
 		data() {
 			return {
-				menuHeight: app.globalData.menuHeight,
-				navHeight: app.globalData.navHeight,
-				menuTop: app.globalData.menuTop,
-				navTopHeight: app.globalData.navTopHeight,
 				activity: [], //活动列表
 				isFixed: false,
 			};
@ -96,6 +95,21 @@
 		background: #fff;
 		position: relative;
 	}
+	.nav-title {
+		width: calc(100% - 36rpx);
+		text-align: center;
+		font-size: 32rpx;
+		color: #fff;
+		line-height: 40px;
+		display: inline-block;
+	}
+	.back-icon{
+		width: 36rpx;
+		height: 36rpx;
+		position: absolute;
+		top: 50%;
+		left: 36rpx;
+	}

 	.top-bg {
 		width: 100%;
--- a/pages/home/activityDetail/index.vue
+++ b/pages/home/activityDetail/index.vue
@ -0,0 +1,163 @@
+<template>
+	<view class="activity-detail">
+		<view class="head_box">
+		  <cu-custom :isBack="true" :bgColor="'transparent'"></cu-custom>
+		</view>
+		<view class="activity-banner">
+			<image :src="detail.images"></image>
+		</view>
+		<view class="title-box">
+			<view class="title">{{detail.name}}</view>
+			<view class="price">¥{{detail.price || 0}}</view>
+		</view>
+		<view class="activity-info">
+			<view class="title">活动介绍</view>
+			<view class="address acea-row">
+				<image src="../../../static/images/address.png"></image>
+				<view class="label line1" @click="openMap()">活动地点：{{detail.address || ''}}</view>
+			</view>
+			<view class="address acea-row">
+				<image src="../../../static/images/time.png"></image>
+				<view class="label line1">活动时间：{{detail.activityStartTime || ''}}</view>
+			</view>
+			<view class="address acea-row">
+				<image src="../../../static/images/price.png"></image>
+				<view class="label line1">活动费用：{{detail.price || ''}}</view>
+			</view>
+			<view class="info-content">
+				<rich-text :nodes="detail.content"></rich-text>
+			</view>
+			<view class="sign-btn" v-if="detail.status == 1" @click="toSignPage">立即报名</view>
+			<view class="cancel-btn" v-if="detail.status == 2">报名截止</view>
+			<view class="cancel-btn" v-if="detail.status == 3">活动结束</view>
+			<view class="cancel-btn" v-if="detail.status == 0">等待报名</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getActivityInfo } from '@/api/home.js'
+	import { formatRichText } from '@/utils/util.js'
+	export default{
+		data(){
+			return {
+				id: '',
+				detail: {}
+			}
+		},
+		mounted() {
+			this.id = this.$yroute.query.id
+			this.getDetail()
+		},
+		methods:{
+			getDetail(){
+				getActivityInfo(this.id).then((res)=>{
+					if(res.success){
+						res.data.content = formatRichText(res.data.content)
+						this.detail = res.data
+					} else{
+						uni.showToast({
+							title: '服务器错误',
+							icon: 'none'
+						})
+					}
+				})
+			},
+			openMap(){
+				uni.openLocation({
+					latitude: this.detail.latitude,
+					longitude: this.detail.longitude,
+					success: function () {
+						console.log('success');
+					}
+				});
+			},
+			toSignPage() {
+			 uni.navigateTo({
+			   url: '/pages/activity/signIn/index?id=' + this.detail.id
+			 });
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+.cuIcon-back{
+	color: #fff;
+}
+.activity-detail{
+	width: 100%;
+	position: relative;
+	.activity-banner{
+		width: 100%;
+		height: 750rpx;
+		position: absolute;
+		top: 0;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.title-box{
+		width: 100%;
+		padding: 60rpx 40rpx 12rpx;
+		border-radius: 34rpx 34rpx 0px 0px;
+		background: #fff;
+		border-bottom: 26rpx solid #F7F7F7;
+		position: relative;
+		top: 536rpx;
+		left: 0;
+		.title{
+			color: #212121;
+			font-size: 38rpx;
+			margin-bottom: 34rpx;
+		}
+		.price{
+			color: #E70012;
+			font-size: 44rpx;
+			line-height: 58rpx;
+		}
+	}
+	.activity-info{
+		width: 100%;
+		padding: 52rpx 40rpx 32rpx;
+		background: #fff;
+		position: absolute;
+		top: 894rpx;
+		left: 0;
+		.title{
+			font-size: 40rpx;
+			color: #000;
+			margin-bottom: 34rpx;
+		}
+		.address{
+			font-size: 28rpx;
+			color: #707070;
+			margin-bottom: 20rpx;
+			.label{
+				width: calc(100% - 70rpx);
+			}
+			image{
+				width: 30rpx;
+				height: 30rpx;
+				margin-right: 22rpx;
+			}
+		}
+		.sign-btn{
+			width: 100%;
+			height: 92rpx;
+			font-size: 40rpx;
+			color: #fff;
+			line-height: 92rpx;
+			text-align: center;
+			background: #212121;
+			margin-top: 52rpx;
+		}
+		.cancel-btn{
+			background: #F4F4F4;
+			color: #868686;
+		}
+	}
+}
+
+</style>
--- a/pages/home/components/activateList.vue
+++ b/pages/home/components/activateList.vue
@ -0,0 +1,133 @@
+<template>
+	<view class="activate-list-box">
+		<view class="activate-list">
+			<view class="activate-item" 
+				v-for="(item,index) in list" :key="index"
+				@click="itemClick(item)"
+				>
+				<image :src="item.images"></image>
+				<view class="title line2">{{item.name}}</view>
+				<view class="desc" v-if="showDesc">
+					自1992年创立的莫斯科国际平面设计大赛双年展至今已进入18届
+				</view>
+				<view class="btn-box acea-row row-between-wrapper" v-if="showAuth">
+					<view class="auth">{{item.cateName}}</view>
+					<view class="btn">即刻报名</view>
+				</view>
+				<view class="match-bottom acea-row row-between-wrapper" v-if="!showAuth">
+					<view class="mb-left acea-row">
+						<view class="acea-row row-middle">
+							<text>300</text>
+							<image src="../../../static/images/eye.png"></image>
+						</view>
+						<view class="time">2023-02-23 </view>
+					</view>
+					<view class="btn-box">
+						<view class="btn" v-if="index%2 == 0">进行中</view>
+						<view class="btn btn-disabled" v-if="index%2 !== 0">已结束</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props: {
+			list: {
+				type: Array,
+				default: ()=> []
+			},
+			showDesc: {
+				type: Boolean,
+				default: false
+			},
+			showAuth: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data(){
+			return {
+				
+			}
+		},
+		methods: {
+			itemClick(item){
+				this.$yrouter.push({
+					path: '/pages/home/activityDetail/index',
+					query: {
+						id: item.id
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+.activate-list-box{
+	width: 100%;
+	.activate-list{
+		width: 100%;
+		.activate-item{
+			width: 100%;
+			padding: 30rpx 40rpx;
+			background: #fff;
+			border-bottom: 26rpx solid #F7F7F7;
+			image{
+				width: 100%;
+				height: 480rpx;
+			}
+			.title{
+				width: 100%;
+				font-size: 44rpx;
+				color: #212121;
+				font-weight: 500;
+				margin: 30rpx 0 10rpx;
+			}
+			.desc{
+				font-size: 32rpx;
+				color: #9F9F9F;
+				margin-bottom: 10rpx;
+			}
+			.btn-box{
+				.auth{
+					color: #9F9F9F;
+					font-size: 32rpx;
+				}
+				.btn{
+					width: 214rpx;
+					height: 54rpx;
+					border: 2rpx solid #000000;
+					border-radius: 25px;
+					text-align: center;
+					line-height: 54rpx;
+					font-size: 24rpx;
+					color: #000;
+				}
+				.btn-disabled{
+					background: #7E7E7E;
+					color: #fff;
+					border-color: #7E7E7E;
+				}
+			}
+			.match-bottom{
+				.mb-left{
+					font-size: 24rpx;
+					color: #707070;
+					image{
+						width: 24rpx;
+						height: 24rpx;
+						margin-left: 10rpx;
+					}
+					.time{
+						margin-left: 36rpx;
+					}
+				}
+			}
+		}
+	}
+}
+</style>
--- a/pages/home/components/expertList.vue
+++ b/pages/home/components/expertList.vue
@ -0,0 +1,77 @@
+<template>
+	<view class="expert-list">
+		<view class="expert-item" v-for="(item,index) in list" :key="index"> 
+			<view class="top-box acea-row">
+				<view class="header-img-box">
+					<image :src="item.avatar" mode="aspectFill"></image>
+				</view>
+				<view class="name-box">
+					<view class="name">{{item.name}}</view>
+					<view class="tip lin2">{{item.job}}</view>
+				</view>
+			</view>
+			<view class="info-box">
+				<u-read-more ref="uReadMore" showHeight="200" :toggle="true">
+					<rich-text :nodes="item.introduction"></rich-text>
+				</u-read-more>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props: {
+			list: {
+				type: Array,
+				default: ()=> []
+			},
+		},
+		methods:{
+			
+		}
+	}
+</script>
+
+<style lang="less">
+	.expert-list{
+		width: 100%;
+		padding: 36rpx 40rpx;
+		.expert-item{
+			width: 100%;
+			margin-bottom: 32rpx;
+			.top-box{
+				width: 100%;
+				padding: 34rpx 32rpx;
+				background: linear-gradient(to right, #65666B, #BDC0CA);
+				.header-img-box{
+					width: 136rpx;
+					height: 136rpx;
+					border-radius: 50%;
+					overflow: hidden;
+					margin-right: 30rpx;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.name-box{
+					width: calc(100% - 200rpx);
+					font-size: 24rpx;
+					color: #fff;
+					.name{
+						font-size: 44rpx;
+						margin-bottom: 24rpx;
+					}
+				}
+			}
+			.info-box{
+				height: auto;
+				background: #F1F1F1;
+				padding: 18rpx 32rpx;
+				font-size: 24rpx;
+				color: #6D6E74;
+			}
+		}
+	}
+</style>
--- a/pages/home/components/tabNav.vue
+++ b/pages/home/components/tabNav.vue
@ -0,0 +1,88 @@
+<template>
+	<view class="tab-nav-box">
+		<view 
+			class="tab-list acea-row row-between" 
+			:style="{ color: dColor,fontSize: fontSize + 'rpx' }">
+			<view 
+				class="tab-item" 
+				:class="active == index ? 'active' : '' " 
+				v-for="(item,index) in tabList" :key="index"
+				@click="tabItemClick(index)"
+			>
+			{{item.name}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props: {
+			tabList: {
+				type: Array,
+				default: ()=> []
+			},
+			dColor: {
+				type: String,
+				default: '#9F9F9F'
+			},
+			fontSize: {
+				type: Number,
+				default: 32
+			}
+		},
+		data(){
+			return {
+				active: 0
+			}
+		},
+		methods:{
+			tabItemClick(i){
+				this.active = i
+				this.$emit('tabItemClick',i)
+			},
+			tabItemClick(i){
+				this.active = i
+				this.$emit('tabItemClick',i)
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.tab-nav-box{
+		width: 100%;
+		padding: 8rpx 80rpx;
+		background: #fff;
+		border-bottom: 2rpx solid #F5F5F5;
+		.tab-list{
+			width: 100%;
+			height: 100%;
+			.tab-item{
+				position: relative;
+				&::after{
+					display: block;
+					content: '';
+					width: 48rpx;
+					height: 4rpx;
+					border-radius: 2rpx;
+					background: #06050A;
+					position: absolute;
+					bottom: -8rpx;
+					left: 50%;
+					opacity: 0;
+					margin-left: -24rpx;
+					transform: scaleX(0);
+					transition: all .2s ease, opacity .15s ease;
+				}
+				&.active{
+					color: #06050A;
+					&::after{
+						opacity: 1;
+						transform: scaleX(1);
+					}
+				}
+			}
+		}
+	}
+</style>
--- a/pages/home/index.css
+++ b/pages/home/index.css
@ -1,382 +0,0 @@
-
-.home-page{
-  padding-bottom: 190rpx;
-}
-.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: 38rpx 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-left: 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);
-  border-radius: 8rpx;
-  position: relative;
-}
-.investment-item .item-bg{
-  width: 324rpx;
-  height: 408rpx;
-  position: absolute;
-}
-.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;
-}
-.fz28{
-  font-size: 28rpx;
-  line-height: 40rpx;
-  color: #1D1D1D;
-}
-.fz24{
-  font-size: 24rpx;
-  line-height: 34rpx;
-}
-.fz20{
-  font-size: 20rpx;
-  line-height: 28rpx;
-}
-.company-info{
-  margin-left: 12rpx;
-}
-.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;
-}
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
--- a/pages/information/components/informationList.vue
+++ b/pages/information/components/informationList.vue
@ -0,0 +1,94 @@
+<template>
+	<view class="information-list-box">
+		<view class="information-list">
+			<view class="information-item acea-row row-between" v-for="(item,index) in list" :key="index" @click="toDetail(item)">
+				<view class="item-l acea-row row-column-between">
+					<view class="title line2">{{item.title}}！</view>
+					<view class="acea-row row-middle">
+						<view class="tip">精选</view>
+						<view class="time">{{item.createTime}}</view>
+						<view class="view-count acea-row">
+							<text>{{item.visit || 0}}</text>
+							<image src="../../../static/images/eye.png"></image>
+						</view>
+					</view>
+				</view>
+				<image class="img" :src="item.imageInput" mode="aspectFill"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name: 'InformationList',
+		props:{
+			list: {
+				type: Array,
+				default: []
+			}
+		},
+		data(){
+			return {
+				
+			}
+		},
+		methods:{
+			toDetail(item){
+				this.$yrouter.push({
+					path: '/pages/life/articleDetail/index',
+					query: {
+						id: item.id
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	.information-list-box{
+		width: 100%;
+		padding: 40rpx;
+		.information-list{
+			width: 100%;
+			.information-item{
+				width: 100%;
+				padding: 30rpx 24rpx 16rpx;
+				box-shadow: 0px 6rpx 20rpx rgba(190, 190, 190, 0.28);
+				margin-bottom: 36rpx;
+				.item-l{
+					width: 448rpx;
+					font-size: 24rpx;
+					color: #707070;
+					.title{
+						color: #000;
+						font-size: 32rpx;
+					}
+					.tip{
+						width: 80rpx;
+						height: 32rpx;
+						background: #212121;
+						text-align: center;
+						line-height: 32rpx;
+						color: #fff;
+					}
+					.time{
+						margin: 0 30rpx;
+					}
+					.view-count{
+						image{
+							width: 24rpx;
+							height: 24rpx;
+							margin-left: 10rpx;
+						}
+					}
+				}
+				.img{
+					width: 144rpx;
+					height: 176rpx;
+				}
+			}
+		}
+	}
+</style>
--- a/pages/information/index.vue
+++ b/pages/information/index.vue
@ -1,177 +1,90 @@
 <template>
 	<view class="information-box">
-		<skeleton v-if="showSkeleton" ref="skeleton" loading="chiaroscuro" selector="skeleton" bgcolor="#FFF"></skeleton>
-		<view class="search-box acea-row row-middle skeleton-rect">
-			<image src="../../static/images/search-icon.png" mode=""></image>
-			<input type="text" value="" placeholder="请输入相关关键词" />
-			<view class="search acea-row row-center-wrapper">搜一下</view>
-		</view>
-		<swiper class="vote-box skeleton-rect">
-			<swiper-item v-for="(item,index) in hotList" :key="index" @click="toDetail(item.id)">
-				<image :src="item.imageInput" mode="aspectFill" class="vote-img"></image>
-				<view class="news">
-					<view class="news-title-h line1">{{item.title}}</view>
-					<view class="news-title-s line1">{{item.createTime}}</view>
-				</view>
-			</swiper-item>
-		</swiper>
-		<scroll-view class="scroll-view_N skeleton-rect" scroll-x="true">
-			<view class="rotaion-box" @click="toCategoryList(item.id)" v-for="(item,index) in categoryList" :key="index">
-				<view class="acea-row rotaion row-center">
-					<image :src="item.img" mode="aspectFill"></image>
-					<view class="rotaion-h">{{item.name}}</view>
-					<view class="rotaion-s">{{item.description}}</view>
-				</view>
-			</view>
-		</scroll-view>
-		<!-- 最新资讯 -->
-		<view class="newInfo-box skeleton-rect" v-if="newList.length > 0">
-			<image src="../../static/images/newInfo.png" mode="" class="newInfo-title-img"></image>
-			<view class="newInfo">
-				<view class="modular acea-row row-between" v-for="(item,index) in newList" :key="index"
-					@click="toDetail(item.id)">
-					<view class="acea-row title">
-						<view class="modular-h line2">{{item.title}}</view>
-						<view class="title-l acea-row row-between">
-							<view>{{item.author}}</view>
-							<view>{{item.createTime.split(' ')[0]}}</view>
-							<view class="acea-row row-middle">{{item.visit}}
-								<image src="../../static/images/eye.png" mode="aspectFill"></image>
-							</view>
-						</view>
-					</view>
-					<image :src="item.imageInput" mode="aspectFill"></image>
-				</view>
-			</view>
-		</view>
-		<!-- 热点精选 -->
-		<view class="hotspot-box skeleton-rect">
-			<image src="../../static/images/user/hotspot.png" mode="" class="title-h-img"></image>
-			<scroll-view class="scroll-view_H acea-row" scroll-x="true">
-				<view class="slide-box" v-for="(item,index) in hotList" :key="index" @click="toDetail(item.id)">
-					<image :src="item.imageInput" mode="aspectFill"></image>
-					<view class="hotspot-con">
-						<view class="hotspot-icon">热点</view>
-						<view class="hotspot-title-h line2">{{item.title}}</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<!-- 值得关注 -->
-		<view class="follow-box skeleton-rect">
-			<image src="../../static/images/follow-title.png" mode="" class="title-h-img"></image>
-			<view class="follow-con" v-for="(item,index) in concernList" :key="index" @click="toDetail(item.id)">
-				<view class="follow-top acea-row row-between">
-					<view class="acea-row follow-title">
-						<view class="follow-h line2">{{item.title}}</view>
-						<view class="follow-title-l acea-row row-between">
-							<view>{{item.author}}</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>
-							</view>
-						</view>
-					</view>
-					<image :src="item.imageInput" mode="aspectFill"></image>
-				</view>
-				<view class="follow-bottom acea-row row-middle">
-					<image :src="item.imageInput" mode=""></image>
-					<view class="follow-title-b acea-row row-column-between">
-						<view class="title-s line1">{{item.author}}</view>
-						<view class="title-con line1">{{item.title}}</view>
-					</view>
-					<!-- <view class="follow-btn">关注+</view> -->
-				</view>
-			</view>
-			<!-- <LoadStatus :loadStatus="loadstatus"></LoadStatus> -->
-		</view>
+		<!-- 顶部主页 -->
+		<view class="head_box" :style="[{height:CustomBar + 'px'}]">
+			<cu-custom :isBack="true">
+				<block slot="backText">
+					<text class="nav-title shopro-selector-rect">资讯</text>
+				</block>
+			</cu-custom>
+		</view>
+		<TabNav :tabList="cateList" @tabItemClick="tabItemClick"></TabNav>
+		<InformationList :list="inforList"></InformationList>
+		<u-loadmore :status="status" :marginTop="30" />
 	</view>
 </template>

 <script>
-	import { getArticle } from "@/api/home";
-	import { articleIndex } from "@/api/article"
+	import {
+		getArticle
+	} from "@/api/home";
+	import {
+		articleIndex
+	} from "@/api/article"
 	import LoadStatus from "@/components/LoadStatus"
 	import skeleton from '@/components/quick-skeleton/quick-skeleton'
+	import tabNav from '../home/components/tabNav.vue'
+	import informationList from './components/informationList.vue'
 	export default {
-		components:{
+		components: {
 			LoadStatus,
-			skeleton
+			skeleton,
+			tabNav,
+			informationList
 		},
 		data() {
 			return {
-				categoryList: [],
 				newList: [],
-				hotList: [],
-				concernList: [],
-				articleList: [],
+				inforList: [],
+				cateList: [],
+				cid: null,
 				page: 0,
 				size: 10,
-				loadstatus: '上拉加载更多...',
-				showSkeleton: true
+				showSkeleton: true,
+				status: 'nomore',
 			}
 		},
 		mounted() {
-			// this.getArticleList()
-			this.getArticleIndex()
+			this.getArticleIndex().then(()=>{
+				this.cid = this.cateList[0].id
+			})
 		},
 		onReachBottom() {
 			this.page = this.page + 1
-			// this.getArticleList()
 		},
-		computed:{
-			
+		watch: {
+			cid: {
+				handler(val) {
+					console.log(val)
+					this.inforList = this.newList.filter((item) => item.cid == val)
+				},
+				immediate: true
+			},
 		},
 		onPullDownRefresh() {
 			this.getArticleIndex()
 		},
 		onReady: function() {
 			const that = this;
-			that.$refs.skeleton.attachedAction();
-			that.$refs.skeleton.readyAction();
 		},
 		methods: {
-			getArticleIndex(){
+			async getArticleIndex() {
 				uni.showLoading({
 					title: '正在加载中...',
 				})
-				articleIndex().then((res)=>{
-					this.categoryList = res.data.categoryList
-					this.concernList = res.data.concernList
-					this.hotList = res.data.hotList
+				let res = await articleIndex()
+				this.cateList = res.data.categoryList
 				this.newList = res.data.newList
+				// if(this.cid == null){
+				// 	this.cid = this.cateList[0].id
+				// }
+				
 				uni.hideLoading()
 				uni.stopPullDownRefresh()
-					this.showSkeleton = false
-				})
-			},
-			getArticleList() {
-				this.loadstatus = '正在加载中...'
-				getArticle({
-					page: this.page,
-					size: this.size,
-					isHot: 0
-				}).then((res) => {
-					if(res.data.content.length < this.size){
-						this.loadstatus = '没有更多了...'
-					}
-					this.articleList = this.articleList.concat(res.data.content)
-				})
 			},
-			toDetail(id) {
-				this.$yrouter.push({
-					path: '/pages/life/articleDetail/index',
-					query: {
-						id: id
+			tabItemClick(val) {
+				this.cid = this.cateList[val].id
 			}
-				})
-			},
-			toCategoryList(id){
-				uni.navigateTo({
-					url: '/pages/life/articleList/index?active=' + id
-				});
-			},
 		}
 	}
 </script>
@ -179,347 +92,20 @@
 <style lang="less">
 	.information-box {
 		width: 100%;
-		height: auto;
-		margin-bottom: 50rpx;
-		position: relative;
+		min-height: 100vh;
+		background: #fff;
+		border-bottom: 26rpx solid #F7F7F7;
 	}

-	.search-box {
-		width: 670rpx;
-		height: 68rpx;
-		border: 2rpx solid #FF5100;
-		border-radius: 8rpx;
-		margin: 24rpx auto 52rpx;
-		font-size: 28rpx;
-		position: relative;
+	.nav-title {
+		font-size: 48rpx;
+		font-weight: 500;
+		color: #06050A;
+		margin-left: 20rpx;
+		line-height: 40px;
 	}

-	.search-box image {
-		width: 35rpx;
-		height: 35rpx;
-		margin: 0 29rpx 0 52rpx;
-	}
-
-	.search {
-		position: absolute;
-		right: -2rpx;
-		width: 132rpx;
-		height: 68rpx;
-		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
-		border-radius: 8rpx;
-		color: #fff;
-
-	}
-
-	.vote-box {
-		width: 670rpx;
-		height: 358rpx;
-		box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
-		border-radius: 16rpx;
-		margin: 0 auto;
-		position: relative;
-		overflow: hidden;
-	}
-
-	.vote-img {
-		position: absolute;
-		width: 670rpx;
-		height: 358rpx;
-	}
-
-	.news {
-		width: 590rpx;
-		height: 94rpx;
-		background: rgba(0, 0, 0, 0.2);
-		border-radius: 14rpx;
-		position: absolute;
-		bottom: 6rpx;
-		left: 50%;
-		margin-left: -295rpx;
-		color: #fff;
-		padding: 14rpx;
-	}
-
-	.news-title-h {
-		font-size: 28rpx;
-	}
-
-	.news-title-s {
-		font-size: 20rpx;
-	}
-
-/* 	.vote {
-		width: 100%;
-		height: 110rpx;
-		position: absolute;
-		bottom: 0;
-		border: 1rpx solid #000000;
-	} */
-
-	.scroll-view_N {
-		width: 100%;
-		height: 238rpx;
-		margin: 30rpx 0rpx 34rpx 0rpx;
-		white-space: nowrap;
-	}
-
-	.rotaion-box {
-		width: 168rpx;
-		height: 208rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 6rpx 12rpx rgba(0, 0, 0, 0.16);
-		border-radius: 16rpx;
-		margin: 10rpx 32rpx 10rpx 0rpx;
-		display: inline-block;
-	}
-
-	.rotaion-box:nth-child(1) {
-		margin-left: 40rpx;
-	}
-
-	.rotaion {
-		width: 100%;
-		height: 208rpx;
-		padding: 36rpx 0 16rpx 0;
-	}
-
-	.rotaion image {
-		width: 80rpx;
-		height: 80rpx;
-		border-radius: 50%;
-	}
-
-	.rotaion-h {
-		height: 34rpx;
-		font-size: 24rpx;
-		color: #333333;
-		font-weight: 600;
-	}
-
-	.rotaion-s {
-		height: 26rpx;
-		font-size: 18rpx;
-		color: #9D9D9D;
-	}
-
-	/* 最新资讯 */
-	.newInfo-box {
-		overflow: hidden;
-	}
-
-	.newInfo-title-img {
-		width: 160rpx;
-		height: 52rpx;
-		margin: 0 0 18rpx 38rpx;
-	}
-
-	.newInfo {
-		width: 100%;
-		height: 528rpx;
-		overflow-y: scroll;
-		border-top: 2rpx solid #EFEFEF;
-	}
-
-	.modular {
-		width: 100%;
-		height: 176rpx;
-		border-bottom: 2rpx solid #EFEFEF;
-		padding: 20rpx 40rpx 22rpx 40rpx;
-	}
-
-	.modular-h {
-		width: 400rpx;
-		height: 80rpx;
-		font-size: 28rpx;
-		color: #4A4A4A;
-		font-weight: 600;
-	}
-
-	.modular image {
-		width: 204rpx;
-		height: 134rpx;
-		border-radius: 8px;
-	}
-
-	.title {
-		width: 400rpx;
-		height: 134rpx;
-	}
-
-	.title-l {
-		width: 400rpx;
-		height: 34rpx;
-		font-size: 24rpx;
-		color: #707070;
-	}
-
-	.title-l image {
-		width: 24rpx;
-		height: 24rpx;
-		margin-left: 5rpx;
-	}
-
-	/* 热点精选 */
-	.hotspot-box {
-		width: 100%;
-		height: 456rpx;
-	}
-
-	.title-h-img {
-		width: 162rpx;
-		height: 62rpx;
-		margin: 32rpx 0 5rpx 40rpx;
-	}
-
-	.scroll-view_H {
-		width: 100%;
-		height: 344rpx;
-		white-space: nowrap;
-	}
-
-	.scroll-view_H image {
-		width: 670rpx;
-		height: 344rpx;
-		border-radius: 10rpx;
-		position: absolute;
-	}
-
-	.slide-box {
-		position: relative;
-		width: 670rpx;
-		height: 100%;
-		display: inline-block;
-		margin-right: 16rpx;
-	}
-
-	.hotspot-con {
-		width: 670rpx;
-		height: 94rpx;
-		background: rgba(0, 0, 0, 0.2);
-		border-radius: 0px 0px 8rpx 8rpx;
-		padding: 8rpx 32rpx;
-		color: #fff;
-		position: absolute;
-		bottom: 0;
-	}
-
-	.hotspot-icon {
-		width: 72rpx;
-		height: 32rpx;
-		background: #FE3737;
-		border-radius: 12rpx 2rpx 12rpx 0;
-		position: absolute;
-		top:-46rpx;
-		font-size: 22rpx;
-		color: #fff;
-		text-align: center;
-		margin-bottom: 16rpx;
-	}
-
-	.hotspot-title-h {
-		max-width: 588rpx;
-		max-height: 80rpx;
-		font-size: 28rpx;
-		color: #FFFFFF;
-		white-space: pre-wrap;
-	}
-
-	/* 值得关注 */
-	.follow-box {
-		width: 100%;
-		position: relative;
-		overflow: hidden;
-	}
-
-	.follow-con {
-		width: 670rpx;
-		height: 250rpx;
-		margin: 0 auto;
-		background: #FFFFFF;
-		box-shadow: 0rpx 4rpx 10rpx rgba(0, 0, 0, 0.16);
-		border-radius: 16rpx;
-		margin-bottom: 32rpx;
-	}
-
-	.follow-top {
-		width: 100%;
-		height: 170rpx;
-		padding: 20rpx 20rpx 26rpx 20rpx;
-		border-bottom: 1rpx solid #DCDCDC;
-	}
-
-	.follow-top image {
-		width: 232rpx;
-		height: 130rpx;
-		border-radius: 16rpx;
-	}
-
-	.follow-title {
-		width: 370rpx;
-		height: 100%;
-	}
-
-	.follow-h {
-		width: 100%;
-		height: 80rpx;
-		font-size: 28rpx;
-		color: #000000;
-		font-weight: 600;
-	}
-
-	.follow-title-l {
-		width: 290rpx;
-		height: 28rpx;
-		font-size: 20rpx;
-		color: #707070;
-	}
-
-	.follow-title-l image {
-		width: 24rpx;
-		height: 24rpx;
-		margin-left: 5rpx;
-	}
-
-	.follow-bottom {
-		width: 100%;
-		height: 80rpx;
-		padding: 14rpx 20rpx 14rpx 20rpx;
-	}
-
-	.follow-bottom image {
-		width: 52rpx;
-		height: 52rpx;
-		border-radius: 50%;
-		margin-right: 8rpx;
-	}
-
-	.follow-title-b {
-		width: 230rpx;
-		height: 52rpx;
-		.title-s {
-			height: 25rpx;
-			line-height: 25rpx;
-			font-size: 20rpx;
-			font-weight: 600;
-		}
-		.title-con {
-			height: 20rpx;
-			font-size: 16rpx;
-			color: #707070;
-		}
-	}
-
-	
-
-	.follow-btn {
-		width: 136rpx;
-		height: 40rpx;
-		background: linear-gradient(39deg, #FF5A0D 0%, #FFAC85 100%);
-		border-radius: 26rpx;
-		font-size: 28rpx;
-		color: #fff;
-		text-align: center;
-		position: absolute;
-		right: 60rpx;
+	.cuIcon-back {
+		display: none;
 	}
 </style>
--- a/pages/life/addGoods/index.vue
+++ b/pages/life/addGoods/index.vue
@ -629,7 +629,7 @@
 			.btn{
 				width: 230rpx;
 				height: 80rpx;
-				background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+				background: #000;
 				text-align: center;
 				line-height: 80rpx;
 				font-size: 38rpx;
@ -800,7 +800,7 @@
 					bakcground:#E9E9E9
 				}
 				.submit-btn{
-					background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+					background: #000;
 				}
 			}
 		}
@ -864,7 +864,7 @@
 				.s-btn{
 					width: 230rpx;
 					height: 80rpx;
-					background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+					background: #000;
 					border-radius: 40rpx;
 					text-align: center;
 					line-height: 80rpx;
--- a/pages/life/articleDetail/index.vue
+++ b/pages/life/articleDetail/index.vue
@ -4,7 +4,7 @@
    <view class="article-header">
      <view class="headline">{{ detail.title }}</view>
      <view class="acea-row">
-        <image :src="detail.authorLogo" class="header-img"></image>
+        <image :src="detail.authorLogo || detail.imageInput" class="header-img"></image>
        <view class="">
          <view class="release-auth line1">{{ detail.author }}</view>
          <view class="acea-row">
@ -32,6 +32,7 @@

 <script>
 import { getArticleDetail } from "@/api/home";
+import { formatRichText } from "@/utils/util.js"
 export default {
  data() {
    return {
@ -60,38 +61,10 @@ export default {
  methods: {
    getArticleDetail() {
      getArticleDetail({ id: this.id }).then((res) => {
-        res.data.content = this.formatRichText(res.data.content);
+        res.data.content = formatRichText(res.data.content);
        this.detail = res.data;
      });
    },
-    formatRichText(html) {
-      let newContent = html.replace(/<img[^>]*>/gi, function (match, capture) {
-        match = match
-          .replace(/style="[^"]+"/gi, "")
-          .replace(/style='[^']+'/gi, "");
-        match = match
-          .replace(/width="[^"]+"/gi, "")
-          .replace(/width='[^']+'/gi, "");
-        match = match
-          .replace(/height="[^"]+"/gi, "")
-          .replace(/height='[^']+'/gi, "");
-        return match;
-      });
-      newContent = newContent.replace(
-        /style="[^"]+"/gi,
-        function (match, capture) {
-          match = match
-            .replace(/width:[^;]+;/gi, "max-width:100%;")
-            .replace(/width:[^;]+;/gi, "max-width:100%;");
-          return match;
-        }
-      );
-      newContent = newContent.replace(
-        /\<img/gi,
-        '<img style="max-width:100%;height:auto;display:block;margin-top:0;margin-bottom:0;"'
-      );
-      return newContent;
-    },
  },
  onLoad: function (option) {
    this.id = this.$yroute.query.id;
--- a/pages/life/goodsDetails/index.vue
+++ b/pages/life/goodsDetails/index.vue
@ -245,7 +245,7 @@
 		.preview-btn{
 			width: 230rpx;
 			height: 80rpx;
-			background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+			background: #000;
 			text-align: center;
 			line-height: 80rpx;
 			font-size: 38rpx;
--- a/pages/life/index.css
+++ b/pages/life/index.css
@ -1 +0,0 @@
-/* pages/life/index.wxss */
--- a/pages/life/index.vue
+++ b/pages/life/index.vue
@ -1,7 +1,7 @@
 <template>
 	<view class="productSort">
 		<view class="page-top-box" :class="isFixed == true ? 'on' : ''">
-      <view class="top-box acea-row row-between-wrapper">
+			<!-- <view class="top-box acea-row row-between-wrapper">
        <view class="top-box-l acea-row row-middle">
          <image src="../../static/images/localtion.png"></image>
          <text>武汉</text>
@ -9,45 +9,42 @@
        <view class="cart-btn-box" @click="goShoppingCart()">
          <image src="../../static/images/cart.png"></image>
        </view>
-      </view>
+      </view> -->
 			<div class="index">
 				<view class="header acea-row row-center-wrapper">
 					<view @click="goGoodSearch()" class="search acea-row row-middle">
 						<text class="iconfont icon-xiazai5"></text>搜索商品
 					</view>
+					<view class="cart-btn-box" @click="goShoppingCart()">
+						<image src="../../static/images/cart.png"></image>
+					</view>
 				</view>
 			</div>
 		</view>
 		<view class="category-tab-box">
 			<scroll-view class="scroll-view_H" scroll-x="true">
-        <view
-					v-for="item in categoryList" 
-					:key="item.id"
-					@click="tabClick(item)"
-					:class="sid == item.id ? 'category-item category-item-active' : 'category-item'"
-				>
+				<view v-for="item in categoryList" :key="item.id" @click="tabClick(item)" :class="fid == item.id ? 'category-item category-item-active' : 'category-item'">
 					{{item.cateName}}
 				</view>
 			</scroll-view>
 		</view>
+
 		<view class="warter-box">
 			<!-- <view class="headline">
 				<image src="../../static/images/rec-title.png" mode=""></image>
 			</view> -->
+			<view class="second-cate-box acea-row" v-if="secondCateList.length> 0">
+				<view class="second-cate-item" v-for="item in secondCateList" :key="item.id" @click="secondCateClick(item.id)" :class="sid == item.id ? 'second-cate-item-active' : ''">
+					<view class="img-box">
+						<image :src="item.pic"></image>
+					</view>
+					<view class="name">{{item.cateName}}</view>
+				</view>
+			</view>
 			<u-waterfall v-model="flowList" ref="uWaterfall">
 				<template v-slot:left="{ leftList }">
-          <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="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">
 							<view class="title line2"> {{ item.storeName }} </view>
 							<view class="price-box acea-row row-between-wrapper">
@ -58,19 +55,8 @@
 					</view>
 				</template>
 				<template v-slot:right="{ rightList }">
-          <view
-            class="warter"
-						style="margin-left: 30rpx;"
-            v-for="(item, index) in rightList"
-            :key="index"
-            @tap="toGoodsDetail(item.id)"
-          >
-            <image
-              class="warter-img"
-              :src="item.image"
-              :index="index"
-              mode="widthFix"
-            ></image>
+					<view class="warter" style="margin-left: 30rpx;" v-for="(item, index) in rightList" :key="index" @tap="toGoodsDetail(item.id)">
+						<image class="warter-img" :src="item.image" :index="index" mode="widthFix"></image>
 						<view class="goodsinfo-box">
 							<view class="title line2"> {{ item.storeName }} </view>
 							<view class="price-box acea-row row-between-wrapper">
@ -81,23 +67,29 @@
 					</view>
 				</template>
 			</u-waterfall>
-      <u-loadmore
-        bg-color="rgb(240, 240, 240)"
-        :status="loadStatus"
-        @loadmore="addRandomData"
-      ></u-loadmore>
+			<u-loadmore bg-color="rgb(240, 240, 240)" margin-top="40" :status="loadStatus" @loadmore="addRandomData"></u-loadmore>
 		</view>
 		<!-- <tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar> -->
 	</view>
 </template>
 <script>
-import { getCategory, getProducts, getArticle, getActivity, getSecondCategory } from "@/api/store";
-import { trim } from "@/utils";
-import { mapGetters } from "vuex";
-import tabbar from "../../tabbarComponent/tabbar";
-import vSwiper from "@/components/vSwiper.vue";
-const app = getApp();
-export default {
+	import {
+		getCategory,
+		getProducts,
+		getArticle,
+		getActivity,
+		getSecondCategory
+	} from "@/api/store";
+	import {
+		trim
+	} from "@/utils";
+	import {
+		mapGetters
+	} from "vuex";
+	import tabbar from "../../tabbarComponent/tabbar";
+	import vSwiper from "@/components/vSwiper.vue";
+	const app = getApp();
+	export default {
 		components: {
 			tabbar,
 			vSwiper,
@ -105,7 +97,7 @@ export default {
 		name: "GoodsClass",
 		computed: mapGetters(["userInfo"]),
 		props: {},
-  data: function () {
+		data: function() {
 			return {
 				category: [],
 				navActive: 0,
@ -121,16 +113,21 @@ export default {
 				page: 1,
 				limit: 10,
 				isLoad: true, //是否还有更多
-			categoryList: [{id: 0, cateName: '全部'}], //分类列表
-			sid: 0, //分类id
+				categoryList: [{
+					id: 0,
+					cateName: '全部'
+				}], //分类列表
+				fid: 0, //一级分类id
+				secondCateList: [], //二级分类
+				sid: 0, //二级分类id
 				articleList: [],
-      active: 1,
+				active: 0,
 				show: false,
 				activity: [],
 			};
 		},
 		watch: {
-    "$yroute.query.id": function (n) {
+			"$yroute.query.id": function(n) {
 				if (n) {
 					this.activeCateId(n);
 				}
@ -153,8 +150,8 @@ export default {
 				},
 			}
 		},
-  mounted: function () {
-		this.getSecondCategory().then(()=>{
+		mounted: function() {
+			this.getSecondCategory().then(() => {
 				this.getProducts();
 			})
 		},
@ -168,7 +165,7 @@ export default {
 			wx.showNavigationBarLoading();
 			this.isLoad = true;
 			this.page = 1;
-		this.sid = this.categoryList[0].id;
+			this.fid = this.categoryList[0].id;
 			// this.getActivity();
 			this.clear().then(() => {
 				this.getProducts();
@ -194,13 +191,18 @@ export default {
 			goGoodsList(child) {
 				this.$yrouter.push({
 					path: "/pages/shop/GoodsList/index",
-        query: { id: child.id, title: child.cateName },
+					query: {
+						id: child.id,
+						title: child.cateName
+					},
 				});
 			},
 			toGoodsDetail(id) {
 				this.$yrouter.push({
 					path: "/pages/shop/GoodsCon/index",
-        query: { id: id },
+					query: {
+						id: id
+					},
 				});
 			},
 			activeCateId(n) {
@ -237,22 +239,44 @@ export default {
 				});
 			},
 			tabClick(i) {
-      this.sid = i.id;
+				this.fid = i.id;
 				this.page = 1;
 				this.isLoad = true;
 				this.flowList = [];
-			this.$refs.uWaterfall.clear();
+				this.getSecondCate(i.id)
+			},
+			getSecondCate(id) {
+				if (id == 0) { //全部商品
+					this.secondCateList = []
+					this.sid = 0
+					this.clear().then(() => {
 						this.getProducts();
+					});
+				} else {
+					this.categoryList.forEach((item) => {
+						if (item.id == id) {
+							this.secondCateList = item.children
+							this.sid = this.secondCateList[0].id || 0
+						}
+					})
+					this.clear().then(() => {
+						this.getProducts();
+					});
+				}
+			},
+			secondCateClick(id) {
+				this.sid = id;
+				this.clear().then(() => {
+					this.getProducts();
+				});
 			},
 			async getProducts() {
 				this.loadStatus = "loading";
-      getProducts(
-				{ 
+				getProducts({
 					page: this.page,
-					limit: this.limit ,
+					limit: this.limit,
 					sid: this.sid
-				}
-			).then((res) => {
+				}).then((res) => {
 					// console.log(res)
 					if (this.page > 1) {
 						this.flowList = this.flowList.concat(res.data);
@ -268,21 +292,23 @@ export default {
 					}
 					wx.hideNavigationBarLoading();
 					uni.stopPullDownRefresh();
-				console.log(this.flowList,'flowList')
+					// console.log(this.flowList, 'flowList')
 				});
 			},
-		async getSecondCategory(){
+			async getSecondCategory() {
 				let res = await getSecondCategory();
-			this.categoryList = [ ...this.categoryList, ...res.data ]
-			// console.log(this.categoryList,'categoryList')
+				this.categoryList = [...this.categoryList, ...res.data]
+				console.log(this.categoryList,'categoryList')
 			},

-    submitForm: function () {
+			submitForm: function() {
 				var val = trim(this.search);
 				if (val) {
 					this.$yrouter.push({
 						path: "/pages/shop/GoodsList/index",
-          query: { s: val },
+						query: {
+							s: val
+						},
 					});
 					setTimeout(() => (this.search = ""), 500);
 				}
@ -297,23 +323,18 @@ export default {
 				});
 			},
 		},
-  beforeDestroy: function () {
+		beforeDestroy: function() {
 			// document.removeEventListener("scroll", this.onScroll, false);
 		},
-};
+	};
 </script>
-<style lang="scss" scoped>
-</style>
-
 <style lang="less" scoped>
-.productSort {
-  // height: 100%;
-  // padding-bottom: 200rpx;
+	.productSort {
 		background: #eeeeee !important;
 		position: relative;
-}
+	}

-.page-top-box {
+	.page-top-box {
 		width: 100%;
 		position: fixed;
 		top: 0;
@ -322,11 +343,13 @@ export default {
 		background: #fff;
 		padding: 0 30rpx 20rpx;
 		box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
+
 		.top-box {
 			.top-box-l {
 				font-size: 32rpx;
 				color: #000;
 				font-weight: 500;
+
 				image {
 					width: 26rpx;
 					height: 30rpx;
@ -334,78 +357,134 @@ export default {
 					margin-right: 10rpx;
 				}
 			}
+		}
+
 		.cart-btn-box {
 			width: 50rpx;
 			height: 50rpx;
+			margin-left: 12rpx;
+
 			image {
 				width: 100%;
 				height: 100%;
 			}
 		}
-  }
+
 		.index {
-    height: 96rpx;
 			.header {
 				height: 68rpx;
 				position: static;
 				padding: 0;
-      margin-top: 34rpx;
+
 				.search {
 					background-color: #eeeeee;
 					border-radius: 8rpx;
 				}
 			}
 		}
-}
-.category-tab-box {
+	}
+
+	.category-tab-box {
 		width: 100%;
 		height: 108rpx;
 		line-height: 108rpx;
-  // margin-bottom: 30rpx;
-  padding-top: 160rpx;
-	position: relative;
-  .scroll-view_H {
-    width: 100%;
+		// padding-top: 90rpx;
 		position: fixed;
-		top: 160rpx;
+		top: 86rpx;
 		left: 0;
-		padding-left: 30rpx;
 		z-index: 999;
+
+		.scroll-view_H {
+			width: 100%;
+			padding-left: 30rpx;
 			background: #fff;
 			white-space: nowrap;
+
 			.category-item {
 				display: inline-block;
 				font-size: 28rpx;
 				line-height: 40rpx;
 				color: #999;
 				margin-right: 40rpx;
+
 				&.category-item-active {
-        color: #ff6d31;
+					color: #292929;
 					font-size: 32rpx;
 					font-weight: 500;
 					position: relative;
+
 					&::after {
 						content: "";
-          width: 100%;
-          height: 8rpx;
+						width: 80%;
+						height: 6rpx;
 						border-radius: 6rpx;
 						display: block;
 						position: absolute;
 						bottom: -24rpx;
-          left: 0;
-          background: #ff7942;
+						left: 50%;
+						transform: translateX(-50%);
+						background: #292929;
+					}
+				}
+			}
+		}
+	}
+
+	.second-cate-box {
+		width: 100%;
+		padding: 28rpx 28rpx 0;
+		background: #FFFFFF;
+		border-radius: 8rpx;
+		margin-bottom: 20rpx;
+
+		.second-cate-item {
+			width: 100rpx;
+			text-align: center;
+			margin-right: 36rpx;
+			margin-bottom: 28rpx;
+
+			&:nth-child(5n) {
+				margin-right: 0;
 			}
+
+			.img-box {
+				width: 100rpx;
+				height: 100rpx;
+				line-height: 100rpx;
+				text-align: center;
+				margin-bottom: 10rpx;
+
+				image {
+					width: 98%;
+					height: 98%;
+					display: inline-block;
 				}
 			}
+
+			.name {
+				color: #4B4B4B;
+				font-size: 22rpx;
 			}
-}
-.warter-box {
+
+		}
+		
+		.second-cate-item-active{
+			.name{
+				color: #292929;
+			}
+		}
+	}
+
+	.warter-box {
 		width: 100%;
-  padding: 126rpx 24rpx 190rpx 24rpx;
+		min-height: 100vh;
+		padding: 216rpx 24rpx 190rpx 24rpx;
+
 		.u-waterfall {
 			width: 100%;
 			display: flex;
 			justify-content: space-between;
+
 			.u-column {
 				.warter {
 					width: 336rpx !important;
@ -415,13 +494,16 @@ export default {
 					overflow: hidden;
 					box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.06);
 					margin-bottom: 20rpx;
+
 					image {
 						width: 100%;
 						display: block;
 					}
+
 					.goodsinfo-box {
 						width: 100%;
 						padding: 12rpx 16rpx;
+
 						.title {
 							font-size: 28rpx;
 							font-weight: 500;
@ -429,12 +511,14 @@ export default {
 							width: 100%;
 							height: 80rpx;
 						}
+
 						.price {
 							font-size: 28rpx;
 							font-weight: bold;
 							line-height: 40rpx;
-            color: #ff7942;
+							color: #292929;
 						}
+
 						.old-price {
 							font-size: 20rpx;
 							line-height: 28rpx;
@ -445,49 +529,60 @@ export default {
 				}
 			}
 		}
-}
-.banner-img-box {
+	}
+
+	.banner-img-box {
 		width: 100%;
 		padding: 220rpx 40rpx 32rpx;
+
 		.img-box-l {
 			width: 324rpx;
 			height: 400rpx;
+
 			image {
 				width: 100%;
 				height: 100%;
 			}
 		}
+
 		.img-box-r {
 			width: 324rpx;
 			height: 400rpx;
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;
+
 			// align-items: ;
 			image {
 				width: 324rpx;
 				height: 190rpx;
 			}
 		}
-}
-.goods-list-box {
+	}
+
+	.goods-list-box {
 		width: 100%;
 		padding: 0 30rpx;
+
 		.goods-list-item {
 			width: 100%;
+
 			.goods-type-box {
 				image {
 					width: 94rpx;
 					height: 94rpx;
 				}
+
 				.t-word {
 					font-size: 36rpx;
 					color: #222;
 					font-weight: 600;
 				}
 			}
+
 			.goods-list {
 				width: 100%;
+
 				.goods-item {
 					width: 335rpx;
 					background: #fff;
@ -496,29 +591,34 @@ export default {
 					border-radius: 10rpx;
 					overflow: hidden;
 					box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.06);
+
 					image {
 						width: 100%;
 						height: 278rpx;
 					}
 				}
+
 				.goods-item:nth-child(2n) {
 					margin-right: 0;
 				}
+
 				.goods-desc-box {
 					width: 100%;
 					padding: 16rpx;
 					font-size: 24rpx;
+
 					.goods-name {
 						line-height: 34rpx;
 					}
+
 					.price {
 						font-size: 28rpx;
-          color: #e5270f;
+						color: #292929;
 						line-height: 40rpx;
 						margin-bottom: 26rpx;
 					}
 				}
 			}
 		}
-}
+	}
 </style>
--- a/pages/life/learnMore/index.vue
+++ b/pages/life/learnMore/index.vue
@ -1,8 +1,14 @@
 <template>
 	<view class="more-page">
-		<view class="page-title acea-row row-middle row-center" :style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'"><image src="../../../static/images/back.png" mode="" @tap="toBackHome"></image>详情</view>
-		<swiper class="swiper-box" autoplay="true" indicator-dots='true' indicator-color='#B17815'
-			indicator-active-color='#FFB93E'>
+		<view class="head_box">
+		  <cu-custom :isBack="true" :bgColor="'transparent'">
+		    <block slot="backText">
+					<image src="../../../static/images/back.png" @click="backClick" class="back-icon"></image>
+		      <text class="nav-title shopro-selector-rect">详情</text>
+		    </block>
+		  </cu-custom>
+		</view>
+		<swiper class="swiper-box" autoplay="true" indicator-dots='true' indicator-color='#B17815' indicator-active-color='#FFB93E'>
 			<swiper-item>
 				<image src="https://download.cyjyyjy.com/learnMore1.png"></image>
 			</swiper-item>
@ -24,12 +30,11 @@
 	export default {
 		data() {
 			return {
-				menuHeight: app.globalData.menuHeight,
-				menuTop: app.globalData.menuTop,
+				
 			};
 		},
-		methods:{
-			toBackHome(e){
+		methods: {
+			toBackHome(e) {
 				console.log("1")
 				uni.navigateBack();
 			}
@ -38,22 +43,26 @@
 </script>

 <style lang="less">
-	.more-page{
+	.more-page {
 		width: 100%;
 		height: 100%;
 		position: relative;
 	}
-	.page-title{
-	  width: 100%;
+
+	.nav-title {
+		width: calc(100% - 36rpx);
+		text-align: center;
+		font-size: 32rpx;
 		color: #fff;
-	  position: relative;
-		z-index: 999;
-		image{
-			width: 30rpx;
-			height: 35rpx;
-			position: absolute;
-			left: 40rpx;
+		line-height: 40px;
+		display: inline-block;
 	}
+	.back-icon{
+		width: 36rpx;
+		height: 36rpx;
+		position: absolute;
+		top: 50%;
+		left: 36rpx;
 	}

 	.swiper-box {
--- a/pages/life/temp/index.vue
+++ b/pages/life/temp/index.vue
@ -22,7 +22,7 @@
 			<view class="step-freight-box">
 				<view class="acea-row row-between">
 					<view>阶梯运费</view>
-					<switch :checked="templateList[0]" color="#FF6D31" style="transform:scale(0.7)" @change="switchChange" />
+					<switch :checked="templateList[0]" color="#000" style="transform:scale(0.7)" @change="switchChange" />
 				</view>
 				<view class="step-box" v-show="templateList[0]">
 					<view class="acea-row row-middle row-center">
@ -57,7 +57,7 @@
 					<view class="step-freight-box">
 						<view class="acea-row row-between">
 							<view>阶梯运费</view>
-							<switch :checked="item.setpFreight" color="#FF6D31" style="transform:scale(0.7)" @change="appointSwitchChange(index)" />
+							<switch :checked="item.setpFreight" color="#000" style="transform:scale(0.7)" @change="appointSwitchChange(index)" />
 						</view>
 						<view class="step-box" v-show="item.setpFreight">
 							<view class="acea-row row-middle row-center">
@ -320,7 +320,7 @@ export default {
 		text-align: center;
 		color: #fff;
 		font-size: 38rpx;
-		background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+		background: #000;
 		border-radius: 40rpx;
 		position: absolute;
 		bottom: 100rpx;
--- a/pages/life/tempList/index.vue
+++ b/pages/life/tempList/index.vue
@ -145,7 +145,7 @@
 			font-size: 34rpx;
 			font-weight: 500;
 			border-radius: 40rpx;
-			background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+			background: #000;
 			color: #fff;
 			position: fixed;
 			bottom: 30rpx;
--- a/pages/life/yunInfo/index.vue
+++ b/pages/life/yunInfo/index.vue
@ -52,7 +52,7 @@
 					<image src="../../../static/images/home/top-bg.png" mode=""></image>
 					<view class="hotspot-con">
 						<view class="hotspot-icon">热点</view>
-						<view class="hotspot-title-h">禅易云生态：加入云生态，共建万亿私域资源圈获取海量资源与福利。</view>
+						<view class="hotspot-title-h">湖北省艺术设计协会：加入云生态，共建万亿私域资源圈获取海量资源与福利。</view>
 					</view>
 				</view>
 			</scroll-view>
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@ -323,7 +323,7 @@ export default {
 				color: #222;
 				.state{
 					font-size: 32rpx;
-					color: #FF6D31;
+					color: #000;
 				}
 			}
 			.item-info {
@ -347,7 +347,7 @@ export default {
 							margin-bottom: 40rpx;
 						}
 						.money-txt{
-							color: #FF6D31;
+							color: #000;
 							font-size: 42rpx;
 							font-weight: 500;
 						}
@ -368,7 +368,7 @@ export default {
 				border: none;
 				border-top: 1rpx solid #eee;
 				.money{
-					color: #FF6D31;
+					color: #000;
 					font-weight: 500;
 				}
 			}
--- a/pages/release/companyAuth/index.css
+++ b/pages/release/companyAuth/index.css
@ -1,5 +1,7 @@
 /* pages/release/companyAuth/index.wxss */
-
+.auth-page{
+	background: #fff;
+}
 .is-legal-box{
  width: 100%;
  padding: 30rpx 40rpx;
@ -93,7 +95,7 @@
 .submit-btn{
  width: 670rpx;
  height: 76rpx;
-  background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
+  background: #292929;
  border-radius: 38rpx;
  color: #fff;
  font-size: 28rpx;
--- a/pages/release/companyAuth/index.vue
+++ b/pages/release/companyAuth/index.vue
@ -202,8 +202,8 @@
 				},
 				isEdit: false,
 				scaleArr: ['0-25', '25-99', '99-200', '200-500', '500及以上'],
-				resourcesList: "",
-				resourcesIdx: ""
+				resourcesList: null,
+				resourcesIdx: null
 			};
 		},

@ -253,9 +253,9 @@
 			},

 			resourcesChange(e) {
-				// console.log(e)
+				console.log(e)
 				let idx = Number(e.detail.value);
-				this.setData({ //['form.industryId']: this.data.resourcesList[idx].id
+				this.setData({ 
 					resourcesIdx: idx,
 				});
 				this.form.industryId = this.resourcesList[idx].id;
@ -536,7 +536,9 @@
 		width: 70%;
 		text-align: right;
 	}
-
+	.form-item .yyzz{
+		width: 100%;
+	}
 	.yyzz image {
 		width: 670rpx;
 		height: 368rpx;
@ -558,17 +560,6 @@
 		margin-bottom: 10rpx;
 	}

-	.submit-btn {
-		width: 670rpx;
-		height: 76rpx;
-		background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
-		border-radius: 38rpx;
-		color: #fff;
-		font-size: 28rpx;
-		line-height: 76rpx;
-		text-align: center;
-		margin: 40rpx auto;
-	}

 	.arrorR {
 		width: 14rpx;
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@ -24,14 +24,14 @@
 			</view>
 			<image src="/static/images/home/arrow-r.png" class="tojump"></image>
 		</view>
-		<view class="auth-btn acea-row row-middle" @tap="toInvestorAuth">
+		<!-- <view class="auth-btn acea-row row-middle" @tap="toInvestorAuth">
 			<view><image src="/static/images/user/investor.png" class="auth-headimg investor-img"></image></view>
 			<view>
 				<view class="auth-title">投资方认证</view>
 				<view class="auth-title-h">投资方认证后可查看项目方发布项目详情</view>
 			</view>
 			<image src="/static/images/home/arrow-r.png" class="tojump"></image>
-		</view>
+		</view> -->
  </view>
  <view :class="'posi ' + (authStatus == 1 || authStatus == 2 ? 'top30' : '')">
    <!-- <view class="tips-box">
@ -72,13 +72,13 @@
 					<view class="tip-s">我要发布我的资源展示在供应广场</view>
 				</view>
      </view>
-			<view :class="'btn ' + (authStatus == 2 ? '' : 'default' )" @tap="" class="acea-row row-middle btn-demo">
+			<!-- <view :class="'btn ' + (authStatus == 2 ? '' : 'default' )" @tap="" class="acea-row row-middle btn-demo">
 			  <image src="/static/images/auth-icon3.png"></image>
 				<view>
 					<view class="tip">发布项目</view>
 					<view class="tip-s">发布优质项目精准推荐投资方</view>
 				</view>
-			</view>
+			</view> -->
    </view>
    <view class="close" @tap="back"><image src="/static/images/close-icon.png"></image></view>
  </view>
--- a/pages/release/perfectCompanyInfo/index.css
+++ b/pages/release/perfectCompanyInfo/index.css
@ -1,86 +0,0 @@
-/* pages/release/perfectCompanyInfo/index.wxss */
-.perfect-companyInfo-page{
-  width: 100%;
-  padding: 24rpx 40rpx;
-  border-top: 2rpx solid #EEEEEE;
-}
-.title{
-  color: #1D1D1D;
-  font-size: 32rpx;
-}
-.title::before{
-  content: '';
-  display: inline-block;
-  width: 8rpx;
-  height: 42rpx;
-  background: #FF7942;  
-  border-radius: 4rpx;
-  margin-right: 10rpx;
-}
-.form-box{
-  font-size: 28rpx;
-  color: #666666;
-}
-.form-item{
-  margin-top: 22rpx;
-}
-.chose{
-  padding: 0 !important;
-  margin: 0 !important;
-  width: auto !important;
-  background: #fff;
-  font-size: 26rpx;
-  color: #666;
-  font-weight: normal;
-}
-.red{
-  color: #FF0000;
-}
-.inp-box{
-  width: 100%;
-  height: 60rpx;
-  background: #EEEEEE;
-  border-radius: 4rpx;
-  padding-left: 22rpx;
-  margin-top: 20rpx;
-}
-.inp-box input{
-  width: 100%;
-  height: 100%;
-}
-.upload-box{
-  width: 100%;
-  margin-top: 20rpx;
-  padding-bottom: 24rpx;
-  border-bottom: 2rpx solid #EEEEEE;
-}
-.upload-box image{
-  width: 120rpx;
-  height: 120rpx;
-  margin-right: 20rpx;
-}
-.textarea-box{
-  width: 100%;
-  height: 352rpx;
-  background: #EEEEEE;
-  border-radius: 4rpx;
-  padding: 22rpx;
-  margin-top: 20rpx;
-}
-.textarea-box textarea{
-  width: 100%;
-  height: 100%;
-  line-height: 40rpx;
-}
-.submit-btn{
-  width: 670rpx !important;
-  height: 76rpx !important;
-  background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
-  border-radius: 38rpx;
-  color: #fff;
-  font-size: 28rpx !important;
-  line-height: 76rpx !important;
-  text-align: center;
-  margin:40rpx auto !important;
-  padding: 0 !important;
-}
--- a/pages/release/perfectCompanyInfo/index.vue
+++ b/pages/release/perfectCompanyInfo/index.vue
@ -303,7 +303,7 @@ export default {
  display: inline-block;
  width: 8rpx;
  height: 42rpx;
-  background: #FF7942;  
+  background: #292929;  
  border-radius: 4rpx;
  margin-right: 10rpx;
 }
@ -388,7 +388,7 @@ export default {
 .submit-btn{
  width: 670rpx !important;
  height: 76rpx !important;
-  background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
+  background: #292929;
  border-radius: 38rpx;
  color: #fff;
  font-size: 28rpx !important;
--- a/pages/release/perfectPersonInfo/index.css
+++ b/pages/release/perfectPersonInfo/index.css
@ -1,100 +0,0 @@
-/* pages/release/perfectCompanyInfo/index.wxss */
-.perfect-companyInfo-page{
-  width: 100%;
-  padding: 24rpx 40rpx;
-  border-top: 2rpx solid #EEEEEE;
-}
-.introduction-box{
-  font-size: 28rpx;
-  color: #666666;
-  padding-bottom: 30rpx;
-  border-bottom: 2rpx solid #EEEEEE;
-}
-.introduction-item{
-  margin-top: 20rpx;
-}
-.introduction-item input{
-  /* width: 100rpx; */
-  text-align: right;
-
-}
-.introduction-item image{
-  width: 13rpx;
-  height: 24rpx;
-  margin-left: 10rpx;
-} 
-.title{
-  color: #1D1D1D;
-  font-size: 32rpx;
-}
-.title::before{
-  content: '';
-  display: inline-block;
-  width: 8rpx;
-  height: 42rpx;
-  background: #FF7942;  
-  border-radius: 4rpx;
-  margin-right: 10rpx;
-}
-.form-box{
-  font-size: 28rpx;
-  color: #666666;
-}
-.picker{
-  font-size: 28rpx;
-  color: #666666;
-}
-.form-item{
-  margin-top: 22rpx;
-}
-.red{
-  color: #FF0000;
-}
-.inp-box{
-  width: 100%;
-  height: 60rpx;
-  background: #EEEEEE;
-  border-radius: 4rpx;
-  padding-left: 22rpx;
-  margin-top: 20rpx;
-}
-.inp-box input{
-  width: 100%;
-  height: 100%;
-}
-.upload-box{
-  width: 100%;
-  margin-top: 20rpx;
-  padding-bottom: 24rpx;
-  border-bottom: 2rpx solid #EEEEEE;
-}
-.upload-box image{
-  width: 120rpx;
-  height: 120rpx;
-  margin-right: 20rpx;
-}
-.textarea-box{
-  width: 100%;
-  height: 352rpx;
-  background: #EEEEEE;
-  border-radius: 4rpx;
-  padding: 22rpx;
-  margin-top: 20rpx;
-}
-.textarea-box textarea{
-  width: 100%;
-  height: 100%;
-  line-height: 40rpx;
-}
-.submit-btn{
-  width: 670rpx !important;
-  height: 76rpx !important;
-  background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
-  border-radius: 38rpx;
-  color: #fff;
-  font-size: 28rpx !important;
-  line-height: 76rpx !important;
-  text-align: center;
-  margin:40rpx auto !important;
-  padding: 0 !important;
-}
--- a/pages/release/perfectPersonInfo/index.vue
+++ b/pages/release/perfectPersonInfo/index.vue
@ -336,7 +336,7 @@ export default {
  display: inline-block;
  width: 8rpx;
  height: 42rpx;
-  background: #FF7942;  
+  background: #292929;  
  border-radius: 4rpx;
  margin-right: 10rpx;
 }
@ -413,7 +413,7 @@ export default {
 .submit-btn{
  width: 670rpx !important;
  height: 76rpx !important;
-  background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
+  background: #292929;
  border-radius: 38rpx;
  color: #fff;
  font-size: 28rpx !important;
--- a/pages/release/personAuth/index.css
+++ b/pages/release/personAuth/index.css
@ -1,2 +0,0 @@
-/* pages/release/personAuth/index.wxss */
-@import "../companyAuth/index.css";
--- a/pages/release/personAuth/index.vue
+++ b/pages/release/personAuth/index.vue
@ -211,8 +211,5 @@ export default {
 };
 </script>
 <style>
-/* pages/release/personAuth/index.wxss */
@import "../companyAuth/index.css";
-
-
 </style>
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@ -555,13 +555,13 @@
 		width: 390rpx;
 	}
 	.shoppingCart .list .item .picTxt .carnum view {
-	    border: 2rpx solid #F99C10;
+	    border: 2rpx solid #292929;
 	    width: 66rpx;
 	    text-align: center;
 	    height: 100%;
 	    line-height: 44rpx;
 	    font-size: 28rpx;
-	    color: #F99C10;
+	    color: #292929;
 	}
 	.shoppingCart .list .item .picTxt .carnum .plus{
 		border-radius: 0 12rpx 12rpx 0;
@ -570,7 +570,7 @@
 		 border-radius: 12rpx 0rpx 0rpx 12rpx;
 	 }
 	 .shoppingCart .list .item .picTxt .carnum .num {
-	     color: #F99C10;
+	     color: #292929;
 	 }
 	
 	.shoppingCart .footer {
@ -590,8 +590,7 @@
 		.toBuy-btn{
 			width: 194rpx;
 			height: 68rpx;
-			background: -webkit-linear-gradient(top, #EA533E 0%, #E5270F 100%);
-			background: linear-gradient(180deg, #EA533E 0%, #E5270F 100%);
+			background: linear-gradient(180deg, #292929 0%, #292929 100%);
 			box-shadow: 0px 4rpx 6rpx 2rpx rgba(255, 213, 208, 0.59);
 			border-radius: 34rpx;
 			font-size: 32rpx;
@ -602,7 +601,7 @@
 		}
 	}
 	.shoppingCart .noCart .toBuy-btn{
-		background: #F99C10;
+		background: #292929;
 	}
 	
 </style>
--- a/pages/user/addServiceCode/index.vue
+++ b/pages/user/addServiceCode/index.vue
@ -54,7 +54,7 @@
 				text-align: center;
 				color: #fff;
 				font-size: 32rpx;
-				background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+				background: #000;
 				border-radius: 40rpx;
 			}
 		}
--- a/pages/user/agreement/index.css
+++ b/pages/user/agreement/index.css
@ -1,47 +0,0 @@
-/* pages/user/agreement/index.wxss */
-.agreement-box{
-  width: 100%;
-  position: relative;
-}
-.agreement-box image{
-  width: 100%;
-  display: block;
-}
-.agreement-box .img{
-  height: 2848rpx;
-}
-.agreement-box .img1{
-  height: 924rpx;
-}
-.agreement-box .img2{
-  height: 834rpx;
-}
-.agreement-box .img3{
-  height: 1090rpx;
-}
-
-.btn-box{
-  width: 440rpx !important;
-  height: 142rpx !important;
-  padding: 0 !important;
-  position: absolute;
-  top: 658rpx;
-  left: 50%;
-  margin-left: -220rpx !important;
-  background: none !important;
-}
-
-.pay-box{
-  width: 100%;
-  min-height: 100vh;
-}
-.pay-box image{
-  width: 100%;
-  display: block;
-}
-.pay-box .img1{
-  height: 609rpx;
-}
-.pay-box .img2{
-  height: 1235rpx;
-}
--- a/pages/user/agreement/index.vue
+++ b/pages/user/agreement/index.vue
@ -1,9 +1,9 @@
 <template>
 	<!--pages/user/agreement/index.wxml-->
 	<view>
-		<view class="back-btn" :style="'top:' + navTopHeight + 'rpx'" @tap="backPage">
-			<image src="/static/images/back.png" mode></image>
-		</view>
+		<cu-custom :bgColor="'rgba(0,0,0,0.9)'" :isBack="true">
+			<block slot="backText">返回</block>
+		</cu-custom>
 		<view class="pay-box" v-if="userInfo.nickname != '' && userInfo.isVip == 1">
 			<image src="https://download.cyjyyjy.com/pay1.png" class="img1"></image>
 			<image src="https://download.cyjyyjy.com/pay2.png" class="img2"></image>
@ -253,6 +253,12 @@
 	.pay-box {
 		width: 100%;
 		min-height: 100vh;
+		position: absolute;
+		top: 0;
+	}
+	
+	.action{
+		color: #fff;
 	}
 	
 	.pay-box image {
--- a/pages/user/completeData/index.css
+++ b/pages/user/completeData/index.css
@ -1,134 +0,0 @@
-/* pages/user/completeData/index.wxss */
-page{
-  width: 100%;
-  height: 100vh;
-}
-.page-box{
-  width: 100%;
-  height: 100%;
-  position: relative;
-}
-.bg-img-box{
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-.bg-img-box image{
-  width: 100%;
-  height: 100%;
-}
-.mail-box{
-  width: 687rpx;
-  position: absolute;
-  top: 0;
-  left: 50%;
-  transform: translateX(-50%);
-}
-.mail-box .mail-img-box{
-  position: absolute;
-}
-
-.mail-top,.mail-bottom{
-  z-index: 3;
-}
-.mail-top{
-  z-index: 4;
-   top: 10rpx;
-   /* top: 314rpx; */
-}
-.top-move{
-  animation: topMove 2s ease;
-  animation-fill-mode: forwards;
-}
-.mail-top image{
-  width: 687rpx;
-  height: 445rpx;
-}
-.mail-center image{
-  width: 684rpx;
-  height: 648rpx;
-  transform: scale(0.99);
-}
-.mail-center{
-  top: 316rpx;
-}
-.mail-bottom image{
-  width: 687rpx;
-  height: 432rpx;
-  
-}
-.mail-bottom{
-  top: 616rpx;
-}
-.btm-move{
-  animation: btmMove 1.5s  ease;
-  animation-fill-mode: forwards;
-}
-@keyframes topMove{
-  0% {
-    top: 10rpx;
-    opacity: 0.8;
-  }
-  100% {
-    top: 314rpx;
-    opacity: 1;
-  }
-}
-@keyframes btmMove{
-  0% {
-    top: 616rpx;
-    opacity: 0.2;
-  }
-  100% {
-    top: 532rpx;
-    opacity: 1;
-  }
-}
-
-.tips{
-  width: 100%;
-  color:#EFDACA;
-  font-size: 40rpx;
-  line-height: 56rpx;
-  position: absolute;
-  top: 1000rpx;
-  text-align: center;
-}
-.word-move{
-  animation: wordMove 1s ease;
-  animation-fill-mode: forwards;
-}
-@keyframes wordMove{
-  0%{
-    left: -100%;
-  }
-  100%{
-    left: 0;
-  }
-}
-.pay-btn{
-  width: 686rpx;
-  height: 82rpx;
-  position: absolute;
-  top: 1100rpx;
-  left: 50%;
-  transform: translateX(-50%);
-  background: linear-gradient(322deg, #DEB99F 0%, #E9D1C0 51%, #E3C9B5 100%);
-  border-radius: 62rpx;
-  text-align: center;
-  line-height: 82rpx;
-  color: #946F46;
-}
-.tip{
-  width: 100%;
-  text-align: center;
-  color: #EFDACA;
-  font-size: 32rpx;
-  line-height: 44rpx;
-  position: absolute;
-  top: 1200rpx;
-  left: 50%;
-  transform: translateX(-50%);
-}
--- a/pages/user/completeData/index.vue
+++ b/pages/user/completeData/index.vue
@ -1,9 +1,9 @@
 <template>
 	<!--pages/user/completeData/index.wxml-->
 	<view class="page-box">
-		<view class="back-btn" :style="'top:' + navTopHeight + 'rpx'" @tap="backPage">
-			<image src="/static/images/back.png" mode></image>
-		</view>
+		<cu-custom :bgColor="'transparent'" :isBack="true">
+			<block slot="backText">返回</block>
+		</cu-custom>
 		<view class="bg-img-box">
 			<image src="https://download.cyjyyjy.com/personalPage-bg.png"></image>
 		</view>
@ -120,6 +120,10 @@
 		height: 100vh;
 	}
 	
+	.action{
+		color: #fff;
+	}
+	
 	.page-box {
 		width: 100%;
 		height: 100%;
--- a/pages/user/editNeeds/index.css
+++ b/pages/user/editNeeds/index.css
@ -1,113 +0,0 @@
-/* pages/user/editNeeds/index.wxss */
-.form-box{
-  width: 100%;
-  padding: 32rpx 38rpx;
-  font-size: 28rpx;
-  color:#666666;
-}
-.form-item{
-  margin-bottom: 60rpx;
-}
-
-.red{
-  color: #FF0000;
-}
-.colO{
-  color: #FF6D31;
-  font-size: 24rpx;
-}
-.inp-box{
-  width: 100%;
-  padding: 10rpx 22rpx;
-  background: #eee;
-  color: #666;
-  margin-top: 36rpx;
-}
-.pick-box{
-  width: 92%;
-  background: #eee;
-  box-sizing: border-box;
-  /* padding: 10rpx 22rpx; */
-}
-.pick-box .picker{
-  width: 100%;
-  color: #666666;
-}
-.inp-box input{
-  width: 90%;
-  height: 100%;
-}
-.area-box{
-  width: 100%;
-  height: 290rpx;
-  padding: 24rpx 22rpx;
-  background: #eee;
-  color: #666;
-  margin-top: 36rpx;
-}
-.area-box textarea{
-  width: 100%;
-  height: 100%;
-}
-.upload-box{
-  width: 100%;
-  height: 140rpx;
-  margin-top: 26rpx;
-}
-.upload-box image{
-  width: 140rpx;
-  height: 140rpx;
-  margin-right: 12rpx;
-}
-
-.tab-item{
-  width: 122rpx;
-  height: 40rpx;
-  text-align: center;
-  line-height: 40rpx;
-  border: 1px solid #707070;
-  border-radius: 8rpx;
-  color: #666;
-  font-size: 22rpx;
-  margin-left: 20rpx;
-}
-.tab-a{
-   background: linear-gradient(341deg, #FF5100 0%, #FFA782 100%);
-   color: #fff;
-   border: none;
-}
-.time-box{
-  margin-top: 24rpx;
-}
-.timepick-box{
-  width: 308rpx;
-  height: 60rpx;
-  background: #eee;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 20rpx;
-}
-.timepick-box picker{
-  width: 100%;
-}
-.arrow-d{
-  width: 14rpx;
-  height: 24rpx;
-  transform: rotate(90deg);
-}
-.m14{
-  margin: 0 14rpx;
-}
-.submit-btn{
-  width: 670rpx !important;
-  height: 76rpx !important;
-  background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
-  border-radius: 38rpx;
-  color: #fff;
-  font-size: 28rpx !important;
-  line-height: 76rpx !important;
-  text-align: center;
-  margin:40rpx auto 20rpx !important;
-  padding: 0 !important;
-}
--- a/pages/user/editNeeds/index.vue
+++ b/pages/user/editNeeds/index.vue
@ -345,6 +345,9 @@ export default {
 </script>
 <style>
 /* pages/user/editNeeds/index.wxss */
+.edit-needs-box{
+	background: #fff;
+}
 .form-box{
  width: 100%;
  padding: 32rpx 38rpx;
@ -359,7 +362,7 @@ export default {
  color: #FF0000;
 }
 .colO{
-  color: #FF6D31;
+  color: #000;
  font-size: 24rpx;
 }
 .inp-box{
@ -418,7 +421,7 @@ export default {
  margin-left: 20rpx;
 }
 .tab-a{
-   background: linear-gradient(341deg, #FF5100 0%, #FFA782 100%);
+   background: #232323;
   color: #fff;
   border: none;
 }
@ -448,7 +451,7 @@ export default {
 .submit-btn{
  width: 240rpx !important;
  height: 76rpx !important;
-  background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
+  background: #232323;
  border-radius: 38rpx;
  color: #fff;
  font-size: 28rpx !important;
--- a/pages/user/goodsManage/index.vue
+++ b/pages/user/goodsManage/index.vue
@ -191,7 +191,7 @@
 		.on{
 			font-weight: 500;
 			color: #000;
-			border-bottom: 6rpx solid #FF6D31;
+			border-bottom: 6rpx solid #000;
 		}
 	}
 	.goods-list-box{
@ -225,7 +225,7 @@
 				color: #b7b7b7;
 			}
 			.money{
-				color: #FF6D31;
+				color: #000;
 				font-weight: 500;
 				line-height: 40rpx;
 			}
@ -247,7 +247,7 @@
 					margin-left: 28rpx;
 				}
 				.off-shelf-btn{
-					color: #FF6D31;
+					color: #000;
 					font-weight: 500;
 				}
 				.edit-btn{
@ -284,7 +284,7 @@
 		line-height: 80rpx;
 		text-align: center;
 		color: #fff;
-		background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+		background: #000;
 		border-radius: 40rpx;
 		position: absolute;
 		bottom: 50rpx;
--- a/pages/user/incomeDetail/index.css
+++ b/pages/user/incomeDetail/index.css
@ -1,118 +0,0 @@
-/* pages/user/incomeDetail/index.wxss */
-page{
-  background: #212226;
-}
-.detail-page{
-  width: 100%;
-  position: relative;
-}
-.top-bg{
-  width: 100%;
-  height: 450rpx;
-}
-.top-bg image{
-  width: 100%;
-  height: 450rpx;
-  position: absolute;
-}
-.income-box{
-  width: 100%;
-  min-height: 200rpx;
-  position: relative;
-  top: 140rpx;
-  left: 0rpx;
-  
-}
-.income-box image{
-  width: 670rpx;
-  height: 208rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-.income-l{
-  width: 50%;
-  height: 100%;
-  position: absolute;
-  left: 0;
-  z-index: 2;
-  color: #946F46;
-  padding: 30rpx 0 20rpx;
-}
-.t{
-  color:#E4C6B0;
-}
-.num{
-  color: #E4C6B0;
-  font-size: 36rpx;
-  font-weight: bold;
-  margin: 20rpx 0;
-}
-.btn{
-  width: 124rpx;
-  height: 44rpx;
-  line-height: 44rpx;
-  text-align: center;
-  background: #EFDACA;
-  border-radius: 62rpx;
-  font-size: 26rpx;
-}
-.income-r{
-  height: auto;
-  left: 50%;
-}
-
-.invitation-list-box{
-  position: relative;
-  z-index: 99;
-  top: -80rpx;
-}
-.invi-title{
-  padding-left: 40rpx;
-  font-size: 32rpx;
-  color: #EFDACA;
-  line-height: 40rpx;
-  margin-bottom: 12rpx;
-}
-.list-box{
-  width: 100%;
-  min-height: 200rpx;
-  background: #212226;
-  border-radius: 40rpx 40rpx 0px 0px;
-  padding-top: 36rpx;
-}
-.rank-list-box{
-  width: 100%;
-  max-height: 780rpx;
-  padding: 0 40rpx;
-  font-size: 24rpx;
-  overflow-y: scroll;
-  color: #E4C6B0;
-}
-.rank-item .num{
-  min-width: 38rpx;
-  height: 32rpx;
-  color: #E4C6B0;
-  font-size: 26rpx;
-}
-.item-right-l image{
-  width: 74rpx;
-  height: 74rpx;
-  border-radius: 50%;
-  margin-right: 16rpx;
-}
-.item-right-l{
-  width: 70%;
-}
-.item-right-l .name{
-  font-size: 24rpx;
-  color: #fff;
-  width: 80%;
-  line-height: 34rpx;
-  margin-top: 6rpx;
-}
-.item-right{
-  width: 618rpx;
-  height: 132rpx;
-  border-bottom: 1px solid #6B6158;
-}
--- a/pages/user/incomeDetail/index.vue
+++ b/pages/user/incomeDetail/index.vue
@ -1,7 +1,7 @@
 <template>
 <!--pages/user/incomeDetail/index.wxml-->
 <view class="detail-page">
-  <view class="back-btn" :style="'top:' + navTopHeight + 'rpx'" @tap="backPage">
+  <view class="back-btn" :style="'top:' + CustomBar + 'rpx'" @tap="backPage">
 			<image src="/static/images/back.png" mode></image>
 	</view>
  <view class="top-bg">
--- a/pages/user/index.css
+++ b/pages/user/index.css
@ -1,170 +0,0 @@
-.home-page{
-  min-height: 100vh;
-  padding-bottom: 130rpx;
-  background: #F3F3F3;
-}
-.page-top-box{
-  width: 100%;
-  height: 575rpx;
-  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;
-  padding: 0 40rpx;
-  color: #fff;
-}
-.top-set-box{
-
-}
-.top-set-box .setIcon{
-  width: 32rpx;
-  height: 29rpx;
-}
-.top-set-box .message{
-  width: 38rpx;
-  height: 29rpx;
-  margin-left: 34rpx;
-}
-.set-box-l{
-  width: 160rpx;
-  height: 44rpx;
-  line-height: 44rpx;
-  text-align: center;
-  background: #FFA583;
-  border-radius: 22rpx;
-  font-size: 24rpx;
-}
-.userInfo-box{
-  margin-top: 34rpx;
-}
-.userInfo-box .header-img{
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 50%;
-  margin-right: 12rpx;
-}
-.userInfo-r .name{
-  font-size: 36rpx;
-  line-height: 50rpx;
-}
-.level{
-  padding: 2rpx 20rpx;
-  font-size: 24rpx;
-  background: #FEC313;
-  text-align: center;
-  border-radius: 25px;
-}
-.img-tags {
-  margin-top: 14rpx;
-}
-.userInfo-r image{
-    width: 132rpx;
-    height: 48rpx;
-}
-.userInfo-r .tyg-tag{
-  width: 188rpx;
-  height: 44rpx;
-  margin-left: 22rpx;
-}
-.my-reminds-box {
-  margin-top: 20rpx;
-}
-.remind-item{
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  font-size: 28rpx;
-}
-.count{
-  font-size: 36rpx;
-}
-.to-tyg-box{
-  text-align: center;
-  margin-top: 24rpx;
-}
-.to-tyg-box image{
-  width: 670rpx;
-  height: 114rpx;
-}
-.menu-list-box{
-  width: 100%;
-  padding: 40rpx;
-}
-.needs-menu-list,.resources-menu-list,.searver-menu-list{
-  width: 100%;
-  background: #fff;
-  box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.07);
-  border-radius: 12rpx;
-  margin-bottom: 32rpx;
-}
-.menu-list{
-  width: 100%;
-  padding: 40rpx 22rpx 22rpx; 
-}
-.menu-item{
-  /* width: 100%; */
-}
-.title-box{
-  width: 100%;
-  padding: 16rpx 20rpx;
-  border-bottom: 1px solid #F0F0F0;
-  font-size: 28rpx;
-  color: #303030;
-}
-.seemore{
-  font-size: 24rpx;
-  color: #BFBFBF;
-}
-.seemore image{
-  width: 12rpx;
-  height: 22rpx;
-  margin-left: 10rpx;
-}
-.menu-item{
-  width: 25%;
-  margin-bottom: 32rpx;
-  color: #4A4A4A;
-  font-size: 24rpx;
-  line-height: 34rpx;
-}
-.menu-item image{
-  width: 48rpx;
-  height: 48rpx;
-  margin-bottom: 14rpx;
-}
-.torelease-img {
-  position: relative;
-  width: 100%;
-  height: 90rpx;
-}
-.torelease-img image{
-  width: 630rpx;
-  height: 62rpx;
-  position: absolute;
-  left: 20rpx;
-}
-.to-btn{
-  width: 118rpx;
-  height: 34rpx;
-  line-height: 34rpx;
-  text-align: center;
-  font-size: 20rpx;
-  color: #ED7632;
-  background: #FFFFFF;
-  border-radius: 20rpx;
-  position: absolute;
-  right: 44rpx;
-  top: 14rpx;
-}
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@ -1,19 +1,21 @@
 <template>
 <view class="home-page">
  <view class="page-top-box">
-    <image src="https://download.cyjyyjy.com/top-bg.png" class="top-bg"></image>
-    <!-- <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: '+ (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" @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> -->
-          <!-- <image src="../../images/user/message-icon.png" class="message"></image> -->
-        </view>
-      </view>
+    <image src="https://download.cyjyyjy.com/sysxh-user-bg.png" class="top-bg"></image>
+		<view class="head_box">
+		  <cu-custom :isBack="true" :bgColor="bgColor">
+				<block slot="backText">
+					<view class="set-box-l"
+						v-if="authType == 1 || authType == 2" 
+						@click="toAuthInfo">{{authType == 1 ? '企业' : '个人'}}中心
+					</view>
+				</block>
+		    <block slot="content">
+		      <text class="nav-title shopro-selector-rect" :class="isFixed ? 'isBlack' : ''">湖北省艺术协会</text>
+		    </block>
+		  </cu-custom>
+		</view>
+    <view class="top-box-content">
      <view class="userInfo-box acea-row row-middle">
        <image :src="userInfo.avatar || '/static/images/user/header.png'" class="header-img"></image>
        <view class="userInfo-r">
@ -53,17 +55,46 @@
      </view>
    </view>
  </view>
-	<view style="padding: 58rpx 40rpx 0; border-radius: 12rpx; overflow: hidden;" 
+	<view style="padding: 0rpx 40rpx 0; border-radius: 12rpx; overflow: hidden;" 
 				v-if="(userInfo.mpOpenId == 0 || !userInfo.mpOpenId) && (scene == 1047 || scene == 1001 || scene == 1011)">
 		<official-account></official-account>
 	</view>
  <view class="menu-list-box">
-    <!-- 需求管理 -->
-    <view class="needs-menu-list">
+		<!-- 我的订单 -->
+		<view class="needs-menu-list myorder-menu-list">
 		  <view class="title-box acea-row row-between-wrapper">
-        <view>需求管理</view>
+		    <view>我的订单</view>
 		  </view>
 		  <view class="menu-list acea-row row-between">
+		    <view class="menu-item acea-row row-column row-center-wrapper" @click="goMyOrder(0)">
+		      <image src="/static/images/user/dfk.png"></image>
+		      <text>待付款</text>
+		    </view>
+		    <view class="menu-item acea-row row-column row-center-wrapper" @click="goMyOrder(1)">
+		      <image src="/static/images/user/dfh.png"></image>
+		      <text>待发货</text>
+		    </view>
+		    <view class="menu-item acea-row row-column row-center-wrapper" @click="goMyOrder(2)">
+		      <image src="/static/images/user/yfh.png"></image>
+		      <text>待收货</text>
+		    </view>
+		    <view class="menu-item acea-row row-column row-center-wrapper" @click="goMyOrder(3)">
+		      <image src="/static/images/user/dpj.png"></image>
+		      <text>待评价</text>
+		    </view>
+				<view class="menu-item acea-row row-column row-center-wrapper" @click="goReturnList">
+				  <image src="/static/images/user/sh.png"></image>
+				  <text>售后/退款</text>
+				</view>
+		  </view>
+		</view>
+    <!-- 需求管理 -->
+    <view class="needs-menu-list">
+      <view class="title-box acea-row">
+        <view class="title-item" :class="titIdx == 0 ? 'tit-a' : '' " @click="this.titIdx = 0">需求管理</view>
+				<view class="title-item" :class="titIdx == 1 ? 'tit-a' : '' "@click="this.titIdx = 1">资源管理</view>
+      </view>
+      <view class="menu-list acea-row row-between" v-show="titIdx == 0">
        <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>
@ -81,17 +112,7 @@
          <text>已结束</text>
        </view>
      </view>
-      <view class="torelease-img" @tap="toRelease(1)">
-        <image src="https://download.cyjyyjy.com/fbxq.png"></image>
-        <view class="to-btn">发布需求</view>
-      </view>
-    </view>
-    <!-- 资源管理 -->
-    <view class="needs-menu-list">
-      <view class="title-box acea-row row-between-wrapper">
-        <view>资源管理</view>
-      </view>
-      <view class="menu-list acea-row row-between">
+			<view class="menu-list acea-row row-between" v-show="titIdx == 1">
 			  <view class="menu-item acea-row row-column row-center-wrapper" @tap="toResourcesManage" data-type="1">
 			    <image src="/static/images/user/xuqiu1.png"></image>
 			    <text>发布中</text>
@ -109,13 +130,15 @@
 			    <text>已结束</text>
 			  </view>
 			</view>
-      <view class="torelease-img" @tap="toRelease(0)">
-        <image src="https://download.cyjyyjy.com/fbzy.png"></image>
-        <view class="to-btn">发布供应</view>
-      </view>
+      <view class="torelease-img acea-row row-between-wrapper" >
+				<view>发布专业优质服务，快速解决问题</view>
+        <view class="to-btn" v-show="titIdx == 0" @tap="toRelease(1)">发布需求</view>
+				<view class="to-btn" v-show="titIdx == 1" @tap="toRelease(0)">发布供应</view>
      </view>
-		<view class="add-service" @click="$yrouter.push({path: '/pages/user/addServiceCode/index'})">
-			<image src="https://download.cyjyyjy.com/addservice2.png"></image>
+			<!-- <view class="torelease-img acea-row row-between-wrapper" v-show="titIdx == 1" @tap="toRelease(0)">
+				<view>发布专业优质服务，快速解决问题</view>
+			  <view class="to-btn">发布供应</view>
+			</view> -->
    </view>
 		<!-- 电商管理 -->
 		<view class="needs-menu-list">
@ -127,57 +150,30 @@
 		  </view>
 		  <view class="menu-list acea-row row-between">
 		    <view class="menu-item acea-row row-column row-center-wrapper" @tap="toReleaseGoods">
-		      <image src="/static/images/user/fuwu2.png"></image>
+		      <image src="/static/images/user/fbsp.png"></image>
 		      <text>发布商品</text>
 		    </view>
 		    <view class="menu-item acea-row row-column row-center-wrapper" @tap="toGoodsManage">
-		      <image src="/static/images/user/fuwu7.png"></image>
+		      <image src="/static/images/user/spgl.png"></image>
 		      <text>商品管理</text>
 		    </view>
 		    <view class="menu-item acea-row row-column row-center-wrapper" @tap="toOrderManage">
-		      <image src="/static/images/user/fuwu3.png"></image>
+		      <image src="/static/images/user/sjdd.png"></image>
 		      <text>商家订单</text>
 		    </view>
 		    <view class="menu-item acea-row row-column row-center-wrapper" v-if="userInfo.store == null" @tap="toOpenShop">
-		      <image src="/static/images/user/fuwu6.png"></image>
+		      <image src="/static/images/user/wykd.png"></image>
 		      <text>我要开店</text>
 		    </view>
 				<view class="menu-item acea-row row-column row-center-wrapper" v-if="userInfo.store !== null" @tap="toMyShop">
-				  <image src="/static/images/user/fuwu6.png"></image>
+				  <image src="/static/images/user/wykd.png"></image>
 				  <text>我的店铺</text>
 				</view>
 		  </view>
 		</view>
-		<!-- 我的订单 -->
-		<view class="needs-menu-list myorder-menu-list">
-		  <view class="title-box acea-row row-between-wrapper">
-		    <view>我的订单</view>
-		  </view>
-		  <view class="menu-list acea-row row-between">
-		    <view class="menu-item acea-row row-column row-center-wrapper" @click="goMyOrder(0)">
-		      <image src="/static/images/user/fuwu2.png"></image>
-		      <text>待付款</text>
-		    </view>
-		    <view class="menu-item acea-row row-column row-center-wrapper" @click="goMyOrder(1)">
-		      <image src="/static/images/user/fuwu7.png"></image>
-		      <text>待发货</text>
-		    </view>
-		    <view class="menu-item acea-row row-column row-center-wrapper" @click="goMyOrder(2)">
-		      <image src="/static/images/user/fuwu3.png"></image>
-		      <text>待收货</text>
-		    </view>
-		    <view class="menu-item acea-row row-column row-center-wrapper" @click="goMyOrder(3)">
-		      <image src="/static/images/user/fuwu6.png"></image>
-		      <text>待评价</text>
-		    </view>
-				<view class="menu-item acea-row row-column row-center-wrapper" @click="goReturnList">
-				  <image src="/static/images/user/fuwu6.png"></image>
-				  <text>售后/退款</text>
-				</view>
-		  </view>
-		</view>
+		
    <!-- 常用服务 -->
-    <view class="needs-menu-list">
+   <!-- <view class="needs-menu-list">
      <view class="title-box acea-row row-between-wrapper">
        <view>常用服务</view>
      </view>
@ -198,7 +194,7 @@
          <image src="/static/images/user/fuwu6.png"></image>
          <text>招商活动</text>
        </view>
-        <!-- <view class="menu-item acea-row row-column row-center-wrapper">
+        <view class="menu-item acea-row row-column row-center-wrapper">
          <image src="../../images/user/fuwu1.png"></image>
          <text>会员中心</text>
        </view>
@ -213,28 +209,21 @@
        <view class="menu-item acea-row row-column row-center-wrapper">
          <image src="../../images/user/fuwu8.png"></image>
          <text>举报通道</text>
-        </view> -->
        </view>
+      </view> -->
    </view>
  </view>
  <!-- <tabbar :current="currentTabIndex" tabBarClick="click"></tabbar> -->
 </view>
 </template>
-
 <script>
-// pages/life/index.js
 const app = getApp();
-import CustomNav from '@/components/CustomNavigator.vue'
-import tabbar from "../../tabbarComponent/tabbar";
-
 export default {
  data() {
    return {
      tabbar: {},
      userInfo: {},
-      navTopHeight: app.globalData.navTopHeight,
-      menuHeight: app.globalData.menuHeight,
-      menuTop: app.globalData.menuTop,
+      CustomBar: this.CustomBar,
      demandCounts: 0,
      supplyCounts: 0,
      authStatus: 0,
@ -243,18 +232,21 @@ export default {
 			currentTabIndex: 4,
 			scene: app.globalData.scene,
 			isFixed: false,
+			bgColor: 'transprant',
+			titIdx: 0
    };
  },
  components: {
-    tabbar,
-		CustomNav
+		
  },
  props: {},
 	onPageScroll(e) {
 		if (e.scrollTop > 60) {
-			this.isFixed = true;
+			this.isFixed = true
+			this.bgColor = "#ffffff"
 		} else {
-			this.isFixed = false;
+			this.isFixed = false
+			this.bgColor = "transprant"
 		};
 	},
  /**
@ -289,7 +281,6 @@ export default {
        }
      });
    },
-
    isAuthentication() {
      app.http('get', 'user/isAuthentication').then(res => {
        if (res.data.success) {
@ -320,13 +311,11 @@ export default {
        });
      }
    },
-
    toAuth() {
      uni.navigateTo({
        url: '/pages/release/index'
      });
    },
-
    getOrderCount() {
      app.http('GET', 'Communicate/getOrderCounts').then(res => {
        if (res.data.success) {
@ -337,7 +326,6 @@ export default {
        }
      });
    },
-
    // 跳转首席体验官
    toMine() {
      if (this.userInfo.isVip) {
@ -350,21 +338,18 @@ export default {
        });
      }
    },
-
    //跳转资源订单
    toResourcesOrder() {
      uni.navigateTo({
        url: '/pages/user/resourcesOrder/index'
      });
    },
-
    //跳转需求订单
    toNeedsOrder() {
      uni.navigateTo({
        url: '/pages/user/needsOrder/index'
      });
    },
-
    //跳转需求管理
    toNeedsManage(e) {
      let type = e.currentTarget.dataset.type;
@ -372,7 +357,6 @@ export default {
        url: '/pages/user/needsManage/index?type=' + type
      });
    },
-
    //跳转资源管理
    toResourcesManage(e) {
      let type = e.currentTarget.dataset.type;
@ -447,12 +431,15 @@ export default {
 .home-page{
  min-height: 100vh;
  padding-bottom: 130rpx;
-  background: #F3F3F3;
-}
-.page-top-box{
+  background: #fff;
+	.page-top-box{
 		width: 100%;
-  // height: 575rpx;
 		position: relative;
+		height: 588rpx;
+	}
+	.cuIcon-back{
+		display: none;
+	}
 }
 .page-title{
  width: 100%;
@ -460,9 +447,20 @@ export default {
  text-align: center;
  position: relative;
 }
+.nav-title {
+	width: 100%;
+	text-align: center;
+	font-size: 32rpx;
+	color: #fff;
+	line-height: 40px;
+	display: inline-block;
+}
+.isBlack{
+	color: #000;
+}
 .top-bg{
  width: 100%;
-  height: 598rpx;
+  height: 568rpx;
  position: absolute;
 }
 .top-box-content{
@ -470,9 +468,7 @@ export default {
  padding: 0 40rpx;
  color: #fff;
 	z-index: 999;
-}
-.top-set-box{
-
+	top: 20rpx;
 }
 .top-set-box .setIcon{
  width: 32rpx;
@ -488,12 +484,14 @@ export default {
  height: 44rpx;
  line-height: 44rpx;
  text-align: center;
-  background: #FFA583;
+  background: #292929;
  border-radius: 22rpx;
  font-size: 24rpx;
+	color: #fff;
+	margin-top: 16rpx;
 }
 .userInfo-box{
-  margin-top: 60rpx;
+  // margin-top: 60rpx;
 }
 .userInfo-box .header-img{
  width: 120rpx;
@ -553,7 +551,7 @@ export default {
 }
 .to-tyg-box{
  text-align: center;
-  margin-top: 24rpx;
+  margin-top: 48rpx;
 }
 .to-tyg-box image{
  width: 670rpx;
@ -561,7 +559,7 @@ export default {
 }
 .menu-list-box{
  width: 100%;
-  padding: 40rpx;
+  padding: 0 40rpx 40rpx;
 }
 .needs-menu-list,.resources-menu-list,.searver-menu-list{
  width: 100%;
@ -577,6 +575,7 @@ export default {
 	left: 0; right: 0;
 	width: 100%;
 	height: 100%;
+	z-index: 9;
 	margin: auto;
 	border-radius: 5px;
 	background: rgba(255, 255, 255, .9);
@ -588,7 +587,7 @@ export default {
 		top: 50%;
 		text-align: center;
 		transform: translate(-50%,-50%);
-		color: #FF6D31;
+		color: #292929;
 		font-size: 36rpx;
 		font-weight: bold;
 	}
@ -615,6 +614,37 @@ export default {
  border-bottom: 1px solid #F0F0F0;
  font-size: 28rpx;
  color: #303030;
+	font-weight: bold;
+	.title-item{
+		font-size: 28rpx;
+		color: #999;
+		margin-right: 90rpx;
+		position: relative;
+		font-weight: normal;
+		&::after{
+			display: block;
+			content: '';
+			width: 80rpx;
+			height: 6rpx;
+			border-radius: 2rpx;
+			background: #06050A;
+			position: absolute;
+			bottom: -16rpx;
+			left: 50%;
+			opacity: 0;
+			margin-left: -40rpx;
+			transform: scaleX(0);
+			transition: all .2s ease, opacity .15s ease;
+		}
+		&.tit-a{
+			color: #292929;
+			font-weight: bold;
+			&::after{
+				opacity: 1;
+				transform: scaleX(1);
+			}
+		}
+	}
 }
 .seemore{
  font-size: 24rpx;
@ -653,13 +683,11 @@ export default {
 .torelease-img {
  position: relative;
  width: 100%;
-  height: 90rpx;
-}
-.torelease-img image{
-  width: 630rpx;
  height: 62rpx;
-  position: absolute;
-  left: 20rpx;
+	background: #656565;
+	padding: 0 32rpx;
+	color: #fff;
+	font-size: 24rpx;
 }
 .to-btn{
  width: 118rpx;
@ -667,11 +695,8 @@ export default {
  line-height: 34rpx;
  text-align: center;
  font-size: 20rpx;
-  color: #ED7632;
+  color: #292929;
  background: #FFFFFF;
  border-radius: 20rpx;
-  position: absolute;
-  right: 44rpx;
-  top: 14rpx;
 }
 </style>
--- a/pages/user/mine/index.css
+++ b/pages/user/mine/index.css
@ -1,293 +0,0 @@
-/* pages/user/index.wxss */
-page{
-  background: #212226;
-}
-image{
-  width: 100%;
-  height: 100%;
-}
-.user-index-box{
-  min-height: 100vh;
-  color: #EFDACA;
-  position: relative;
-}
-.user-index-top{
-  width: 100%;
-  height: 1020rpx;
-  position: relative;
-}
-.user-index-top .top-bg{
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-.user-info-box{
-  position: absolute;
-  top: 112rpx;
-  left: 40rpx;
-  z-index: 2;
-}
-.header-img{
-  width: 134rpx;
-  height: 134rpx;
-  margin-right: 34rpx;
-}
-.header-img image{
-  width: 134rpx;
-  height: 134rpx;
-  border-radius: 50%;
-}
-.user-info{
-  width: 450rpx;
-}
-.user-title{
-  width: 242rpx;
-  height: 56rpx;
-}
-.user-title image{
-  width: 242rpx;
-  height: 56rpx;
-}
-
-.menu-box{
-  width: 670rpx;
-  height: 244rpx;
-  border: 2px solid #EFDACA;
-  border-radius: 16rpx;
-  position: absolute;
-  top: 290rpx;
-  left: 40rpx;
-  padding: 20rpx 0 16rpx 16rpx;
-}
-.menu-title-box{
-  font-size: 32rpx;
-  line-height: 44rpx;
-  font-weight: bold;
-}
-.fz20{
-  font-size: 20rpx;
-  font-weight: normal;
-}
-.see-more image{
-  width: 10rpx;
-  height: 18rpx;
-  display: block;
-  margin-left: 10rpx;
-}
-.scroll-view_H{
-  white-space: nowrap;
-  width: 100%;
-}
-.menu-list{
-  margin-top: 36rpx;
-}
-.menu-item{
-  display: inline-block;
-  text-align: center;
-  margin-right: 30rpx;
-}
-.menu-item image{
-  width: 70rpx;
-  height: 70rpx;
-  display: inline-block;
-  margin-bottom: 6rpx;
-}
-
-.myIncome-box{
-  position: absolute;
-  top: 576rpx;
-  left: 40rpx;
-}
-.income-box{
-  width: 670rpx;
-  height: 208rpx;  
-  border-radius: 12rpx;
-  margin-top: 10rpx;
-  position: relative;
-}
-.income-box image{
-  width: 670rpx;
-  height: 208rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-.income-l{
-  width: 50%;
-  height: 100%;
-  position: absolute;
-  left: 0;
-  z-index: 2;
-  color: #946F46;
-  padding: 30rpx 0 20rpx;
-}
-.num{
-  color: #363636;
-  font-size: 36rpx;
-  font-weight: bold;
-}
-.btn{
-  width: 124rpx;
-  height: 44rpx;
-  line-height: 44rpx;
-  text-align: center;
-  background: #EFDACA;
-  border-radius: 62rpx;
-  font-size: 26rpx;
-}
-.income-r{
-  left: 50%;
-}
-.invitation-list-box{
-  position: relative;
-  z-index: 99;
-  top: -140rpx;
-}
-.invi-title{
-  padding-left: 40rpx;
-  font-size: 32rpx;
-  color: #EFDACA;
-  line-height: 40rpx;
-  margin-bottom: 12rpx;
-}
-.list-box{
-  width: 100%;
-  background: #212226;
-  border-radius: 40rpx 40rpx 0px 0px;
-  padding-top: 36rpx;
-}
-.medal-box{
-
-}
-.medal{
-  width: 224rpx;
-  height: 336rpx;
-  font-size: 20rpx;
-  color: #946F46;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  position: relative;
-  text-align: center;
-  line-height: 38rpx;
-}
-.medal .medal-bg{
-  width: 224rpx;
-  height: 336rpx;
-  position: absolute;
-}
-.medal-content{
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  z-index: 22;
-}
-.user-header{
-  width: 86rpx;
-  height: 86rpx;
-  border-radius: 50%;
-  overflow: hidden;
-  position: absolute;
-  left: 50%;
-  top: -43rpx;
-  transform: translateX(-50%);
-}
-.medal-content .user-name{
-  color: #363636;
-  font-size: 24rpx;
-  line-height: 34rpx;
-  margin-bottom: 16rpx;
-  margin-top: 56rpx;
-}
-.income-money{
-  font-size: 28rpx;
-  color: #363636;
-  font-weight: bold;
-  margin-top: 16rpx;
-}
-.medal-icon{
-  width: 136rpx;
-  height: 136rpx;
-  position: absolute;
-  right: -68rpx;
-  bottom: -10rpx;
-}
-.medal1{
-  margin: 0 22rpx;
-  z-index: 99;
-}
-.medal2,.medal3{
-  width: 202rpx;
-  height: 303rpx;
-  margin-top: 80rpx;
-}
-.medal3{
-  margin-top: 100rpx;
-}
-.medal2 .medal-icon{
-  width: 112rpx;
-  height: 112rpx;
-  bottom: -20rpx;
-  right: -20rpx;
-}
-.medal2 .medal-bg,.medal3 .medal-bg{
-  width: 202rpx;
-  height: 303rpx;
-}
-.medal3 .medal-icon{
-  width: 100rpx;
-  height: 100rpx;
-  right: -20rpx;
-}
-.rank-list-box{
-  width: 100%;
-  max-height: 780rpx;
-  padding: 0 40rpx;
-  font-size: 24rpx;
-  overflow-y: scroll;
-}
-.rank-item .num{
-  min-width: 50rpx;
-  color: #E4C6B0;
-}
-.item-right-l image{
-  width: 74rpx;
-  height: 74rpx;
-  border-radius: 50%;
-  margin-right: 16rpx;
-}
-.item-right-l{
-  width: 70%;
-}
-.item-right-l .name{
-  font-size: 24rpx;
-  color: #fff;
-  width: 80%;
-}
-.item-right{
-  width: 618rpx;
-  height: 132rpx;
-  border-bottom: 1px solid #6B6158;
-}
-.item-right-r{
-  text-align: right;
-}
-
-.share-btn{
-  width: 334rpx !important;
-  height: 132rpx !important;
-  padding: 0 !important;
-  margin: 40rpx auto !important;
-  background: transparent !important;
-  position: fixed;
-  bottom: 0rpx;
-  left: 50%;
-  margin-left: -162rpx !important;
-  z-index: 999;
-}
-.share-btn image{
-  width: 334rpx;
-  height: 132rpx;
-  display: inline-block;
-}
--- a/pages/user/mine/index.vue
+++ b/pages/user/mine/index.vue
@ -3,8 +3,10 @@
 	<view class="user-index-box">
 		<view class="user-index-top">
 			<image src="https://download.cyjyyjy.com/userIndex-top-bg.png" class="top-bg"></image>
-			<view class="back-btn" :style="'top:' + navTopHeight + 'rpx'" @tap="backUserIndex">
-				<image src="/static/images/back.png" mode></image>
+			<view class="head_box">
+			  <cu-custom bgColor="transparent" :isBack="true">
+					<block slot="backText">返回</block>
+				</cu-custom>
 			</view>
 			<view class="user-info-box acea-row">
 				<view class="header-img">
@ -135,7 +137,7 @@
 	export default {
 		data() {
 			return {
-				navTopHeight: app.globalData.menuTop + app.globalData.navTopHeight + 10,
+				CustomBar: this.CustomBar,
 				userInfo: {},
 				pageData: {},
 				rankList: [],
@ -167,8 +169,7 @@
 					name: '增值收益',
 					icon: "https://download.cyjyyjy.com/menu9.png"
 				}],
-				shareFlag: false,
-				CustomBar: app.globalData.CustomBar
+				shareFlag: false
 			};
 		},

@ -179,6 +180,7 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
+			console.log(this.CustomBar)
 			this.setData({
 				userInfo: uni.getStorageSync('userInfo')
 			});
@ -198,7 +200,7 @@
 		onShareAppMessage: function(res) {
 			if (this.shareFlag) {
 				return {
-					title: '禅易云生态',
+					title: '湖北省艺术设计协会',
 					imageUrl: "https://download.cyjyyjy.com/shareImg.png",
 					path: '/pages/user/agreement/index?id=' + this.userInfo.uid // 路径，传递参数到指定页面。

--- a/pages/user/myShop/index.vue
+++ b/pages/user/myShop/index.vue
@ -180,7 +180,7 @@
 			.on{
 				font-weight: 500;
 				color: #000;
-				border-bottom: 6rpx solid #FF6D31;
+				border-bottom: 6rpx solid #000;
 			}
 		}
 		.card-box{
@ -292,7 +292,7 @@
 			line-height: 80rpx;
 			text-align: center;
 			color: #fff;
-			background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+			background: #000;
 			border-radius: 40rpx;
 			position: absolute;
 			bottom: 50rpx;
--- a/pages/user/needsManage/index.css
+++ b/pages/user/needsManage/index.css
@ -1,116 +0,0 @@
-/* pages/user/NeedsManage/index.wxss */
-.manage-page{
-  width: 100%;
-  min-height: 100vh;
-  background: #EEEEEE;
-}
-.tabs-box{
-  width: 100%;
-  padding: 18rpx 58rpx;
-  background: #fff; 
-}
-.tab{
-  text-align: center;
-  font-size: 28rpx;
-  color: #707070;
-  position: relative;
-}
-.tab::after{
-  display: block;
-  content: '';
-  width: 100%;
-  height: 8rpx;
-  border-radius: 8rpx;
-  background: #FF6D31;
-  position: absolute;
-  bottom: -22rpx;
-  left: 50%;
-  margin-left: -41rpx;
-  opacity: 0;
-  transform: scaleX(0);
-  transition: all .2s cubic-bezier(.18,.89,.17,.88),opacity .15s ease;
-}
-.tab-a::after{
-  opacity: 1;
-  transform: scaleX(1);
-}
-.list{
-  width: 100%;
-  padding: 32rpx 40rpx;
-}
-.list-item{
-  width: 100%;
-  padding: 20rpx 20rpx 32rpx;
-  background: #fff;
-  border-radius: 12rpx;
-  margin-bottom: 20rpx;
-}
-
-.n-title{
-  font-size: 28rpx;
-  color: #1D1D1D;
-  font-weight: 500;
-  margin-bottom: 18rpx;
-}
-.tag-item{
-  width: 114rpx;
-  height: 36rpx;
-  line-height: 34rpx;
-  text-align: center;
-  color: #FC9367;
-  border: 1rpx solid #FC9367;
-  background: #fff;
-  border-radius: 4rpx;
-  font-size: 24rpx;
-  margin-right: 8rpx;
-}
-.colG{
-  color: #3A9EFA;
-  border-color: #3A9EFA;
-}
-.top-r{
-  color: #FF5100;
-  font-size: 20rpx;
-  font-weight: 600;
-  line-height: 40rpx;
-}
-.status{
-  font-size: 30rpx;
-}
-.fz28{
-  color:#707070;
-  line-height: 40rpx;
-  margin: 18rpx 0 10rpx;
-}
-.colR{
-  color: #FF5100;
-}
-.desc{
-  font-size: 24rpx;
-  line-height: 34rpx;
-  color: #333;
-}
-.time{
-  font-size: 24rpx;
-  color: #707070;
-}
-.btn-box{
-  font-size: 30rpx;
-  font-weight: 500;
-  line-height: 40px;
-  color: #FF5100;
-}
-.btn{
-  font-size: 28rpx;
-  width: 150rpx;
-  height: 56rpx;
-  line-height: 56rpx;
-  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
-  border-radius: 12rpx;
-  color: #fff;
-  margin-left: 16rpx;
-}
-.default{
-  background: linear-gradient(134deg, #BFBFBF 0%, #BFBFBF 100%);
-}
--- a/pages/user/needsManage/index.vue
+++ b/pages/user/needsManage/index.vue
@ -318,7 +318,7 @@ export default {
  width: 100%;
  height: 8rpx;
  border-radius: 8rpx;
-  background: #FF6D31;
+  background: #000;
  position: absolute;
  bottom: -22rpx;
  left: 50%;
@ -327,6 +327,10 @@ export default {
  transform: scaleX(0);
  transition: all .2s ease,opacity .15s ease;
 }
+.tab-a{
+	color: #292929;
+	font-weight: bold;
+}
 .tab-a::after{
  opacity: 1;
  transform: scaleX(1);
@ -403,7 +407,7 @@ export default {
  height: 56rpx;
  line-height: 56rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  color: #fff;
  margin-left: 16rpx;
--- a/pages/user/needsOrder/index.css
+++ b/pages/user/needsOrder/index.css
@ -1,66 +0,0 @@
-/* pages/user/needsOrder/index.wxss */
-@import "../resourcesOrder/index.css";
-
-.needs-info-box{
-  border: none !important;
-}
-.info2{
-  width: calc(100% - 120rpx);
-}
-.info-item image{
-  width: 90rpx;
-  height: 90rpx;
-  margin-right: 24rpx;
-}
-.info-item{
-  font-size: 24rpx;
-  border-top: 2rpx solid #F0F0F0;
-  padding: 20rpx 0;
-}
-.projectinfo-box{
-  font-size: 26rpx;
-  margin: 2rpx 0;
-}
-.tag-item{
-  /* transform: scale(0.8); */
-  margin: 0;
-}
-
-.needs-info-box{
-  /* padding-bottom: 22rpx; */
-  border-bottom: 2rpx solid #F0F0F0;
-  margin-bottom: 22rpx;
-}
-.n-title{
-  color: #1D1D1D;
-  font-size: 32rpx;
-  line-height: 44rpx;
-}
-.n-price{
-  color: #707070;
-  font-size: 28rpx;
-  margin: 8rpx 0;
-}
-.n-desc{
-  font-size: 24rpx;
-  line-height: 34rpx;
-  color: #333333;
-}
-.btn-box{
-  margin-top: 10rpx;
-}
-.btn-item {
-  font-size: 24rpx;
-  width: 130rpx;
-  height: 50rpx;
-  line-height: 50rpx;
-  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
-  border-radius: 12rpx;
-  color: #fff;
-  margin-left: 8rpx;
-}
-.status {
-  min-width: 150rpx;
-  text-align: right;
-}
--- a/pages/user/needsOrder/index.vue
+++ b/pages/user/needsOrder/index.vue
@ -463,7 +463,7 @@ export default {
  height: 50rpx;
  line-height: 50rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  color: #fff;
  margin-left: 8rpx;
--- a/pages/user/openStore/index.vue
+++ b/pages/user/openStore/index.vue
@ -200,7 +200,7 @@
 			line-height: 80rpx;
 			text-align: center;
 			color: #fff;
-			background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+			background: #000;
 			border-radius: 40rpx;
 			margin: 110rpx auto 30rpx;
 		}
--- a/pages/user/orderManage/index.vue
+++ b/pages/user/orderManage/index.vue
@ -177,7 +177,7 @@
 		.on{
 			font-weight: 500;
 			color: #000;
-			border-bottom: 6rpx solid #FF6D31;
+			border-bottom: 6rpx solid #000;
 		}
 	}
 	.no-order{
@ -222,7 +222,7 @@
 					margin-right: 12rpx;
 				}
 				.create-time{
-					color: #FF6D31;
+					color: #000;
 				}
 			}
 			.item-top{
@ -256,7 +256,7 @@
 			.total-price-box{
 				width: 100%;
 				.total-price{
-					color: #FF6D31;
+					color: #000;
 					font-size: 32rpx;
 					font-weight: 500;
 					margin-left: 40rpx;
@ -288,8 +288,8 @@
 					border-color: #D2D2D2;
 				}
 				.tip-btn{
-					color: #FF6D31;
-					border-color: #FF6D31;
+					color: #000;
+					border-color: #000;
 				}
 			}
 			.logistics-box{
--- a/pages/user/pay/index.css
+++ b/pages/user/pay/index.css
@ -1,15 +0,0 @@
-/* pages/user/pay/index.wxss */
-.pay-box{
-  width: 100%;
-  min-height: 100vh;
-}
-.pay-box image{
-  width: 100%;
-  display: block;
-}
-.img1{
-  height: 609rpx;
-}
-.img2{
-  height: 1235rpx;
-}
--- a/pages/user/personalData/index.css
+++ b/pages/user/personalData/index.css
@ -1,130 +0,0 @@
-/* pages/user/personalData/index.wxss */
-page{
-  width: 100%;
-  height: 100vh;
-}
-.personal-index{
-  width: 100%;
-  height: 100vh;
-  position: relative;
-  overflow: hidden;
-}
-.bg-img-box{
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-.bg-img-box image{
-  width: 100%;
-  height: 100%;
-}
-.logo-box{
-  position: absolute;
-  top: 220rpx;
-  left: 32rpx;
-  width: 100%;
-  font-size: 40rpx;
-  color: #EFDACA;
-}
-.logo-box image{
-  width: 160rpx;
-  height: 90rpx;
-  margin-bottom: 22rpx;
-}
-
-.form-box{
-  position: absolute;
-  top: 400rpx;
-  left: 0;
-  font-size: 28rpx;
-  color: #363636;
-  width: 100%;
-  padding: 0 32rpx;
-}
-.title{
-  font-size: 40rpx;
-  color: #EFDACA;
-}
-
-.form{
-  width: 100%;
-  min-height: 640rpx;
-  background: linear-gradient(322deg, #DEB99F 0%, #E9D1C0 51%, #E3C9B5 100%);
-  border-radius: 8rpx;
-  margin: 62rpx 0;
-  padding: 16rpx 0;
-}
-.form .inp-box{
-  width: 100%;
-  height: 86rpx;
-  padding: 0 16rpx;
-  border-bottom: 2rpx solid #B89F83;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.form .inp-box .label{
-  width: 160rpx;
-  text-align: left;
-}
-.inp-box input{
-  text-align: right;
-}
-.sencode-box{
-  width: calc(100% - 180rpx);
-}
-.sencode-box input{
-  width: 230rpx;
-} 
-.sencode-box .sendcode-btn,.getPhone-btn{
-  width: 220rpx;
-  height: 66rpx;
-  text-align: center;
-  line-height: 66rpx;
-  background: #FFFFFF;
-  color: #BE996F;
-  box-shadow: 6rpx 6rpx 12rpx #D1BCA5;
-  border-radius: 8rpx;
-  position: relative;
-}
-.sendcode-btn::before{
-  content: '';
-  display: inline-block;
-  width: 2rpx;
-  height: 40rpx;
-  background: #C3AA91;
-  position: absolute;
-  left: -10rpx;
-  top: 10rpx;
-}
-.picker{
-  color: #6D6D6D;
-}
-.noBorder{
-  border: none !important;
-}
-
-.submit-btn{
-  width: 268rpx;
-  height: 82rpx;
-  text-align: center;
-  line-height: 82rpx;
-  color: #946F46;
-  font-size: 32rpx;
-  background: linear-gradient(322deg, #DEB99F 0%, #E9D1C0 51%, #E3C9B5 100%);
-  box-shadow: 6rpx 6rpx 20rpx rgba(22, 22, 22, 0.43);
-  border-radius: 62rpx;
-  margin: 0 auto;
-}
-
-
-.getPhone-btn{
-  width: 210rpx !important;
-  padding: 0 !important;
-  font-size: 28rpx;
-  font-weight: normal;
-  color: #BE996F;
-  margin-left: 10rpx !important;
-}
--- a/pages/user/personalData/index.vue
+++ b/pages/user/personalData/index.vue
@ -1,13 +1,13 @@
 <template>
 <!--pages/user/personalData/index.wxml-->
 <view class="personal-index">
-  <view class="back-btn" :style="'top:' + navTopHeight + 'rpx'" @tap="backPage">
-			<image src="/static/images/back.png" mode></image>
+  <view class="head_box">
+  	<cu-custom :isBack="true" :bgColor="rgb(35, 35, 40)"></cu-custom>
  </view>
  <view class="bg-img-box"><image src="https://download.cyjyyjy.com/personalPage-bg.png"></image></view>
  <view class="logo-box acea-row row-column">
    <image src="/static/images/logo.png"></image>
-    <view>欢迎入驻禅易云生态</view>
+    <view>欢迎入驻湖北省艺术设计协会</view>
  </view>
  <view class="form-box">
    <view class="title">请完善个人信息</view>
@ -354,6 +354,9 @@ page{
  width: 100%;
  height: 100vh;
 }
+.head_box{
+	color: #fff;
+}
 .personal-index{
  width: 100%;
  height: 100vh;
--- a/pages/user/profession/index.css
+++ b/pages/user/profession/index.css
@ -1,6 +0,0 @@
-/* pages/user/profession/index.wxss */
-.sonItem{
-  font-size: 28rpx;
-  line-height: 40rpx;
-  padding: 20rpx;
-}
--- a/pages/user/resourcesManage/index.css
+++ b/pages/user/resourcesManage/index.css
@ -1,114 +0,0 @@
-/* pages/user/resourcesManage/index.wxss */
-.manage-page{
-  width: 100%;
-  min-height: 100vh;
-  background: #EEEEEE;
-}
-.tabs-box{
-  width: 100%;
-  padding: 18rpx 58rpx;
-  background: #fff; 
-}
-.tab{
-  text-align: center;
-  font-size: 28rpx;
-  color: #707070;
-  position: relative;
-}
-.tab::after{
-  display: block;
-  content: '';
-  width: 100%;
-  height: 8rpx;
-  border-radius: 8rpx;
-  background: #FF6D31;
-  position: absolute;
-  bottom: -22rpx;
-  left: 50%;
-  opacity: 0;
-  transform: translateX(-50%) scaleX(0);
-  transition: all .2s cubic-bezier(.18,.89,.17,.88),opacity .15s ease;
-}
-.tab-a::after{
-  opacity: 1;
-  left: 0;
-  transform: translateX(0%) scaleX(1);
-}
-.list{
-  width: 100%;
-  padding: 32rpx 40rpx;
-}
-.list-item{
-  width: 100%;
-  padding: 20rpx 20rpx 32rpx;
-  background: #fff;
-  border-radius: 12rpx;
-  margin-bottom: 20rpx;
-}
-.number{
-  margin-bottom: 24rpx;
-  color: #666666;
-  font-size: 28rpx;
-}
-.status{
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #FF5100;
-}
-.info-box image{
-  width: 154rpx;
-  height: 154rpx;
-  border-radius: 8rpx;
-  margin-right: 12rpx;
-}
-.info{
-  width: 450rpx;
-  font-size: 28rpx;
-}
-.i-title{
-  font-weight: 500;
-  line-height: 40rpx;
-  color: #1D1D1D;
-}
-.i-desc{
-  font-size: 24rpx;
-  font-weight: 400;
-  line-height: 34rpx;
-  color: #666666;
-  height: 110rpx;
-  overflow: hidden;
-}
-.time{
-  color: #A7A7A7;
-  font-size: 24rpx;
-}
-.colO{
-  font-size: 28rpx;
-  margin: 24rpx 0 4rpx;
-  color: #FF5100;
-}
-.btn-box{
-  font-size: 30rpx;
-  font-weight: 500;
-  line-height: 40px;
-  color: #FF5100;
-}
-.btn{
-  font-size: 28rpx;
-  width: 150rpx;
-  height: 56rpx;
-  line-height: 56rpx;
-  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
-  border-radius: 12rpx;
-  color: #fff;
-  margin-left: 16rpx;
-}
-.default{
-  background: linear-gradient(134deg, #BFBFBF 0%, #BFBFBF 100%);
-}
-.text{
-  font-size: 28rpx;
-  color: #666;
-}
-
--- a/pages/user/resourcesManage/index.vue
+++ b/pages/user/resourcesManage/index.vue
@ -257,7 +257,7 @@ export default {
  width: 100%;
  height: 8rpx;
  border-radius: 8rpx;
-  background: #FF6D31;
+  background: #000;
  position: absolute;
  bottom: -22rpx;
  left: 50%;
@ -265,6 +265,10 @@ export default {
  transform: translateX(-50%) scaleX(0);
  transition: all .2s ease,opacity .15s ease;
 }
+.tab-a{
+	color: #292929;
+	font-weight: bold;
+}
 .tab-a::after{
  opacity: 1;
  left: 0;
@ -339,7 +343,7 @@ export default {
  height: 56rpx;
  line-height: 56rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  color: #fff;
  margin-left: 16rpx;
--- a/pages/user/resourcesOrder/index.css
+++ b/pages/user/resourcesOrder/index.css
@ -24,7 +24,7 @@ image{
  width: 100%;
  height: 8rpx;
  border-radius: 8rpx;
-  background: #FF6D31;
+  background: #000;
  position: absolute;
  bottom: -22rpx;
  left: 50%;
@ -186,7 +186,7 @@ image{
  height: 50rpx;
  padding: 10rpx;
  font-size: 24rpx;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  text-align: center;
  color: #fff;
@ -224,7 +224,7 @@ image{
  height: 56rpx;
  line-height: 56rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  color: #fff;
  margin-left: 16rpx;
--- a/pages/user/resourcesOrder/index.vue
+++ b/pages/user/resourcesOrder/index.vue
@ -429,7 +429,7 @@ image{
  width: 100%;
  height: 8rpx;
  border-radius: 8rpx;
-  background: #FF6D31;
+  background: #000;
  position: absolute;
  bottom: -22rpx;
  left: 50%;
@ -596,7 +596,7 @@ image{
  height: 50rpx;
  padding: 0 6rpx;
  font-size: 24rpx;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  text-align: center;
  line-height: 50rpx;
@ -635,7 +635,7 @@ image{
  height: 56rpx;
  line-height: 56rpx;
  text-align: center;
-  background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+  background: #000;
  border-radius: 12rpx;
  color: #fff;
  margin-left: 16rpx;
--- a/pages/user/sendGoods/index.vue
+++ b/pages/user/sendGoods/index.vue
@ -159,7 +159,7 @@
 			line-height: 80rpx;
 			text-align: center;
 			color: #fff;
-			background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+			background: #000;
 			border-radius: 40rpx;
 			margin-top: 110rpx;
 		}
--- a/pages/user/withdraw/index.vue
+++ b/pages/user/withdraw/index.vue
@ -123,7 +123,7 @@
 		line-height: 80rpx;
 		text-align: center;
 		color: #fff;
-		background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+		background: #000;
 		border-radius: 40rpx;
 		margin: 120rpx auto;
 	}
--- a/static/images/address.png
+++ b/static/images/address.png
--- a/Show More
+++ b/Show More