From cfb73e3e435f770297ef5ea4301cb14c4c18ca82 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 01 十二月 2025 16:13:44 +0800
Subject: [PATCH] feat: 1.3.0.4临时
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 58 ++++++++++++++--------------
packages/components/src/Card/TaskCard.vue | 21 ++++++++++
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue | 1
apps/cMiniApp/config/dev.js | 4 +-
apps/cMiniApp/config/index.js | 32 ++++++++--------
apps/cMiniApp/project.private.config.json | 4 +-
6 files changed, 70 insertions(+), 50 deletions(-)
diff --git a/apps/cMiniApp/config/dev.js b/apps/cMiniApp/config/dev.js
index c84544a..ea12242 100644
--- a/apps/cMiniApp/config/dev.js
+++ b/apps/cMiniApp/config/dev.js
@@ -3,8 +3,8 @@
module.exports = {
env: {
NODE_ENV: '"development"',
- BASE_URL: '"http://localhost:53780"',
- // BASE_URL: '"https://testfj.81812333.com"',
+ // BASE_URL: '"http://localhost:53780"',
+ BASE_URL: '"https://testfj.81812333.com"',
BASE_URL_JX: '"https://api.jx818.com"',
APP_ENV: '"development"',
diff --git a/apps/cMiniApp/config/index.js b/apps/cMiniApp/config/index.js
index 14ef20c..752f8e8 100644
--- a/apps/cMiniApp/config/index.js
+++ b/apps/cMiniApp/config/index.js
@@ -134,24 +134,24 @@
})
);
- if (process.env.NODE_ENV !== 'development') {
- chain.merge({
- plugin: {
- install: {
- plugin: require('terser-webpack-plugin'),
- args: [
- {
- terserOptions: {
- compress: true, // 榛樿浣跨敤terser鍘嬬缉
- keep_classnames: true, // 涓嶆敼鍙榗lass鍚嶇О
- keep_fnames: true, // 涓嶆敼鍙樺嚱鏁板悕绉�
- },
+ // if (process.env.NODE_ENV !== 'development') {
+ chain.merge({
+ plugin: {
+ install: {
+ plugin: require('terser-webpack-plugin'),
+ args: [
+ {
+ terserOptions: {
+ compress: true, // 榛樿浣跨敤terser鍘嬬缉
+ keep_classnames: true, // 涓嶆敼鍙榗lass鍚嶇О
+ keep_fnames: true, // 涓嶆敼鍙樺嚱鏁板悕绉�
},
- ],
- },
+ },
+ ],
},
- });
- }
+ },
+ });
+ // }
chain.merge({
optimization: {
diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json
index 3ae1b90..527d115 100644
--- a/apps/cMiniApp/project.private.config.json
+++ b/apps/cMiniApp/project.private.config.json
@@ -26,8 +26,8 @@
"name": "鏀跺叆璇︽儏",
"pathName": "subpackages/wallet/incomeDetailInfo/incomeDetailInfo",
"query": "id=7899c603-f237-4505-949d-08de234155c4",
- "scene": null,
- "launchMode": "default"
+ "launchMode": "default",
+ "scene": null
},
{
"name": "楠屾敹璇︽儏",
diff --git a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
index 0e4419c..0c508cf 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
@@ -37,6 +37,7 @@
:service-fee="item.serviceFee"
:settlement-cycle="item.settlementCycle"
:address-name="item.addressName"
+ :isRead="false"
@click="goTaskDetail(item)"
>
<template #actions>
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index d81634d..e44efb3 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -164,41 +164,41 @@
}
});
-const tmplIds = ['T7Gta6H6TROZjcqeSWVTG2wWGGInWh0fGTOgCCgVBuk'];
+const tmplIds = ['ziC07K27Km9OAywf-KYwHiWgn195j9tmuFKxbDZ79tg'];
const handleApply = _.debounce(
useAccessReal(
async () => {
try {
- // if (!Taro.requestSubscribeMessage) {
- // await Message.confirm({ message: '浣犵殑寰俊鐗堟湰杩囦綆锛屼笉鏀寔璁㈤槄娑堟伅锛屾槸鍚︾户缁姤鍚�' });
- // }
- // const res = await Taro.getSetting({
- // withSubscriptions: true,
- // });
- // let setting: boolean[] = [];
- // if (res.subscriptionsSetting && res.subscriptionsSetting.itemSettings) {
- // setting = tmplIds
- // .map((id) => res.subscriptionsSetting.itemSettings[id] !== 'accept')
- // .filter(Boolean);
- // }
- // console.log('setting: ', setting);
- // if (setting.length > 0) {
- // Taro.requestSubscribeMessage({
- // tmplIds: tmplIds,
- // success: function (res) {
- // console.log('res: ', res);
- // },
- // });
- // }
- let params: API.ApplyTaskCommand = {
- ids: [id],
- };
- let res = await taskUserServices.applyTask(params);
- if (res) {
- Message.success('鎶ュ悕鎴愬姛');
- refetch({ type: 'inactive' });
+ if (!Taro.requestSubscribeMessage) {
+ await Message.confirm({ message: '浣犵殑寰俊鐗堟湰杩囦綆锛屼笉鏀寔璁㈤槄娑堟伅锛屾槸鍚︾户缁姤鍚�' });
}
+ const res = await Taro.getSetting({
+ withSubscriptions: true,
+ });
+ let setting: boolean[] = [];
+ if (res.subscriptionsSetting && res.subscriptionsSetting.itemSettings) {
+ setting = tmplIds
+ .map((id) => res.subscriptionsSetting.itemSettings[id] !== 'accept')
+ .filter(Boolean);
+ }
+ console.log('setting: ', setting);
+ // if (setting.length > 0) {
+ Taro.requestSubscribeMessage({
+ tmplIds: tmplIds,
+ success: function (res) {
+ console.log('res: ', res);
+ },
+ });
+ // }
+ // let params: API.ApplyTaskCommand = {
+ // ids: [id],
+ // };
+ // let res = await taskUserServices.applyTask(params);
+ // if (res) {
+ // Message.success('鎶ュ悕鎴愬姛');
+ // refetch({ type: 'inactive' });
+ // }
} catch (error) {}
},
{ message: '瀹炲悕鎴愬姛鍚庢墠鍙姤鍚嶏紝璇峰墠寰�瀹炲悕璁よ瘉' }
diff --git a/packages/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue
index 0985e59..cf9cc09 100644
--- a/packages/components/src/Card/TaskCard.vue
+++ b/packages/components/src/Card/TaskCard.vue
@@ -1,5 +1,5 @@
<template>
- <div class="task-card-wrapper">
+ <div class="task-card-wrapper" :class="{ 'un-read': !isRead }">
<div class="task-card-title-wrapper">
<div class="task-card-title">{{ name }}</div>
<slot name="title-right">
@@ -122,10 +122,14 @@
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
hireStatus?: EnumTaskUserHireStatus;
+
+ isRead?: boolean;
};
const props = withDefaults(defineProps<Props>(), {
showActions: true,
+
+ isRead: true,
});
const emit = defineEmits<{
@@ -142,6 +146,21 @@
background-color: #fff;
border-radius: 12px;
+ &.un-read {
+ position: relative;
+
+ &::before {
+ content: '';
+ position: absolute;
+ width: 12px;
+ height: 12px;
+ border-radius: 50%;
+ background-color: red;
+ right: 18px;
+ top: 12px;
+ }
+ }
+
&:last-child {
margin-bottom: 0;
}
--
Gitblit v1.9.1