Commit dad53d96 authored by JingChao's avatar JingChao

wechat

parent f7c3f82e
...@@ -42,18 +42,10 @@ module.exports = { ...@@ -42,18 +42,10 @@ module.exports = {
type: 'confirm', type: 'confirm',
message: 'install workflow modules in App?', message: 'install workflow modules in App?',
}, },
/*calculate:{
type: 'confirm',
message: 'install calculate modules in App?',
},*/
riskstrom:{ riskstrom:{
type: 'confirm', type: 'confirm',
message: 'install riskstrom modules in App?', message: 'install riskstrom modules in App?',
}, },
robot:{
type: 'confirm',
message: 'install robot modules in App?',
},
esign:{ esign:{
type: 'confirm', type: 'confirm',
message: 'install esign modules in App?', message: 'install esign modules in App?',
...@@ -97,7 +89,6 @@ module.exports = { ...@@ -97,7 +89,6 @@ module.exports = {
'src/pages/applications/workflow/**/*': 'wfl', 'src/pages/applications/workflow/**/*': 'wfl',
'src/pages/applications/financCalculate/**/*': 'project', 'src/pages/applications/financCalculate/**/*': 'project',
'src/pages/applications/riskStorm/**/*': 'riskstrom', 'src/pages/applications/riskStorm/**/*': 'riskstrom',
'src/pages/applications/robot/**/*': 'robot',
'src/pages/applications/esign/**/*': 'esign', 'src/pages/applications/esign/**/*': 'esign',
'src/pages/applications/reports/**/*': 'report', 'src/pages/applications/reports/**/*': 'report',
'src/pages/applications/qiXinBao/**/*': 'qixin', 'src/pages/applications/qiXinBao/**/*': 'qixin',
......
...@@ -25,8 +25,8 @@ const webpackConfig = merge(baseWebpackConfig, { ...@@ -25,8 +25,8 @@ const webpackConfig = merge(baseWebpackConfig, {
devtool: config.build.productionSourceMap ? config.build.devtool : false, devtool: config.build.productionSourceMap ? config.build.devtool : false,
output: { output: {
path: config.build.assetsRoot, path: config.build.assetsRoot,
filename: utils.assetsPath('js/[name].[chunkhash].js'), filename: utils.assetsPath('js/[name][id].[chunkhash].js'),
chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') chunkFilename: utils.assetsPath('js/[name][id].[chunkhash].js')
}, },
plugins: [ plugins: [
// http://vuejs.github.io/vue-loader/en/workflow/production.html // http://vuejs.github.io/vue-loader/en/workflow/production.html
......
...@@ -72,7 +72,7 @@ module.exports = { ...@@ -72,7 +72,7 @@ module.exports = {
* Source Maps * Source Maps
*/ */
productionSourceMap: true, productionSourceMap: false,
// https://webpack.js.org/configuration/devtool/#production // https://webpack.js.org/configuration/devtool/#production
devtool: '#source-map', devtool: '#source-map',
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<script src="https://gw.alipayobjects.com/os/antv/assets/lib/lodash-4.17.4.min.js"></script> <script src="https://gw.alipayobjects.com/os/antv/assets/lib/lodash-4.17.4.min.js"></script>
<script src="https://gw.alipayobjects.com/os/antv/assets/lib/jquery-3.2.1.min.js"></script> <script src="https://gw.alipayobjects.com/os/antv/assets/lib/jquery-3.2.1.min.js"></script>
<script src="https://gw.alipayobjects.com/os/rmsportal/NjNldKHIVQRozfbAOJUW.js"></script> <script src="https://gw.alipayobjects.com/os/rmsportal/NjNldKHIVQRozfbAOJUW.js"></script>
<script src="static/prototype.js"></script>
<title>车租易</title> <title>车租易</title>
</head> </head>
<body> <body>
......
...@@ -20,9 +20,6 @@ import { ...@@ -20,9 +20,6 @@ import {
Picker, Picker,
} from 'vux' } from 'vux'
import './scripts/prototype'
import './scripts/vuePlatform'
import WorkflowPrj from './components/workflow-prj' import WorkflowPrj from './components/workflow-prj'
import WorkflowCon from './components/workflow-con' import WorkflowCon from './components/workflow-con'
...@@ -98,11 +95,8 @@ Vue.prototype.$routeGo = routeGo ...@@ -98,11 +95,8 @@ Vue.prototype.$routeGo = routeGo
FastClick.attach(document.body) FastClick.attach(document.body)
Vue.config.productionTip = false Vue.config.productionTip = true
vum.$vumPlatform.ready(function () {
})
/* eslint-disable no-new */ /* eslint-disable no-new */
new Vue({ new Vue({
......
<template> <template>
<h-view class="public-style contract-mainten-list" title="合同维护"> <h-view class="public-style contract-mainten-list" title="合同维护">
<h-content class="scroll-content">
<s-tab @tabClick="switchTab"> <s-tab @tabClick="switchTab">
<tab-item>本年</tab-item> <tab-item>本年</tab-item>
<tab-item>本季</tab-item> <tab-item>本季</tab-item>
...@@ -48,7 +47,6 @@ ...@@ -48,7 +47,6 @@
ref="scroll" ref="scroll"
:updateData="[con_list]" :updateData="[con_list]"
:pullUp="true" :pullUp="true"
class="content-scroll"
@pullingUp="loadMore"> @pullingUp="loadMore">
<list-item :item-height="80"> <list-item :item-height="80">
<item <item
...@@ -64,7 +62,6 @@ ...@@ -64,7 +62,6 @@
</item> </item>
</list-item> </list-item>
</scroll> </scroll>
</h-content>
</h-view> </h-view>
</template> </template>
...@@ -198,32 +195,19 @@ ...@@ -198,32 +195,19 @@
<style lang="less" rel="stylesheet"> <style lang="less" rel="stylesheet">
.contract-mainten-list { .contract-mainten-list {
.scroll-content{
position: absolute;
top: 0;
bottom: 0;
height: auto;
overflow: hidden;
-webkit-overflow-scrolling: touch;
overflow-scrolling: touch;
}
.content-scroll{
top:225px;
}
.content{ .content{
overflow: hidden; overflow: hidden;
} }
.hls-switch-tab .tab-content .h-tab-item .h-item { .hls-switch-tab .tab-content .h-tab-item .h-item {
width: 100%; width: 100%;
} }
.hls-switch-tab { .hls-switch-tab {
position: relative; position: relative;
} }
.info-board { .info-board {
background-color: #FFF; background-color: rgb(255, 255, 255);
position: relative;
z-index: 5;
.board-line { .board-line {
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
...@@ -233,25 +217,20 @@ ...@@ -233,25 +217,20 @@
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
padding-bottom: 6px; padding-bottom: 6px;
&:before { &:before {
content: ''; content: '';
} }
&:after { &:after {
content: ''; content: '';
} }
&:first-child { &:first-child {
justify-content: flex-start; justify-content: flex-start;
-webkit-justify-content: flex-start; -webkit-justify-content: flex-start;
} }
&:nth-child(2) { &:nth-child(2) {
justify-content: center; justify-content: center;
-webkit-justify-content: center; -webkit-justify-content: center;
} }
.ionic-img { .ionic-img {
margin-left: 11px; margin-left: 11px;
margin-right: 4px; margin-right: 4px;
...@@ -264,16 +243,13 @@ ...@@ -264,16 +243,13 @@
border: none; border: none;
} }
} }
.text { .text {
font-size: @font-size-middle; font-size: @font-size-middle;
} }
span { span {
font-size: 26px; font-size: 26px;
color: #FF8877; color: rgb(255, 136, 119);
margin-right: 2px; margin-right: 2px;
&:nth-child(2) { &:nth-child(2) {
font-size: @font-size-small; font-size: @font-size-small;
color: #313131; color: #313131;
...@@ -281,7 +257,6 @@ ...@@ -281,7 +257,6 @@
margin-left: 2px; margin-left: 2px;
} }
} }
.board-block { .board-block {
height: 100%; height: 100%;
width: 100%; width: 100%;
...@@ -296,37 +271,35 @@ ...@@ -296,37 +271,35 @@
} }
} }
} }
.search { .search {
display: flex; display: flex;
height: 50px; height: 50px;
background-color: #FFF; background-color: rgb(255, 255, 255);
margin-top: 10px; //margin-top: 10px;
position: relative;
z-index: 5;
padding: 5px 0;
// margin-bottom: 10px; // margin-bottom: 10px;
.searchInput { .searchInput {
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
height: 33px; height: 33px;
border: 1px solid #5D98F6; /*no*/ border: 1px solid rgb(93, 152, 246); /*no*/
margin: 7px 10px; margin: 7px 10px;
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
-webkit-align-items: center; -webkit-align-items: center;
.img-box { .img-box {
height: 17px; height: 17px;
border-right: 1px solid #5D98F6; /*no*/ border-right: 1px solid rgb(93, 152, 246); /*no*/
padding: 2px 0; padding: 2px 0;
margin-left: 10px; margin-left: 10px;
img { img {
margin-right: 5px; margin-right: 5px;
width: 15px; width: 15px;
} }
} }
input { input {
width: 100%; width: 100%;
font-size: 13px; font-size: 13px;
...@@ -339,48 +312,32 @@ ...@@ -339,48 +312,32 @@
} }
} }
} }
.vue-better-scroll {
// top: 226px;
}
.vue-better-scroll__wrapper {
margin-top: 10px;
}
.hls-item { .hls-item {
&:nth-child(odd) { &:nth-child(odd) {
background-color: #EFF1F3; background-color: rgb(239, 241, 243);
} }
&:nth-child(even) { &:nth-child(even) {
background-color: #fff; background-color: #fff;
} }
.contents .add-name { .contents .add-name {
.left-icon { .left-icon {
width: 34px; width: 34px;
} }
.text { .text {
margin-left: 15px; margin-left: 15px;
.cont { .cont {
margin-top: 5px; margin-top: 5px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
&:first-child { &:first-child {
margin-top: 0; margin-top: 0;
} }
} }
.cont-num { .cont-num {
margin-top: 8px; margin-top: 8px;
font-size: 15px; font-size: 15px;
line-height: 21px; line-height: 21px;
color: #5D98F6; color: rgb(93, 152, 246);
} }
} }
} }
......
<template> <template>
<h-view class="public-style contract-sign-list" title="合同签约"> <h-view class="public-style contract-sign-list" title="合同签约">
<h-content class="scroll-content">
<s-tab @tabClick="switchTab"> <s-tab @tabClick="switchTab">
<tab-item>本年</tab-item> <tab-item>本年</tab-item>
<tab-item>本季</tab-item> <tab-item>本季</tab-item>
...@@ -48,7 +47,6 @@ ...@@ -48,7 +47,6 @@
ref="scroll" ref="scroll"
:updateData="[con_list]" :updateData="[con_list]"
:pullUp="true" :pullUp="true"
class="content-scroll"
@pullingUp="loadMore"> @pullingUp="loadMore">
<list-item :item-height="80"> <list-item :item-height="80">
<item <item
...@@ -64,7 +62,6 @@ ...@@ -64,7 +62,6 @@
</item> </item>
</list-item> </list-item>
</scroll> </scroll>
</h-content>
</h-view> </h-view>
</template> </template>
...@@ -198,18 +195,6 @@ ...@@ -198,18 +195,6 @@
<style lang="less" rel="stylesheet"> <style lang="less" rel="stylesheet">
.contract-sign-list { .contract-sign-list {
.scroll-content{
position: absolute;
top: 0;
bottom: 0;
height: auto;
overflow: hidden;
-webkit-overflow-scrolling: touch;
overflow-scrolling: touch;
}
.content-scroll{
top:225px;
}
.content{ .content{
overflow: hidden; overflow: hidden;
} }
...@@ -222,7 +207,9 @@ ...@@ -222,7 +207,9 @@
} }
.info-board { .info-board {
background-color: #FFF; background-color: rgb(255, 255, 255);
position: relative;
z-index: 5;
.board-line { .board-line {
display: flex; display: flex;
...@@ -271,7 +258,7 @@ ...@@ -271,7 +258,7 @@
span { span {
font-size: 26px; font-size: 26px;
color: #FF8877; color: rgb(255, 136, 119);
margin-right: 2px; margin-right: 2px;
&:nth-child(2) { &:nth-child(2) {
...@@ -300,15 +287,17 @@ ...@@ -300,15 +287,17 @@
.search { .search {
display: flex; display: flex;
height: 50px; height: 50px;
background-color: #FFF; background-color: rgb(255, 255, 255);
margin-top: 10px; padding: 5px 0;
position: relative;
z-index: 5;
// margin-bottom: 10px; // margin-bottom: 10px;
.searchInput { .searchInput {
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
height: 33px; height: 33px;
border: 1px solid #5D98F6; /*no*/ border: 1px solid rgb(93, 152, 246); /*no*/
margin: 7px 10px; margin: 7px 10px;
width: 100%; width: 100%;
display: flex; display: flex;
...@@ -317,7 +306,7 @@ ...@@ -317,7 +306,7 @@
.img-box { .img-box {
height: 17px; height: 17px;
border-right: 1px solid #5D98F6; /*no*/ border-right: 1px solid rgb(93, 152, 246); /*no*/
padding: 2px 0; padding: 2px 0;
margin-left: 10px; margin-left: 10px;
...@@ -340,17 +329,9 @@ ...@@ -340,17 +329,9 @@
} }
} }
.vue-better-scroll {
// top: 226px;
}
.vue-better-scroll__wrapper {
margin-top: 10px;
}
.hls-item { .hls-item {
&:nth-child(odd) { &:nth-child(odd) {
background-color: #EFF1F3; background-color: rgb(239, 241, 243);
} }
&:nth-child(even) { &:nth-child(even) {
...@@ -380,7 +361,7 @@ ...@@ -380,7 +361,7 @@
margin-top: 8px; margin-top: 8px;
font-size: 15px; font-size: 15px;
line-height: 21px; line-height: 21px;
color: #5D98F6; color: rgb(93, 152, 246);
} }
} }
} }
......
...@@ -33,8 +33,9 @@ ...@@ -33,8 +33,9 @@
</template> </template>
<script> <script>
import calService from './calculateService' import calService from './calculateService'
export default {
export default {
name: 'CalculationEnter', name: 'CalculationEnter',
data () { data () {
return { return {
...@@ -73,15 +74,15 @@ export default { ...@@ -73,15 +74,15 @@ export default {
}) })
}, },
}, },
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.calculatEnter{ .calculatEnter {
.content{ .content {
background-color:#F7F7F8; background-color: rgb(247, 247, 247);
.hls-list-item { .hls-list-item {
background-color:#F7F7F8; background-color: rgb(247, 247, 248);
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -94,12 +95,10 @@ export default { ...@@ -94,12 +95,10 @@ export default {
padding: 0; padding: 0;
height: 96px; height: 96px;
border-bottom: 1px solid #ccc; /*no*/ border-bottom: 1px solid #ccc; /*no*/
background-color:#fff; background-color: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
&.activated { &.activated {
opacity: 0.9; opacity: 0.9;
-webkit-transform: scale(0.95); -webkit-transform: scale(0.95);
...@@ -107,54 +106,52 @@ export default { ...@@ -107,54 +106,52 @@ export default {
} }
.finaning-contents { .finaning-contents {
height: 100%; height: 100%;
width: 93%; width: 100%;
padding: 0 10px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.contents-info{ .contents-info {
height: 100%; height: 100%;
width: 90%; width: 90%;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
align-items: flex-start; align-items: flex-start;
.contents-info-type{ .contents-info-type {
color: #556B78; color: rgb(85, 107, 120);
font-size: 15px; font-size: 15px;
height: 25px; height: 25px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.contents-info-description{ .contents-info-description {
width: 100%; width: 100%;
line-height: 15px; line-height: 15px;
color: #99AFC6; color: rgb(153, 175, 198);
font-size: 14px; font-size: 14px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.contents-info-time{ .contents-info-time {
color: #99AFC6; color: rgb(153, 175, 198);
font-size: 14px; font-size: 14px;
} }
} }
.next-icon{ .next-icon {
padding-right: 5px; padding-right: 5px;
height: 100%; height: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.next-icon-img{ .next-icon-img {
width: 28px; width: 28px;
height: 28px; height: 28px;
img{ img {
width: 28px; width: 28px;
} }
} }
......
<template> <template>
<h-view class="public-style partner-list" title="客户维护"> <h-view class="public-style partner-list" title="客户维护">
<h-content class="scroll-content">
<div class="top-part"> <div class="top-part">
<div class="client"> <div class="client">
<div class="client-img"> <div class="client-img">
<img src="@/assets/image/bpMaster/count@2x.png" > <img src="@/assets/image/bpMaster/count@2x.png">
</div> </div>
<div class="statistics">客户总计</div> <div class="statistics">客户总计</div>
</div> </div>
...@@ -31,16 +30,15 @@ ...@@ -31,16 +30,15 @@
</div> </div>
<div class="search"> <div class="search">
<div class="search-box" @click="showSearchModal"> <div class="search-box" @click="showSearchModal">
<div class="search-icon"><img src="@/assets/image/bpMaster/search@2x.png" ></div> <div class="search-icon"><img src="@/assets/image/bpMaster/search@2x.png"></div>
<div class="hint">请输入客户名称/客户类型</div> <div class="hint">请输入客户名称/客户类型</div>
</div> </div>
<div class="add-icon" @click="createPartent()"><img src="@/assets/image/bpMaster/add@2x.png" ></div> <div class="add-icon" @click="createPartent()"><img src="@/assets/image/bpMaster/add@2x.png"></div>
</div> </div>
<scroll <scroll
ref="scrollList" ref="scrollList"
:updateData="[bpList]" :updateData="[bpList]"
:pullUp="true" :pullUp="true"
class="content-scroll"
@pullingUp="loadMore"> @pullingUp="loadMore">
<list-item :item-height="80"> <list-item :item-height="80">
<item <item
...@@ -56,9 +54,7 @@ ...@@ -56,9 +54,7 @@
</item> </item>
</list-item> </list-item>
</scroll> </scroll>
</h-content> <h-modal ref="modal" v-model="showModalValue" position="bottom" class="search-modal">
<h-modal ref="modal" v-model="showModalValue" position="bottom" cus-class="search-modal">
<h-view> <h-view>
<h-header :proportion="[1,15,4]" class="bar-custom" style="height: 44px;padding-top: 0px"> <h-header :proportion="[1,15,4]" class="bar-custom" style="height: 44px;padding-top: 0px">
<div slot="center" class="search-shelter"> <div slot="center" class="search-shelter">
...@@ -66,7 +62,8 @@ ...@@ -66,7 +62,8 @@
<input <input
v-focus id="risk-search-input" v-model="info.key" type="text" v-focus id="risk-search-input" v-model="info.key" type="text"
placeholder="伙伴名称/类型" class="search-input"> placeholder="伙伴名称/类型" class="search-input">
<img v-show="info.key" src="@/assets/image/bpMaster/clear.png" class="clear-button" @click="clearCondition()"> <img v-show="info.key" src="@/assets/image/bpMaster/clear.png" class="clear-button"
@click="clearCondition()">
</div> </div>
<div slot="right" class="h-header-btn" @click="hideModal">取消</div> <div slot="right" class="h-header-btn" @click="hideModal">取消</div>
</h-header> </h-header>
...@@ -95,7 +92,7 @@ ...@@ -95,7 +92,7 @@
</template> </template>
<script> <script>
export default { export default {
data () { data () {
return { return {
offsize: 1, offsize: 1,
...@@ -129,7 +126,7 @@ export default { ...@@ -129,7 +126,7 @@ export default {
let vm = this let vm = this
let url = $config.basePath + 'query_bp_master' let url = $config.basePath + 'query_bp_master'
let url1 = $config.basePath + 'bp_count_query' let url1 = $config.basePath + 'bp_count_query'
let param = {'offsize': vm.offsize} let param = { 'offsize': vm.offsize }
let param1 = {} let param1 = {}
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
...@@ -234,75 +231,74 @@ export default { ...@@ -234,75 +231,74 @@ export default {
}, },
}, },
} }
</script> </script>
<style lang="less" scoped type="text/less"> <style lang="less" scoped type="text/less">
.partner-list { .partner-list {
.scroll-content{
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: auto;
height: auto;
overflow: hidden;
-webkit-overflow-scrolling: touch;
overflow-scrolling: touch;
}
.content {
background-color: #eff1f3; background-color: #eff1f3;
padding-top: 0; //padding-top: 0;
.top-part{ .top-part {
background-color: #FFFFFF; background-color: #FFFFFF;
padding:12px 0 10px 0; padding: 12px 0 10px 0;
.client{ position: relative;
z-index: 5;
.client {
display: flex; display: flex;
.client-img{
margin:0 5px 0 15px; .client-img {
img{ margin: 0 5px 0 15px;
width:17px;
img {
width: 17px;
height: 15px; height: 15px;
} }
} }
.statistics{
.statistics {
font-size: 14px; font-size: 14px;
line-height: 16px; line-height: 16px;
color: #363636; color: #363636;
} }
} }
.total-num{
.total-num {
width: 100%; width: 100%;
padding: 10px 0 25px 0; padding: 10px 0 25px 0;
font-size: 26px; font-size: 26px;
color: #FF8877; color: #FF8877;
display: flex; display: flex;
justify-content: center; justify-content: center;
.measure{
.measure {
font-size: 13px; font-size: 13px;
color: #313131; color: #313131;
padding:5px; padding: 5px;
} }
} }
.list-general{
.list-general {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
.enterprise{
.enterprise {
width: 25%; width: 25%;
display: flex; display: flex;
text-align:center; text-align: center;
flex-direction: column; flex-direction: column;
.list-name{
.list-name {
font-size: 13px; font-size: 13px;
color: #313131; color: #313131;
} }
.list-num{
.list-num {
padding-top: 6px; padding-top: 6px;
font-size: 14px; font-size: 14px;
color: #FF8877; color: #FF8877;
.sum-num{
.sum-num {
font-size: 12px; font-size: 12px;
line-height: 17px; line-height: 17px;
color: #313131; color: #313131;
...@@ -312,79 +308,89 @@ export default { ...@@ -312,79 +308,89 @@ export default {
} }
} }
} }
.search{
margin-top:5px; .search {
margin-top: 5px;
width: 100%; width: 100%;
background-color: #FFFFFF; background-color: #FFFFFF;
display: flex; display: flex;
padding: 12.5px 0; padding: 12.5px 0;
.search-box{ z-index: 5;
width:80%; position: relative;
margin-left:15px;
.search-box {
width: 80%;
margin-left: 15px;
display: flex; display: flex;
background: #FDFFFF; background: #FDFFFF;
border: 1px solid @headerColor; /*no*/ border: 1px solid @headerColor; /*no*/
border-radius: 50px; border-radius: 50px;
.search-icon{
.search-icon {
padding-left: 10px; padding-left: 10px;
display: flex; display: flex;
align-items: center; align-items: center;
img{
img {
width: 22px; width: 22px;
height:15px; height: 15px;
border-right:1px solid @headerColor; /*no*/ border-right: 1px solid @headerColor; /*no*/
padding-right:7px; padding-right: 7px;
} }
} }
.hint{
font-size:12px; .hint {
margin-left:12px; font-size: 12px;
margin-left: 12px;
color: #DBD8D8; color: #DBD8D8;
display: flex; display: flex;
align-items: center; align-items: center;
} }
} }
.add-icon{
margin-left:23px; .add-icon {
img{ margin-left: 23px;
width:26px;
height:26px; img {
width: 26px;
height: 26px;
} }
} }
} }
.hls-item { .hls-item {
&:nth-child(odd){ &:nth-child(odd) {
background-color: #EFF1F3; background-color: #EFF1F3;
} }
&:nth-child(even){
&:nth-child(even) {
background-color: #fff; background-color: #fff;
} }
.contents { .contents {
.add-name { .add-name {
.cont-name{ .cont-name {
font-size: 15px; font-size: 15px;
line-height: 21px; line-height: 21px;
color: @headerColor; color: @headerColor;
} }
.cont-type{
.cont-type {
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #888; color: #888;
} }
.left-icon{
.left-icon {
width: 35px; width: 35px;
} }
} }
} }
} }
}
.search-modal{ .search-modal {
.scroll-content{
top:44px .search-shelter {
}
.search-shelter{
height: 30px; height: 30px;
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
...@@ -392,19 +398,18 @@ export default { ...@@ -392,19 +398,18 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
img{
img {
width: 15px; width: 15px;
margin: 0 10px; margin: 0 10px;
} }
input{
input {
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
} }
} }
} }
.content-scroll{
top:198px
}
} }
</style> </style>
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<template> <template>
<h-view class="public-style project-mainten" title="申请维护"> <h-view class="public-style project-mainten" title="申请维护">
<h-content class="scroll-content">
<s-tab @tabClick="changeData"> <s-tab @tabClick="changeData">
<tab-item>本年</tab-item> <tab-item>本年</tab-item>
<tab-item>本季</tab-item> <tab-item>本季</tab-item>
...@@ -50,7 +49,6 @@ ...@@ -50,7 +49,6 @@
</div> </div>
<scroll <scroll
ref="scroll" ref="scroll"
class="content-scroll"
:updateData="[prjList]" :updateData="[prjList]"
:pullUp="true" :pullUp="true"
@pullingUp="loadMore"> @pullingUp="loadMore">
...@@ -67,13 +65,12 @@ ...@@ -67,13 +65,12 @@
</item> </item>
</list-item> </list-item>
</scroll> </scroll>
</h-content>
</h-view> </h-view>
</template> </template>
<script> <script>
import projectService from './projectService' import projectService from './projectService'
export default { export default {
name: 'PrjMaintenList', name: 'PrjMaintenList',
data () { data () {
return { return {
...@@ -230,37 +227,21 @@ export default { ...@@ -230,37 +227,21 @@ export default {
}) })
}, },
}, },
} }
</script> </script>
<style lang="less"> <style lang="less">
.project-mainten { .project-mainten {
.scroll-content{
position: absolute;
top:0;
bottom: 0;
height: auto;
overflow: hidden;
-webkit-overflow-scrolling: touch;
overflow-scrolling: touch;
}
.content-scroll{
top:225px;
}
.content{
overflow: hidden;
}
.hls-switch-tab .tab-content .h-tab-item .h-item { .hls-switch-tab .tab-content .h-tab-item .h-item {
width: 100%; width: 100%;
} }
.hls-switch-tab { .hls-switch-tab {
position: relative; position: relative;
} }
.info-board { .info-board {
background-color: #FFF; background-color: rgb(255, 255, 255);
position: relative;
z-index: 5;
.board-line { .board-line {
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
...@@ -270,47 +251,38 @@ export default { ...@@ -270,47 +251,38 @@ export default {
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
padding-bottom: 6px; padding-bottom: 6px;
&:before { &:before {
content: ''; content: '';
} }
&:after { &:after {
content: ''; content: '';
} }
&:first-child { &:first-child {
justify-content: flex-start; justify-content: flex-start;
-webkit-justify-content: flex-start; -webkit-justify-content: flex-start;
} }
&:nth-child(2) { &:nth-child(2) {
justify-content: center; justify-content: center;
-webkit-justify-content: center; -webkit-justify-content: center;
} }
.ionic-img { .ionic-img {
margin-left: 11px; margin-left: 11px;
margin-right: 4px; margin-right: 4px;
width: 17px; width: 17px;
height: 15px; height: 15px;
img { img {
height: 100%; height: 100%;
width: 100%; width: 100%;
border: none; border: none;
} }
} }
.text { .text {
font-size: @font-size-middle; font-size: @font-size-middle;
} }
span { span {
font-size: 26px; font-size: 26px;
color: #FF8877; color: rgb(255, 136, 119);
margin-right: 2px; margin-right: 2px;
&:nth-child(2) { &:nth-child(2) {
font-size: @font-size-small; font-size: @font-size-small;
color: #313131; color: #313131;
...@@ -318,12 +290,10 @@ export default { ...@@ -318,12 +290,10 @@ export default {
margin-left: 2px; margin-left: 2px;
} }
} }
.board-block { .board-block {
height: 100%; height: 100%;
width: 100%; width: 100%;
text-align: center; text-align: center;
.number { .number {
span { span {
font-size: @font-size-middle; font-size: @font-size-middle;
...@@ -337,33 +307,29 @@ export default { ...@@ -337,33 +307,29 @@ export default {
.search { .search {
display: flex; display: flex;
height: 50px; height: 50px;
background-color: #FFF; background-color: rgb(255, 255, 255);
margin-top: 10px; padding:5px 0;
// margin-bottom: 10px; position: relative;
z-index: 5;
.searchInput { .searchInput {
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
height: 33px; height: 33px;
border: 1px solid #5D98F6; /*no*/ border: 1px solid rgb(93, 152, 246); /*no*/
margin: 7px 10px; margin: 7px 10px;
width: 100%; width: 100%;
display: flex;
align-items: center; align-items: center;
-webkit-align-items: center; -webkit-align-items: center;
.img-box { .img-box {
height: 17px; height: 17px;
border-right: 1px solid #5D98F6; /*no*/ border-right: 1px solid rgb(93, 152, 246); /*no*/
padding: 2px 0; padding: 2px 0;
margin-left: 10px; margin-left: 10px;
img { img {
margin-right: 5px; margin-right: 5px;
width: 15px; width: 15px;
} }
} }
input { input {
width: 100%; width: 100%;
font-size: 13px; font-size: 13px;
...@@ -376,48 +342,32 @@ export default { ...@@ -376,48 +342,32 @@ export default {
} }
} }
} }
.vue-better-scroll {
// top: 226px;
}
.vue-better-scroll__wrapper {
margin-top: 10px;
}
.hls-item { .hls-item {
&:nth-child(odd) { &:nth-child(odd) {
background-color: #EFF1F3; background-color: rgb(239, 241, 243);
} }
&:nth-child(even) { &:nth-child(even) {
background-color: #fff; background-color: #fff;
} }
.contents .add-name { .contents .add-name {
.left-icon { .left-icon {
width: 34px; width: 34px;
} }
.text { .text {
margin-left: 15px; margin-left: 15px;
.cont { .cont {
margin-top: 5px; margin-top: 5px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
&:first-child { &:first-child {
margin-top: 0; margin-top: 0;
} }
} }
.cont-num { .cont-num {
margin-top: 8px; margin-top: 8px;
font-size: 15px; font-size: 15px;
line-height: 21px; line-height: 21px;
color: #5D98F6; color: rgb(93, 152, 246);
} }
} }
} }
......
...@@ -115,7 +115,8 @@ ...@@ -115,7 +115,8 @@
<style scoped lang="less" rel="stylesheet"> <style scoped lang="less" rel="stylesheet">
.public-style { .public-style {
.search { .search {
position: fixed; position: relative;
z-index: 5;
width: 100%; width: 100%;
height: 45px; height: 45px;
display: -webkit-flex; display: -webkit-flex;
...@@ -125,6 +126,7 @@ ...@@ -125,6 +126,7 @@
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
padding: 0 15px; padding: 0 15px;
background-color: #fff;
border-bottom:1px solid @background-color-gray; border-bottom:1px solid @background-color-gray;
.searchBox { .searchBox {
background-color: #fff; background-color: #fff;
...@@ -153,7 +155,7 @@ ...@@ -153,7 +155,7 @@
} }
} }
.content { .content {
margin-top: 45px; // margin-top: 45px;
} }
} }
</style> </style>
...@@ -126,12 +126,14 @@ export default { ...@@ -126,12 +126,14 @@ export default {
.search { .search {
position: relative; position: relative;
z-index: 5;
width: 100%; width: 100%;
height:45px; height:45px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 0 15px; padding: 0 15px;
background-color: #fff;
border-bottom:1px solid @background-color-gray; /*no*/ border-bottom:1px solid @background-color-gray; /*no*/
.searchBox { .searchBox {
background-color: #fff; background-color: #fff;
......
/**
* @Author think
* @Date 2019-06-18 14:36
*/
<template>
<h-view class="public-style robot" title="小易">
<!--<h-header :has-border="false" class="bar-custom">
<div slot="left" class="h-header-btn" @click="$hlsExit()">
<i class="ion-ios-arrow-back"/>
</div>
<div slot="center">小易</div>
</h-header>-->
<h-content id="home-content" class="has-footer">
<div v-for="item in message" class="message">
<p v-show="false" class="message-time" v-text="item.time"/>
<div v-show="!item.isFromeMe" class="message-wrap">
<img src="@/assets/image/robot/robot.png" class="head-pic">
<span class="triangle-left"/>
<p class="message" @click="showImg($event)" v-html="item.content"/>
</div>
<div v-show="item.isFromeMe" class="message-wrap">
<img v-show="userImg" :src="userImg" class="head-pic-right">
<img v-show="!userImg" src="@/assets/image/robot/user7.png" class="head-pic-right">
<span class="triangle-right"/>
<p class="message-right" v-text="item.content"/>
</div>
</div>
</h-content>
<bottom-tab class="bar bar-footer bar-light">
<label class="item item-input footer-input">
<textarea
v-auto-size ref="textarea" v-model="robot_message.question" placeholder="请输入"
rows="1"/>
</label>
<div class="footer-btn-wrap" @click="sendMsg()">
<div class="send-button">
<p>发送</p>
</div>
</div>
</bottom-tab>
</h-view>
</template>
<script>
export default {
name: 'Robot',
data () {
return {
userImg: window.localStorage.userImg || '',
message: [{
'isFromeMe': false,
'content': '小易7*24小时为您服务!',
}],
robot_message: {
question: null,
},
autosize: true,
height: '',
}
},
watch: {},
created: function () {
},
mounted () {
this.height = this.$refs.textarea.clientHeight
},
methods: {
scrollBottom () {
let div = document.getElementById('home-content')
div.scrollTop = div.scrollHeight
},
sendMsg () {
let vm = this
let RobotMessage = {}
if (this.robot_message.question) {
let object = {
'isFromeMe': true,
'content': this.robot_message.question,
}
this.message.push(object)
let url = process.env.rootPath + '?sysName=HLS_ROBOT&apiName=query_answer'
let question = encodeURIComponent(this.robot_message.question)
let params = {
'channel': 'app',
'userId': window.localStorage.user_id,
'sessionId': window.localStorage.user_id,
'question': question,
}
vm.hlsHttp.post(url, params).then(function (res) {
vm.resetHeight()
// 机器人聊天数据存表
RobotMessage.question = vm.robot_message.question
RobotMessage.chatId = res.chatId
vm.robot_message.question = null
if (res.answers) {
let answer = res.answers[0]
let reponse = {
'isFromeMe': false,
'content': answer.answer,
}
// 界面显示聊天
vm.message.push(reponse)
// 答案
RobotMessage.answer = answer.answer
// 历史记录表
vm.addRobotMessage(RobotMessage)
}
})
} else {
vm.hlsPopup.showLongCenter('内容不能为空')
}
},
addRobotMessage (robotMessage) {
let vm = this
let url = process.env.rootPath + '/app/addRobotMessage'
let params = {
'channel': 'app',
'userId': window.localStorage.user_id,
'sessionId': window.localStorage.user_id,
'question': robotMessage.question,
'chatId': robotMessage.chatId,
'answer': robotMessage.answer,
'respond': robotMessage.answer,
}
vm.hlsHttp.post(url, params).then(function (res) {
vm.scrollBottom()
})
},
showImg ($event) {
let vm = this
if ($event.target.tagName.toLowerCase() === 'img') {
let src = $event.target.src
vm.hlsPopup.showBigPicture({
imgUrl: src,
})
} else if ($event.target.tagName.toLowerCase() === 'a') {
let href = $event.target.href
cordova.InAppBrowser.open(href, '_system', 'location=yes')
}
},
resetHeight () {
// this.$refs.textarea.clientHeight = this.height;
this.$refs.textarea.style.height = this.height + 'px'
},
},
}
</script>
<style lang="less">
.robot {
background-color: #eeeeee;
.h-bottom-tab{
box-shadow: none;
}
.content {
background-color: #eeeeee;
//border: 1px solid red;
.message {
position: relative;
}
.message-wrap {
padding: 7px;
overflow: auto;
position: relative;
.message {
float: left;
margin-left: 16px;
background-color: #fff;
padding: 10px 8px;
line-height: 18px;
max-width: 270px;
border-radius: 5px;
font-size: 16px;
letter-spacing: 1px; /*no*/
text-align: left;
color: #000;
img{
width: 100%;
}
}
.head-pic-right {
float: right;
max-height: 35px;
height: 35px;
max-width: 35px;
width: 35px;
border-radius: 18px;
margin-left: 10px;
}
.head-pic {
float: left;
max-height: 35px;
height: 35px;
max-width: 35px;
width: 35px;
border-radius: 18px;
}
.message-right {
float: right;
margin-right: 8px;
background-color: #97d55b;
padding: 10px 8px;
line-height: 18px;
max-width: 225px;
border-radius: 5px;
font-size: 16px;
letter-spacing: 1px; /*no*/
text-align: left;
word-break: break-all;
color: #000;
}
.triangle-left {
// left: 45px;
border-color: transparent #FFF transparent transparent;
display: inline-block;
width: 0;
height: 0;
position: absolute;
border-width: 8px 10px;
border-style: solid;
top: 17px;
}
.triangle-right {
right: 45px;
border-color: transparent transparent transparent #97d55b;
display: inline-block;
width: 0;
height: 0;
position: absolute;
border-width: 8px 10px;
border-style: solid;
top: 17px;
}
}
}
.bar-footer {
height: auto !important;
min-height: 44px;
margin-top: 0;
background-color: #fafafa;
bottom: 0;
.item-input {
border: none !important;
padding: 3px 0 3px 5px;
width: 85%;
background: #fff;
margin: 5px 0;
}
.footer-btn-wrap {
height: 100%;
font-size: 16px;
width: 15%;
display: flex;
align-items: center;
justify-content: center;
.send-button {
height: 30px;
width: 100%;
//border: 1px solid red;
display: flex;
align-items: center;
justify-content: center;
p {
margin: 0 auto;
}
}
}
textarea {
line-height: 20px;
font-size: 16px;
width: 100%;
resize: none;
padding: 2px;
border: none;
margin-bottom: 0;
}
}
}
</style>
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
ref="scroll" ref="scroll"
:autoUpdate="true" :autoUpdate="true"
:pullUp="true" :pullUp="true"
class="content scroll-content"
@pullingUp="loadMore"> @pullingUp="loadMore">
<div v-if="index[0]"> <div v-if="index[0]">
<div v-for="(li,index) in list" class="workflow-list"> <div v-for="(li,index) in list" class="workflow-list">
...@@ -344,7 +343,7 @@ export default { ...@@ -344,7 +343,7 @@ export default {
} }
.content { .content {
margin-top: 40px; // margin-top: 40px;
.workflow-list { .workflow-list {
margin-top: 10px; margin-top: 10px;
......
...@@ -243,21 +243,6 @@ export default { ...@@ -243,21 +243,6 @@ export default {
'appCode': 'HLS_APP', 'appCode': 'HLS_APP',
}, },
{{/riskstrom}} {{/riskstrom}}
{{#robot}}
{
'functionId': 48,
'functionCode': '270',
'functionName': '小易',
'functionIcon': require('@/assets/home-manager/robot.png'),
'functionState': 'Robot',
'prodFlag': 'Y',
'enableFlag': 'Y',
'functionType': 'local',
'target': null,
'applicationFlag': 'N',
'appCode': 'HLS_APP',
},
{{/robot}}
], ],
}, },
], ],
......
This diff is collapsed.
This diff is collapsed.
/**
*
* @param fmt
* @returns {*}
* @constructor
*/
Date.prototype.format = function (fmt) { // eslint-disable-line
var o = {
'M+': this.getMonth() + 1, // 月份
'd+': this.getDate(), // 日
'h+': this.getHours(), // 小时
'm+': this.getMinutes(), // 分
's+': this.getSeconds(), // 秒
'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
'S': this.getMilliseconds(), // 毫秒
}
if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
for (var k in o) { if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length))) }
return fmt
}
/**
* 移除数组的某个元素
* @param dx 下标
* @returns {boolean}
*/
Array.prototype.remove = function (dx) { // eslint-disable-line
if (isNaN(dx) || dx > this.length) {
return false
}
for (var i = 0, n = 0; i < this.length; i++) {
if (this[i] !== this[dx]) {
this[n++] = this[i]
}
}
this.length -= 1
}
...@@ -3841,18 +3841,6 @@ he@1.2.x, he@^1.1.0: ...@@ -3841,18 +3841,6 @@ he@1.2.x, he@^1.1.0:
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
"hls-easy-ui@https://hel.hand-china.com/easyUI/hls-easy-ui.git":
version "0.0.4"
resolved "https://hel.hand-china.com/easyUI/hls-easy-ui.git#5f7b05e25ed733d273c1efa516e493b01ec75e04"
dependencies:
autosize "^3.0.20"
better-scroll "^1.10.3"
fastclick "https://hel.hand-china.com/easyUI/fastclick.git"
vue "^2.5.2"
vue-lazyload "1.2.3"
vue-router "^3.0.1"
vux "^2.9.2"
hmac-drbg@^1.0.0: hmac-drbg@^1.0.0:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
......
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