Commit dabca616 authored by Jennie Shi's avatar Jennie Shi

样式调整

parent 4535da18
...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"2.6.8"' currentVersion: '"2.6.9"'
} }
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<span>合同创建</span> <span>合同创建</span>
</div> </div>
</h-header> </h-header>
<h-content class="scroll-content"> <h-content>
<list-item :item-height="44" class="second-part"> <list-item :item-height="44" class="second-part">
<item :showArrow="true" @click.native="picker"> <item :showArrow="true" @click.native="picker">
<div slot="name" class="font-color required">承租人</div> <div slot="name" class="font-color required">承租人</div>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<input type="text" placeholder="请输入承租人名称/证件号码"> <input type="text" placeholder="请输入承租人名称/证件号码">
</div> </div>
<scroll <scroll
ref="scroll" ref="scroll" class="scroll-content"
> >
<div class="wrap"> <div class="wrap">
<div v-for="(item,index) in showLists" :key="index" class="contract-lists" > <div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
...@@ -572,8 +572,12 @@ export default { ...@@ -572,8 +572,12 @@ export default {
<style lang="less" type="text/less"> <style lang="less" type="text/less">
#sales-info { #sales-info {
.content{
margin-top:0;
}
.scroll-content{ .scroll-content{
margin-top:60px; margin-top:0;
top:100px;
} }
.date-pic { .date-pic {
height: 17px; height: 17px;
...@@ -627,7 +631,6 @@ export default { ...@@ -627,7 +631,6 @@ export default {
.wrap { .wrap {
width: 100%; width: 100%;
padding: 8px; padding: 8px;
margin-top: 50px;
.contract-lists { .contract-lists {
width: 100%; width: 100%;
background: #fff; background: #fff;
...@@ -671,7 +674,6 @@ export default { ...@@ -671,7 +674,6 @@ export default {
} }
.content{ .content{
position: absolute; position: absolute;
top:0;
} }
.scrollContent{ .scrollContent{
padding-top: 0 !important; padding-top: 0 !important;
......
<!--
* @Descrip: 主页
* @Author: your name
* @Date: 2019-10-10 14:25:15
* @LastEditTime: 2019-11-14 09:56:22
* @LastEditors: Please set LastEditors
-->
<template> <template>
<h-view id="homePage" class="public-style" title="待办审批"> <h-view id="toDoList" class="public-style" title="待办审批">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5, 1, 1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()"> <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>待办审批</span> <span>待办审批</span>
</div> </div>
</h-header> </h-header>
<div class="wrap has-header"> <div class="wrap has-header">
<div class="tab"> <div class="tab">
<p><span :class="{'selected':selected === 'todo'}" @click="isSelected('todo')"><img v-if="selected === 'todo'" src='@/assets/functionCenter/todo-check.png'><img v-if="selected === 'done'" src='@/assets/functionCenter/todo.png'>待办</span></p> <p>
<p><span :class="{'selected':selected === 'done'}" @click="isSelected('done')"><img v-if="selected === 'done'" src='@/assets/functionCenter/done-check.png'><img v-if="selected === 'todo'" src='@/assets/functionCenter/done.png'>已办</span></p> <span
</div> :class="{ selected: selected === 'todo' }"
<div class="search"> @click="isSelected('todo')"
<input v-model="searchInput" type="text" v-on:input="searchList()" placeholder="请输入用户名称"> ><img
</div> v-if="selected === 'todo'"
src="@/assets/functionCenter/todo-check.png"
><img
v-if="selected === 'done'"
src="@/assets/functionCenter/todo.png"
>待办</span
>
</p>
<p>
<span
:class="{ selected: selected === 'done' }"
@click="isSelected('done')"
><img
v-if="selected === 'done'"
src="@/assets/functionCenter/done-check.png"
><img
v-if="selected === 'todo'"
src="@/assets/functionCenter/done.png"
>已办</span
>
</p>
</div>
<div class="search">
<input
v-model="searchInput"
type="text"
placeholder="请输入用户名称"
@input="searchList()"
>
</div>
</div> </div>
<div v-if="(todoList.length === 0 && selected === 'todo') || (doneList.length === 0 && selected === 'done')"> <div
v-if="
(todoList.length === 0 && selected === 'todo') ||
(doneList.length === 0 && selected === 'done')
"
>
<div class="display"> <div class="display">
<img src="@/assets/messageCenter/noMsg.png" alt=""> <img src="@/assets/messageCenter/noMsg.png" alt="" >
</div> </div>
</div> </div>
<scroll <scroll
v-if="selected === 'todo' && todoList.length > 0" v-if="selected === 'todo' && todoList.length > 0"
ref="scroll" ref="scroll"
:updateData="todoList" :updateData="todoList"
:pullUp="true" :pullUp="true"
:autoUpdate="true" :autoUpdate="true"
:listenScroll="true" :listenScroll="true"
class="scroll-content"
@pullingUp="loadMore()" @pullingUp="loadMore()"
> >
<div class="pay-content"> <div class="pay-content">
<div v-for="(item,index) in todoList" :key="index" class="contract-item"> <div
v-for="(item, index) in todoList"
:key="index"
class="contract-item"
>
<div class="header"> <div class="header">
<img src="@/assets/contractRepayment/contract.png" alt=""> <img src="@/assets/contractRepayment/contract.png" alt="" >
<h2>客户准入审批</h2> <h2>客户准入审批</h2>
<p><img src="@/assets/functionCenter/in@2x.png" alt="" @click="approvalInfo(item.document_id, item.document_name, item.record_id, 'todo', item.bp_class)"></p> <p>
<img
src="@/assets/functionCenter/in@2x.png"
alt=""
@click="
approvalInfo(
item.document_id,
item.document_name,
item.record_id,
'todo',
item.bp_class
)
"
>
</p>
</div> </div>
<div class="center"> <div class="center">
<h2>客户名称</h2> <h2>客户名称</h2>
...@@ -61,11 +107,29 @@ ...@@ -61,11 +107,29 @@
@pullingUp="loadMore()" @pullingUp="loadMore()"
> >
<div class="pay-content"> <div class="pay-content">
<div v-for="(item,index) in doneList" :key="index" class="contract-item"> <div
v-for="(item, index) in doneList"
:key="index"
class="contract-item"
>
<div class="header"> <div class="header">
<img src="@/assets/contractRepayment/contract.png" alt=""> <img src="@/assets/contractRepayment/contract.png" alt="" >
<h2>客户准入审批</h2> <h2>客户准入审批</h2>
<p><img src="@/assets/functionCenter/in@2x.png" alt="" @click="approvalInfo(item.document_id, item.document_name, item.record_id, 'done', item.bp_class)"></p> <p>
<img
src="@/assets/functionCenter/in@2x.png"
alt=""
@click="
approvalInfo(
item.document_id,
item.document_name,
item.record_id,
'done',
item.bp_class
)
"
>
</p>
</div> </div>
<div class="center"> <div class="center">
<h2>客户名称</h2> <h2>客户名称</h2>
...@@ -83,21 +147,20 @@ export default { ...@@ -83,21 +147,20 @@ export default {
name: 'ToDoList', name: 'ToDoList',
data () { data () {
return { return {
selected: 'todo', selected: 'todo',
searchInput: '', searchInput: '',
todoList: [], todoList: [],
doneList: [], doneList: [],
pageNum: 1, pageNum: 1,
pageNum_1: 1, pageNum_1: 1,
mysetTimeout: null mysetTimeout: null,
} }
}, },
watch: { // watch: {},
}, // created () {
created () { // this.getTodoList()
this.getTodoList() // this.getDoneList()
this.getDoneList() // },
},
activated () { activated () {
this.getTodoList() this.getTodoList()
this.getDoneList() this.getDoneList()
...@@ -121,7 +184,7 @@ export default { ...@@ -121,7 +184,7 @@ export default {
}, },
getTodoList () { getTodoList () {
this.pageNum = 1 this.pageNum = 1
this.todoList = []; this.todoList = []
let param = { let param = {
document_name: '', document_name: '',
phone: window.localStorage.getItem('user_phone'), phone: window.localStorage.getItem('user_phone'),
...@@ -135,6 +198,7 @@ export default { ...@@ -135,6 +198,7 @@ export default {
let returnData = [] let returnData = []
if (res.result === 'S') { if (res.result === 'S') {
returnData = res.lists returnData = res.lists
debugger
returnData.forEach((data, index, array) => { returnData.forEach((data, index, array) => {
this.todoList.push(data) this.todoList.push(data)
}) })
...@@ -145,7 +209,7 @@ export default { ...@@ -145,7 +209,7 @@ export default {
}, },
getDoneList () { getDoneList () {
this.pageNum_1 = 1 this.pageNum_1 = 1
this.doneList = []; this.doneList = []
let param = { let param = {
document_name: '', document_name: '',
phone: window.localStorage.getItem('user_phone'), phone: window.localStorage.getItem('user_phone'),
...@@ -170,8 +234,8 @@ export default { ...@@ -170,8 +234,8 @@ export default {
loadMore () { loadMore () {
let url let url
let param let param
if (this.selected === "todo") { if (this.selected === 'todo') {
this.pageNum ++ this.pageNum++
url = $config.basePath + 'to_do_list' url = $config.basePath + 'to_do_list'
param = { param = {
document_name: this.searchInput, document_name: this.searchInput,
...@@ -179,8 +243,8 @@ export default { ...@@ -179,8 +243,8 @@ export default {
phone: window.localStorage.getItem('user_phone'), phone: window.localStorage.getItem('user_phone'),
pagesize: 10, pagesize: 10,
} }
} else if (this.selected === "done") { } else if (this.selected === 'done') {
this.pageNum_1 ++ this.pageNum_1++
url = $config.basePath + 'done_list' url = $config.basePath + 'done_list'
param = { param = {
document_name: this.searchInput, document_name: this.searchInput,
...@@ -217,7 +281,7 @@ export default { ...@@ -217,7 +281,7 @@ export default {
} }
}) })
}, },
approvalInfo(document_id, document_name, record_id, type, bpclass) { approvalInfo (document_id, document_name, record_id, type, bpclass) {
this.$router.push({ this.$router.push({
name: 'approvalInfo', name: 'approvalInfo',
params: { params: {
...@@ -228,381 +292,386 @@ export default { ...@@ -228,381 +292,386 @@ export default {
bpclass: bpclass, bpclass: bpclass,
}, },
}) })
} },
}, },
} }
</script> </script>
<style lang='less' scoped> <style lang='less' scoped>
@import "../../styles/vue-1px"; @import "../../styles/vue-1px";
.display { .display {
position: fixed; position: fixed;
top: 0; top: 0;
img {
width: 100%;
height: 100%;
}
}
#toDoList {
.scroll-content {
top: 100px;
}
.wrap {
width: 100%;
position: absolute;
z-index: 100;
}
.tab {
display: flex;
background-color: #fff;
padding: 6px 8px 4px 6px;
img { img {
width: 100%; vertical-align: middle;
height: 100%; width: 15px;
// margin-top: -70px; height: 15px;
margin-right: 10px;
position: relative;
top: -2px;
}
p {
text-align: center;
flex: auto;
span {
display: block;
padding: 6px 0;
background-color: #fff;
font-family: PingFangSC-Regular;
font-size: 15px;
color: #656464;
}
span.selected {
background: rgba(29, 63, 255, 0.2);
border-radius: 20px;
color: #1d3fff;
font-family: PingFangSC-Semibold;
font-weight: 700;
}
} }
} }
#homePage { .search {
.wrap { background-color: #fff;
width: 100%; padding: 8px 12px;
position: absolute; position: relative;
z-index: 100 input {
background: url("../../assets/contractStart/search1.png") 320px no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
padding-left: 12px;
border-radius: 4px;
height: 36px;
line-height: 36px;
width: 100%;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #888c8f;
} }
.tab {
display: flex;
background-color: #fff;
padding: 6px 8px 4px 6px;
img {
vertical-align: middle;
width: 15px;
height: 15px;
margin-right: 10px;
position: relative;
top: -2px;
}
p {
text-align: center;
flex: auto;
span { input::placeholder {
display: block; font-family: PingFangSC-Regular;
padding: 6px 0; font-size: 14px;
background-color: #fff; color: #888c8f;
font-family: PingFangSC-Regular; letter-spacing: 0;
font-size: 15px; }
color: #656464;
}
span.selected { input:focus {
background: rgba(29,63,255,.2); background: url("../../assets/contractStart/search2.png") 320px no-repeat;
border-radius: 20px; background-size: 16px 16px;
color: #1D3FFF; background-color: rgba(239, 239, 239, 0.55);
font-family: PingFangSC-Semibold; border: 2px solid #bcc6ff;
font-weight: 700;
}
}
} }
.search { }
background-color: #fff; .pay-content {
padding: 8px 12px; padding: 8px 8px;
.contract-item {
background-color: #fff;
margin-bottom: 8px;
.header {
position: relative; position: relative;
input { height: 44px;
background: url("../../assets/contractStart/search1.png") 320px no-repeat; p img{
background-size: 16px 16px; width: 22px;
background-color: rgba(239,239,239,0.55); height: 22px;
padding-left: 12px;
border-radius: 4px;
height: 36px;
line-height: 36px;
width: 100%;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #888C8F;
} }
img {
input::placeholder { position: absolute;
font-family: PingFangSC-Regular; width: 30px;
font-size: 14px; height: 30px;
color: #888C8F; left: 10px;
letter-spacing: 0; top: 8px;
} }
h2 {
input:focus { position: absolute;
background: url("../../assets/contractStart/search2.png") 320px no-repeat; top: 14px;
background-size: 16px 16px; left: 50px;
background-color: rgba(239, 239, 239, 0.55); font-family: PingFangSC-Semibold;
border: 2px solid #bcc6ff; font-size: 14px;
color: #4b4a4b;
letter-spacing: 0;
margin: 0px;
} }
} p {
.pay-content { img {
padding: 8px 8px;
.contract-item {
background-color: #fff;
margin-bottom: 8px;
.header {
position: relative; position: relative;
height: 44px; top: 0;
img { left: 0;
position: absolute; }
width: 30px; position: absolute;
height: 30px; right: 10px;
left: 10px; top: 8px;
top: 8px; // width: 57px;
} padding: 2px 4px;
h2 { // height: 21px;
position: absolute; // line-height: 19px;
top: 14px; text-align: center;
left: 50px; border-radius: 2px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #4B4A4B;
letter-spacing: 0;
margin: 0px;
}
p {
img {
position: relative;
top: 0;
left: 0;
}
position: absolute;
right: 10px;
top: 8px;
// width: 57px;
padding: 2px 4px;
// height: 21px;
// line-height: 19px;
text-align: center;
border-radius: 2px;
font-family: PingFangSC-Regular;
font-size: 14px;
}
} }
}
.center { .center {
position: relative; position: relative;
height: 44px; height: 44px;
background: rgba(239, 239, 239, 0.55); background: rgba(239, 239, 239, 0.55);
h2 { h2 {
position: absolute; position: absolute;
top: 13px; top: 13px;
left: 15px; left: 15px;
font-size: 14px; font-size: 14px;
color: #4B4A4B; color: #4b4a4b;
letter-spacing: 0; letter-spacing: 0;
margin: 0px; margin: 0px;
}
p {
position: absolute;
right: 20px;
top: 13px;
// width: 57px;
padding: 2px 4px;
// height: 21px;
// line-height: 19px;
text-align: center;
border-radius: 2px;
font-family: PingFangSC-Regular;
font-size: 14px;
}
} }
p {
position: absolute;
right: 20px;
top: 13px;
// width: 57px;
padding: 2px 4px;
// height: 21px;
// line-height: 19px;
text-align: center;
border-radius: 2px;
font-family: PingFangSC-Regular;
font-size: 14px;
} }
}
} }
.content{ }
background-color: #EFEFEF; .content {
} background-color: #efefef;
.top-wrap { }
width: 100%; .top-wrap {
height: 100px; width: 100%;
background-color: @headerColor; height: 100px;
border-bottom-right-radius: 30%; background-color: @headerColor;
border-bottom-left-radius: 30%; border-bottom-right-radius: 30%;
position: absolute; border-bottom-left-radius: 30%;
top: 0; position: absolute;
} top: 0;
}
.top-wrap-white { .top-wrap-white {
width: 100%; width: 100%;
height: 100px; height: 100px;
position: absolute; position: absolute;
top: 100px; top: 100px;
} }
.home-city { .home-city {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
}
.h-header .h-header-left .h-header-btn:first-of-type {
padding-left: 0.2rem;
}
.functions {
height: 108px;
width: 96%;
margin: -6px auto 10px;
border-radius: 10px;
background: #fff;
padding-top: 10px;
display: flex;
justify-content: space-between;
&:before {
content: "";
} }
.h-header .h-header-left .h-header-btn:first-of-type { &:after {
padding-left: 0.2rem; content: "";
} }
.functions { .function-item {
height: 108px; height: 100%;
width: 96%;
margin: -6px auto 10px;
border-radius: 10px;
background: #fff;
padding-top: 10px;
display: flex; display: flex;
justify-content: space-between; flex-direction: column;
justify-content: space-around;
&:before { align-items: center;
content: '' img {
margin: 0;
} }
div {
&:after { margin-bottom: 14px;
content: '' ont-family: PingFangSC-Regular;
font-size: 13px;
color: #3c3d48;
letter-spacing: 0;
} }
}
}
.function-item { .h-header .h-header-center div {
height: 100%; text-align: left !important;
display: flex; }
flex-direction: column;
justify-content: space-around;
align-items: center;
img{
margin: 0;
}
div{
margin-bottom: 14px;
ont-family: PingFangSC-Regular;
font-size: 13px;
color: #3C3D48;
letter-spacing: 0;
}
}
} .locations {
height: 24px;
width: 24px;
}
.h-header .h-header-center div { .hls-swipe {
text-align: left !important; width: 100vw;
img {
width: 100vw;
// height: 100%;
} }
.hls-swipe-indicators {
.locations { left: 54%;
height: 24px; bottom: 20px;
width: 24px; .hls-swipe-indicators-item {
width: 10px;
height: 2px;
border-radius: 0;
}
.hls-swipe-indicators-item--active {
background-color: #fff;
}
} }
}
.center-pic {
margin-top: 10px;
width: 100%;
display: flex;
flex-direction: row;
padding: 0 1% 0 1%;
.left-pic {
width: 41.6%;
margin-left: 4px;
.hls-swipe {
width: 100vw;
img { img {
width: 100vw; width: 100%;
// height: 100%; height: 100%;
}
.hls-swipe-indicators{
left: 54%;
bottom: 20px;
.hls-swipe-indicators-item{
width: 10px;
height: 2px;
border-radius: 0;
}
.hls-swipe-indicators-item--active{
background-color: #FFF;
}
} }
} }
.center-pic { .right-pic {
margin-top: 10px; width: 55.2%;
width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: column;
padding: 0 1% 0 1%; margin-left: 4px;
.left-pic {
width: 41.6%;
margin-left: 4px;
img { img {
width: 100%; max-width: 100%;
height: 100%; height: auto;
}
} }
.right-pic { img:nth-of-type(2) {
width: 55.2%; margin-top: 4px;
display: flex; }
flex-direction: column; }
margin-left: 4px; }
img {
max-width: 100%;
height: auto;
}
img:nth-of-type(2) { .guessing {
margin-top: 4px; display: flex;
align-items: center;
height: 22px;
font-family: PingFangSC-Semibold;
font-size: 16px;
color: #00469c;
font-weight: 600;
letter-spacing: 0.57px;
height: 40px;
padding-left: 2%;
span {
padding-top: 2px;
margin-left: 4px;
}
img {
width: 14px;
height: 14px;
}
}
.guessing-wrap {
position: relative;
width: 96%;
margin: 0 auto;
.hls-list-item {
border-radius: 10px;
.contents {
padding: 8px 6px 8px 0;
.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%;
}
}
.guessing { .item-content {
display: flex; .top {
align-items: center;
height: 22px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 16px; font-size: 16px;
color: #00469C; color: #3b3b3b;
letter-spacing: 0.54px;
margin-top: 10px;
font-weight: 600; font-weight: 600;
letter-spacing: 0.57px;
height: 40px;
padding-left: 2%;
span{
padding-top: 2px;
margin-left: 4px;
}
img{
width: 14px;
height: 14px;
}
} }
.guessing-wrap{ .hot {
position: relative; position: absolute;
width: 96%; top: 0;
margin: 0 auto; right: 0;
.hls-list-item{ width: 45px;
border-radius: 10px;
.contents{
padding: 8px 6px 8px 0;
.add-content{
justify-content: flex-start;
}
}
}
} }
.item-pic { .center {
width: 110px; margin-top: 6px;
height: 110px;
display: flex; display: flex;
justify-content: center; .firsts {
align-items: center; width: 76px;
img { font-family: PingFangSC-Regular;
width: 100%; font-size: 14px;
// height: 100%; color: rgba(56, 63, 69, 0.6);
letter-spacing: 0.5px;
} }
}
.item-content { .seconds {
.top { flex: 1;
font-family: PingFangSC-Semibold; text-align: left;
font-size: 16px;
color: #3B3B3B;
letter-spacing: 0.54px;
margin-top: 10px;
font-weight: 600; font-weight: 600;
} font-family: PingFangSC-Semibold;
.hot { font-size: 14px;
position: absolute; color: #4b4a4b;
top: 0; letter-spacing: 0.5px;
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);
letter-spacing: 0.5px;
}
.seconds {
flex: 1;
text-align: left;
font-weight: 600;
font-family: PingFangSC-Semibold;
font-size: 14px;
color: #4B4A4B;
letter-spacing: 0.5px;
}
} }
} }
} }
}
</style> </style>
<template> <template>
<h-view class="setting" title="设置"> <h-view id="setting" class="public-style" title="设置">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()"> <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
...@@ -7,38 +7,38 @@ ...@@ -7,38 +7,38 @@
</div> </div>
</h-header> </h-header>
<h-content> <h-content>
<div class="setting"> <div class="setting">
<list-item :item-height="66" class="list"> <list-item :item-height="66" class="list">
<item @click.native="imgUploadShow(app_user_id)"> <item @click.native="imgUploadShow(app_user_id)">
<div slot="name" style="color:#656464;">修改头像</div> <div slot="name" style="color:#656464;">修改头像</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div> <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
</item> </item>
</list-item> </list-item>
<list-item :item-height="50" class="list"> <list-item :item-height="50" class="list">
<item :show-arrow="true" @click.native="changePageHead()"> <item @click.native="changePageHead()">
<div slot="name" style="color:#656464;">修改信息</div> <div slot="name" style="color:#656464;">修改信息</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div> <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
</item> </item>
<item @click.native="changeRole()"> <item @click.native="changeRole()">
<div slot="name" style="color:#656464;">角色切换</div> <div slot="name" style="color:#656464;">角色切换</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div> <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
</item> </item>
<item @click.native="resetPwd()"> <item @click.native="resetPwd()">
<div slot="name" style="color:red;">修改密码</div> <div slot="name" style="color:red;">修改密码</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div> <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
</item> </item>
<item @click.native="updateVersion()"> <item @click.native="updateVersion()">
<div slot="name" style="color:#656464;width:100%;">版本更新&nbsp;&nbsp;&nbsp; <div slot="name" style="color:#656464;width:100%;">版本更新&nbsp;&nbsp;&nbsp;
<span class="updateSign" v-if="version > currentVersion">NEW</span> <!-- <span v-if="version" class="updateSign">NEW</span> -->
<span style="float:right;color:#383F45;opacity:0.4;">当前版本&nbsp;&nbsp;{{currentVersion}}</span> </div>
</div> <div slot="right-icon" style="float:right;color:#383F45;opacity:0.4;">当前版本&nbsp;&nbsp;{{ currentVersion }}</div>
</item> </item>
<item @click.native="unBind()"> <item @click.native="unBind()">
<div slot="name" style="color:#656464;">解除绑定</div> <div slot="name" style="color:#656464;">解除绑定</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div> <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
</item> </item>
</list-item> </list-item>
</div> </div>
</h-content> </h-content>
<role-switch <role-switch
v-show="roleSwitchFlag" v-show="roleSwitchFlag"
...@@ -56,7 +56,7 @@ import defaultImg from '../../assets/myInfo/1.png' ...@@ -56,7 +56,7 @@ import defaultImg from '../../assets/myInfo/1.png'
export default { export default {
components: { components: {
roleSwitch, roleSwitch,
defaultImg defaultImg,
}, },
data () { data () {
return { return {
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
}, },
computed: { computed: {
roleList () { roleList () {
let roleObj = {'TENANT':'主承租人','GUTA':'担保人','FACTORY':'主机厂','AGENT':'经销商','OFFICE':'办事处'} let roleObj = {'TENANT': '主承租人', 'GUTA': '担保人', 'FACTORY': '主机厂', 'AGENT': '经销商', 'OFFICE': '办事处'}
let obj = { let obj = {
bp_type: this.user_bp_type, bp_type: this.user_bp_type,
bp_type_n: roleObj[this.user_bp_type], bp_type_n: roleObj[this.user_bp_type],
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
}, },
hote_update_version (content, url) { hote_update_version (content, url) {
hlsPopup.showConfirm({ hlsPopup.showConfirm({
title: '版本更新'+ this.version, title: '版本更新' + this.version,
content: content, content: content,
onConfirm: function (index) { onConfirm: function (index) {
if (index === 1) { if (index === 1) {
...@@ -337,14 +337,14 @@ export default { ...@@ -337,14 +337,14 @@ export default {
await this.getMultipleRole() await this.getMultipleRole()
vm.$refs.roleSwitchRoleList.show() vm.$refs.roleSwitchRoleList.show()
} else { } else {
hlsPopup.showLongCenter('您当前尚无可用角色') hlsPopup.showLongCenter('您当前尚无可用角色')
} }
}, },
// 用户信息 // 用户信息
changePageHead () { changePageHead () {
let vm = this let vm = this
if (vm.bp_id) { if (vm.bp_id) {
if (vm.user_bp_status === 'NEW' ||vm.user_bp_status === 'RETURN') { if (vm.user_bp_status === 'NEW' || vm.user_bp_status === 'RETURN') {
vm.flag = true vm.flag = true
if (vm.user_bp_class === 'NP') { if (vm.user_bp_class === 'NP') {
vm.$router.push({ vm.$router.push({
...@@ -542,12 +542,16 @@ export default { ...@@ -542,12 +542,16 @@ export default {
hlsPopup.hideLoading() hlsPopup.hideLoading()
} }
}, },
} },
} }
</script> </script>
<style lang="less"> <style lang="less">
.updateSign { #setting{
.content{
margin-top:0 ;
}
.updateSign {
background: red; background: red;
color: white; color: white;
padding: 0 5px; padding: 0 5px;
...@@ -560,4 +564,5 @@ export default { ...@@ -560,4 +564,5 @@ export default {
height: 20px; height: 20px;
} }
} }
}
</style> </style>
<!--
* @Descrip: 主页
* @Author: your name
* @Date: 2019-10-10 14:25:15
* @LastEditTime: 2019-11-14 09:56:22
* @LastEditors: Please set LastEditors
-->
<template> <template>
<h-view id="newList" class="public-style" title="资讯动态"> <h-view id="newList" class="public-style" title="资讯动态">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5, 1, 1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()"> <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>资讯动态</span> <span>资讯动态</span>
</div> </div>
</h-header> </h-header>
<div class="search has-header"> <div class="search has-header">
<input v-model="searchInput" type="text" v-on:input="searchList()" placeholder="请输入标题名称"> <input
v-model="searchInput"
type="text"
placeholder="请输入标题名称"
@input="searchList()"
>
</div> </div>
<div v-if="newsList.length === 0"> <div v-if="newsList.length === 0">
<div class="display"> <div class="display">
<img src="@/assets/messageCenter/noMsg.png" alt=""> <img src="@/assets/messageCenter/noMsg.png" alt="" >
</div> </div>
</div> </div>
<scroll <scroll
...@@ -27,13 +25,29 @@ ...@@ -27,13 +25,29 @@
:pullUp="true" :pullUp="true"
:autoUpdate="true" :autoUpdate="true"
:listenScroll="true" :listenScroll="true"
class="scroll-content"
@pullingUp="loadMore()" @pullingUp="loadMore()"
> >
<div class="pay-content" v-for="(item,index) in newsList" :key="index" @click="newsInfo(item.new_id)"> <div
v-for="(item, index) in newsList"
:key="index"
class="pay-content"
@click="newsInfo(item.new_id)"
>
<ul> <ul>
<li><img class="title_logo" src="@/assets/homePage/inform.png">{{item.new_title}}</li> <li>
<li>{{item.new_note}}</li> <img class="title_logo" src="@/assets/homePage/inform.png" >{{
<li>{{item.new_date}}<span>查看详情<img src="@/assets/functionCenter/in@2x.png"></span></li> item.new_title
}}
</li>
<li>{{ item.new_note }}</li>
<li>
{{ item.new_date
}}<span
>查看详情<img
src="@/assets/functionCenter/in@2x.png"
></span>
</li>
</ul> </ul>
</div> </div>
</scroll> </scroll>
...@@ -46,16 +60,15 @@ export default { ...@@ -46,16 +60,15 @@ export default {
name: 'ToDoList', name: 'ToDoList',
data () { data () {
return { return {
searchInput: '', searchInput: '',
newsList: [], newsList: [],
pageNum: 1, pageNum: 1,
mysetTimeout: null mysetTimeout: null,
} }
}, },
watch: { watch: {},
},
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next((vm) => {
vm.searchInput = '' vm.searchInput = ''
vm.pageNum = 1 vm.pageNum = 1
vm.getNewsList() vm.getNewsList()
...@@ -113,7 +126,7 @@ export default { ...@@ -113,7 +126,7 @@ export default {
}) })
}, },
loadMore () { loadMore () {
this.pageNum ++ this.pageNum++
let url let url
let param let param
url = $config.basePath + 'news_query_list' url = $config.basePath + 'news_query_list'
...@@ -150,97 +163,100 @@ export default { ...@@ -150,97 +163,100 @@ export default {
} }
</script> </script>
<style lang='less'> <style lang='less'>
@import "../../styles/vue-1px"; @import "../../styles/vue-1px";
.display { .display {
position: fixed; position: fixed;
top: 0; top: 0;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
// margin-top: -70px; // margin-top: -70px;
}
} }
#newList { }
background: #EFEFEF; #newList {
.pay-content { background: #efefef;
width: 96%; .scroll-content {
margin: 10px auto; top: 50px;
border-radius: 10px; }
background: #fff; .pay-content {
padding: 10px 20px; width: 96%;
display: flex; margin: 10px auto;
justify-content: space-between; border-radius: 10px;
align-items: center; background: #fff;
ul { padding: 10px 20px;
flex-grow: 1; display: flex;
li { justify-content: space-between;
height: 30px; align-items: center;
line-height: 30px; ul {
font-size: 14px; flex-grow: 1;
li {
height: 30px;
line-height: 30px;
font-size: 14px;
vertical-align: middle;
text-align: left;
overflow: hidden;
.title_logo {
margin-right: 15px;
}
img {
vertical-align: middle; vertical-align: middle;
text-align: left; width: 15px;
overflow: hidden; }
.title_logo { &:nth-child(2) {
margin-right: 15px; border-bottom: 1px solid #f1f0f5;
} }
img { span {
vertical-align: middle; color: #1d3fff;
width: 15px; float: right;
} }
&:nth-child(2) { &:nth-child(2) {
border-bottom: 1px solid #F1F0F5; font-family: PingFangSC-Regular;
} font-size: 14px;
span { color: rgba(56, 63, 69, 0.6);
color: #1D3FFF; letter-spacing: 0;
float: right; }
} &:nth-child(3) {
&:nth-child(2) { font-family: PingFangSC-Regular;
font-family: PingFangSC-Regular; font-size: 14px;
font-size: 14px; color: rgba(56, 63, 69, 0.6);
color: rgba(56,63,69,0.60); letter-spacing: 0;
letter-spacing: 0;
}
&:nth-child(3) {
font-family: PingFangSC-Regular;
font-size: 14px;
color: rgba(56,63,69,0.60);
letter-spacing: 0;
}
} }
} }
} }
.search { }
background-color: #fff; .search {
padding: 8px 12px; background-color: #fff;
position: absolute; padding: 8px 12px;
position: absolute;
width: 100%;
z-index: 100;
margin-bottom: 8px;
input {
padding-left: 12px;
height: 36px;
width: 100%; width: 100%;
z-index: 100; font-family: PingFangSC-Regular;
margin-bottom: 8px; font-size: 14px;
input { color: #21254c;
padding-left: 12px; line-height: 36px;
height: 36px; border-radius: 4px;
width: 100%; background: url("../../assets/contractStart/search1.png") 320px no-repeat;
font-family: PingFangSC-Regular; background-size: 16px 16px;
font-size: 14px; background-color: rgba(239, 239, 239, 0.55);
color: #21254c; }
line-height: 36px; input::placeholder {
border-radius: 4px; font-family: PingFangSC-Regular;
background: url("../../assets/contractStart/search1.png") 320px no-repeat; font-size: 14px;
background-size: 16px 16px; color: #888c8f;
background-color: rgba(239, 239, 239, 0.55); letter-spacing: 0;
} }
input::placeholder { input:focus {
font-family: PingFangSC-Regular; background: url("../../assets/contractStart/search2.png") 320px no-repeat;
font-size: 14px; background-size: 16px 16px;
color: #888C8F; background-color: rgba(239, 239, 239, 0.55);
letter-spacing: 0; border: 2px solid #bcc6ff;
}
input:focus {
background: url("../../assets/contractStart/search2.png") 320px no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
border: 2px solid #bcc6ff;
}
} }
} }
}
</style> </style>
<!--
* @Description: 产品展示列表
* @Author: y/>e: 2019-10-16 14:39:07
* @LastEditors : Please set LastEditors
-->
<template> <template>
<h-view id="prolist" class="public-style" title="产品线"> <h-view id="prolist" class="public-style" title="产品线">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5, 1, 1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()"> <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>产品线</span> <span>产品线</span>
</div> </div>
</h-header> </h-header>
<!-- 搜索 --> <!-- 搜索 -->
<div class="search has-header"> <div class="search has-header">
<input v-model="searchInput" type="text" placeholder="请输入经销商/产品名称/产品型号"> <input
v-model="searchInput"
type="text"
placeholder="请输入经销商/产品名称/产品型号"
>
</div> </div>
<scroll <scroll
ref="scroll" ref="scroll"
:updateData="lists" :updateData="lists"
:pullUp="true" :pullUp="true"
class="scroll-content"
@pullingUp="loadMore" @pullingUp="loadMore"
> >
<div class="division-box"> <div class="division-box">
<div v-for="(item,index) in lists" :key="index" class="item-pic" @click="goDetailed(item.division)"> <div
<img :src="item.url" alt=""> v-for="(item, index) in lists"
:key="index"
class="item-pic"
@click="goDetailed(item.division)"
>
<img :src="item.url" alt="" >
<p>{{ item.product_line }}</p> <p>{{ item.product_line }}</p>
</div> </div>
</div> </div>
</scroll> </scroll>
<div v-if="lists.length===0"> <div v-if="lists.length === 0">
<div class="display"> <div class="display">
<img src="@/assets/messageCenter/noMsg.png" alt=""> <img src="@/assets/messageCenter/noMsg.png" alt="" >
</div> </div>
</div> </div>
</h-view> </h-view>
...@@ -60,7 +65,7 @@ export default { ...@@ -60,7 +65,7 @@ export default {
}, },
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next((vm) => {
if (from.name === 'QueryHome' || from.name === 'TabQueryHome') { if (from.name === 'QueryHome' || from.name === 'TabQueryHome') {
vm.factory_bp_id = vm.$route.params.factory_bp_id vm.factory_bp_id = vm.$route.params.factory_bp_id
vm.pagenum = 1 vm.pagenum = 1
...@@ -71,127 +76,159 @@ export default { ...@@ -71,127 +76,159 @@ export default {
} }
}) })
}, },
methods: methods: {
{ // 根据产品名称查询列表
// 根据产品名称查询列表 proQuery () {
proQuery () { let vm = this
let vm = this vm.pagenum = 1
vm.pagenum = 1 let url = $config.basePath + 'prd_product_division_list'
let url = $config.basePath + 'prd_product_division_list' let param = {
let param = { // division: vm.division,
// division: vm.division, factory_bp_id: vm.factory_bp_id,
factory_bp_id: vm.factory_bp_id, searchInput: vm.searchInput,
searchInput: vm.searchInput, pagenum: vm.pagenum,
pagenum: vm.pagenum, pagesize: 10,
pagesize: 10, }
} vm.hlsPopup.showLoading('数据加载中')
vm.hlsPopup.showLoading('数据加载中') vm.$post(url, param).then(function (res) {
vm.$post(url, param).then(function (res) { vm.hlsPopup.hideLoading()
vm.hlsPopup.hideLoading() if (res.result === 'S') {
if (res.result === 'S') { vm.lists = res.lists
vm.lists = res.lists if (vm.lists.length === 0) {
if (vm.lists.length === 0) { vm.$refs.scroll.update(true)
vm.$refs.scroll.update(true) } else if (vm.lists.length > 0 && vm.lists.length < 10) {
} else if (vm.lists.length > 0 && vm.lists.length < 10) { vm.lists.forEach((item) => {
vm.lists.forEach(item => { item['url'] = item.division_attachment_id
item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg ? process.env.filePath +
}) 'attachment_id=' +
vm.$refs.scroll.update(true) item.division_attachment_id +
} else if (vm.lists.length === 10) { '&access_token=' +
vm.lists.forEach(item => { window.localStorage.access_token
item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg : noImg
}) })
vm.$refs.scroll.update(false) vm.$refs.scroll.update(true)
} } else if (vm.lists.length === 10) {
} else { vm.lists.forEach((item) => {
hlsPopup.showLongCenter(res.message) item['url'] = item.division_attachment_id
} ? process.env.filePath +
}) 'attachment_id=' +
}, item.division_attachment_id +
'&access_token=' +
window.localStorage.access_token
: noImg
})
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
loadMore () { loadMore () {
let vm = this let vm = this
vm.pagenum = vm.pagenum + 1 vm.pagenum = vm.pagenum + 1
let url = $config.basePath + 'prd_product_division_list' let url = $config.basePath + 'prd_product_division_list'
let param = { let param = {
factory_bp_id: vm.factory_bp_id, factory_bp_id: vm.factory_bp_id,
searchInput: vm.searchInput, searchInput: vm.searchInput,
pagenum: vm.pagenum, pagenum: vm.pagenum,
pagesize: 10, pagesize: 10,
} }
vm.hlsPopup.showLoading('数据加载中') vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
let returnData = [] let returnData = []
if (res.result === 'S') { if (res.result === 'S') {
returnData = res.lists returnData = res.lists
if (returnData.length === 0) { if (returnData.length === 0) {
vm.$refs.scroll.update(true) vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) { } else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach(item => { returnData.forEach((item) => {
item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg item['url'] = item.division_attachment_id
}) ? process.env.filePath +
returnData.forEach((data, index, array) => { 'attachment_id=' +
vm.lists.push(array[index]) item.division_attachment_id +
}) '&access_token=' +
vm.$refs.scroll.update(true) window.localStorage.access_token
} else if (returnData.length === 10) { : noImg
returnData.forEach(item => { })
item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg returnData.forEach((data, index, array) => {
}) vm.lists.push(array[index])
returnData.forEach((data, index, array) => { })
vm.lists.push(array[index]) vm.$refs.scroll.update(true)
}) } else if (returnData.length === 10) {
vm.$refs.scroll.update(false) returnData.forEach((item) => {
} item['url'] = item.division_attachment_id
} else { ? process.env.filePath +
hlsPopup.showLongCenter(res.message) 'attachment_id=' +
} item.division_attachment_id +
}) '&access_token=' +
}, window.localStorage.access_token
: noImg
})
returnData.forEach((data, index, array) => {
vm.lists.push(array[index])
})
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// 搜索 // 搜索
search () { search () {
let vm = this let vm = this
vm.pagenum = 1 vm.pagenum = 1
let num = Math.random() * 10 let num = Math.random() * 10
// vm.bpList = [] // vm.bpList = []
let url = $config.basePath + 'prd_product_division_list' let url = $config.basePath + 'prd_product_division_list'
let param = { let param = {
pagesize: 10, pagesize: 10,
pagenum: 1, pagenum: 1,
searchInput: vm.searchInput, searchInput: vm.searchInput,
factory_bp_id: vm.factory_bp_id, factory_bp_id: vm.factory_bp_id,
} }
vm.hlsPopup.showLoading('数据加载中') vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
vm.lists = res.lists vm.lists = res.lists
vm.lists.forEach(item => { vm.lists.forEach((item) => {
item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg item['url'] = item.division_attachment_id
}) ? process.env.filePath +
if (vm.lists.length >= 0 && vm.lists.length < 10) { 'attachment_id=' +
vm.$refs.scroll.update(true) item.division_attachment_id +
} else if (vm.lists.length === 10) { '&access_token=' +
vm.$refs.scroll.update(false) window.localStorage.access_token
} : noImg
}) })
}, if (vm.lists.length >= 0 && vm.lists.length < 10) {
// val:产品id, status: 收藏状态 vm.$refs.scroll.update(true)
goDetailed (val) { } else if (vm.lists.length === 10) {
this.$router.push({ vm.$refs.scroll.update(false)
name: 'EntityList', }
params: { })
division: val, },
}, // val:产品id, status: 收藏状态
}) goDetailed (val) {
}, this.$router.push({
}, name: 'EntityList',
params: {
division: val,
},
})
},
},
} }
</script> </script>
<style lang='less' scoped> <style lang='less' scoped>
#prolist { #prolist {
background:rgba(239, 239, 239, 0.55); background: rgba(239, 239, 239, 0.55);
.scroll-content {
top: 50px;
}
.display { .display {
position: fixed; position: fixed;
top: 0; top: 0;
...@@ -200,7 +237,7 @@ export default { ...@@ -200,7 +237,7 @@ export default {
height: 100%; height: 100%;
vertical-align: middle; vertical-align: middle;
height: calc(100% - 30px); height: calc(100% - 30px);
// margin-top: -70px; // margin-top: -70px;
} }
} }
.search { .search {
...@@ -228,16 +265,16 @@ export default { ...@@ -228,16 +265,16 @@ export default {
input::placeholder { input::placeholder {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #888C8F; color: #888c8f;
letter-spacing: 0; letter-spacing: 0;
} }
input:focus { input:focus {
background: url("../../assets/contractStart/search2.png") 320px no-repeat; background: url("../../assets/contractStart/search2.png") 320px no-repeat;
background-size: 16px 16px; background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55); background-color: rgba(239, 239, 239, 0.55);
border: 2px solid #bcc6ff; border: 2px solid #bcc6ff;
} }
} }
.division-box { .division-box {
display: flex; display: flex;
......
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