Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp in...

wupengfei

2 天以前 98bcc6ad603cc7281f3410ed61ebdf29465591b8

Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1

 apps/bMiniApp/project.private.config.json

@@ -23,6 +23,13 @@
        "miniprogram": {
            "list": [
                {
                    "name": "发布任务",
                    "pathName": "subpackages/task/publishTask/publishTask",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "验收管理",
                    "pathName": "subpackages/task/taskCheck/taskCheck",
                    "query": "",
@@ -33,13 +40,6 @@
                    "name": "验收详情",
                    "pathName": "subpackages/task/taskCheckDetail/taskCheckDetail",
                    "query": "id=927b9898-1e9f-4aec-99aa-08ddf4e125c9&date=2025-10-19&checkReceiveStatus=10",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "",
                    "pathName": "subpackages/payrollManage/payrollManageDetail/payrollManageDetail",
                    "query": "id=22201b25-b058-4774-808c-08de0d1eb0de&operatorToken=47358a9a-02a0-41ef-8da1-0366266af084",
                    "launchMode": "default",
                    "scene": null
                }

 apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue

@@ -78,7 +78,7 @@
          >
            <nut-grid-item v-for="(item, index) in _videos" :key="item" class="pro-img-grid-item">
              <div class="pro-img-grid-img-item">
                <Video class="pro-img-grid-img" :src="item" />
                <video class="pro-img-grid-img" :src="item" />
              </div>
            </nut-grid-item>
          </nut-grid>

 apps/bMiniApp/src/hooks/router.ts

@@ -1,6 +1,7 @@
import Taro from '@tarojs/taro';
import { TabBarPageRouter } from '@/constants';
import { useSystemStore } from '@/stores/modules/system';
import { httpLoggerRecord } from '@12333/utils';

export function useSwitchTab() {
  const systemStore = useSystemStore();
@@ -10,6 +11,10 @@
    console.log('index: ', index);
    systemStore.setTabIndex(index);
    Taro.switchTab(option);
    httpLoggerRecord.info({
      message: `[switchTab]`,
      args: [option, { index, TabBarPageRouter }],
    });
  };
  return switchTab;
}

 apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue

@@ -242,6 +242,20 @@
          >
        </nut-radio-group>
      </nut-form-item>
      <nut-form-item
        label="结算方式:"
        class="bole-form-item"
        prop="settlementAccess"
        label-width="90px"
        required
      >
        <ChooseInputWithPicker
          v-model="form.settlementAccess"
          placeholder="请选择结算方式"
          :value-enum="EnumEnterpriseWalletAccessText"
          :disabled="isEdit"
        />
      </nut-form-item>
    </nut-form>
  </ContentScrollView>
  <PageFooter>
@@ -266,6 +280,8 @@
  EnumSettlementCycleDateMonthArray,
  EnumTaskCheckReceiveMethod,
  EnumTaskCheckReceiveMethodText,
  EnumEnterpriseWalletAccess,
  EnumEnterpriseWalletAccessText,
} from '@12333/constants';
import {
  ChooseInputWithPicker,
@@ -338,12 +354,14 @@
  checkReceiveMethod: EnumTaskCheckReceiveMethod.CheckIn,
  applyBeginTime: '',
  applyEndTime: '',
  settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});

const rules = reactive<FormRules>({
  name: [{ required: true, message: '请输入任务名称' }],
  genderLimit: [{ required: true, message: '请选择性别要求' }],
  settlementCycleDate: [{ required: true, message: '请设置结算日期' }],
  settlementAccess: [{ required: true, message: '请选择结算方式' }],
  // addressDetail: [{ required: true, message: '请输入详细地址' }],
  billingMethod: [
    {
@@ -449,6 +467,7 @@
    form.checkReceiveMethod = data.checkReceiveMethod;
    form.applyBeginTime = dayjs(data.applyBeginTime).format('YYYY-MM-DD');
    form.applyEndTime = dayjs(data.applyEndTime).format('YYYY-MM-DD');
    form.settlementAccess = data.settlementAccess;
  },
});

@@ -489,6 +508,7 @@
      checkReceiveMethod: form.checkReceiveMethod,
      applyBeginTime: dayjs(form.applyBeginTime).format('YYYY-MM-DD 00:00:00'),
      applyEndTime: dayjs(form.applyEndTime).format('YYYY-MM-DD 23:59:59'),
      settlementAccess: form.settlementAccess,
    };
    if (isEdit) {
      params.id = taskId;

 apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue

@@ -32,7 +32,7 @@
          :media-type="['video']"
        >
          <template #item="{ item }">
            <Video class="editor-video" :src="item.url" />
            <video class="editor-video" :src="item.url" />
          </template>
          <template #upload-icon>
            <UploaderIcon color="#808080" />
@@ -40,7 +40,7 @@
        </Uploader>
        <div class="video-demo">
          <div class="video-demo-title">视频模板</div>
          <Video class="editor-video" :src="OssAssets.mine.UseResumeVideo" />
          <video class="editor-video" :src="OssAssets.mine.UseResumeVideo" />
        </div>
      </nut-form-item>
    </nut-form>
@@ -59,7 +59,6 @@
import { FileItem } from '@nutui/nutui-taro/dist/types/__VUE/uploader/type';
import { useQuery } from '@tanstack/vue-query';
import { Uploader as UploaderIcon } from '@nutui/icons-vue-taro';
import { Video } from '@tarojs/components';
import { OssAssets } from '@/constants';

defineOptions({

 package.json

@@ -53,6 +53,7 @@
    "postcss-html": "1.5.0",
    "prettier": "^2.7.1",
    "release-it": "^17.6.0",
    "rimraf": "^6.0.1",
    "stylelint": "^14.15.0",
    "stylelint-config-html": "^1.1.0",
    "stylelint-config-prettier": "^9.0.4",

 packages/components/src/Input/ChooseInputWithPicker.vue

@@ -18,11 +18,13 @@
  enumValueKey?: string;
  valueEnum?: ValueEnum;
  modelValue: string | number;
  disabled?: boolean;
};

const props = withDefaults(defineProps<Props>(), {
  enumLabelKey: 'label',
  enumValueKey: 'value',
  disabled: false,
});

const emit = defineEmits<{
@@ -38,6 +40,9 @@
);

function handleOpen() {
  if (props.disabled) {
    return;
  }
  const _modelValue = [props.modelValue];
  Portal.add((key) => {
    return h(

 packages/constants/enterpriseWallet.ts

New file
@@ -0,0 +1,11 @@
import { EnumEnterpriseWalletAccess } from './apiEnum';

export const EnumEnterpriseWalletAccessTextOnlyAlipay = {
  [EnumEnterpriseWalletAccess.Alipay]: '支付宝',
};

export const EnumEnterpriseWalletAccessText = {
  [EnumEnterpriseWalletAccess.Alipay]: '支付宝',
  [EnumEnterpriseWalletAccess.PingAnPay]: '平安银行',
  [EnumEnterpriseWalletAccess.WeChatPay]: '微信',
};

 packages/constants/index.ts

@@ -14,3 +14,4 @@
export * from './task';
export * from './apiEnum';
export * from './enterpriseEmployee';
export * from './enterpriseWallet';

 packages/utils/LoggerRecord/index.ts

@@ -55,7 +55,7 @@
  }
}

export const httpLoggerRecord = new HttpLoggerRecord({
const Options: LoggerRecordOptions = {
  moduleName: getUtilsConfig().appName,
  enableStorage: true,
  loggerStorageAdapter() {
@@ -71,4 +71,8 @@
  getPageUrl() {
    return Taro.getCurrentInstance()?.router?.path ?? '';
  },
});
};

export const defaultLoggerRecord = new LoggerRecord(Options);

export const httpLoggerRecord = new HttpLoggerRecord(Options);