Skip to content

H
hls-xcmg-vue-app
Commit 7fd35740 authored by 邹骏's avatar 邹骏
Browse files
Options

需求修改

parent f6abeca5
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 44 deletions
config.xml
View file @ 7fd35740
......@@ -110,4 +110,5 @@
<plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
<engine name="android" spec="~6.2.3" />
<plugin name="IdCardPlugin" spec="C:\Users\zoujun\Desktop\pl\IdCardPlugin-测试" />
</widget>
config/prod.env.js
View file @ 7fd35740
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
appId: '"com.xcmg.app"',
currentVersion: '"0.2.0"'
currentVersion: '"0.2.1"'
}
config/uat.env.js
View file @ 7fd35740
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"2.5.9"'
currentVersion: '"2.6.2"'
}
package-lock.json
View file @ 7fd35740
......@@ -166,6 +166,9 @@
"integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
"dev": true
},
"IdCardPlugin": {
"version": "file:C:/Users/zoujun/Desktop/pl/IdCardPlugin-测试"
},
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz",
......@@ -2498,13 +2501,13 @@
}
},
"cordova-android": {
"version": "6.2.3",
"resolved": "https://registry.npm.taobao.org/cordova-android/download/cordova-android-6.2.3.tgz",
"integrity": "sha1-JJ8hts5fHxyEenq4OxaQnb7Vqig=",
"version": "6.2.0",
"resolved": "https://registry.npm.taobao.org/cordova-android/download/cordova-android-6.2.0.tgz",
"integrity": "sha1-32iB29cuIzA8o9/e03KrAWFMAXM=",
"dev": true,
"requires": {
"cordova-common": "^2.0.1",
"elementtree": "0.1.6",
"elementtree": "^0.1.6",
"nopt": "^3.0.1",
"properties-parser": "^0.2.3",
"q": "^1.4.1",
......@@ -2532,7 +2535,7 @@
"dev": true
},
"big-integer": {
"version": "1.6.22",
"version": "1.6.17",
"bundled": true,
"dev": true
},
......@@ -2545,7 +2548,7 @@
}
},
"brace-expansion": {
"version": "1.1.7",
"version": "1.1.6",
"bundled": true,
"dev": true,
"requires": {
......@@ -2559,7 +2562,7 @@
"dev": true
},
"cordova-common": {
"version": "2.0.2",
"version": "2.0.1",
"bundled": true,
"dev": true,
"requires": {
......@@ -2584,11 +2587,11 @@
"dev": true
},
"elementtree": {
"version": "0.1.6",
"version": "0.1.7",
"bundled": true,
"dev": true,
"requires": {
"sax": "0.3.5"
"sax": "1.1.4"
}
},
"glob": {
......@@ -2692,7 +2695,7 @@
"dev": true
},
"sax": {
"version": "0.3.5",
"version": "1.1.4",
"bundled": true,
"dev": true
},
......
package.json
View file @ 7fd35740
......@@ -13,6 +13,7 @@
"clean": "rimraf www/*"
},
"dependencies": {
"IdCardPlugin": "file:C:/Users/zoujun/Desktop/pl/IdCardPlugin-测试",
"autosize": "^3.0.20",
"better-scroll": "^1.10.3",
"cordova-ios": "^5.1.1",
......@@ -33,8 +34,7 @@
"vue-router": "^3.0.1",
"vuex": "^2.1.1",
"vuex-i18n": "^1.3.1",
"vux": "^2.9.0",
"cordova-android": "~6.2.3"
"vux": "^2.9.0"
},
"devDependencies": {
"autoprefixer": "^7.1.2",
......@@ -50,7 +50,7 @@
"chalk": "^2.0.1",
"connect-history-api-fallback": "^1.3.0",
"copy-webpack-plugin": "^4.0.1",
"cordova-android": "^6.2.3",
"cordova-android": "^6.2.0",
"cross-env": "^5.2.0",
"css-loader": "^0.28.0",
"eslint": "^4.15.0",
......
plugins/fetch.json
View file @ 7fd35740
......@@ -227,7 +227,7 @@
"IdCardPlugin": {
"source": {
"type": "local",
"path": "E:\\Project\\hand\\hls-xcmg-vue-app\\node_modules\\idcardplugin-test"
"path": "E:\\Project\\hand\\hls-xcmg-vue-app\\node_modules\\IdCardPlugin"
},
"is_top_level": true,
"variables": {}
......
src/pages/contractCreate/creat-rent-info.vue
View file @ 7fd35740
......@@ -123,13 +123,13 @@
<div slot="name" class="required">产品数量</div>
<input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请输入产品数量">
</item>
<item class="check" @click.native="saveInfo.if_sent_car=!saveInfo.if_sent_car">
<!-- <item class="check" @click.native="saveInfo.if_sent_car=!saveInfo.if_sent_car">
<div slot="name" class="required">是否已发车</div>
<img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!saveInfo.if_sent_car" slot="content" />
</item>
</item> -->
</list-item>
<div v-if="saveInfo.if_sent_car">
<!-- <div v-if="saveInfo.if_sent_car">
<div class="userInfo" v-if="saveInfo.if_sent_car">租赁物信息<img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="downNum=true;resetRent()"></div>
<item-option v-for="(item,index) in leaseList" ref="underTake" :key="index" class="mySlider">
<list-item :item-height="68" @click.native="downNum=true;getRent(item.project_lease_item_id)">
......@@ -148,7 +148,7 @@
<option-button type="delete" text @click.native="delete_release(item.project_lease_item_id,index)"></option-button>
</div>
</item-option>
</div>
</div> -->
<div class="userInfo">融资信息</div>
<div class="hint-info">
<img src="@/assets/contractCreate/hint.png">提示 以下为单个设备商务政策
......@@ -557,6 +557,7 @@ export default {
vm.divisionLists = []
vm.pagenum = 1
vm.pagenumPolicy = 1
vm.downNum = false
vm.setTime()
vm.fromPage = window.localStorage.fromPage
vm.saveInfo.project_id = window.localStorage.project_id // 重新赋值，防止缓存
......@@ -584,7 +585,7 @@ export default {
vm.rentList()
}
Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
if (i !== 'project_id' && i !== 'bp_name' && i !== 'lease_start_date') {
if (i !== 'project_id' && i !== 'bp_name' && i !== 'lease_start_date' && i !== 'if_sent_car') {
vm.saveInfo[i] = ''
}
})
......@@ -599,6 +600,7 @@ export default {
vm.repayPeriod()// 还款周期查询
vm.getPayWay()// 支付方式查询
}, 0)
console.log(vm.factory_ocr_type)
}
})
},
......@@ -935,10 +937,13 @@ export default {
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
Object.assign(vm.saveInfo, res.info)
vm.saveInfo.product_plan_name = res.info.product_plan_id_n
vm.saveInfo.division_n = res.info.product_name
vm.saveInfo.down_payment = res.info.down_payment
if (res.info !== undefined) {
Object.assign(vm.saveInfo, res.info)
vm.saveInfo.product_plan_name = res.info.product_plan_id_n
vm.factory_ocr_type = res.info.factory_ocr_type
vm.saveInfo.division_n = res.info.product_name
vm.saveInfo.down_payment = res.info.down_payment
}
vm.saveInfo.int_rate_n = vm.saveInfo.int_rate_n.replace('%', '')
vm.saveInfo.down_payment_ratio_n = vm.saveInfo.down_payment_ratio_n.replace('%', '')
vm.saveInfo.deposit_ratio_n = vm.saveInfo.deposit_ratio_n.replace('%', '')
......@@ -1039,6 +1044,11 @@ export default {
let param = {
master: vm.saveInfo,
}
if (vm.saveInfo.if_sent_car == true) {
param.master.if_sent_car = 'Y'
} else if (vm.saveInfo.if_sent_car == false) {
param.master.if_sent_car = 'N'
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
......@@ -1934,7 +1944,6 @@ export default {
.date-check {
background: url("../../assets/trial/date.png") 350px no-repeat;
background-size: 16px 16px;
padding-right: 15px;
}
.hint-info {
......
src/pages/functionCenter/approval-info.vue
View file @ 7fd35740
......@@ -74,18 +74,12 @@ export default {
this.record_id = this.$route.params.record_id
this.type = this.$route.params.type
this.bpclass = this.$route.params.bpclass
console.log('--------------------------')
console.log(this.document_id)
if (this.bpclass == 'NP') {
this.isSelected(0)
this.$refs.activedCom.getMultipleRole()
this.$refs.activedCom.getBpType()
this.$refs.activedCom.getbaseInfo()
this.$refs.activedCom.loadItemList(true)
} else if (this.bpclass == 'ORG') {
this.isSelected(1)
this.$refs.activedCom.getMultipleRole()
this.$refs.activedCom.getBpType()
this.$refs.activedCom.getbaseInfo()
this.$refs.activedCom.loadItemList(true)
}
},
created () {
......@@ -96,16 +90,8 @@ export default {
this.bpclass = this.$route.params.bpclass
if (this.bpclass == 'NP') {
this.isSelected(0)
this.$refs.activedCom.getMultipleRole()
this.$refs.activedCom.getBpType()
this.$refs.activedCom.getbaseInfo()
this.$refs.activedCom.loadItemList(true)
} else if (this.bpclass == 'ORG') {
this.isSelected(1)
this.$refs.activedCom.getMultipleRole()
this.$refs.activedCom.getBpType()
this.$refs.activedCom.getbaseInfo()
this.$refs.activedCom.loadItemList(true)
}
},
methods: {
......
src/pages/home/home-page.vue
View file @ 7fd35740
......@@ -131,7 +131,6 @@ export default {
// } else { // ios使用插件定位
console.log('&&&&&&&&&&&&___ios')
// if (!$config.isMobilePlatform) {
// }
baidumap_location.getCurrentPosition(function (result) {
if (window.localStorage.getItem('province')) {
......
www/index.html
View file @ 7fd35740
<!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=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.fc841f5d74a3f3a31cb51827eea96d2a.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.d1d652612de8a132d4e5.js></script><script type=text/javascript src=./static/js/app.19a8959a1a4e70a0d0cc.js></script></body></html>
\ 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=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.ab4b75077c5dc235ef1ae0e67a560945.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.c03114a139eeae927c64.js></script><script type=text/javascript src=./static/js/app.67a421d22f3e21c60089.js></script></body></html>
\ No newline at end of file
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