Merge remote-tracking branch 'origin/dev-login'

zhengyiming

20 小时以前 a3e1da45f265bb7593fb585b114a268a104c5d8a

Merge remote-tracking branch 'origin/dev-login'

 apps/cMiniApp/.eslintrc-auto-import.json

@@ -109,6 +109,7 @@
    "APP_ENV": true,
    "DirectiveBinding": true,
    "MaybeRef": true,
    "MaybeRefOrGetter": true
    "MaybeRefOrGetter": true,
    "NODE_ENV": true
  }
}

 apps/cMiniApp/auto-imports.d.ts

@@ -9,6 +9,7 @@
  const AppLocalConfig: typeof import('./src/constants/app')['AppLocalConfig']
  const BackType: typeof import('./src/constants/enum')['BackType']
  const EffectScope: typeof import('vue')['EffectScope']
  const NODE_ENV: typeof import('./src/constants/app')['NODE_ENV']
  const OssAssets: typeof import('./src/constants/img')['OssAssets']
  const RouterPath: typeof import('./src/constants/router')['RouterPath']
  const TabBarPageRouter: typeof import('./src/constants/tabBar')['TabBarPageRouter']
@@ -124,6 +125,7 @@
    readonly AppLocalConfig: UnwrapRef<typeof import('./src/constants/app')['AppLocalConfig']>
    readonly BackType: UnwrapRef<typeof import('./src/constants/enum')['BackType']>
    readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
    readonly NODE_ENV: UnwrapRef<typeof import('./src/constants/app')['NODE_ENV']>
    readonly OssAssets: UnwrapRef<typeof import('./src/constants/img')['OssAssets']>
    readonly RouterPath: UnwrapRef<typeof import('./src/constants/router')['RouterPath']>
    readonly TabBarPageRouter: UnwrapRef<typeof import('./src/constants/tabBar')['TabBarPageRouter']>

 apps/cMiniApp/project.config.json

@@ -37,7 +37,11 @@
        "showES6CompileOption": false,
        "useCompilerPlugins": false,
        "ignoreUploadUnusedFiles": true,
        "condition": false
        "condition": false,
        "compileWorklet": false,
        "localPlugins": false,
        "swc": false,
        "disableSWC": true
    },
    "compileType": "miniprogram",
    "editorSetting": {
@@ -46,10 +50,11 @@
    },
    "srcMiniprogramRoot": "dist/",
    "condition": {},
    "libVersion": "3.1.0",
    "libVersion": "3.10.0",
    "packOptions": {
        "ignore": [],
        "include": []
    },
    "appid": "wxb9e0baf4f87aa0de"
    "appid": "wxb9e0baf4f87aa0de",
    "simulatorPluginLibVersion": {}
}

 apps/cMiniApp/project.private.config.json

@@ -1,93 +1,25 @@
{
    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
    "projectname": "cMiniApp",
    "setting": {
        "compileHotReLoad": true,
        "bigPackageSizeSupport": true,
        "urlCheck": false
    },
    "condition": {
        "miniprogram": {
            "list": [
                {
                    "name": "实名认证",
                    "pathName": "subpackages/authentication/authenticationRealName/authenticationRealName",
                    "query": "type=realName",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "我的简历",
                    "pathName": "subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "公司详情",
                    "pathName": "subpackages/task/companyDetail/companyDetail",
                    "query": "id=f775538f-985c-4d51-7985-08ddd5c71bbf",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "任务详情",
                    "pathName": "subpackages/task/taskDetail/taskDetail",
                    "query": "id=04c75425-e783-4dbf-0f16-08ddd626b756",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "城市选择",
                    "pathName": "subpackages/city/citySelect/citySelect",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "期望岗位",
                    "pathName": "subpackages/curriculum/expectPosition/expectPosition",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "我的简历",
                    "pathName": "subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "求职意向",
                    "pathName": "subpackages/curriculum/mineJobIntention/mineJobIntention",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "验收详情",
                    "pathName": "subpackages/task/taskCheckDetail/taskCheckDetail",
                    "query": "id=57a8f533-2a46-7a88-e008-3a1775810dd2",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "提交验收",
                    "pathName": "subpackages/task/taskSubmitCheck/taskSubmitCheck",
                    "query": "id=57a8f533-2a46-7a88-e008-3a1775810dd2",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "任务",
                    "pathName": "pages/task/task",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                }
            ]
        }
    },
    "libVersion": "3.10.0"
  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
  "projectname": "cMiniApp",
  "setting": {
    "compileHotReLoad": true,
    "bigPackageSizeSupport": true,
    "urlCheck": false,
    "coverView": true,
    "lazyloadPlaceholderEnable": false,
    "skylineRenderEnable": false,
    "preloadBackgroundData": false,
    "autoAudits": false,
    "useApiHook": true,
    "useApiHostProcess": true,
    "showShadowRootInWxmlPanel": true,
    "useStaticServer": false,
    "useLanDebug": false,
    "showES6CompileOption": false,
    "checkInvalidKey": true,
    "ignoreDevUnusedFiles": true,
    "useIsolateContext": true
  },
  "condition": {},
  "libVersion": "3.10.0"
}

 apps/cMiniApp/src/components/Uploader/Uploader.vue

@@ -4,6 +4,7 @@
    v-model:file-list="innerFileList"
    multiple
    :media-type="['image']"
    :sourceType="sourceType"
    :before-xhr-upload="beforeXhrUpload"
    @failure="handleFailure"
    :maximize="maximize"
@@ -23,6 +24,7 @@
    v-model:file-list="innerFileList"
    multiple
    :media-type="['image']"
    :sourceType="sourceType"
    :before-xhr-upload="beforeXhrUpload"
    @failure="handleFailure"
    :maximize="maximize"
@@ -47,14 +49,18 @@
  name: 'Uploader',
});

type SourceType = 'album' | 'camera';

type Props = {
  fileList: FileItem[];
  onMySuccess?: (file: FileItem) => any;
  limitFileSize?: number;
  sourceType?: SourceType[];
};

const props = withDefaults(defineProps<Props>(), {
  limitFileSize: 2,
  sourceType: () => ['album', 'camera'],
});

const emit = defineEmits<{

 apps/cMiniApp/src/constants/app.ts

@@ -6,3 +6,4 @@
};

export const APP_ENV = process.env.APP_ENV;
export const NODE_ENV = process.env.NODE_ENV;

 apps/cMiniApp/src/subpackages/login/authorization/authorization.vue

@@ -25,7 +25,8 @@
      v-model="state.policyChecked"
      policyBtnText="若手机号未注册，将为您直接注册账号，注册即为同意"
    />
    <div class="other-login-channel-wrapper" v-if="!isLoginByWeb">
    <!-- <div class="other-login-channel-wrapper" v-if="!isLoginByWeb"> -->
    <div class="other-login-channel-wrapper" v-if="NODE_ENV === 'development'">
      <nut-divider>其他登录方式</nut-divider>
      <div class="other-login-channel-list">
        <div class="other-login-channel-list-item" @click="goLoginByForm()">
@@ -34,7 +35,7 @@
          </div>
          <div class="other-login-channel-list-item-text">验证码登录</div>
        </div>
        <!-- <div
        <div
          class="other-login-channel-list-item"
          @click="goLoginByForm(LoginFormTabs.AccountLogin)"
        >
@@ -42,7 +43,7 @@
            <img :src="IconPassword" />
          </div>
          <div class="other-login-channel-list-item-text">账户登录</div>
        </div> -->
        </div>
      </div>
    </div>
  </LoginPageLayout>
@@ -61,6 +62,8 @@
import IconPassword from '@/assets/login/icon-btn-password.png';
import { LoginFormTabs } from '../constants';
import * as authServices from '@12333/services/apiV2/auth';
import { NODE_ENV } from '@/constants';
console.log('NODE_ENV: ', NODE_ENV);

defineOptions({
  name: 'authorization',

 apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue

@@ -37,6 +37,7 @@
            </div> -->
          </div>
          <TaskPrice
            v-if="detail.releaseStatus !== EnumTaskReleaseStatus.Stopped"
            :value="toThousand(detail.serviceFee ?? 0)"
            :unit="BillingMethodEnumUnit[detail.billingMethod]"
          />

 apps/cMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue

@@ -7,6 +7,7 @@
          :maximum="9"
          :limitFileSize="10"
          class="bole-uploader nopaddingtop"
          :sourceType="['camera']"
        >
        </Uploader>
      </nut-form-item>

 apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue

@@ -24,11 +24,7 @@
  name: 'InnerPage',
});

const { userDetail } = useUser();

const isBindBank = computed(() =>
  userDetail.value?.bankCardAAccesses?.find(() => EnumUserBankCardAccess.Bank)
);
const { userDetail, isBindBank } = useUser();

function goIncomeDetail() {
  Taro.navigateTo({

 packages/components/src/Card/TaskCard.vue

@@ -4,6 +4,7 @@
      <div class="task-card-title">{{ name }}</div>
      <slot name="title-right">
        <TaskPrice
          v-if="releaseStatus !== EnumTaskReleaseStatus.Stopped"
          :value="toThousand(serviceFee ?? 0)"
          :unit="BillingMethodEnumUnit[billingMethod]"
        />

 packages/utils/LoggerRecord/index.ts

@@ -69,6 +69,6 @@
    };
  },
  getPageUrl() {
    return Taro.getCurrentInstance().router.path;
    return Taro.getCurrentInstance()?.router?.path ?? '';
  },
});