Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
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
hujun
tl_estate
Commits
d7418149
Commit
d7418149
authored
Dec 05, 2018
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商铺列表 商铺详情修改
parent
7d541710
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
103 additions
and
32 deletions
+103
-32
share_detail.html
application/app/view/index/share_detail.html
+5
-0
share_detail.html
application/index/view/share_shop/share_detail.html
+5
-0
detaila_tl.js
public/app/js/detaila_tl.js
+1
-1
detaila_tuiguang.js
public/app/js/detaila_tuiguang.js
+1
-0
shopList.vue
public/appnew/src/components/shop/shopList.vue
+42
-14
shopSearchList.vue
public/appnew/src/components/shopSearch/shopSearchList.vue
+49
-17
No files found.
application/app/view/index/share_detail.html
View file @
d7418149
...
...
@@ -58,6 +58,11 @@
</ul>
</div>
<!--line 3-->
<!--最适合业态-->
<p
class=
"b3_font1 b3_span_shop_yetai"
>
<span>
最适合业态:
</span>
<span
class=
"b3_span_shop_yetai_con gw"
></span>
</p>
<p
class=
"b3_font1 b3_span_shop_num"
>
<span>
剩余铺数:
</span>
<span
class=
"b3_span_build_num gw"
></span>
...
...
application/index/view/share_shop/share_detail.html
View file @
d7418149
...
...
@@ -59,6 +59,11 @@
</ul>
</div>
<!--line 3-->
<!--最适合业态-->
<p
class=
"b3_font1 b3_span_shop_yetai"
>
<span>
最适合业态:
</span>
<span
class=
"b3_span_shop_yetai_con gw"
></span>
</p>
<p
class=
"b3_font1 b3_span_shop_num"
>
<span>
剩余铺数:
</span>
<span
class=
"b3_span_build_num gw"
></span>
...
...
public/app/js/detaila_tl.js
View file @
d7418149
...
...
@@ -133,7 +133,7 @@
$
(
".kaiye-time"
).
html
(
response
.
data
.
start_business_date
);
// $(".duinei").html(response.data.city + response.data.disc + response.data.external_address);
$
(
".duinei"
).
html
(
response
.
data
.
address
);
$
(
".b3_span_shop_yetai_con"
).
html
(
response
.
data
.
fit_industry_type
);
$
(
".jiaotong"
).
html
(
response
.
data
.
traffic
);
/*配套设施 */
$
(
".electric-quantity-details"
).
html
(
response
.
data
.
electric_quantity
+
'KW'
);
...
...
public/app/js/detaila_tuiguang.js
View file @
d7418149
...
...
@@ -124,6 +124,7 @@
$
(
".kaiye-time"
).
html
(
response
.
data
.
start_business_date
);
// $(".duinei").html(response.data.city + response.data.disc + response.data.external_address);
$
(
".duinei"
).
html
(
response
.
data
.
address
);
$
(
".b3_span_shop_yetai_con"
).
html
(
response
.
data
.
fit_industry_type
);
$
(
".jiaotong"
).
html
(
response
.
data
.
traffic
);
/*配套设施 */
...
...
public/appnew/src/components/shop/shopList.vue
View file @
d7418149
...
...
@@ -34,9 +34,9 @@
<img-error
:datasrc=
"selesctImg(item2)"
:imgtype=
"'house'"
></img-error>
</div>
<div
class=
"shop-list-con shop-list"
>
<p
class=
"shop-title shop-list-top"
>
{{
item2
.
title
}}
</p>
<p
class=
"shop-rent shop-list-top
"
>
{{
selesctRent
(
item2
)
}}
</p>
<p
class=
"shop-list-top"
>
<p
class=
"shop-title shop-list-top
-first
"
>
{{
item2
.
title
}}
</p>
<p
class=
"shop-rent shop-list-top
-two"
>
租金均价:
<span>
{{
selesctRent
(
item2
)
}}
</span>
{{
selesctRentType
(
item2
)
}}
</p>
<p
class=
"shop-list-top
-three
"
>
<span
v-for=
"(item3, index3) in item2.shop_sign.split(',').splice(0, 3)"
class=
"shop-lable"
>
{{
item3
}}
</span>
</p>
</div>
...
...
@@ -546,19 +546,35 @@
selesctRent
(
item
){
var
_rent_type
=
''
;
if
(
item
.
rent_type
==
1
){
_rent_type
=
'
租金均价:'
+
item
.
rent_price
+
'元/月'
;
_rent_type
=
'
'
+
item
.
rent_price
;
};
if
(
item
.
rent_type
==
2
){
_rent_type
=
'
租金均价:'
+
item
.
rent_price
+
'%'
;
_rent_type
=
'
'
+
item
.
rent_price
;
};
if
(
item
.
rent_type
==
3
){
_rent_type
=
'
租金均价:'
+
item
.
rent_price
+
'元/天/m²'
;
_rent_type
=
'
'
+
item
.
rent_price
;
};
if
(
item
.
rent_type
==
4
){
_rent_type
=
'
租金均价:'
+
item
.
rent_price
+
'元/年'
;
_rent_type
=
'
'
+
item
.
rent_price
;
};
return
_rent_type
;
},
selesctRentType
(
item
){
var
_rent_type_item
=
''
;
if
(
item
.
rent_type
==
1
){
_rent_type_item
=
'元/月'
;
};
if
(
item
.
rent_type
==
2
){
_rent_type_item
=
'%'
;
};
if
(
item
.
rent_type
==
3
){
_rent_type_item
=
'元/天/m²'
;
};
if
(
item
.
rent_type
==
4
){
_rent_type_item
=
'元/年'
;
};
return
_rent_type_item
;
},
resetConditions
(){
let
_this
=
this
;
_this
.
mainData
=
[
...
...
@@ -682,25 +698,37 @@
overflow
:
hidden
;
}
.shop-list-con
.shop-title
{
font-size
:
.
3
rem
;
font-size
:
.
28
rem
;
width
:
4.5rem
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
height
:
.8rem
;
text-overflow
:
-o-ellipsis-lastline
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
-webkit-box
;
-webkit-line-clamp
:
2
;
-webkit-box-orient
:
vertical
;
margin-top
:
-.05rem
;
}
.shop-list-con
.shop-rent
{
font-size
:
.2
6
rem
;
font-size
:
.2
0
rem
;
color
:
#FF5C50
;
}
.shop-list-con
.shop-rent
>
span
{
font-size
:
.30rem
;
font-weight
:
600
;
}
.shop-list-con
.shop-lable
{
font-size
:
.22rem
;
padding
:
.05rem
.1rem
;
color
:
#FFA900
;
background-color
:
#
FFF4DF
;
background-color
:
#
fff
;
margin-right
:
.1rem
;
box-sizing
:
border-box
;
border
:
1px
solid
rgba
(
255
,
186
,
18
,
0.5
);
border-radius
:
2px
;
}
.shop-list-top
{
margin-top
:
.
12
rem
;
.shop-list-top
-three
{
margin-top
:
.
08
rem
;
}
/*选择项样式*/
nav
>
.nav-main-choose
{
...
...
public/appnew/src/components/shopSearch/shopSearchList.vue
View file @
d7418149
...
...
@@ -5,6 +5,8 @@
<select
@
change=
"changeSearchCriteria"
>
<option
value=
"商铺名称"
>
商铺名称
</option>
<option
value=
"商铺编号"
>
商铺编号
</option>
<option
value=
"详细业态关键词"
>
适合业态
</option>
</select>
<img
:src=
"icon_down"
class=
"icon-search-img"
/>
</div>
...
...
@@ -32,11 +34,11 @@
<img-error
:datasrc=
"selesctImg(item2)"
:imgtype=
"'house'"
></img-error>
</div>
<div
class=
"shop-list-con shop-list"
>
<p
class=
"shop-title shop-list-top
"
>
{{
item2
.
title
}}
</p>
<p
class=
"shop-rent shop-list-top"
>
{{
selesctRent
(
item2
)
}}
</p>
<p
class=
"shop-list-top
"
>
<span
v-for=
"(item3, index3) in item2.shop_sign.split(',').splice(0, 3)"
class=
"shop-lable"
>
{{
item3
}}
</span>
</p>
<p
class=
"shop-title shop-list-top-first
"
>
{{
item2
.
title
}}
</p>
<p
class=
"shop-rent shop-list-top-two"
><span>
{{
selesctRent
(
item2
)
}}
</span>
{{
selesctRentType
(
item2
)
}}
</p>
<p
class=
"shop-list-top-three
"
>
<span
v-for=
"(item3, index3) in item2.shop_sign.split(',').splice(0, 3)"
class=
"shop-lable"
>
{{
item3
}}
</span>
</p>
</div>
</li>
</ul>
...
...
@@ -207,8 +209,10 @@
};
if
((
_this
.
initInputValue
==
'商铺名称'
)
&&
!
(
_this
.
ajax_input_value
==
''
)){
_data
.
title
=
_this
.
ajax_input_value
;
}
else
if
(
!
(
_this
.
ajax_input_value
==
''
)){
}
else
if
(
(
_this
.
initInputValue
==
'商铺编号'
)
&&
!
(
_this
.
ajax_input_value
==
''
)){
_data
.
house_id
=
_this
.
ajax_input_value
*
1
;
}
else
if
(
!
(
_this
.
ajax_input_value
==
''
)){
_data
.
fit_industry_type
=
_this
.
ajax_input_value
;
}
_this
.
axios
({
method
:
'get'
,
...
...
@@ -459,19 +463,35 @@
selesctRent
(
item
){
var
_rent_type
=
''
;
if
(
item
.
rent_type
==
1
){
_rent_type
=
'
租金均价:'
+
item
.
rent_price
+
'元/月'
;
_rent_type
=
'
'
+
item
.
rent_price
;
};
if
(
item
.
rent_type
==
2
){
_rent_type
=
'
租金均价:'
+
item
.
rent_price
+
'%'
;
_rent_type
=
'
'
+
item
.
rent_price
;
};
if
(
item
.
rent_type
==
3
){
_rent_type
=
'
租金均价:'
+
item
.
rent_price
+
'元/天/m²'
;
_rent_type
=
'
'
+
item
.
rent_price
;
};
if
(
item
.
rent_type
==
4
){
_rent_type
=
'
租金均价:'
+
item
.
rent_price
+
'元/年'
;
_rent_type
=
'
'
+
item
.
rent_price
;
};
return
_rent_type
;
},
selesctRentType
(
item
){
var
_rent_type_item
=
''
;
if
(
item
.
rent_type
==
1
){
_rent_type_item
=
'元/月'
;
};
if
(
item
.
rent_type
==
2
){
_rent_type_item
=
'%'
;
};
if
(
item
.
rent_type
==
3
){
_rent_type_item
=
'元/天/m²'
;
};
if
(
item
.
rent_type
==
4
){
_rent_type_item
=
'元/年'
;
};
return
_rent_type_item
;
},
resetConditions
(){
let
_this
=
this
;
_this
.
mainData
=
[
...
...
@@ -579,25 +599,37 @@
overflow
:
hidden
;
}
.shop-list-con
.shop-title
{
font-size
:
.
3
rem
;
font-size
:
.
28
rem
;
width
:
4.5rem
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
height
:
.8rem
;
text-overflow
:
-o-ellipsis-lastline
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
-webkit-box
;
-webkit-line-clamp
:
2
;
-webkit-box-orient
:
vertical
;
margin-top
:
-.05rem
;
}
.shop-list-con
.shop-rent
{
font-size
:
.2
6
rem
;
font-size
:
.2
0
rem
;
color
:
#FF5C50
;
}
.shop-list-con
.shop-rent
>
span
{
font-size
:
.30rem
;
font-weight
:
600
;
}
.shop-list-con
.shop-lable
{
font-size
:
.22rem
;
padding
:
.05rem
.1rem
;
color
:
#FFA900
;
background-color
:
#
FFF4DF
;
background-color
:
#
fff
;
margin-right
:
.1rem
;
box-sizing
:
border-box
;
border
:
1px
solid
rgba
(
255
,
186
,
18
,
0.5
);
border-radius
:
2px
;
}
.shop-list-top
{
margin-top
:
.
12
rem
;
.shop-list-top
-three
{
margin-top
:
.
08
rem
;
}
/*选择项样式*/
nav
>
.nav-main-choose
{
...
...
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