From a19700f02d4b5f99baa3e17848f6b80be65c5a46 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 11 Jul 2024 14:06:20 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + public/index.html | 1 - src/api/user.js | 7 ++--- src/views/Enjoyableservices/detail.vue | 43 ++++++++++++++++---------- src/views/Enjoyableservices/index.vue | 2 +- src/views/activity/detail.vue | 21 +++++++++---- src/views/activity/index.vue | 4 +-- src/views/home/index.vue | 10 +++--- src/views/selectAgency/index.vue | 2 +- vue.config.js | 4 +-- 10 files changed, 56 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 46e45a9..32013c1 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "build": "vue-cli-service build", "build:dev": "vue-cli-service build --mode development", "build:stage": "vue-cli-service build --mode staging", + "build:prod": "vue-cli-service build --mode production", "lint": "vue-cli-service lint", "deps": "yarn upgrade-interactive --latest" }, diff --git a/public/index.html b/public/index.html index 9b7626f..80c65d1 100644 --- a/public/index.html +++ b/public/index.html @@ -14,7 +14,6 @@
- diff --git a/src/api/user.js b/src/api/user.js index d16b2e0..755e77c 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -140,10 +140,9 @@ export function myCommonsService(data) { }) } //获取可享服务详情 -export function icServiceWarmRecord(data) { +export function icServiceWarmRecord(id) { return request({ - url: `/governance/icServiceWarmRecord/detail`, - method: 'post', - data + url: `/governance/policy/policyDetail/${id}`, + method: 'get', }) } diff --git a/src/views/Enjoyableservices/detail.vue b/src/views/Enjoyableservices/detail.vue index 5cb4e7c..9445251 100644 --- a/src/views/Enjoyableservices/detail.vue +++ b/src/views/Enjoyableservices/detail.vue @@ -2,32 +2,31 @@
-
{{ DetailList.title }}
+
{{ info.title }}
- {{ - DetailList.status ? "进行中" : "已结束" }} - {{ - DetailList.status ? "进行中" : "已结束" }} -
{{ DetailList.data }}
+ {{ + info.expiredFlag ? "进行中" : "已结束" }} +
{{ info.data }}
-
享受服务条件：{{ DetailList.condition }}
-
服务提供方：{{ DetailList.provider }}
-
-
服务时间：
-
{{ DetailList.serviceData }}
+
享受服务条件：{{ info.resiSearchTagName }}
+
服务提供方：{{ info.assignText|| '--' }}
+
+
服务时间：{{ info.assignInfo.serviceTimeStart }} 至
{{ info.assignInfo.serviceTimeEnd }}
+
{{ info.serviceData }}
-
+ +
diff --git a/src/views/Enjoyableservices/index.vue b/src/views/Enjoyableservices/index.vue index 55c21ff..9ba47c9 100644 --- a/src/views/Enjoyableservices/index.vue +++ b/src/views/Enjoyableservices/index.vue @@ -3,7 +3,7 @@
-
+
{{ item.status? "进行中":"已结束" }} {{ item.status? "进行中":"已结束" }} diff --git a/src/views/activity/detail.vue b/src/views/activity/detail.vue index 4a25d26..5563d10 100644 --- a/src/views/activity/detail.vue +++ b/src/views/activity/detail.vue @@ -9,7 +9,7 @@ + :value="info.cutOffTime || '--'"> -
@@ -34,11 +34,11 @@
-
报名人数：30 /35人
+
报名人数：{{info.currentParticipants || 0}} / {{info.participants}}人
转发 立即报名
+ 转发 立即报名
@@ -52,7 +52,8 @@ export default { signUp: [ { name: "", mobile: "", remark: "" }, ], - info:{} + info:{}, + isPast:false }; }, created() { @@ -64,10 +65,18 @@ export default { } }, methods: { + checkIfPast() { + const currentTimestamp = Date.now(); + const specifiedTimestamp = new Date(this.info.cutOffTime.replace(/-/g, '/')).getTime(); + this.isPast = specifiedTimestamp < currentTimestamp; + }, async detail(id){ let res = await detail(id) if(res){ - this.info = res + this.info = res; + if(res.cutOffTime){ + this.checkIfPast() + } } }, handelAddResi() { diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue index a4acc78..afd8abb 100644 --- a/src/views/activity/index.vue +++ b/src/views/activity/index.vue @@ -10,11 +10,11 @@
时间：{{ item.startTime }}
- 报名人数： {{ item.participants }}/报名人数： {{ item.currentParticipants }}/{{ item.participants }}人
报名 + :disabled="new Date(item.cutOffTime.replace(/-/g, '/')).getTime()报名
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index cc0d0ef..7f22d3d 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -45,7 +45,7 @@
+ @click="handelClickJump(item.path,'tab')" :key="index"> {{ item.title }}
@@ -64,11 +64,11 @@
时间：{{ item.startTime }}
- 报名人数： {{ item.participants }}/报名人数： {{ item.currentParticipants }}/{{ item.participants }}人
报名 + :disabled="new Date(item.cutOffTime.replace(/-/g, '/')).getTime()报名
@@ -199,7 +199,6 @@ export default { if(item.coverPic){ this.$router.push({name:'communityPublicityDetail',query:{item:JSON.stringify(item)}}) } - }, async querystaffmessage(){ let parm = { @@ -297,7 +296,6 @@ export default { let res = await communityPublicity(parm) if (res) { this.PublicityList = res.list.slice(0, 2) - console.log(this.PublicityList,"s dsfd fs"); this.PublicityListImg = res.list.filter((item)=>item.coverPic) } }, @@ -317,7 +315,7 @@ export default { } }, handelClickJump(path,item) { - if (path === 'event' || path === 'service' || path === 'activity') { + if (path === 'event' || path === 'service' || path === 'activity' || path === 'Enjoyableservices' || item === 'tab') { if (this.$store.state.app.userInfo.mobile) { this.$router.push({ path: `/${path}` }); } else { diff --git a/src/views/selectAgency/index.vue b/src/views/selectAgency/index.vue index de582cd..8012453 100644 --- a/src/views/selectAgency/index.vue +++ b/src/views/selectAgency/index.vue @@ -11,7 +11,7 @@ - 手动选择 + 手动选择
diff --git a/vue.config.js b/vue.config.js index d63d574..35c1165 100644 --- a/vue.config.js +++ b/vue.config.js @@ -8,10 +8,10 @@ const resolve = dir => path.join(__dirname, dir) const name = defaultSettings.title || 'vue mobile template' // 生产环境，测试和正式 const IS_PROD = ['production', 'prod'].includes(process.env.NODE_ENV) - +const PUBLIC_PATH = process.env.PUBLIC_PATH const { defineConfig } = require('@vue/cli-service') module.exports = defineConfig({ - publicPath: process.env.NODE_ENV === 'development' ? '/' : '', // 署应用包时的基本 URL。 vue-router hash 模式使用 + publicPath: process.env.NODE_ENV === 'development' ? '/' : PUBLIC_PATH, // 署应用包时的基本 URL。 vue-router hash 模式使用 // publicPath: process.env.NODE_ENV === 'development' ? '/' : '/h5', //署应用包时的基本 URL。 vue-router history模式使用 outputDir: `dist/${OUTPUT_FILE_NAME}`, // 生产环境构建文件的目录 assetsDir: 'static', // outputDir的静态资源(js、css、img、fonts)目录