fix

config/request.js

@@ -5,8 +5,8 @@
  */
 
 export default {
-  baseURL: 'http://192.168.31.217:10010/',
+  // baseURL: 'http://192.168.31.217:10010/',
-  // baseURL: 'http://124.71.79.122/',
+  baseURL: 'http://124.71.79.122/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },

other/activityDetail/activityDetail.vue

@@ -13,13 +13,13 @@
 				<view class="label">状态：</view>
 				<view class="val">{{ statusList[comStatus] }}</view>
 			</view>
-			<view class="line">
+			<view v-if="form.whetherToShowApplicants === '1'" class="line">
 				<view class="label">人数限制：</view>
 				<view class="val">{{ form.quantityLimit }}</view>
 			</view>
 			<view class="line items-start">
 				<view class="label">举办时间：</view>
-				<view class="val">{{ form.playStartTime + ' ~ ' + form.playEndTime }}</view>
+				<view class="val">{{ form.startTime + ' ~ ' + form.endTime }}</view>
 			</view>
 			<view class="line">
 				<view class="label">活动地点：</view>
@@ -55,7 +55,7 @@
 		
 		<view class="btns">
 			<button class="share" open-type="share">分享</button>
-			<view :class="['btn sign', {signed, disabled: comStatus !== 1}]" @click="presign">{{ comStatus === 1 ? (signed ? '取消报名' : '立刻报名') : statusList[comStatus] }}</view>
+			<view :class="['btn sign', {signed, disabled: comStatus !== 1}]" @click="presign">{{ stopSign ? '已截止报名' : comStatus === 1 ? (signed ? '取消报名' : '立刻报名') : statusList[comStatus] }}</view>
 		</view>
 		
 		<uni-popup ref="popup" type="dialog">
@@ -73,9 +73,10 @@
 			return {
 				Common,
 				id: '',
-				statusList: ['未开始', '进行中', '已截止报名', '已结束'],
+				statusList: ['待开始', '进行中', '已截止报名', '已结束'],
 				comStatus: 0,
 				signed: 0,
+				stopSign: 0,
 				curTab: 0,
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
 				status: 'more', // 上拉加载状态 more|loading|noMore
@@ -84,6 +85,8 @@
 				pageSize: 5,
 				total: 0,
 				form: {
+					startTime: '',
+					endTime: '',
 					quantityLimit: '',
 					playStartTime: '',
 					playEndTime: '',
@@ -120,6 +123,7 @@
 		onShow() {
 			const pages = getCurrentPages()
 			const { options } = pages[pages.length - 1]
+			this.stopSign = 0
 			this.id = options.id
 			this.getInfo()
 		},
@@ -131,6 +135,9 @@
 				})
 				getCompetition(this.id).then(async (res) => {
 					const data = res.competition
+					data.startTime = data.playStartTime.substr(5, 11).split('-').join('/')
+					data.endTime = data.playEndTime.substr(5, 11).split('-').join('/')
+					
 					this.form = data
 					
 					this.now = await Util.getNow()
@@ -163,14 +170,18 @@
 				const { now } = this
 				// 报名中(whetherToSignUp 是否已报名 1已报名，0未报名)
 				if (now < signUpStartTime) {
+					// 待开始
 					status = 0
 				} else if (now > signUpStartTime && now < signUpEndTime) {
+					// 报名中
 					status = 1
 					if (data.competitionRegistration) signed = 1
 				} else if (now > signUpEndTime && now < playEndTime) {
-					status = 2
+					// 已截止报名
+					this.stopSign = 1
 				} else if (now > playEndTime) {
-					status = 3
+					// 已结束
+					status = 2
 				}
 				this.comStatus = status
 				this.signed = signed
@@ -184,6 +195,7 @@
 					competitionId: this.id,
 					pageNum: this.page,
 					pageSize: this.pageSize,
+					querySource: 1,
 				}).then(async ({ data }) => {
 					this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records
 					this.page++ // 每次获取了数据后page+1

pages/person/person.vue

@@ -4,7 +4,7 @@
 		<image class="bg" src="https://occupationlab.com/images/preschoolEdu/person-bg.png" />
 		
 		<view class="team-wrap" :style="{paddingTop: headerTop}">
-			<view v-if="platformId !== 7 && teams.length" class="team">
+			<view v-if="platformId !== 7 && teams.length > 1" class="team">
 				<uni-data-picker class="picker-input" placeholder="切换团队" popup-title="切换团队" preload :clear-icon="false" :localdata="teams" :map="{text: 'classificationName', value: 'teamId'}" v-model="teamId" @change="teamChange"></uni-data-picker>
 			</view>
 		</view>
@@ -403,8 +403,8 @@
 		border-radius: 50%;
 	}
 	.avatar {
-		width: 100rpx;
+		width: 120rpx;
-		height: 100rpx;
+		height: 120rpx;
 		border: 0;
 	}
 	.person {
@@ -414,7 +414,7 @@
 	}
 	.name {
 		max-width: 49vw;
-		font-size: 32rpx;
+		font-size: 36rpx;
 		font-weight: 600;
 		color: #333;
 	}

pages/supplier/supplier.vue

@@ -15,7 +15,7 @@
 							{{ item.companyName }}
 						</view>
 						<view class="info">
-							<view class="meta ell">{{ item.briefIntroduction }}</view>
+							<view class="intro ell">{{ item.briefIntroduction }}</view>
 							<view class="meta">{{ item.province }}-{{ item.city }}</view>
 						</view>
 					</view>
@@ -233,9 +233,13 @@
 		font-size: 28rpx;
 		color: #999;
 	}
-	.meta {
+	.intro {
 		margin: 10rpx 0;
-		font-size: 28rpx;
+		font-size: 24rpx;
+		color: #777;
+	}
+	.meta {
+		font-size: 26rpx;
 		color: #333;
 	}
 	.ell-wrap {