From ae1b411fcb54f794646b32b29c47cb380163f95e Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 17 二月 2025 14:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue b/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue
index 2d20cbc..f5bd9aa 100644
--- a/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue
+++ b/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue
@@ -6,10 +6,10 @@
<div class="city-btn-wrapper">
<div class="city-btn">
<img :src="IconLocaltion" class="city-btn-icon" />
- <div class="city-btn-text">{{ locationCity }}</div>
+ <div class="city-btn-text">褰撳墠瀹氫綅锛歿{ locationCity }}</div>
</div>
</div>
- <div class="reset-localtion">閲嶆柊瀹氫綅</div>
+ <div class="reset-localtion" @click="resetLocation">閲嶆柊瀹氫綅</div>
</div>
<Elevator :index-list="elevatorData" :height="'100%'" @click-item="clickItem" />
</ContentView>
@@ -24,7 +24,8 @@
import { groupBy, sortBy } from 'lodash';
import { useUserStore } from '@/stores/modules/user';
import { Elevator } from '@12333/components';
-import IconLocaltion from '@/assets/home/icon-localtion.png';
+import IconLocaltion from '@/assets/task/icon-localtion.png';
+import { setLocationCity } from '@/utils';
defineOptions({
name: 'citySelect',
@@ -66,12 +67,54 @@
console.log('item: ', item, getAreaByAreaCode(item.parentId).areaName);
userStore.setLocationCity(item.name, getAreaByAreaCode(item.parentId).areaName);
};
+
+async function resetLocation() {
+ try {
+ await setLocationCity();
+ } catch (error) {}
+}
</script>
<style lang="scss">
@import '@/styles/common.scss';
.citySelect-page-wrapper {
+ .home-searchbar-wrapper {
+ padding: 32px 0 28px;
+ display: flex;
+ align-items: center;
+
+ .city-btn-wrapper {
+ flex: 1;
+ min-width: 0;
+
+ .city-btn {
+ display: flex;
+ align-items: center;
+ padding-right: 36px;
+ color: boleGetCssVar('text-color', 'primary');
+
+ .city-btn-icon {
+ width: 40px;
+ height: 40px;
+ }
+
+ .city-btn-text {
+ @include ellipsis;
+ margin-left: 12px;
+ font-size: 30px;
+ }
+ }
+ }
+
+ .reset-localtion {
+ font-weight: 400;
+ font-size: 24px;
+ color: boleGetCssVar('color', 'primary');
+ line-height: 28px;
+ }
+ }
+
.current-city {
padding: 20px 0;
color: boleGetCssVar('text-color', 'primary');
--
Gitblit v1.9.1