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
948bd148
Commit
948bd148
authored
Dec 18, 2018
by
agping
Committed by
hujun
Dec 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
字段调整
parent
f80c8f82
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
108 additions
and
4 deletions
+108
-4
detaila_tuiguang.js
public/app/js/detaila_tuiguang.js
+1
-1
redPackMask.vue
public/appnew/src/components/shop/redPackMask.vue
+81
-0
shopList.vue
public/appnew/src/components/shop/shopList.vue
+26
-3
No files found.
public/app/js/detaila_tuiguang.js
View file @
948bd148
...
@@ -424,7 +424,7 @@
...
@@ -424,7 +424,7 @@
});
});
//点击 商铺详情的 更多商铺
//点击 商铺详情的 更多商铺
$
(
'.shop-list'
).
click
(
function
()
{
$
(
'.shop-list'
).
click
(
function
()
{
location
.
href
=
ServerHost
+
"/app/dist/#/shopList?city="
+
p_city
+
'&type='
+
p_type
+
'&p_district_id='
+
p_district_id
+
'&p_store_id='
+
p_store_id
+
'&p_agent_id='
+
p_agent_id
+
'&generalizeId='
+
generalize_id
;
location
.
href
=
ServerHost
+
"/app/dist/#/shopList?city="
+
p_city
+
'&type='
+
p_type
+
'&p_district_id='
+
p_district_id
+
'&p_store_id='
+
p_store_id
+
'&p_agent_id='
+
p_agent_id
+
'&generalizeId='
+
generalize_id
+
'&redBag=1'
;
});
});
}
else
if
(
pc_isOfficial
){
}
else
if
(
pc_isOfficial
){
$
(
'.pc-contact-agent'
).
show
();
$
(
'.pc-contact-agent'
).
show
();
...
...
public/appnew/src/components/shop/redPackMask.vue
0 → 100644
View file @
948bd148
<
template
>
<div
class=
"red-pack-mask flex-center"
>
<div>
<div
class=
"red-pack-area"
></div>
<div
class=
"close-btn-area"
@
click=
"closeClick"
></div>
</div>
</div>
</
template
>
<
script
>
export
default
{
name
:
''
,
components
:
{
},
props
:
{
data
:
{
type
:
Object
,
default
:
()
=>
({
message
:
'hello'
})
}
},
data
()
{
return
{
}
},
watch
:
{
data
(
newValue
,
oldVal
)
{
}
},
created
()
{
let
_this
=
this
;
},
mounted
()
{
let
_this
=
this
;
},
computed
:
{
},
methods
:
{
closeClick
()
{
this
.
$emit
(
'closeclick'
);
}
}
}
</
script
>
<
style
scoped
>
.red-pack-mask
{
position
:
fixed
;
z-index
:
670
;
top
:
0
;
left
:
0
;
width
:
100vw
;
height
:
100vh
;
background-color
:
rgba
(
0
,
0
,
0
,
.7
);
}
.red-pack-area
{
width
:
5.92rem
;
height
:
6.9rem
;
background
:
url(images/img@2x.png)
no-repeat
center
center
/
5.92rem
6.9rem
;
margin-bottom
:
1.46rem
;
}
.close-btn-area
{
width
:
.72rem
;
height
:
.72rem
;
background
:
url(images/icon_close@2x.png)
no-repeat
center
center
/
.72rem
.72rem
;
margin
:
0
auto
;
}
</
style
>
\ No newline at end of file
public/appnew/src/components/shop/shopList.vue
View file @
948bd148
...
@@ -83,9 +83,12 @@
...
@@ -83,9 +83,12 @@
</div>
</div>
<div
class=
"mark-shop-choose-gray"
v-for=
"(item, index) in mainDataChoose"
v-show=
"(initTabNumMainChoose == index) && item.isShow"
@
click=
"tabMainChoose(index)"
>
<div
class=
"mark-shop-choose-gray"
v-for=
"(item, index) in mainDataChoose"
v-show=
"(initTabNumMainChoose == index) && item.isShow"
@
click=
"tabMainChoose(index)"
>
</div>
</div>
<div
class=
"to-five-page"
v-if=
'isGif'
@
click=
"tabFivePage()"
>
<
!--
<
div
class=
"to-five-page"
v-if=
'isGif'
@
click=
"tabFivePage()"
>
<img
:src=
"gif_img"
class=
"to-five-page-img"
/>
<img
:src=
"gif_img"
class=
"to-five-page-img"
/>
</div>
</div>
-->
<red-pack-mask
@
closeclick=
"showRedPackMask = false"
v-if=
"showRedPackMask"
></red-pack-mask>
<div
class=
"immediately-to-receive"
@
click=
"tabFivePage()"
></div>
</div>
</div>
</
template
>
</
template
>
...
@@ -97,10 +100,12 @@
...
@@ -97,10 +100,12 @@
import
icon_down
from
'@/components/shop/images/icon_down@2x.png'
;
import
icon_down
from
'@/components/shop/images/icon_down@2x.png'
;
import
icon_down02
from
'@/components/shop/images/icon_down02@2x.png'
;
import
icon_down02
from
'@/components/shop/images/icon_down02@2x.png'
;
import
paginationLoad
from
'@/components/publicEg/paginationLoad'
;
import
paginationLoad
from
'@/components/publicEg/paginationLoad'
;
import
redPackMask
from
'@/components/shop/redPackMask'
;
import
'@/assets/js/layer041002.js'
;
import
'@/assets/js/layer041002.js'
;
export
default
{
export
default
{
components
:
{
components
:
{
'pagination-load'
:
paginationLoad
,
'pagination-load'
:
paginationLoad
,
'red-pack-mask'
:
redPackMask
,
},
},
data
:
()
=>
({
data
:
()
=>
({
list
:
[],
list
:
[],
...
@@ -175,6 +180,8 @@
...
@@ -175,6 +180,8 @@
'title'
:
'更多'
,
'title'
:
'更多'
,
'isShow'
:
false
,
'isShow'
:
false
,
}],
}],
showRedPackMask
:
false
,
//是否显示红包弹窗
}),
}),
created
()
{
created
()
{
let
_this
=
this
;
let
_this
=
this
;
...
@@ -190,6 +197,12 @@
...
@@ -190,6 +197,12 @@
_this
.
p_agent_id
=
_this
.
$route
.
query
.
p_agent_id
;
_this
.
p_agent_id
=
_this
.
$route
.
query
.
p_agent_id
;
_this
.
generalizeId
=
_this
.
$route
.
query
.
generalizeId
;
_this
.
generalizeId
=
_this
.
$route
.
query
.
generalizeId
;
_this
.
site_area
=
6
;
_this
.
site_area
=
6
;
if
(
_this
.
$route
.
query
.
redBag
){
_this
.
showRedPackMask
=
false
;
}
else
{
_this
.
showRedPackMask
=
true
;
}
};
};
//H5 官网
//H5 官网
if
(
_this
.
$route
.
query
.
isOfficial
){
if
(
_this
.
$route
.
query
.
isOfficial
){
...
@@ -502,8 +515,9 @@
...
@@ -502,8 +515,9 @@
},
},
//到500代金券
//到500代金券
tabFivePage
(){
tabFivePage
(){
console
.
log
(
555
)
let
_this
=
this
;
let
_this
=
this
;
var
str1
=
this
.
common
.
ServerHost
+
"/app/baidu_send?"
+
'city='
+
_this
.
$route
.
query
.
city
+
'&type='
+
_this
.
$route
.
query
.
type
+
'&p_district_id='
+
_this
.
$route
.
query
.
p_district_id
+
'&p_store_id='
+
_this
.
$route
.
query
.
p_store_id
+
'&p_agent_id='
+
_this
.
$route
.
query
.
p_agent_id
+
'&generalizeId='
+
_this
.
$route
.
query
.
generalizeId
;
var
str1
=
this
.
common
.
ServerHost
+
"/app/baidu_send?"
+
'city='
+
_this
.
$route
.
query
.
city
+
'&type='
+
_this
.
$route
.
query
.
type
+
'&p_district_id='
+
_this
.
$route
.
query
.
p_district_id
+
'&p_store_id='
+
_this
.
$route
.
query
.
p_store_id
+
'&p_agent_id='
+
_this
.
$route
.
query
.
p_agent_id
+
'&generalizeId='
+
_this
.
$route
.
query
.
generalizeId
+
'&redBag=1'
;
location
.
href
=
str1
;
location
.
href
=
str1
;
},
},
delMore
(){
delMore
(){
...
@@ -911,4 +925,13 @@
...
@@ -911,4 +925,13 @@
.to-five-page
img
{
.to-five-page
img
{
width
:
1.6rem
;
width
:
1.6rem
;
}
}
.immediately-to-receive
{
width
:
4.3rem
;
height
:
.9rem
;
position
:
absolute
;
top
:
7.6rem
;
right
:
1.5rem
;
z-index
:
999
;
cursor
:
pointer
;
}
</
style
>
</
style
>
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