Skip to content

H
hls-xcmg-vue-app
Commit 6dcb7a8e authored by Jennie Shi's avatar Jennie Shi
Browse files
Options

jeshi

parent fc6ac38c
Show whitespace changes
Inline Side-by-side
Showing with 173 additions and 135 deletions
config.xml
View file @ 6dcb7a8e
...@@ -102,4 +102,5 @@ ...@@ -102,4 +102,5 @@
<plugin name="cordova-plugin-device" spec="2.0.2" /> <plugin name="cordova-plugin-device" spec="2.0.2" />
<plugin name="cordova-plugin-splashscreen" spec="5.0.2" /> <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" /> <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
<engine name="android" spec="~6.2.0" />
</widget> </widget>
index.html
View file @ 6dcb7a8e
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<script type="text/javascript" src="cordova.js"></script> <script type="text/javascript" src="cordova.js"></script>
<!-- 定位 --> <!-- 定位 -->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script> <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script>
<title>徐工融租</title> <title>徐工金服</title>
</head> </head>
<body> <body>
<div id="app-box"></div> <div id="app-box"></div>
......
src/pages/carConfirm/confirm-detail.vue
View file @ 6dcb7a8e
...@@ -300,22 +300,24 @@ export default { ...@@ -300,22 +300,24 @@ export default {
}, },
goContent (item) { goContent (item) {
// 详情 // 详情
// window.open(url) // 合同状态更新保存
// cordova.InAppBrowser.open(url, '_self', 'location=yes')
cordova.ThemeableBrowser.open(item.attachment_file_path, '_blank', {})
let vm = this let vm = this
vm.attachFlag = true
vm.attachUrl = item.attachment_file_path
let url = process.env.basePath + 'prj_content_status_save' let url = process.env.basePath + 'prj_content_status_save'
let param = { let param = {
parameter: {
master: { master: {
content_id: item.content_id, content_id: item.content_id,
auth_credit_flag: 'Y', auth_credit_flag: 'Y',
}, },
},
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => { vm.hlsHttp.post(url, param).then(res => {
hlsPopup.hideLoading() hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.$router.push({name: 'previewPdf', params: {attachUrl: vm.attachUrl}})
} else { } else {
vm.hlsPopup.showLongCenter(res.message) vm.hlsPopup.showLongCenter(res.message)
} }
...@@ -652,7 +654,11 @@ export default { ...@@ -652,7 +654,11 @@ export default {
} }
.aguremrnt-list { .aguremrnt-list {
display: flex; display: flex;
display: -webkit-flex;
flex-direction: row; flex-direction: row;
-webkit-flex-direction:row;
align-items:center;
-webkit-align-items:center;
.unread { .unread {
width: 34px; width: 34px;
height: 20px; height: 20px;
...@@ -674,8 +680,8 @@ export default { ...@@ -674,8 +680,8 @@ export default {
} }
.second { .second {
height: 32px; // height: 32px;
line-height: 32px; // line-height: 32px;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
margin-left: 16px; margin-left: 16px;
......
src/pages/contractSigning/contract-detail.vue
View file @ 6dcb7a8e
...@@ -131,6 +131,10 @@ ...@@ -131,6 +131,10 @@
</div> </div>
</item> </item>
</list-item> </list-item>
<!-- <iframe
v-if="attachFlag" :src="attachUrl"
frameborder="0" scrolling="yes" width="100%"
height="100%" /> -->
</h-content> </h-content>
<h-content v-if="num === 1"> <h-content v-if="num === 1">
<list-item :item-height="44" class="second-part"> <list-item :item-height="44" class="second-part">
...@@ -293,6 +297,8 @@ export default { ...@@ -293,6 +297,8 @@ export default {
isshow: false, // 提示框的显示与隐藏 isshow: false, // 提示框的显示与隐藏
bp_flag: false, // 判断自然人和法人 bp_flag: false, // 判断自然人和法人
num: 0, num: 0,
attachFlag: false,
attachUrl: null,
tabNum: null, tabNum: null,
bp_name: '', bp_name: '',
read_status: 'N', read_status: 'N',
...@@ -431,11 +437,10 @@ export default { ...@@ -431,11 +437,10 @@ export default {
}, },
goContent (item) { goContent (item) {
// 详情 // 详情
// window.open(url)
// cordova.InAppBrowser.open(url, '_self', 'location=yes')
cordova.ThemeableBrowser.open(item.attachment_file_path, '_blank', {})
// 合同状态更新保存 // 合同状态更新保存
let vm = this let vm = this
vm.attachFlag = true
vm.attachUrl = item.attachment_file_path
let url = process.env.basePath + 'prj_content_status_save' let url = process.env.basePath + 'prj_content_status_save'
let param = { let param = {
parameter: { parameter: {
...@@ -449,6 +454,7 @@ export default { ...@@ -449,6 +454,7 @@ export default {
vm.hlsHttp.post(url, param).then(res => { vm.hlsHttp.post(url, param).then(res => {
hlsPopup.hideLoading() hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.$router.push({name: 'previewPdf', params: {attachUrl: vm.attachUrl}})
} else { } else {
vm.hlsPopup.showLongCenter(res.message) vm.hlsPopup.showLongCenter(res.message)
} }
...@@ -1031,7 +1037,6 @@ export default { ...@@ -1031,7 +1037,6 @@ export default {
.alert { .alert {
padding-bottom: 30px; padding-bottom: 30px;
width: 100%; width: 100%;
//margin-top: -10px;
background: #fbf2d2; background: #fbf2d2;
} }
.alert-fund { .alert-fund {
...@@ -1333,10 +1338,13 @@ export default { ...@@ -1333,10 +1338,13 @@ export default {
letter-spacing: 0; letter-spacing: 0;
} }
} }
.aguremrnt-list { .aguremrnt-list {
display: flex; display: flex;
display: -webkit-flex;
flex-direction: row; flex-direction: row;
-webkit-flex-direction:row;
align-items:center;
-webkit-align-items:center;
.unread{ .unread{
width:34px; width:34px;
height: 20PX; height: 20PX;
...@@ -1358,8 +1366,8 @@ export default { ...@@ -1358,8 +1366,8 @@ export default {
} }
.second { .second {
height: 32px; // height: 32px;
line-height: 32px; // line-height: 32px;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
margin-left: 16px; margin-left: 16px;
......
src/pages/contractSigning/previewPdf.vue 0 → 100644
View file @ 6dcb7a8e
<template>
<h-view class="previewPdf">
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>合同预览</span>
</div>
</h-header>
<iframe
:src="attachUrl"
frameborder="0" scrolling="yes" width="100%"
height="100%" />
</h-view>
</template>
<script>
export default {
data () {
return {
attachUrl: this.$route.params.attachUrl,
}
},
}
</script>
<style lang="less" rel="stylesheet">
</style>
src/router/index.js
View file @ 6dcb7a8e
...@@ -125,6 +125,7 @@ import PickLessee from '@/pages/contractCreate/pick-lessee' ...@@ -125,6 +125,7 @@ import PickLessee from '@/pages/contractCreate/pick-lessee'
import CreateBaseInfo from '@/pages/contractCreate/create-base-info' import CreateBaseInfo from '@/pages/contractCreate/create-base-info'
import CreateRentInfo from '@/pages/contractCreate/creat-rent-info' import CreateRentInfo from '@/pages/contractCreate/creat-rent-info'
import CreateEnclosureInfo from '@/pages/contractCreate/create-enclosure-info' import CreateEnclosureInfo from '@/pages/contractCreate/create-enclosure-info'
import previewPdf from '@/pages/contractSigning/previewPdf'
// 我的发票 // 我的发票
import MyInvoice from '@/pages/invoice/invoice' import MyInvoice from '@/pages/invoice/invoice'
...@@ -296,6 +297,7 @@ export default new Router({ ...@@ -296,6 +297,7 @@ export default new Router({
{path: '/create-base-info', component: CreateBaseInfo, name: 'CreateBaseInfo', meta: {keepAlive: true}}, {path: '/create-base-info', component: CreateBaseInfo, name: 'CreateBaseInfo', meta: {keepAlive: true}},
{path: '/create-rent-info', component: CreateRentInfo, name: 'CreateRentInfo', meta: {keepAlive: true}}, {path: '/create-rent-info', component: CreateRentInfo, name: 'CreateRentInfo', meta: {keepAlive: true}},
{path: '/create-enclosure-info', component: CreateEnclosureInfo, name: 'CreateEnclosureInfo', meta: {keepAlive: true}}, {path: '/create-enclosure-info', component: CreateEnclosureInfo, name: 'CreateEnclosureInfo', meta: {keepAlive: true}},
{path: '/previewPdf', component: previewPdf, name: 'previewPdf', meta: {keepAlive: true}},
// 我的发票 // 我的发票
{path: '/invoice', component: MyInvoice, name: 'MyInvoice', meta: {keepAlive: false}}, {path: '/invoice', component: MyInvoice, name: 'MyInvoice', meta: {keepAlive: false}},
], ],
......
www/index.html 100755 → 100644
View file @ 6dcb7a8e
<<<<<<< HEAD <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.319a48f0ae278016467a36c7c8fdc1b9.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3f20fa93928dc721ea21.js></script><script type=text/javascript src=./static/js/app.edf254bec46da36c7032.js></script></body></html>
<<<<<<< HEAD \ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.486eb393b1929813a88cd1e17a0b75ae.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.347d8a64f0016023e186.js></script><script type=text/javascript src=./static/js/app.cf0b522c85816b556395.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.1fba01d4acb1ed0185103a92c1363a7a.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.737b66774b6e80545073.js></script><script type=text/javascript src=./static/js/app.b55aa48989ca8151b595.js></script></body></html>
>>>>>>> 9acbe89d947ec7fd32a726a05985fc405fef6acb
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.a1bf5c012e0d37c257e22ffbcd1475db.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3f20fa93928dc721ea21.js></script><script type=text/javascript src=./static/js/app.2e1cb6fea43cbdb7228e.js></script></body></html>
>>>>>>> jeshi
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