From ae17051ad572fd69f40192e29a96e42c898aff78 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期一, 01 九月 2025 16:43:59 +0800 Subject: [PATCH] feat: 签约 --- apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 1 + apps/cMiniApp/types/global.d.ts | 2 +- apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue | 7 +------ apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue | 2 +- apps/bMiniApp/config/prod.js | 2 ++ apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue | 4 ++-- apps/bMiniApp/config/dev.js | 2 ++ apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue | 1 + 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/apps/bMiniApp/config/dev.js b/apps/bMiniApp/config/dev.js index 5b793dc..0578270 100644 --- a/apps/bMiniApp/config/dev.js +++ b/apps/bMiniApp/config/dev.js @@ -6,6 +6,8 @@ BASE_URL: '"http://localhost:53780"', BASE_URL_JX: '"https://api.jx818.com"', + APP_ENV: '"development"', + OSS_URL: '"https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/"', WEMAP_KEY: 'T2UBZ-N563J-ZCHFF-XDOXN-VCH7S-CJB2T', }, diff --git a/apps/bMiniApp/config/prod.js b/apps/bMiniApp/config/prod.js index 4e89645..7c26763 100644 --- a/apps/bMiniApp/config/prod.js +++ b/apps/bMiniApp/config/prod.js @@ -6,6 +6,8 @@ OSS_URL: '"https://parkmanagement.oss-cn-hangzhou.aliyuncs.com"', + APP_ENV: '"production"', + WEMAP_KEY: 'DYRBZ-ZGPCF-X3OJN-N2AA3-JWUCE-HEBXJ', }, defineConstants: {}, diff --git a/apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue b/apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue index ce64069..0a234f5 100644 --- a/apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue +++ b/apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue @@ -79,7 +79,7 @@ { showLoading: false, getResponse: true } ); - if (res) { + if (res && process.env.APP_ENV === 'staging') { // @ts-ignore form.verificationCode = res?.data?.extras?.code ?? ''; } diff --git a/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue b/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue index 6d21758..05feac6 100644 --- a/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue +++ b/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue @@ -7,6 +7,7 @@ :showArrow="false" :enterpriseName="enterpriseDetail?.enterpriseName ?? ''" :taskCount="enterpriseDetail?.taskCount ?? 0" + :isReal="enterpriseDetail?.isReal ?? false" ></CompanyDesc> </ContentView> <div style="flex: 1; min-height: 0"> diff --git a/apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue b/apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue index de0bd65..edf01e5 100644 --- a/apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue +++ b/apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue @@ -4,7 +4,7 @@ <div class="taskDetail-company-title">{{ enterpriseName }}</div> <RectRight v-if="showArrow" :size="8" class="taskDetail-company-arrow" /> </div> - <div class="taskDetail-company-info" v-if="isCertified"> + <div class="taskDetail-company-info" v-if="isReal"> <img :src="IconSafe" class="safe-company-info-icon" /> <div class="taskDetail-company-info-text">宸茶璇� | {{ taskCount }}涓矖浣嶅湪鎷�</div> </div> @@ -26,7 +26,7 @@ type Props = { showArrow?: boolean; - isCertified?: boolean; + isReal?: boolean; enterpriseName?: string; taskCount?: number; /** diff --git a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue b/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue index dfbebb2..1e2143c 100644 --- a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue +++ b/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue @@ -1,6 +1,6 @@ <template> <ContentScrollView style="background-color: transparent"> - <div v-if="isCertified" class="companyInfo-info-wrapper"> + <div v-if="enterpriseDetail?.isReal" class="companyInfo-info-wrapper"> <div class="companyInfo-info-item"> <div class="companyInfo-info-item-label">浼佷笟鍚嶇О</div> <div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseName }}</div> @@ -53,11 +53,6 @@ }; const props = withDefaults(defineProps<Props>(), {}); - -/** - * TODO 浼佷笟鏄惁璁よ瘉 娉ㄥ唽璧勬湰 - */ -const isCertified = ref(false); const { enterpriseDetail } = useEnterpriseDetail({ id: toRef(props, 'enterpriseId') }); </script> diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue index 3204d9c..683b95e 100644 --- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue @@ -92,6 +92,7 @@ @click="goCompanyDetail" :enterpriseName="detail?.enterpriseName ?? ''" :taskCount="detail?.taskCount ?? 0" + :isReal="detail?.isReal ?? false" ></CompanyDesc> </CellChunk> </Cell> diff --git a/apps/cMiniApp/types/global.d.ts b/apps/cMiniApp/types/global.d.ts index 3858762..e8d25a3 100644 --- a/apps/cMiniApp/types/global.d.ts +++ b/apps/cMiniApp/types/global.d.ts @@ -39,7 +39,7 @@ TARO_ENV: 'weapp' | 'swan' | 'alipay' | 'h5' | 'rn' | 'tt' | 'quickapp' | 'qq' | 'jd' NODE_ENV: 'development' | 'production'; - APP_ENV: 'staging'; + APP_ENV: 'staging'| 'development' | 'production'; BASE_URL: string; TEST_BASE_URL: string; -- Gitblit v1.9.1