Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
S
shuchengMiniPro
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cfld-frontend
shuchengMiniPro
Commits
914a516d
Commit
914a516d
authored
Dec 20, 2023
by
shilei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://101.201.78.203/cfld-front/shuchengminipro
into dev
parents
50248eba
152b6bd4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
24 deletions
+31
-24
CommonDetail.vue
src/pages/detail/components/CommonDetail.vue
+4
-8
areaData.js
src/pages/entryPark/areaData.js
+0
-0
index.vue
src/pages/entryPark/index.vue
+27
-16
No files found.
src/pages/detail/components/CommonDetail.vue
View file @
914a516d
...
@@ -33,7 +33,6 @@
...
@@ -33,7 +33,6 @@
class=
"flex align-center justify-center common-detail__contact-btn"
class=
"flex align-center justify-center common-detail__contact-btn"
@
tap=
"handleContact"
@
tap=
"handleContact"
>
>
<!-- todo 图标 -->
<image
<image
class=
"common-detail__icon"
class=
"common-detail__icon"
src=
"@/static/img/icon-phone.png"
src=
"@/static/img/icon-phone.png"
...
@@ -89,10 +88,6 @@ export default defineComponent({
...
@@ -89,10 +88,6 @@ export default defineComponent({
};
};
return
config
[
this
.
detailType
];
return
config
[
this
.
detailType
];
},
},
phone
()
{
// todo 联系人电话
return
""
;
},
imageList
()
{
imageList
()
{
if
(
this
.
detail
)
{
if
(
this
.
detail
)
{
const
{
imgUrlList
=
[],
vrUrlList
=
[]
}
=
this
.
detail
;
const
{
imgUrlList
=
[],
vrUrlList
=
[]
}
=
this
.
detail
;
...
@@ -133,11 +128,12 @@ export default defineComponent({
...
@@ -133,11 +128,12 @@ export default defineComponent({
}
}
},
},
handleContact
()
{
handleContact
()
{
if
(
this
.
phone
)
{
const
{
contactPerson
,
phone
}
=
this
.
detail
||
{};
if
(
contactPerson
&&
phone
)
{
this
.
callTitle
=
this
.
typeName
+
"对接人"
;
this
.
callTitle
=
this
.
typeName
+
"对接人"
;
this
.
phoneInfo
=
{
this
.
phoneInfo
=
{
name
:
this
.
detail
.
contactPerson
,
name
:
contactPerson
,
phone
:
this
.
phone
,
phone
,
};
};
}
else
{
}
else
{
this
.
callTitle
=
"联系我们"
;
this
.
callTitle
=
"联系我们"
;
...
...
src/pages/entryPark/areaData.js
0 → 100644
View file @
914a516d
This diff is collapsed.
Click to expand it.
src/pages/entryPark/index.vue
View file @
914a516d
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
v-show=
"activeBar !== 1"
>
<div>
<dropdown-vue
<dropdown-vue
ref=
"dropDown"
ref=
"dropDown"
:menuList=
"$u.deepClone(menuList[activeBar])"
:menuList=
"$u.deepClone(menuList[activeBar])"
...
@@ -95,8 +95,8 @@
...
@@ -95,8 +95,8 @@
>
>
</u-empty>
</u-empty>
</view>
</view>
<div
v-
show=
"mode === 'map'"
class=
"content z-100
"
style=
"padding-top: 246rpx;"
>
<div
v-
else
class=
"content z-100"
:class=
"
{'no-filter': activeBar === 1}
" style="padding-top: 246rpx;">
<map
id=
"mapId"
@
markertap=
"handleMarkerClick"
@
callouttap=
"handleMarkerClick"
:scale=
'11'
style=
"width: 100%;height: calc(100vh - 246rpx)"
latitude=
"31.464086"
longitude=
"116.944909"
class=
"map"
:markers=
"markers"
>
<map
id=
"mapId"
:polygons=
"polygons"
@
markertap=
"handleMarkerClick"
@
callouttap=
"handleMarkerClick"
:scale=
'11'
style=
"width: 100%;height: calc(100vh - 246rpx)"
latitude=
"31.464086"
longitude=
"116.944909"
class=
"map"
:markers=
"markers"
>
</map>
</map>
<div
v-if=
"activeInfo.id"
:key=
"activeInfo.id"
@
click=
"toDetail(activeInfo)"
style=
"position: fixed;padding: 0 30rpx;bottom: 30rpx;width: 100vw;z-index: 999;box-sizing: border-box;"
>
<div
v-if=
"activeInfo.id"
:key=
"activeInfo.id"
@
click=
"toDetail(activeInfo)"
style=
"position: fixed;padding: 0 30rpx;bottom: 30rpx;width: 100vw;z-index: 999;box-sizing: border-box;"
>
<park-card-vue
:key=
"activeInfo.id"
:key-words=
"keyWords"
:detail=
"activeInfo"
v-if=
"activeBar == 0"
></park-card-vue>
<park-card-vue
:key=
"activeInfo.id"
:key-words=
"keyWords"
:detail=
"activeInfo"
v-if=
"activeBar == 0"
></park-card-vue>
...
@@ -114,6 +114,7 @@ import carrierCardVue from "../../components/media/carrier-card.vue";
...
@@ -114,6 +114,7 @@ import carrierCardVue from "../../components/media/carrier-card.vue";
import
parkCardVue
from
"../../components/media/park-card.vue"
;
import
parkCardVue
from
"../../components/media/park-card.vue"
;
import
landCardVue
from
"../../components/media/land-card.vue"
;
import
landCardVue
from
"../../components/media/land-card.vue"
;
import
dropdownVue
from
"../../components/dropdown/dropdown.vue"
;
import
dropdownVue
from
"../../components/dropdown/dropdown.vue"
;
import
areaData
from
'./areaData.js'
;
export
default
{
export
default
{
components
:
{
components
:
{
carrierCardVue
,
carrierCardVue
,
...
@@ -130,6 +131,14 @@ export default {
...
@@ -130,6 +131,14 @@ export default {
pageNum
:
1
,
pageNum
:
1
,
haveMore
:
true
,
haveMore
:
true
,
isLoading
:
true
,
isLoading
:
true
,
polygons
:
[
{
points
:
areaData
,
strokeWidth
:
2
,
strokeColor
:
'#4274EF'
,
fillColor
:
'#4274EF10'
,
}
],
//筛选菜单列表
//筛选菜单列表
menuList
:
[
menuList
:
[
[
[
...
@@ -148,18 +157,18 @@ export default {
...
@@ -148,18 +157,18 @@ export default {
},
},
],
],
[
[
//
{
{
//
id: 1,
id
:
1
,
//
name: "土地类型",
name
:
"土地类型"
,
//
isMultiple: false, //是否多选
isMultiple
:
false
,
//是否多选
//
showType: 3, //下拉框类型(1、2、3、4)
showType
:
3
,
//下拉框类型(1、2、3、4)
//
},
},
//
{
{
//
id: 2,
id
:
2
,
//
name: "面积",
name
:
"面积"
,
//
isMultiple: false, //是否多选
isMultiple
:
false
,
//是否多选
//
showType: 3, //下拉框类型(1、2、3、4)
showType
:
3
,
//下拉框类型(1、2、3、4)
//
},
},
],
],
[
[
{
{
...
@@ -243,6 +252,8 @@ export default {
...
@@ -243,6 +252,8 @@ export default {
carrier_type
:
'carrierType'
,
carrier_type
:
'carrierType'
,
carrier_construction
:
'carrierConstruction'
,
carrier_construction
:
'carrierConstruction'
,
carrier_area
:
'carrierArea'
,
carrier_area
:
'carrierArea'
,
land_type
:
'landType'
,
land_area
:
'area'
,
}
}
const
result
=
Object
.
entries
(
params
).
map
(([
key
,
value
])
=>
{
const
result
=
Object
.
entries
(
params
).
map
(([
key
,
value
])
=>
{
const
target
=
config
[
key
];
const
target
=
config
[
key
];
...
@@ -454,7 +465,7 @@ export default {
...
@@ -454,7 +465,7 @@ export default {
.content {
.content {
padding-top: 250rpx + 20rpx;
padding-top: 250rpx + 20rpx;
&.no-filter {
&.no-filter {
padding-top: 250rpx + 20rpx - 80rpx;
//
padding-top: 250rpx + 20rpx - 80rpx;
}
}
}
}
.media-card {
.media-card {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment