Merge branch 'master' of http://git.zhiqiyun.com/xionghaojie/renshou

office/team/index.css

@@ -86,7 +86,7 @@ page{
 	font-size: 24rpx;
 	font-family: PingFang SC-Medium, PingFang SC;
 	font-weight: 500;
-	color: #FF7000;
+	color: #999;
 }
 .step-btn{
 	width: 94rpx;

office/team/index.vue

@@ -129,7 +129,7 @@
 							<view class="fflex">
 								<view class="step-title tovers">{{item.matchContent.title}}</view>
 								<view class="ddflex" style="justify-content: space-between;margin-top: 10rpx;">
-									<view class="step-price">¥{{item.matchContent.defaultEnlistAmount}}</view>
+									<view class="step-price">{{item.matchContent.endTime}}</view>
 									<view  class="step-btn">查看</view>
 								</view>
 							</view>

topics/home/home.css

@@ -90,7 +90,7 @@ page{
 	font-size: 24rpx;
 	font-family: PingFang SC-Medium, PingFang SC;
 	font-weight: 500;
-	color: #FF7000;
+	color: #999;
 }
 .step-btn{
 	width: 94rpx;

topics/home/home.vue

@@ -192,7 +192,7 @@
 							<view class="fflex">
 								<view class="step-title tovers">{{item.matchContent.title}}</view>
 								<view class="ddflex" style="justify-content: space-between;margin-top: 10rpx;">
-									<view class="step-price">¥12888.00</view>
+									<view class="step-price">{{item.matchContent.endTime}}</view>
 									<view  class="step-btn">查看</view>
 								</view>
 							</view>
@@ -368,7 +368,7 @@ export default {
 		},
 
 		getUserDetail() {
-			req.getRequest('/api/v3/other/getUser', { userId: this.userId }, data => {
+			req.getRequest('/api/v3/moments/getUser', { userId: this.userId }, data => {
 				this.userDetail = data;
 				this.isShowView = true;
 			});