From 8a67e00e54829a650de1ee7c4c9d38846311b26f Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 5 Jan 2024 11:47:45 +0800
Subject: [PATCH] fix
---
config/request.js | 4 ++--
other/activityDetail/activityDetail.vue | 24 ++++++++++++++++++------
pages/person/person.vue | 8 ++++----
pages/supplier/supplier.vue | 10 +++++++---
4 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/config/request.js b/config/request.js
index 9ded45d..aea2d7a 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,8 +5,8 @@
*/
export default {
- baseURL: 'http://192.168.31.217:10010/',
- // baseURL: 'http://124.71.79.122/',
+ // baseURL: 'http://192.168.31.217:10010/',
+ baseURL: 'http://124.71.79.122/',
headers: {
'Content-Type': 'application/json;charset=UTF-8'
},
diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue
index 197e712..1df4f19 100644
--- a/other/activityDetail/activityDetail.vue
+++ b/other/activityDetail/activityDetail.vue
@@ -13,13 +13,13 @@
状态：
{{ statusList[comStatus] }}
-
+
人数限制：
{{ form.quantityLimit }}
举办时间：
- {{ form.playStartTime + ' ~ ' + form.playEndTime }}
+ {{ form.startTime + ' ~ ' + form.endTime }}
活动地点：
@@ -55,7 +55,7 @@
- {{ comStatus === 1 ? (signed ? '取消报名' : '立刻报名') : statusList[comStatus] }}
+ {{ stopSign ? '已截止报名' : comStatus === 1 ? (signed ? '取消报名' : '立刻报名') : statusList[comStatus] }}
@@ -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
diff --git a/pages/person/person.vue b/pages/person/person.vue
index be97086..6b03008 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -4,7 +4,7 @@
-
+
@@ -403,8 +403,8 @@
border-radius: 50%;
}
.avatar {
- width: 100rpx;
- height: 100rpx;
+ width: 120rpx;
+ height: 120rpx;
border: 0;
}
.person {
@@ -414,7 +414,7 @@
}
.name {
max-width: 49vw;
- font-size: 32rpx;
+ font-size: 36rpx;
font-weight: 600;
color: #333;
}
diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue
index dc4c655..48f710b 100644
--- a/pages/supplier/supplier.vue
+++ b/pages/supplier/supplier.vue
@@ -15,7 +15,7 @@
{{ item.companyName }}
- {{ item.briefIntroduction }}
+ {{ item.briefIntroduction }}
{{ item.province }}-{{ item.city }}
@@ -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 {