From ddfa27c45cc80f575f414bac49201ac60f20888a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 14 二月 2025 18:23:59 +0800
Subject: [PATCH] fix: b端
---
apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue | 12 +++++++++++-
apps/cMiniApp/config/staging.js | 3 ++-
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 9 +++++++--
packages/components/src/Card/JobApplicationCard.vue | 23 +++++++++++++++++------
4 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index 3161d44..078d933 100644
--- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -17,7 +17,12 @@
:key="queryState.status"
>
<template #renderItem="{ item }">
- <JobApplicationCard @click="goSubmitTaskDetail(item)" />
+ <JobApplicationCard @click="goSubmitTaskDetail(item)" mode="taskManage">
+ <template #footer-actions>
+ <!-- <nut-button type="primary">浜哄憳瀹夋帓</nut-button> -->
+ <nut-button type="primary" :color="Colors.Info" class="dark-btn">璇︽儏</nut-button>
+ </template>
+ </JobApplicationCard>
</template>
</InfiniteLoading>
</template>
@@ -26,7 +31,7 @@
import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components';
import Taro from '@tarojs/taro';
import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
+import { OrderInputType, Colors } from '@12333/constants';
import * as orderServices from '@12333/services/api/Order';
defineOptions({
diff --git a/apps/cMiniApp/config/staging.js b/apps/cMiniApp/config/staging.js
index ea8eb1a..3da68a7 100644
--- a/apps/cMiniApp/config/staging.js
+++ b/apps/cMiniApp/config/staging.js
@@ -1,6 +1,7 @@
module.exports = {
env: {
- BASE_URL: '"https://testrlywx.boleyuma.com"',
+ // BASE_URL: '"https://testrlywx.boleyuma.com"',
+ BASE_URL: '"https://api.81812333.com"',
BASE_URL_JX: '"https://api.jx818.com"',
OSS_URL: '"https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/"',
diff --git a/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue b/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue
index 98d5e2e..2d20cbc 100644
--- a/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue
+++ b/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue
@@ -1,7 +1,16 @@
<template>
<PageLayout title="閫夋嫨鍩庡競" class="citySelect-page-wrapper" :need-auth="false">
<ContentView class="citySelect-content-wrapper">
- <div class="current-city">褰撳墠鍩庡競锛歿{ locationCity }}</div>
+ <!-- <div class="current-city">褰撳墠鍩庡競锛歿{ locationCity }}</div> -->
+ <div class="home-searchbar-wrapper">
+ <div class="city-btn-wrapper">
+ <div class="city-btn">
+ <img :src="IconLocaltion" class="city-btn-icon" />
+ <div class="city-btn-text">{{ locationCity }}</div>
+ </div>
+ </div>
+ <div class="reset-localtion">閲嶆柊瀹氫綅</div>
+ </div>
<Elevator :index-list="elevatorData" :height="'100%'" @click-item="clickItem" />
</ContentView>
</PageLayout>
@@ -15,6 +24,7 @@
import { groupBy, sortBy } from 'lodash';
import { useUserStore } from '@/stores/modules/user';
import { Elevator } from '@12333/components';
+import IconLocaltion from '@/assets/home/icon-localtion.png';
defineOptions({
name: 'citySelect',
diff --git a/packages/components/src/Card/JobApplicationCard.vue b/packages/components/src/Card/JobApplicationCard.vue
index 5800a9e..20e606c 100644
--- a/packages/components/src/Card/JobApplicationCard.vue
+++ b/packages/components/src/Card/JobApplicationCard.vue
@@ -2,26 +2,29 @@
<div class="job-application-card-wrapper">
<div class="job-application-card-title-wrapper">
<div class="job-application-card-title">瀹㈡埧鏈嶅姟鍛�</div>
- <div class="job-application-card-title-more" @click.stop="handleMore">
+ <TaskPrice :value="212" v-if="mode === 'taskManage'" />
+ <div v-else class="job-application-card-title-more" @click.stop="handleMore">
<img :src="IconMore" class="more-btn-icon" />
</div>
</div>
<div class="job-application-card-line">
<div class="job-application-card-time">{{ `${'2025骞�2鏈�5鏃�'}鑷�${'2025骞�3鏈�5鏃�'}` }}</div>
- <div class="job-application-card-status">{{ '鐢熸晥涓�' }}</div>
+ <div class="job-application-card-status" v-if="mode === 'normal'">{{ '鐢熸晥涓�' }}</div>
</div>
<div class="job-application-card-line">
<div class="job-application-card-company">
<div class="job-application-card-company-tag">H</div>
<div class="job-application-card-company-address">瀹佹尝闆疯开妫厭搴�</div>
</div>
- <div class="job-application-card-people">{{ `鎶ュ悕浜烘暟锛�${5}` }}</div>
+ <div class="job-application-card-people" v-if="mode === 'normal'">{{ `鎶ュ悕浜烘暟锛�${5}` }}</div>
</div>
<div class="job-application-card-line">
<div class="job-application-card-publish-time">{{ `鍙戝竷鏃ユ湡锛�${'2022骞�12鏈�25鏃�'}` }}</div>
- <div class="job-application-card-fee">
- <TaskPrice :value="212" />
- </div>
+ <slot name="footer-actions">
+ <div class="job-application-card-fee">
+ <TaskPrice :value="212" />
+ </div>
+ </slot>
</div>
</div>
</template>
@@ -77,10 +80,12 @@
type Props = CommonTaskCardProps & {
showActions?: boolean;
status?: ResourceStatus;
+ mode?: 'taskManage' | 'normal';
};
const props = withDefaults(defineProps<Props>(), {
showActions: true,
+ mode: 'normal',
});
const emit = defineEmits<{
@@ -265,6 +270,12 @@
.job-application-card-publish-time {
color: boleGetCssVar('text-color', 'regular');
}
+
+ .nut-button {
+ min-width: 144rpx;
+ height: 52rpx;
+ font-size: 24rpx;
+ }
}
}
</style>
--
Gitblit v1.9.1