Merge branch 'dev-1.3.0.3' into dev-1.3.0.4

wupengfei

2025-12-01 6d8cde914540d6e2ecbd0fafda94be48af89c4da

Merge branch 'dev-1.3.0.3' into dev-1.3.0.4

 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"',


 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, // 不改变class名称
                    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, // 不改变class名称
                  keep_fnames: true, // 不改变函数名称
                },
              ],
            },
              },
            ],
          },
        });
      }
        },
      });
      // }

      chain.merge({
        optimization: {

 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": "验收详情",

 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>

 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: '实名成功后才可报名，请前往实名认证' }

 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;
  }