Skip to content

H
hls-xcmg-vue-app
Commit 1c6e32bb authored by jiacheng.mao's avatar jiacheng.mao
Browse files
Options

user_phone调整为大写

parent 43139e1a
Hide whitespace changes
Inline Side-by-side
Showing with 337 additions and 303 deletions
src/pages/functionCenter/function-list.vue
View file @ 1c6e32bb
......@@ -181,6 +181,7 @@ export default {
if (res.info.user_bp_status === 'APPROVED') {
vm.flag = false
}
window.localStorage.setItem('user_phone', res.info.user_phone)
vm.user_bp_status = res.info.user_bp_status
vm.user_bp_class = res.info.user_bp_class
vm.bp_id = res.info.user_bp_id
......
src/pages/home/home-page.vue
View file @ 1c6e32bb
......@@ -29,7 +29,9 @@
<div class="functions">
<div class="title">资讯动态</div>
<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>
<img src="@/assets/functionCenter/in@2x.png" @click="gotoNews()">
<!-- <function-item
......@@ -48,7 +50,7 @@
</div>
</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">
<item>
<div slot="name" class="item-pic">
......@@ -58,9 +60,13 @@
<div slot="content" class="item-content">
<div class="top">{{ list.product_name }}</div>
<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">产品型号</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 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">产品型号</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>
</item>
</list-item>
......@@ -72,6 +78,7 @@
<script>
import functionState from './functionState'
import noImg from '../../assets/productQuery/none.png'
export default {
name: 'HomePage',
data () {
......@@ -132,7 +139,7 @@ export default {
console.log('&&&&&&&&&&&&___ios')
// if (!$config.isMobilePlatform) {
// }
/*baidumap_location.getCurrentPosition(function (result) {
baidumap_location.getCurrentPosition(function (result) {
if (window.localStorage.getItem('province')) {
vm.city = window.localStorage.getItem('city')
vm.province = window.localStorage.getItem('province')
......@@ -143,8 +150,7 @@ export default {
vm.guessingQuery(result.city)
}
}, function (error) {
})*/
// }
})
// setTimeout(vm.guessingQuery(), 0)
},
goFunctionHome (data) {
......@@ -210,6 +216,7 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
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_class = res.info.user_bp_class
vm.bp_id = res.info.user_bp_id
......@@ -271,9 +278,10 @@ export default {
@import "../../styles/vue-1px";
#homePage {
.content{
.content {
background-color: #EFEFEF;
}
.top-wrap {
width: 100%;
height: 100px;
......@@ -311,9 +319,11 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
img {
height: 15px;
}
.title {
flex-grow: 0;
flex-basis: 70px;
......@@ -322,11 +332,13 @@ export default {
font-weight: 600;
line-height: 30px;
text-align: center;
border-right: 1px solid#F1F0F5;
border-right: 1px solid #F1F0F5;
}
ul {
flex-grow: 2;
flex-basis: 2;
li {
height: 30px;
line-height: 30px;
......@@ -334,6 +346,7 @@ export default {
text-align: left;
text-indent: 15px;
font-size: 14px;
img {
vertical-align: middle;
margin-right: 15px;
......@@ -356,10 +369,12 @@ export default {
flex-direction: column;
justify-content: space-around;
align-items: center;
img{
margin: 0;
img {
margin: 0;
}
div{
div {
margin-bottom: 14px;
ont-family: PingFangSC-Regular;
font-size: 13px;
......@@ -381,19 +396,23 @@ export default {
.hls-swipe {
width: 100vw;
img {
width: 100vw;
// height: 100%;
}
.hls-swipe-indicators{
.hls-swipe-indicators {
left: 54%;
bottom: 20px;
.hls-swipe-indicators-item{
.hls-swipe-indicators-item {
width: 10px;
height: 2px;
border-radius: 0;
}
.hls-swipe-indicators-item--active{
.hls-swipe-indicators-item--active {
background-color: #FFF;
}
}
......@@ -405,6 +424,7 @@ export default {
display: flex;
flex-direction: row;
padding: 0 1% 0 1%;
.left-pic {
width: 41.6%;
margin-left: 4px;
......@@ -443,35 +463,43 @@ export default {
letter-spacing: 0.57px;
height: 40px;
padding-left: 2%;
span{
padding-top: 2px;
margin-left: 4px;
span {
padding-top: 2px;
margin-left: 4px;
}
img{
img {
width: 14px;
height: 14px;
}
}
.guessing-wrap{
.guessing-wrap {
position: relative;
width: 96%;
margin: 0 auto;
.hls-list-item{
.hls-list-item {
border-radius: 10px;
.contents{
.contents {
padding: 8px 6px 8px 0;
.add-content{
.add-content {
justify-content: flex-start;
}
}
}
}
.item-pic {
width: 110px;
height: 110px;
display: flex;
justify-content: center;
align-items: center;
img {
width: 100%;
// height: 100%;
......@@ -487,20 +515,23 @@ export default {
margin-top: 10px;
font-weight: 600;
}
.hot {
position: absolute;
top: 0;
right: 0;
width: 45px;
}
.center {
margin-top: 6px;
display: flex;
.firsts {
width: 76px;
font-family: PingFangSC-Regular;
font-size: 14px;
color: rgba(56,63,69,0.60);
color: rgba(56, 63, 69, 0.60);
letter-spacing: 0.5px;
}
......
src/pages/myInfo/my-info.vue
View file @ 1c6e32bb
......@@ -328,11 +328,11 @@ export default {
if (res.result === 'S') {
if (res.info) {
vm.upLoadObj =
process.env.filePath +
'attachment_id=' +
res.info.attachment_id +
'&access_token=' +
window.localStorage.access_token
process.env.filePath +
'attachment_id=' +
res.info.attachment_id +
'&access_token=' +
window.localStorage.access_token
} else {
vm.upLoadObj = defaultImg
}
......@@ -386,7 +386,7 @@ export default {
this.popSetect = false
} else if (
(this.bp_id && this.user_bp_status === 'RETURN') ||
(this.bp_id && this.user_bp_status === 'REJECT')
(this.bp_id && this.user_bp_status === 'REJECT')
) {
this.description = '审核未通过'
this.approveBtn = false
......@@ -657,7 +657,7 @@ export default {
let vm = this
this.hlsPopup.showActionSheet({
buttonArray:
(this.bp_id === undefined || vm.user_bp_type === 'MANAGER') ? ['修改头像'] : ['修改头像', '用户信息', '角色切换'],
(this.bp_id === undefined || vm.user_bp_type === 'MANAGER') ? ['修改头像'] : ['修改头像', '用户信息', '角色切换'],
callback: (index) => {
if (index === 0) {
this.imgUploadShow(vm.app_user_id)
......@@ -666,9 +666,9 @@ export default {
} else if (index === 2) {
if (
(vm.user_bp_type === 'TENANT' ||
vm.user_bp_type === 'GUTA' ||
vm.user_bp_type === 'AGENT') &&
vm.user_bp_status === 'APPROVED'
vm.user_bp_type === 'GUTA' ||
vm.user_bp_type === 'AGENT') &&
vm.user_bp_status === 'APPROVED'
) {
vm.$refs.roleSwitchRoleList.show()
} else {
......@@ -912,6 +912,7 @@ export default {
if (res.info.user_bp_status === 'APPROVED') {
vm.flag = false
}
window.localStorage.setItem('user_phone', res.info.user_phone)
vm.user_bp_status = res.info.user_bp_status
vm.user_bp_class = res.info.user_bp_class
vm.bp_id = res.info.user_bp_id
......@@ -943,8 +944,8 @@ export default {
}
if (
vm.user_bp_type === 'GUTA' ||
vm.user_bp_type === 'TENANT' ||
vm.user_bp_type === 'AGENT'
vm.user_bp_type === 'TENANT' ||
vm.user_bp_type === 'AGENT'
) {
vm.isMultiRole = true
} else {
......@@ -1087,282 +1088,282 @@ export default {
</script>
<style lang="less" scoped>
#my-info {
/* .content-wrap{
margin-left:40px;
}
.content-wrap:not(:nth-of-type(1)){
margin-left:70px;
}*/
.card-top {
width: 330px;
margin: 0 auto;
height: 170px;
display: flex;
align-items: center;
.sign {
margin-left: 24px;
height: 55px;
span {
font-family: PingFangSC-Semibold;
font-size: 18px;
color: #fff;
margin-top: 10px;
}
div {
#my-info {
/* .content-wrap{
margin-left:40px;
}
.content-wrap:not(:nth-of-type(1)){
margin-left:70px;
}*/
.card-top {
width: 330px;
margin: 0 auto;
height: 170px;
display: flex;
align-items: center;
.sign {
margin-left: 24px;
height: 55px;
span {
font-family: PingFangSC-Semibold;
font-size: 18px;
color: #fff;
margin-top: 10px;
}
div {
display: flex;
align-items: center;
margin-top: 20px;
font-family: PingFangSC-Regular;
font-size: 12px;
color: #ffffff;
letter-spacing: 0;
p {
display: flex;
align-items: center;
margin-top: 20px;
justify-content: center;
padding: 0 5px;
height: 20px;
margin-left: 10px;
border: 1px solid #fff;
border-radius: 4px;
font-family: PingFangSC-Regular;
font-size: 12px;
color: #ffffff;
letter-spacing: 0;
p {
display: flex;
align-items: center;
justify-content: center;
padding: 0 5px;
height: 20px;
margin-left: 10px;
border: 1px solid #fff;
border-radius: 4px;
font-family: PingFangSC-Regular;
font-size: 12px;
color: #ffffff;
letter-spacing: 0;
}
.across {
background-color: #1d3fff;
}
.un-across {
background: #0523ce;
}
}
}
img {
width: 59px;
height: 59px;
border-radius: 50%;
border: 1px solid #00469c;
.across {
background-color: #1d3fff;
}
.un-across {
background: #0523ce;
}
}
}
.has {
height: 206px;
img {
width: 59px;
height: 59px;
border-radius: 50%;
border: 1px solid #00469c;
}
.antiHas {
height: 3.12rem;
}
.top {
width: 100%;
// height: 206px;
background: url("../../assets/myInfo/back.png") no-repeat;
background-size: 100% 156px;
background-color: #efefef;
.header {
background-color: rgba(0, 0, 0, 0);
.top-word {
font-family: PingFangSC-Semibold;
font-size: 17px;
letter-spacing: 0.61px;
color: #fff;
}
}
.has {
height: 206px;
}
.antiHas {
height: 3.12rem;
}
.top {
width: 100%;
// height: 206px;
background: url("../../assets/myInfo/back.png") no-repeat;
background-size: 100% 156px;
background-color: #efefef;
.header {
background-color: rgba(0, 0, 0, 0);
.top-word {
font-family: PingFangSC-Semibold;
font-size: 17px;
letter-spacing: 0.61px;
color: #fff;
}
.card {
width: 359px;
height: 108px;
}
.card {
width: 359px;
height: 108px;
margin: 0 auto;
z-index: 10;
position: relative;
top: 0px;
left: 0px;
background-color: #fff;
border-radius: 4px;
.card-info {
width: 295px;
margin: 0 auto;
z-index: 10;
position: relative;
top: 0px;
left: 0px;
background-color: #fff;
border-radius: 4px;
.card-info {
width: 295px;
.card-bottom {
height: 100px;
width: 285px;
margin: 0 auto;
.card-bottom {
height: 100px;
width: 285px;
margin: 0 auto;
display: flex;
justify-content: flex-start;
align-items: center;
text-align: center;
p {
font-family: PingFangSC-Regular;
font-size: 13px;
color: #3c3d48;
margin-top: 5px;
}
img {
width: 48px;
height: 48px;
}
div:not(:first-child) {
margin-left: 60px;
}
display: flex;
justify-content: flex-start;
align-items: center;
text-align: center;
p {
font-family: PingFangSC-Regular;
font-size: 13px;
color: #3c3d48;
margin-top: 5px;
}
img {
width: 48px;
height: 48px;
}
div:not(:first-child) {
margin-left: 60px;
}
}
}
}
.my-content {
background-color: #efefef;
display: flex;
justify-content: center;
flex-wrap: wrap;
.content-top {
width: 339px;
height: 121px;
background-color: #fff;
border-radius: 4px;
margin-top: 8px;
.version {
padding: 10px 0;
text-align: center;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
}
}
.my-content {
background-color: #efefef;
display: flex;
justify-content: center;
flex-wrap: wrap;
.content-top {
width: 339px;
height: 121px;
background-color: #fff;
border-radius: 4px;
margin-top: 8px;
.version {
padding: 10px 0;
text-align: center;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
}
.userInfo {
height: 45px;
line-height: 45px;
color: @headerColor;
font-size: 15px;
margin-left: 16px;
}
.userInfo {
height: 45px;
line-height: 45px;
color: @headerColor;
font-size: 15px;
margin-left: 16px;
position: relative;
}
.userInfo::before {
content: "";
display: block;
width: 4px;
height: 20px;
background-color: @headerColor;
position: absolute;
left: -15px;
top: 12px;
}
.my-contract {
// width: 295px;
margin: 0 auto;
display: flex;
// justify-content: space-around;
// align-items: center;
// flex:1;
text-align: center;
padding: 0 6%;
justify-content: flex-start;
.content-wrap {
position: relative;
}
.userInfo::before {
content: "";
display: block;
width: 4px;
height: 20px;
background-color: @headerColor;
position: absolute;
left: -15px;
top: 12px;
}
.my-contract {
// width: 295px;
margin: 0 auto;
width: 50%;
display: flex;
// justify-content: space-around;
// align-items: center;
// flex:1;
text-align: center;
padding: 0 6%;
justify-content: flex-start;
.content-wrap {
position: relative;
width: 50%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.content-wrap-class {
position: absolute;
top: -10px;
left: 56px;
font-size: 10px;
width: 18px;
height: 18px;
text-align: center;
line-height: 18px;
background-color: red;
color: #fff;
border-radius: 50%;
}
.content-wrap-class-width {
position: absolute;
top: -10px;
left: 25px;
font-size: 10px;
width: 24px;
height: 18px;
text-align: center;
line-height: 18px;
background-color: red;
color: #fff;
border-radius: 50%;
}
}
img {
width: 38px;
height: 38px;
flex-direction: column;
align-items: center;
justify-content: center;
.content-wrap-class {
position: absolute;
top: -10px;
left: 56px;
font-size: 10px;
width: 18px;
height: 18px;
text-align: center;
line-height: 18px;
background-color: red;
color: #fff;
border-radius: 50%;
}
p {
font-family: PingFangSC-Regular;
font-size: 12px;
color: #383f45;
margin-top: 5px;
.content-wrap-class-width {
position: absolute;
top: -10px;
left: 25px;
font-size: 10px;
width: 24px;
height: 18px;
text-align: center;
line-height: 18px;
background-color: red;
color: #fff;
border-radius: 50%;
}
/* div:not(:first-child) {
margin-left: 85px;
}*/
}
.list {
width: 339px;
margin: 0 auto;
background-color: #fff;
img {
width: 38px;
height: 38px;
}
p {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
letter-spacing: 0;
line-height: 18px;
font-size: 12px;
color: #383f45;
margin-top: 5px;
}
/* div:not(:first-child) {
margin-left: 85px;
}*/
}
button {
.list {
width: 339px;
height: 40px;
background: @headerColor;
border-radius: 4px;
color: #fff;
margin: 0 auto;
margin-bottom: 68px;
margin-top: 10px;
background-color: #fff;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
letter-spacing: 0;
line-height: 18px;
}
}
.content {
position: relative;
background-color: #fff;
}
.right-icon {
width: 18px;
height: 18px;
font-size: 10px;
text-align: center;
line-height: 18px;
background-color: red;
color: #fff;
border-radius: 50%;
}
.right-icon-width {
width: 24px;
height: 18px;
font-size: 10px;
text-align: center;
line-height: 18px;
background-color: red;
button {
width: 339px;
height: 40px;
background: @headerColor;
border-radius: 4px;
color: #fff;
border-radius: 50%;
margin: 0 auto;
margin-bottom: 68px;
margin-top: 10px;
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
#my-info {
button {
margin-bottom: 98px;
}
}
.content {
position: relative;
background-color: #fff;
}
.right-icon {
width: 18px;
height: 18px;
font-size: 10px;
text-align: center;
line-height: 18px;
background-color: red;
color: #fff;
border-radius: 50%;
}
.right-icon-width {
width: 24px;
height: 18px;
font-size: 10px;
text-align: center;
line-height: 18px;
background-color: red;
color: #fff;
border-radius: 50%;
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
#my-info {
button {
margin-bottom: 98px;
}
}
}
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#my-info {
button {
margin-bottom: 98px;
}
}
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#my-info {
button {
margin-bottom: 98px;
}
}
}
}
</style>
src/pages/myInfo/setting.vue
View file @ 1c6e32bb
......@@ -237,6 +237,7 @@ export default {
if (res.info.user_bp_status === 'APPROVED') {
vm.flag = false
}
window.localStorage.setItem('user_phone', res.info.user_phone)
vm.user_bp_status = res.info.user_bp_status
vm.user_bp_class = res.info.user_bp_class
vm.bp_id = res.info.user_bp_id
......@@ -287,10 +288,10 @@ export default {
if (res.result === 'S') {
if (res.info) {
vm.upLoadObj = process.env.filePath +
'attachment_id=' +
res.info.attachment_id +
'&access_token=' +
window.localStorage.access_token
'attachment_id=' +
res.info.attachment_id +
'&access_token=' +
window.localStorage.access_token
} else {
vm.upLoadObj = defaultImg
}
......@@ -315,7 +316,7 @@ export default {
this.popSetect = false
} else if (
(this.bp_id && this.user_bp_status === 'RETURN') ||
(this.bp_id && this.user_bp_status === 'REJECT')
(this.bp_id && this.user_bp_status === 'REJECT')
) {
this.description = '审核未通过'
this.approveBtn = false
......@@ -543,26 +544,26 @@ export default {
</script>
<style lang="less">
#setting{
.content{
margin-top:0 ;
}
.updateSign {
background: red;
color: white;
padding: 0 4px;
border-radius: 3px;
font-size: 8px;
height: 18px;
display: flex;
align-items: center;
}
.arrow_right {
display: flex;
align-items: center;
img {
height: 20px;
}
}
#setting{
.content{
margin-top:0 ;
}
.updateSign {
background: red;
color: white;
padding: 0 4px;
border-radius: 3px;
font-size: 8px;
height: 18px;
display: flex;
align-items: center;
}
.arrow_right {
display: flex;
align-items: center;
img {
height: 20px;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment