Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
liyeyun
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
liyeyun
Commits
46e38c24
Commit
46e38c24
authored
Dec 22, 2023
by
shilei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into 'master'
1221 See merge request
!1
parents
cd86ad85
2019eb50
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
55 additions
and
19 deletions
+55
-19
StarDetail.vue
src/components/detail/StarDetail.vue
+3
-2
VideoList.vue
src/components/detail/VideoList.vue
+1
-1
list-land-item.vue
src/components/list/list-land-item.vue
+1
-1
LoginView.vue
src/components/login/LoginView.vue
+0
-0
MapView.vue
src/components/map/MapView.vue
+1
-1
useJoinRequired.ts
src/composable/useJoinRequired.ts
+3
-3
router.ts
src/router/router.ts
+27
-0
ThirdAgreement.vue
src/views/agreement/ThirdAgreement.vue
+7
-0
UserAgreement.vue
src/views/agreement/UserAgreement.vue
+0
-0
UserInfoPolicy.vue
src/views/agreement/UserInfoPolicy.vue
+0
-0
CarrierDetail.vue
src/views/carrier/CarrierDetail.vue
+1
-1
HomeView.vue
src/views/home/HomeView.vue
+3
-2
LandDetail.vue
src/views/land/LandDetail.vue
+2
-2
MyDevelopDetail.vue
src/views/user/MyDevelopDetail.vue
+3
-3
MyIndustrialDetail.vue
src/views/user/MyIndustrialDetail.vue
+3
-3
No files found.
src/components/detail/StarDetail.vue
View file @
46e38c24
...
...
@@ -5,7 +5,7 @@
<div
class=
"main-width"
>
<div
class=
"flex"
>
<div
class=
"mt-[159px] font-yahei font-bold text-white"
>
<div
class=
"main-title h-[86px] w-[638px]
text-[58px] whitespace-nowrap
"
>
<div
class=
"main-title h-[86px] w-[638px]
whitespace-nowrap text-[58px]
"
>
立业
{{
developName
}}
丨共赢发展未来
</div>
<div
class=
"sub-title mt-[13px] h-[37px] w-[637px] whitespace-nowrap text-[28px]"
>
...
...
@@ -247,7 +247,8 @@ const handleShowDesc = () => {
}
.star-detail
{
.star-bg
{
background
:
url('https://cfld-obs-pro01.obs.cn-north-4.myhuaweicloud.com/img/system/%E8%88%92%E5%9F%8E%E5%A4%B4%E5%9B%BE.png?x-image-process=image/quality,q_80')
no-repeat
;
background
:
url('https://cfld-obs-pro01.obs.cn-north-4.myhuaweicloud.com/img/system/%E8%88%92%E5%9F%8E%E5%A4%B4%E5%9B%BE.png?x-image-process=image/quality,q_80')
no-repeat
;
background-size
:
cover
;
background-position-y
:
-100px
;
}
...
...
src/components/detail/VideoList.vue
View file @
46e38c24
...
...
@@ -28,7 +28,7 @@
></CommonVideo>
<CommonImage
v-else
class=
"h-
full w-full
"
class=
"h-
[288px] w-[492px]
"
:src=
"item.videourl"
:type=
"DetailType.develop"
></CommonImage>
...
...
src/components/list/list-land-item.vue
View file @
46e38c24
...
...
@@ -38,7 +38,7 @@
v-if=
"detail.price?.toString().length"
class=
"absolute bottom-[8px] right-0 text-[20px] font-semibold text-[#C0322B]"
>
{{
detail
.
price
}}
元/亩
{{
detail
.
price
}}
万
元/亩
</div>
</div>
</div>
...
...
src/components/login/LoginView.vue
View file @
46e38c24
This diff is collapsed.
Click to expand it.
src/components/map/MapView.vue
View file @
46e38c24
...
...
@@ -102,7 +102,7 @@ const props = defineProps<{
containerClass
?:
string
;
}
>
();
const
infoList
=
ref
<
any
[]
>
([]);
const
{
VITE_BASE_USER_URL
}
=
import
.
meta
.
env
;
const
{
VITE_BASE_USER_URL
}
=
import
.
meta
.
env
;
(
window
as
any
).
_AMapSecurityConfig
=
{
serviceHost
:
`
${
VITE_BASE_USER_URL
}
/_AMapService`
,
};
...
...
src/composable/useJoinRequired.ts
View file @
46e38c24
...
...
@@ -62,19 +62,19 @@ export function useJoinRequired<T extends JoinRequiredParams>(
{
name
:
'亩均年产值'
,
value
:
averageOutputValue
,
unit
:
'万/亩'
,
unit
:
'万
元
/亩'
,
},
],
[
{
name
:
'亩均投资强度'
,
value
:
investmentStrength
,
unit
:
'万/亩'
,
unit
:
'万
元
/亩'
,
},
{
name
:
'亩均税收'
,
value
:
taxationStrength
,
unit
:
'万/亩'
,
unit
:
'万
元
/亩'
,
},
],
[
...
...
src/router/router.ts
View file @
46e38c24
...
...
@@ -44,6 +44,12 @@ const ChangePassword = () => import('@/views/user/ChangePassword.vue');
const
MyDevelopDetail
=
()
=>
import
(
'@/views/user/MyDevelopDetail.vue'
);
/** 我的园区-产业园详情 */
const
MyIndustrialDetail
=
()
=>
import
(
'@/views/user/MyIndustrialDetail.vue'
);
/** 立业云用户协议 */
const
UserAgreement
=
()
=>
import
(
'@/views/agreement/UserAgreement.vue'
);
/** 个人信息保护政策 */
const
UserInfoPolicy
=
()
=>
import
(
'@/views/agreement/UserInfoPolicy.vue'
);
/** 第三方使用信息协议 */
const
ThirdAgreement
=
()
=>
import
(
'@/views/agreement/ThirdAgreement.vue'
);
export
const
enum
RouteName
{
home
=
'home'
,
...
...
@@ -89,6 +95,12 @@ export const enum RouteName {
myDevelopDetail
=
'user-center/my-develop-detail'
,
/** 我的园区-产业园详情 */
myIndustrialDetail
=
'user-center/my-industrial-detail'
,
/** 立业云用户协议 */
userAgreement
=
'user-agreement'
,
/** 个人信息保护政策 */
userInfoPolicy
=
'user-info-policy'
,
/** 第三方使用信息协议 */
thirdAgreement
=
'third-agreement'
,
}
function
gen
(
name
:
RouteName
)
{
...
...
@@ -278,6 +290,21 @@ const routes: readonly RouteRecordRaw[] = [
},
],
},
{
// 立业云用户协议
...
gen
(
RouteName
.
userAgreement
),
component
:
UserInfoPolicy
,
},
{
// 个人信息保护政策
...
gen
(
RouteName
.
userInfoPolicy
),
component
:
UserAgreement
,
},
{
// 第三方使用信息协议
...
gen
(
RouteName
.
thirdAgreement
),
component
:
ThirdAgreement
,
},
{
path
:
'/:pathMatch(.*)*'
,
redirect
:
'/'
,
...
...
src/views/agreement/ThirdAgreement.vue
0 → 100644
View file @
46e38c24
<!-- 第三方使用信息协议 -->
<
template
>
<div
class=
"main-width mx-auto"
>
<p
style=
"text-align: center"
><strong>
第三方使用信息协议
</strong></p>
<p>
同意华夏数科按照本政策的约定,将用户信息提供给第三方
</p>
</div>
</
template
>
src/views/agreement/UserAgreement.vue
0 → 100644
View file @
46e38c24
This diff is collapsed.
Click to expand it.
src/views/agreement/UserInfoPolicy.vue
0 → 100644
View file @
46e38c24
This diff is collapsed.
Click to expand it.
src/views/carrier/CarrierDetail.vue
View file @
46e38c24
...
...
@@ -29,7 +29,7 @@
<DetailInfoCell
:infos=
"joinRequired"
title=
"入驻要求"
>
<DetailInfo
:infos=
"joinRequired"
></DetailInfo>
</DetailInfoCell>
<DetailInfoCell
title=
"周边配套"
title-center
v-if=
"detail.carrierParkVo.latitude"
>
<DetailInfoCell
v-if=
"detail.carrierParkVo.latitude"
title=
"周边配套"
title-center
>
<MapView
:lat=
"detail.carrierParkVo.latitude"
:lng=
"detail.carrierParkVo.longitude"
...
...
src/views/home/HomeView.vue
View file @
46e38c24
...
...
@@ -89,7 +89,7 @@
<div
class=
"mr-[62px] flex items-center"
>
<img
src=
"@/assets/images/icon-volume.png"
class=
"h-4 w-4"
alt=
""
/>
<div
class=
"relative h-5 w-[180px] overflow-hidden"
>
<ul
ref=
"marquee"
class=
"ml-2 h-5 w-[200px] overflow-
y-scroll
text-sm text-white"
>
<ul
ref=
"marquee"
class=
"ml-2 h-5 w-[200px] overflow-
hidden
text-sm text-white"
>
<li
class=
"name"
>
园区数量
{{
homePageData
?.
parkInfoCount
}}
个
</li>
<li
class=
"name"
>
服务企业
{{
homePageData
?.
enterpriseCount
}}
家
</li>
</ul>
...
...
@@ -98,7 +98,7 @@
<div
v-if=
"homePageData?.noticeList.length"
class=
"flex items-center"
>
<img
src=
"@/assets/images/icon-volume.png"
class=
"h-4 w-4"
alt=
""
/>
<div
style=
"width: calc(850px - 17px)"
class=
"relative h-5 overflow-hidden text-sm"
>
<ul
ref=
"marquee2"
class=
"ml-2 h-5 w-[850px] overflow-
y-scroll
text-sm text-white"
>
<ul
ref=
"marquee2"
class=
"ml-2 h-5 w-[850px] overflow-
hidden
text-sm text-white"
>
<li
v-for=
"item in homePageData.noticeList"
:key=
"item.name"
class=
"name"
>
<p
class=
"w-180 ell"
>
{{
item
.
name
}}
...
...
@@ -652,6 +652,7 @@ watchEffect(async () => {
border-radius
:
4px
;
}
.home-media
{
height
:
355px
;
.text-xl
{
font-size
:
18px
;
width
:
180px
;
...
...
src/views/land/LandDetail.vue
View file @
46e38c24
...
...
@@ -14,7 +14,7 @@
investmentDetails: industryDirection,
}"
>
<DetailMainInfo
:value=
"detail.price"
unit=
"万/亩"
name=
"土地价格"
></DetailMainInfo>
<DetailMainInfo
:value=
"detail.price"
unit=
"万
元
/亩"
name=
"土地价格"
></DetailMainInfo>
<DetailMainInfo
:value=
"detail.type"
name=
"土地类型"
></DetailMainInfo>
<DetailMainInfo
:value=
"formatNumber(detail.area)"
...
...
@@ -34,7 +34,7 @@
<DetailInfoCell
:infos=
"joinRequired"
title=
"入驻要求"
>
<DetailInfo
:infos=
"joinRequired"
></DetailInfo>
</DetailInfoCell>
<DetailInfoCell
title=
"周边配套"
title-center
v-if=
"detail.development.latitude"
>
<DetailInfoCell
v-if=
"detail.development.latitude"
title=
"周边配套"
title-center
>
<MapView
:lat=
"detail.development.latitude"
:lng=
"detail.development.longitude"
></MapView>
</DetailInfoCell>
<DetailInfoCell
class=
"!mt-10"
title-center
title=
"所属开发区"
>
...
...
src/views/user/MyDevelopDetail.vue
View file @
46e38c24
...
...
@@ -252,19 +252,19 @@ const joinRequired = computed(() => {
{
name
:
'亩均投资额'
,
value
:
investmentStrength
,
unit
:
'万/亩'
,
unit
:
'万
元
/亩'
,
},
],
[
{
name
:
'亩均税收'
,
value
:
taxationStrength
,
unit
:
'万/亩'
,
unit
:
'万
元
/亩'
,
},
{
name
:
'亩均年产值'
,
value
:
averageOutputValue
,
unit
:
'万/亩'
,
unit
:
'万
元
/亩'
,
},
],
[
...
...
src/views/user/MyIndustrialDetail.vue
View file @
46e38c24
...
...
@@ -277,19 +277,19 @@ const joinRequired = computed(() => {
{
name
:
'亩均投资额'
,
value
:
investmentStrength
,
unit
:
'万/亩'
,
unit
:
'万
元
/亩'
,
},
],
[
{
name
:
'亩均税收'
,
value
:
taxationStrength
,
unit
:
'万/亩'
,
unit
:
'万
元
/亩'
,
},
{
name
:
'亩均年产值'
,
value
:
averageOutputValue
,
unit
:
'万/亩'
,
unit
:
'万
元
/亩'
,
},
],
[
...
...
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