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
: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>
<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>
<div class="search"> <div class="search">
<input v-model="searchInput" type="text" v-on:input="searchList()" placeholder="请输入用户名称"> <input
v-model="searchInput"
type="text"
placeholder="请输入用户名称"
@input="searchList()"
>
</div> </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
...@@ -34,14 +61,33 @@ ...@@ -34,14 +61,33 @@
: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>
...@@ -89,15 +153,14 @@ export default { ...@@ -89,15 +153,14 @@ export default {
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,26 +292,28 @@ export default { ...@@ -228,26 +292,28 @@ 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 { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
// margin-top: -70px;
} }
}
#toDoList {
.scroll-content {
top: 100px;
} }
#homePage {
.wrap { .wrap {
width: 100%; width: 100%;
position: absolute; position: absolute;
z-index: 100 z-index: 100;
} }
.tab { .tab {
display: flex; display: flex;
...@@ -275,9 +341,9 @@ export default { ...@@ -275,9 +341,9 @@ export default {
} }
span.selected { span.selected {
background: rgba(29,63,255,.2); background: rgba(29, 63, 255, 0.2);
border-radius: 20px; border-radius: 20px;
color: #1D3FFF; color: #1d3fff;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-weight: 700; font-weight: 700;
} }
...@@ -290,7 +356,7 @@ export default { ...@@ -290,7 +356,7 @@ export default {
input { input {
background: url("../../assets/contractStart/search1.png") 320px no-repeat; background: url("../../assets/contractStart/search1.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);
padding-left: 12px; padding-left: 12px;
border-radius: 4px; border-radius: 4px;
height: 36px; height: 36px;
...@@ -298,13 +364,13 @@ export default { ...@@ -298,13 +364,13 @@ export default {
width: 100%; width: 100%;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #888C8F; color: #888c8f;
} }
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;
} }
...@@ -324,6 +390,10 @@ export default { ...@@ -324,6 +390,10 @@ export default {
.header { .header {
position: relative; position: relative;
height: 44px; height: 44px;
p img{
width: 22px;
height: 22px;
}
img { img {
position: absolute; position: absolute;
width: 30px; width: 30px;
...@@ -337,7 +407,7 @@ export default { ...@@ -337,7 +407,7 @@ export default {
left: 50px; left: 50px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 14px; font-size: 14px;
color: #4B4A4B; color: #4b4a4b;
letter-spacing: 0; letter-spacing: 0;
margin: 0px; margin: 0px;
} }
...@@ -370,7 +440,7 @@ export default { ...@@ -370,7 +440,7 @@ export default {
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;
} }
...@@ -391,8 +461,8 @@ export default { ...@@ -391,8 +461,8 @@ export default {
} }
} }
} }
.content{ .content {
background-color: #EFEFEF; background-color: #efefef;
} }
.top-wrap { .top-wrap {
width: 100%; width: 100%;
...@@ -432,11 +502,11 @@ export default { ...@@ -432,11 +502,11 @@ export default {
justify-content: space-between; justify-content: space-between;
&:before { &:before {
content: '' content: "";
} }
&:after { &:after {
content: '' content: "";
} }
.function-item { .function-item {
...@@ -445,18 +515,17 @@ export default { ...@@ -445,18 +515,17 @@ 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;
color: #3C3D48; color: #3c3d48;
letter-spacing: 0; letter-spacing: 0;
} }
} }
} }
.h-header .h-header-center div { .h-header .h-header-center div {
...@@ -474,16 +543,16 @@ export default { ...@@ -474,16 +543,16 @@ export default {
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;
} }
} }
} }
...@@ -527,29 +596,29 @@ export default { ...@@ -527,29 +596,29 @@ export default {
height: 22px; height: 22px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 16px; font-size: 16px;
color: #00469C; color: #00469c;
font-weight: 600; font-weight: 600;
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;
} }
} }
...@@ -571,7 +640,7 @@ export default { ...@@ -571,7 +640,7 @@ export default {
.top { .top {
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 16px; font-size: 16px;
color: #3B3B3B; color: #3b3b3b;
letter-spacing: 0.54px; letter-spacing: 0.54px;
margin-top: 10px; margin-top: 10px;
font-weight: 600; font-weight: 600;
...@@ -589,7 +658,7 @@ export default { ...@@ -589,7 +658,7 @@ export default {
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.6);
letter-spacing: 0.5px; letter-spacing: 0.5px;
} }
...@@ -599,10 +668,10 @@ export default { ...@@ -599,10 +668,10 @@ export default {
font-weight: 600; font-weight: 600;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 14px; font-size: 14px;
color: #4B4A4B; color: #4b4a4b;
letter-spacing: 0.5px; 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()">
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</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>
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
</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>
...@@ -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) {
...@@ -344,7 +344,7 @@ export default { ...@@ -344,7 +344,7 @@ export default {
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>
...@@ -49,13 +63,12 @@ export default { ...@@ -49,13 +63,12 @@ export default {
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,8 +163,8 @@ export default { ...@@ -150,8 +163,8 @@ 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 {
...@@ -159,9 +172,12 @@ export default { ...@@ -159,9 +172,12 @@ export default {
height: 100%; height: 100%;
// margin-top: -70px; // margin-top: -70px;
} }
}
#newList {
background: #efefef;
.scroll-content {
top: 50px;
} }
#newList {
background: #EFEFEF;
.pay-content { .pay-content {
width: 96%; width: 96%;
margin: 10px auto; margin: 10px auto;
...@@ -188,22 +204,22 @@ export default { ...@@ -188,22 +204,22 @@ export default {
width: 15px; width: 15px;
} }
&:nth-child(2) { &:nth-child(2) {
border-bottom: 1px solid #F1F0F5; border-bottom: 1px solid #f1f0f5;
} }
span { span {
color: #1D3FFF; color: #1d3fff;
float: right; float: right;
} }
&:nth-child(2) { &:nth-child(2) {
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.6);
letter-spacing: 0; letter-spacing: 0;
} }
&:nth-child(3) { &:nth-child(3) {
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.6);
letter-spacing: 0; letter-spacing: 0;
} }
} }
...@@ -232,7 +248,7 @@ export default { ...@@ -232,7 +248,7 @@ 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 {
...@@ -242,5 +258,5 @@ export default { ...@@ -242,5 +258,5 @@ export default {
border: 2px solid #bcc6ff; 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,8 +76,7 @@ export default { ...@@ -71,8 +76,7 @@ export default {
} }
}) })
}, },
methods: methods: {
{
// 根据产品名称查询列表 // 根据产品名称查询列表
proQuery () { proQuery () {
let vm = this let vm = this
...@@ -93,13 +97,25 @@ export default { ...@@ -93,13 +97,25 @@ export default {
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 ? 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 +
'attachment_id=' +
item.division_attachment_id +
'&access_token=' +
window.localStorage.access_token
: noImg
}) })
vm.$refs.scroll.update(true) vm.$refs.scroll.update(true)
} else if (vm.lists.length === 10) { } else if (vm.lists.length === 10) {
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 +
'attachment_id=' +
item.division_attachment_id +
'&access_token=' +
window.localStorage.access_token
: noImg
}) })
vm.$refs.scroll.update(false) vm.$refs.scroll.update(false)
} }
...@@ -128,16 +144,28 @@ export default { ...@@ -128,16 +144,28 @@ export default {
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 +
'attachment_id=' +
item.division_attachment_id +
'&access_token=' +
window.localStorage.access_token
: noImg
}) })
returnData.forEach((data, index, array) => { returnData.forEach((data, index, array) => {
vm.lists.push(array[index]) vm.lists.push(array[index])
}) })
vm.$refs.scroll.update(true) vm.$refs.scroll.update(true)
} else if (returnData.length === 10) { } else if (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 +
'attachment_id=' +
item.division_attachment_id +
'&access_token=' +
window.localStorage.access_token
: noImg
}) })
returnData.forEach((data, index, array) => { returnData.forEach((data, index, array) => {
vm.lists.push(array[index]) vm.lists.push(array[index])
...@@ -167,8 +195,14 @@ export default { ...@@ -167,8 +195,14 @@ export default {
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 +
'attachment_id=' +
item.division_attachment_id +
'&access_token=' +
window.localStorage.access_token
: noImg
}) })
if (vm.lists.length >= 0 && vm.lists.length < 10) { if (vm.lists.length >= 0 && vm.lists.length < 10) {
vm.$refs.scroll.update(true) vm.$refs.scroll.update(true)
...@@ -191,7 +225,10 @@ export default { ...@@ -191,7 +225,10 @@ export default {
</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;
...@@ -228,7 +265,7 @@ export default { ...@@ -228,7 +265,7 @@ 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;
} }
......
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