Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hls-xcmg-vue-app
Project
Project
Details
Activity
Releases
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
xugong
hls-xcmg-vue-app
Commits
1c6e32bb
Commit
1c6e32bb
authored
Jun 08, 2021
by
jiacheng.mao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user_phone调整为大写
parent
43139e1a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
337 additions
and
303 deletions
+337
-303
function-list.vue
src/pages/functionCenter/function-list.vue
+1
-0
home-page.vue
src/pages/home/home-page.vue
+56
-25
my-info.vue
src/pages/myInfo/my-info.vue
+253
-252
setting.vue
src/pages/myInfo/setting.vue
+27
-26
No files found.
src/pages/functionCenter/function-list.vue
View file @
1c6e32bb
...
@@ -181,6 +181,7 @@ export default {
...
@@ -181,6 +181,7 @@ export default {
if
(
res
.
info
.
user_bp_status
===
'APPROVED'
)
{
if
(
res
.
info
.
user_bp_status
===
'APPROVED'
)
{
vm
.
flag
=
false
vm
.
flag
=
false
}
}
window
.
localStorage
.
setItem
(
'user_phone'
,
res
.
info
.
user_phone
)
vm
.
user_bp_status
=
res
.
info
.
user_bp_status
vm
.
user_bp_status
=
res
.
info
.
user_bp_status
vm
.
user_bp_class
=
res
.
info
.
user_bp_class
vm
.
user_bp_class
=
res
.
info
.
user_bp_class
vm
.
bp_id
=
res
.
info
.
user_bp_id
vm
.
bp_id
=
res
.
info
.
user_bp_id
...
...
src/pages/home/home-page.vue
View file @
1c6e32bb
...
@@ -29,7 +29,9 @@
...
@@ -29,7 +29,9 @@
<div
class=
"functions"
>
<div
class=
"functions"
>
<div
class=
"title"
>
资讯动态
</div>
<div
class=
"title"
>
资讯动态
</div>
<ul>
<ul>
<li
v-for=
"item in newsList"
:key=
"item.index"
><img
src=
"@/assets/homePage/inform.png"
alt=
""
>
{{
item
.
new_title
}}
</li>
<li
v-for=
"item in newsList"
:key=
"item.index"
><img
src=
"@/assets/homePage/inform.png"
alt=
""
>
{{
item
.
new_title
}}
</li>
</ul>
</ul>
<img
src=
"@/assets/functionCenter/in@2x.png"
@
click=
"gotoNews()"
>
<img
src=
"@/assets/functionCenter/in@2x.png"
@
click=
"gotoNews()"
>
<!--
<function-item
<!--
<function-item
...
@@ -48,7 +50,7 @@
...
@@ -48,7 +50,7 @@
</div>
</div>
</div>
</div>
<div
class=
"guessing"
>
猜你喜欢
<span><img
src=
"@/assets/homePage/intrest.png"
></span></div>
<div
class=
"guessing"
>
猜你喜欢
<span><img
src=
"@/assets/homePage/intrest.png"
></span></div>
<div
v-for=
"(list,index) in guessingList"
:key=
"index"
class=
"guessing-wrap"
@
click=
"goProductDetail(list)"
>
<div
v-for=
"(list,index) in guessingList"
:key=
"index"
class=
"guessing-wrap"
@
click=
"goProductDetail(list)"
>
<list-item
:item-height=
"120"
>
<list-item
:item-height=
"120"
>
<item>
<item>
<div
slot=
"name"
class=
"item-pic"
>
<div
slot=
"name"
class=
"item-pic"
>
...
@@ -58,9 +60,13 @@
...
@@ -58,9 +60,13 @@
<div
slot=
"content"
class=
"item-content"
>
<div
slot=
"content"
class=
"item-content"
>
<div
class=
"top"
>
{{
list
.
product_name
}}
</div>
<div
class=
"top"
>
{{
list
.
product_name
}}
</div>
<img
src=
"@/assets/homePage/hot.png"
class=
"hot"
>
<img
src=
"@/assets/homePage/hot.png"
class=
"hot"
>
<div
class=
"center"
><span
class=
"firsts"
>
{{
!
list
.
office_id
&&!
list
.
agent_id
?
"-"
:(
list
.
office_id
?
'办事处'
:
'经销商'
)
}}
</span>
<span
class=
"seconds"
>
{{
!
list
.
office_id
&&!
list
.
agent_id
?
"-"
:(
list
.
office_id
?
list
.
office_name
:
list
.
agent_name
)
}}
</span></div>
<div
class=
"center"
><span
class=
"firsts"
>
{{
!
list
.
office_id
&&!
list
.
agent_id
?
'-'
:(
list
.
office_id
?
'办事处'
:
'经销商'
)
}}
</span>
<div
class=
"center"
><span
class=
"firsts"
>
产品型号
</span>
<span
class=
"seconds"
>
{{
list
.
product_code
}}
</span></div>
<span
class=
"seconds"
>
{{
!
list
.
office_id
&&!
list
.
agent_id
?
'-'
:(
list
.
office_id
?
list
.
office_name
:
list
.
agent_name
)
}}
</span>
<div
class=
"center"
><span
class=
"firsts"
>
地址
</span>
<span
class=
"seconds"
>
{{
!
list
.
office_id
&&!
list
.
agent_id
?(
list
.
province_id_n
===
list
.
city_id_n
?(
list
.
district_id_n
?
list
.
city_id_n
+
list
.
district_id_n
:
list
.
city_id_n
):(
list
.
district_id_n
?
list
.
province_id_n
+
list
.
city_id_n
+
list
.
district_id_n
:
list
.
province_id_n
+
list
.
city_id_n
)):(
list
.
office_id
?
(
list
.
office_province
===
list
.
office_city
?(
list
.
office_district
?
list
.
office_city
+
list
.
office_district
:
list
.
office_city
):(
list
.
office_district
?
list
.
office_province
+
list
.
office_city
+
list
.
office_district
:
list
.
office_province
+
list
.
office_city
)):(
list
.
agent_province
===
list
.
agent_city
?(
list
.
agent_district
?
list
.
agent_city
+
list
.
agent_district
:
list
.
agent_city
):(
list
.
agent_district
?
list
.
agent_province
+
list
.
agent_city
+
list
.
agent_district
:
list
.
agent_province
+
list
.
agent_city
)))
}}
</span></div>
</div>
<div
class=
"center"
><span
class=
"firsts"
>
产品型号
</span>
<span
class=
"seconds"
>
{{
list
.
product_code
}}
</span>
</div>
<div
class=
"center"
><span
class=
"firsts"
>
地址
</span>
<span
class=
"seconds"
>
{{
!
list
.
office_id
&&!
list
.
agent_id
?(
list
.
province_id_n
===
list
.
city_id_n
?(
list
.
district_id_n
?
list
.
city_id_n
+
list
.
district_id_n
:
list
.
city_id_n
):(
list
.
district_id_n
?
list
.
province_id_n
+
list
.
city_id_n
+
list
.
district_id_n
:
list
.
province_id_n
+
list
.
city_id_n
)):(
list
.
office_id
?
(
list
.
office_province
===
list
.
office_city
?(
list
.
office_district
?
list
.
office_city
+
list
.
office_district
:
list
.
office_city
):(
list
.
office_district
?
list
.
office_province
+
list
.
office_city
+
list
.
office_district
:
list
.
office_province
+
list
.
office_city
)):(
list
.
agent_province
===
list
.
agent_city
?(
list
.
agent_district
?
list
.
agent_city
+
list
.
agent_district
:
list
.
agent_city
):(
list
.
agent_district
?
list
.
agent_province
+
list
.
agent_city
+
list
.
agent_district
:
list
.
agent_province
+
list
.
agent_city
)))
}}
</span>
</div>
</div>
</div>
</item>
</item>
</list-item>
</list-item>
...
@@ -72,6 +78,7 @@
...
@@ -72,6 +78,7 @@
<
script
>
<
script
>
import
functionState
from
'./functionState'
import
functionState
from
'./functionState'
import
noImg
from
'../../assets/productQuery/none.png'
import
noImg
from
'../../assets/productQuery/none.png'
export
default
{
export
default
{
name
:
'HomePage'
,
name
:
'HomePage'
,
data
()
{
data
()
{
...
@@ -132,7 +139,7 @@ export default {
...
@@ -132,7 +139,7 @@ export default {
console
.
log
(
'&&&&&&&&&&&&___ios'
)
console
.
log
(
'&&&&&&&&&&&&___ios'
)
// if (!$config.isMobilePlatform) {
// if (!$config.isMobilePlatform) {
// }
// }
/*
baidumap_location.getCurrentPosition(function (result) {
baidumap_location
.
getCurrentPosition
(
function
(
result
)
{
if
(
window
.
localStorage
.
getItem
(
'province'
))
{
if
(
window
.
localStorage
.
getItem
(
'province'
))
{
vm
.
city
=
window
.
localStorage
.
getItem
(
'city'
)
vm
.
city
=
window
.
localStorage
.
getItem
(
'city'
)
vm
.
province
=
window
.
localStorage
.
getItem
(
'province'
)
vm
.
province
=
window
.
localStorage
.
getItem
(
'province'
)
...
@@ -143,8 +150,7 @@ export default {
...
@@ -143,8 +150,7 @@ export default {
vm
.
guessingQuery
(
result
.
city
)
vm
.
guessingQuery
(
result
.
city
)
}
}
},
function
(
error
)
{
},
function
(
error
)
{
})*/
})
// }
// setTimeout(vm.guessingQuery(), 0)
// setTimeout(vm.guessingQuery(), 0)
},
},
goFunctionHome
(
data
)
{
goFunctionHome
(
data
)
{
...
@@ -210,6 +216,7 @@ export default {
...
@@ -210,6 +216,7 @@ export default {
vm
.
hlsPopup
.
hideLoading
()
vm
.
hlsPopup
.
hideLoading
()
if
(
res
.
result
===
'S'
)
{
if
(
res
.
result
===
'S'
)
{
window
.
localStorage
.
setItem
(
'bp_type'
,
res
.
info
.
user_bp_type
)
window
.
localStorage
.
setItem
(
'bp_type'
,
res
.
info
.
user_bp_type
)
window
.
localStorage
.
setItem
(
'user_phone'
,
res
.
info
.
user_phone
)
vm
.
user_bp_status
=
res
.
info
.
user_bp_status
vm
.
user_bp_status
=
res
.
info
.
user_bp_status
vm
.
user_bp_class
=
res
.
info
.
user_bp_class
vm
.
user_bp_class
=
res
.
info
.
user_bp_class
vm
.
bp_id
=
res
.
info
.
user_bp_id
vm
.
bp_id
=
res
.
info
.
user_bp_id
...
@@ -271,9 +278,10 @@ export default {
...
@@ -271,9 +278,10 @@ export default {
@import "../../styles/vue-1px";
@import "../../styles/vue-1px";
#homePage {
#homePage {
.content{
.content
{
background-color: #EFEFEF;
background-color: #EFEFEF;
}
}
.top-wrap {
.top-wrap {
width: 100%;
width: 100%;
height: 100px;
height: 100px;
...
@@ -311,9 +319,11 @@ export default {
...
@@ -311,9 +319,11 @@ export default {
display: flex;
display: flex;
justify-content: space-between;
justify-content: space-between;
align-items: center;
align-items: center;
img {
img {
height: 15px;
height: 15px;
}
}
.title {
.title {
flex-grow: 0;
flex-grow: 0;
flex-basis: 70px;
flex-basis: 70px;
...
@@ -322,11 +332,13 @@ export default {
...
@@ -322,11 +332,13 @@ export default {
font-weight: 600;
font-weight: 600;
line-height: 30px;
line-height: 30px;
text-align: center;
text-align: center;
border-right: 1px solid#F1F0F5;
border-right: 1px solid
#F1F0F5;
}
}
ul {
ul {
flex-grow: 2;
flex-grow: 2;
flex-basis: 2;
flex-basis: 2;
li {
li {
height: 30px;
height: 30px;
line-height: 30px;
line-height: 30px;
...
@@ -334,6 +346,7 @@ export default {
...
@@ -334,6 +346,7 @@ export default {
text-align: left;
text-align: left;
text-indent: 15px;
text-indent: 15px;
font-size: 14px;
font-size: 14px;
img {
img {
vertical-align: middle;
vertical-align: middle;
margin-right: 15px;
margin-right: 15px;
...
@@ -356,10 +369,12 @@ export default {
...
@@ -356,10 +369,12 @@ export default {
flex-direction: column;
flex-direction: column;
justify-content: space-around;
justify-content: space-around;
align-items: center;
align-items: center;
img{
img {
margin: 0;
margin: 0;
}
}
div{
div {
margin-bottom: 14px;
margin-bottom: 14px;
ont-family: PingFangSC-Regular;
ont-family: PingFangSC-Regular;
font-size: 13px;
font-size: 13px;
...
@@ -381,19 +396,23 @@ export default {
...
@@ -381,19 +396,23 @@ export default {
.hls-swipe {
.hls-swipe {
width: 100vw;
width: 100vw;
img {
img {
width: 100vw;
width: 100vw;
// height: 100%;
// height: 100%;
}
}
.hls-swipe-indicators{
.hls-swipe-indicators {
left: 54%;
left: 54%;
bottom: 20px;
bottom: 20px;
.hls-swipe-indicators-item{
.hls-swipe-indicators-item {
width: 10px;
width: 10px;
height: 2px;
height: 2px;
border-radius: 0;
border-radius: 0;
}
}
.hls-swipe-indicators-item--active{
.hls-swipe-indicators-item--active {
background-color: #FFF;
background-color: #FFF;
}
}
}
}
...
@@ -405,6 +424,7 @@ export default {
...
@@ -405,6 +424,7 @@ export default {
display: flex;
display: flex;
flex-direction: row;
flex-direction: row;
padding: 0 1% 0 1%;
padding: 0 1% 0 1%;
.left-pic {
.left-pic {
width: 41.6%;
width: 41.6%;
margin-left: 4px;
margin-left: 4px;
...
@@ -443,35 +463,43 @@ export default {
...
@@ -443,35 +463,43 @@ export default {
letter-spacing: 0.57px;
letter-spacing: 0.57px;
height: 40px;
height: 40px;
padding-left: 2%;
padding-left: 2%;
span{
span {
padding-top: 2px;
padding-top: 2px;
margin-left: 4px;
margin-left: 4px;
}
}
img{
img {
width: 14px;
width: 14px;
height: 14px;
height: 14px;
}
}
}
}
.guessing-wrap{
.guessing-wrap {
position: relative;
position: relative;
width: 96%;
width: 96%;
margin: 0 auto;
margin: 0 auto;
.hls-list-item{
.hls-list-item {
border-radius: 10px;
border-radius: 10px;
.contents{
.contents {
padding: 8px 6px 8px 0;
padding: 8px 6px 8px 0;
.add-content{
.add-content {
justify-content: flex-start;
justify-content: flex-start;
}
}
}
}
}
}
}
}
.item-pic {
.item-pic {
width: 110px;
width: 110px;
height: 110px;
height: 110px;
display: flex;
display: flex;
justify-content: center;
justify-content: center;
align-items: center;
align-items: center;
img {
img {
width: 100%;
width: 100%;
// height: 100%;
// height: 100%;
...
@@ -487,20 +515,23 @@ export default {
...
@@ -487,20 +515,23 @@ export default {
margin-top: 10px;
margin-top: 10px;
font-weight: 600;
font-weight: 600;
}
}
.hot {
.hot {
position: absolute;
position: absolute;
top: 0;
top: 0;
right: 0;
right: 0;
width: 45px;
width: 45px;
}
}
.center {
.center {
margin-top: 6px;
margin-top: 6px;
display: flex;
display: flex;
.firsts {
.firsts {
width: 76px;
width: 76px;
font-family: PingFangSC-Regular;
font-family: PingFangSC-Regular;
font-size: 14px;
font-size: 14px;
color: rgba(56,
63,69,
0.60);
color: rgba(56,
63, 69,
0.60);
letter-spacing: 0.5px;
letter-spacing: 0.5px;
}
}
...
...
src/pages/myInfo/my-info.vue
View file @
1c6e32bb
...
@@ -912,6 +912,7 @@ export default {
...
@@ -912,6 +912,7 @@ export default {
if
(
res
.
info
.
user_bp_status
===
'APPROVED'
)
{
if
(
res
.
info
.
user_bp_status
===
'APPROVED'
)
{
vm
.
flag
=
false
vm
.
flag
=
false
}
}
window
.
localStorage
.
setItem
(
'user_phone'
,
res
.
info
.
user_phone
)
vm
.
user_bp_status
=
res
.
info
.
user_bp_status
vm
.
user_bp_status
=
res
.
info
.
user_bp_status
vm
.
user_bp_class
=
res
.
info
.
user_bp_class
vm
.
user_bp_class
=
res
.
info
.
user_bp_class
vm
.
bp_id
=
res
.
info
.
user_bp_id
vm
.
bp_id
=
res
.
info
.
user_bp_id
...
@@ -1087,7 +1088,7 @@ export default {
...
@@ -1087,7 +1088,7 @@ export default {
</
script
>
</
script
>
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
scoped
>
#my-info {
#my-info {
/* .content-wrap{
/* .content-wrap{
margin-left:40px;
margin-left:40px;
}
}
...
@@ -1321,12 +1322,12 @@ export default {
...
@@ -1321,12 +1322,12 @@ export default {
margin-bottom: 68px;
margin-bottom: 68px;
margin-top: 10px;
margin-top: 10px;
}
}
}
}
.content {
.content {
position: relative;
position: relative;
background-color: #fff;
background-color: #fff;
}
}
.right-icon {
.right-icon {
width: 18px;
width: 18px;
height: 18px;
height: 18px;
font-size: 10px;
font-size: 10px;
...
@@ -1335,8 +1336,8 @@ export default {
...
@@ -1335,8 +1336,8 @@ export default {
background-color: red;
background-color: red;
color: #fff;
color: #fff;
border-radius: 50%;
border-radius: 50%;
}
}
.right-icon-width {
.right-icon-width {
width: 24px;
width: 24px;
height: 18px;
height: 18px;
font-size: 10px;
font-size: 10px;
...
@@ -1345,8 +1346,8 @@ export default {
...
@@ -1345,8 +1346,8 @@ export default {
background-color: red;
background-color: red;
color: #fff;
color: #fff;
border-radius: 50%;
border-radius: 50%;
}
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
.platform-ios {
#my-info {
#my-info {
button {
button {
...
@@ -1354,9 +1355,9 @@ export default {
...
@@ -1354,9 +1355,9 @@ export default {
}
}
}
}
}
}
}
}
// iPhoneXR适配
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
.platform-ios {
#my-info {
#my-info {
button {
button {
...
@@ -1364,5 +1365,5 @@ export default {
...
@@ -1364,5 +1365,5 @@ export default {
}
}
}
}
}
}
}
}
</
style
>
</
style
>
src/pages/myInfo/setting.vue
View file @
1c6e32bb
...
@@ -237,6 +237,7 @@ export default {
...
@@ -237,6 +237,7 @@ export default {
if
(
res
.
info
.
user_bp_status
===
'APPROVED'
)
{
if
(
res
.
info
.
user_bp_status
===
'APPROVED'
)
{
vm
.
flag
=
false
vm
.
flag
=
false
}
}
window
.
localStorage
.
setItem
(
'user_phone'
,
res
.
info
.
user_phone
)
vm
.
user_bp_status
=
res
.
info
.
user_bp_status
vm
.
user_bp_status
=
res
.
info
.
user_bp_status
vm
.
user_bp_class
=
res
.
info
.
user_bp_class
vm
.
user_bp_class
=
res
.
info
.
user_bp_class
vm
.
bp_id
=
res
.
info
.
user_bp_id
vm
.
bp_id
=
res
.
info
.
user_bp_id
...
@@ -543,7 +544,7 @@ export default {
...
@@ -543,7 +544,7 @@ export default {
</
script
>
</
script
>
<
style
lang=
"less"
>
<
style
lang=
"less"
>
#setting{
#setting{
.content{
.content{
margin-top:0 ;
margin-top:0 ;
}
}
...
@@ -556,13 +557,13 @@ export default {
...
@@ -556,13 +557,13 @@ export default {
height: 18px;
height: 18px;
display: flex;
display: flex;
align-items: center;
align-items: center;
}
}
.arrow_right {
.arrow_right {
display: flex;
display: flex;
align-items: center;
align-items: center;
img {
img {
height: 20px;
height: 20px;
}
}
}
}
}
}
</
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