Skip to content

H
hls-xcmg-vue-app
Commit cf216289 authored by 786817560's avatar 786817560
Browse files
Options

Merge branch 'ren' into develop

parents d59d9a52 7331c7d9
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 58 deletions
config/index.js
View file @ cf216289
/*
* @Author: your name
* @Date: 2019-11-11 16:28:43
* @LastEditTime: 2019-12-03 18:22:07
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \hls-xcmg-vue-app\config\index.js
*/
'use strict'
// Template version: 1.2.4
// see http://vuejs-templates.github.io/webpack for documentation.
......
src/pages/contractInquire/contract-records.vue
View file @ cf216289
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-12-02 09:50:30
* @LastEditTime: 2019-12-03 12:27:02
* @LastEditors: Please set LastEditors
* @Description: 合同查询--记录
* @FilePath:
......@@ -108,32 +108,32 @@ export default {
this.$refs.scroll.scrollToTop()
if (this.selected === 'all') {
this.contract_status_n = '全部'
this.pageNum = this.pagenum
// this.pageNum = this.pagenum
this.showLists = this.lists
} else if (this.selected === 'one') {
this.contract_status_n = '待首付'
this.pageNum = this.unSigned_pagenum
// this.pageNum = this.unSigned_pagenum
this.showLists = this.unSignedLists
if (!this.unSigned_flag) {
this.recordQuery('待首付', this.unSignedLists)
}
} else if (this.selected === 'two') {
this.contract_status_n = '首付还款中'
this.pageNum = this.unRepay_pagenum
// this.pageNum = this.unRepay_pagenum
this.showLists = this.unRepayLists
if (!this.unRepay_flag) {
this.recordQuery('首付还款中', this.unRepayLists)
}
} else if (this.selected === 'three') {
this.contract_status_n = '还款中'
this.pageNum = this.repaying_pagenum
// this.pageNum = this.repaying_pagenum
this.showLists = this.repayingLists
if (!this.repaying_flag) {
this.recordQuery('还款中', this.repayingLists)
}
} else if (this.selected === 'four') {
this.contract_status_n = '已结清'
this.pageNum = this.repayed_pagenum
// this.pageNum = this.repayed_pagenum
this.showLists = this.repayedLists
if (!this.repayed_flag) {
this.recordQuery('已结清', this.repayedLists)
......@@ -254,6 +254,22 @@ export default {
loadMore () {
let vm = this
if (vm.selected === 'all') {
vm.pagenum++
vm.pageNum = vm.pagenum
} else if (vm.selected === 'one') {
vm.unSigned_pagenum++
vm.pageNum = vm.unSigned_pagenum
} else if (vm.selected === 'two') {
vm.unRepay_pagenum++
vm.pageNum = vm.unRepay_pagenum
} else if (vm.selected === 'three') {
vm.repaying_pagenum++
vm.pageNum = vm.repaying_pagenum
} else if (vm.selected === 'four') {
vm.repayed_pagenum++
vm.pageNum = vm.repayed_pagenum
}
let url = $config.basePath + 'con_contract_list'
let param = {
user_phone: window.localStorage.user_phone,
......@@ -273,30 +289,30 @@ export default {
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
// 加载更多时，将请求到的数据push到对应数组
if (this.selected === 'all') {
if (vm.selected === 'all') {
vm.lists.push(array[index])
} else if (this.selected === 'one') {
} else if (vm.selected === 'one') {
vm.unSignedLists.push(array[index])
} else if (this.selected === 'two') {
} else if (vm.selected === 'two') {
vm.unRepayLists.push(array[index])
} else if (this.selected === 'three') {
} else if (vm.selected === 'three') {
vm.repayingLists.push(array[index])
} else if (this.selected === 'four') {
} else if (vm.selected === 'four') {
vm.repayedLists.push(array[index])
}
})
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
if (this.selected === 'all') {
if (vm.selected === 'all') {
vm.lists.push(array[index])
} else if (this.selected === 'one') {
} else if (vm.selected === 'one') {
vm.unSignedLists.push(array[index])
} else if (this.selected === 'two') {
} else if (vm.selected === 'two') {
vm.unRepayLists.push(array[index])
} else if (this.selected === 'three') {
} else if (vm.selected === 'three') {
vm.repayingLists.push(array[index])
} else if (this.selected === 'four') {
} else if (vm.selected === 'four') {
vm.repayedLists.push(array[index])
}
})
......
src/pages/contractSigning/contract-detail.vue
View file @ cf216289
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-29 12:40:58
* @LastEditTime: 2019-12-03 15:09:16
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -333,6 +333,7 @@ export default {
vm.bank_flag = false
vm.isConfirm = false
vm.ischecked = false
vm.showModalValue = false
vm.confirm_note = '' // 审批意见
vm.num = 0 // 进入详情显示基本信息
vm.bp_name = vm.$route.params.item.bp_name
......@@ -494,12 +495,8 @@ export default {
if (res.result === 'S') {
vm.save_picture(vm.faceListUpload)
vm.hlsPopup.showSuccess('审批成功')
vm.$router.push({
name: 'ContractSigning',
params: {
backFlag: true,
},
})
window.localStorage.setItem('backFlag', true)
vm.$routeGo()
} else {
vm.hlsPopup.showSuccess(res.message)
}
......
src/pages/contractSigning/contract-signing.vue
View file @ cf216289
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-12-02 09:39:11
* @LastEditTime: 2019-12-03 09:50:57
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -9,7 +9,7 @@
<h-view id="contract-signing">
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="goBack">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()">
<span>合同签约</span>
</div>
</h-header>
......@@ -121,7 +121,7 @@ export default {
vm.user_bp_type = vm.$route.params.user_bp_type
vm.contractList()
} else if (from.name === 'ContractDetail') {
if (vm.$route.params.backFlag) {
if (window.localStorage.backFlag === 'true') {
vm.searchInput = ''
vm.submitPagenum = 1
vm.approvedPagenum = 1
......@@ -334,12 +334,6 @@ export default {
},
})
},
// 返回个人中心
goBack () {
this.$router.push({
name: 'MyInfo',
})
},
},
}
</script>
......
src/pages/distributorSign/contract-details.vue
View file @ cf216289
......@@ -379,12 +379,8 @@ export default {
if (res.result === 'S') {
vm.save_picture(vm.faceListUpload)
vm.hlsPopup.showSuccess('签约成功')
vm.$router.push({
name: 'ContractList',
params: {
backFlag: true,
},
})
window.localStorage.setItem('backflag', true)
vm.$routeGo()
} else {
vm.hlsPopup.showSuccess(res.message)
}
......
src/pages/distributorSign/contract-list.vue
View file @ cf216289
......@@ -86,7 +86,7 @@ export default {
this.$refs.scroll.scrollToTop()
}
},
immediate: true,
// immediate: true,
},
searchInput () {
let vm = this
......@@ -113,7 +113,7 @@ export default {
vm.approvedLists = []
vm.getLists()
} else if (from.name === 'ContractDetails') {
if (vm.$route.params.backFlag) {
if (window.localStorage.backflag === 'true') {
vm.searchInput = ''
vm.submitPagenum = 1
vm.approvedPagenum = 1
......@@ -267,7 +267,9 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.submitLists = res.lists
vm.showLists = vm.submitLists
if (vm.num === 1) {
vm.showLists = vm.submitLists
}
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
......@@ -288,7 +290,9 @@ export default {
}
vm.hlsHttp.post(url, param).then(function (res) {
vm.approvedLists = res.lists
vm.showLists = vm.approvedLists
if (vm.num === 2) {
vm.showLists = vm.approvedLists
}
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
......
src/pages/financingTrial/financing-details.vue
View file @ cf216289
......@@ -2,7 +2,7 @@
* @Descrip""/>User Settings Edit
* @Author: your name
* @Date: 2019-09-29 20:31:00
* @LastEditTime: 2019-11-28 17:37:58
* @LastEditTime: 2019-12-03 18:02:46
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -21,7 +21,7 @@
</item>
<item>
<div slot="name" class="font-color">设备总价</div>
<CurrencyInput slot="content" :value="equip_price" @input="getVal" />
<CurrencyInput slot="content" v-model="equip_price" placeholder="请输入设备总价" />
</item>
<item>
<div slot="name" class="font-color">融资金额</div>
......@@ -87,7 +87,7 @@
</item>
<item>
<div slot="name" class="font-color">年利率</div>
<input slot="content" v-model="info.int_rate_n" placeholder="请输入年利率">
<span slot="content">{{ info.int_rate_n }}</span>
</item>
<!-- <item>
<div slot="name" class="font-color">产品数量</div>
......@@ -146,8 +146,8 @@ export default {
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'FinancingTrial') {
vm.equip_price = Number(vm.$route.params.plan_price) // 参考价
// if (vm.product_plan_id !== vm.$route.params.product_plan_id) {
console.log('ssssss', vm.$route.params.plan_price)
vm.$route.params.plan_price ? vm.equip_price = Number(vm.$route.params.plan_price) : vm.equip_price = ''
// 重置产品id、试算返回id、试算状态、保险押金、gps费用、预计还款日
vm.product_plan_id = vm.$route.params.product_plan_id
vm.quotation_id = ''
......@@ -155,7 +155,6 @@ export default {
vm.insurance_fee = ''
vm.gps_fee = ''
vm.price_date_to = '请选择时间'
// }
vm.detailsQuery()
vm.repayPeriod()
}
......
src/pages/help/detail.vue
View file @ cf216289
<!--
* @Author: your name
* @Date: 2019-11-11 16:28:45
* @LastEditTime: 2019-12-02 15:32:37
* @LastEditTime: 2019-12-03 10:04:41
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \hls-xcmg-vue-app\src\pages\help\detail.vue
......@@ -23,7 +23,7 @@
<p>。</p>
</div>
<div v-if="title === '如何进行“产品试算”？'" class="article">
<p>进入首页“产品试算”功能，选择产品进入试算页面，填写相关数据，即可进行试算。</p>
<p>进入首页“产品试算”功能，选择产品进入试算页面，填写设备金额、保险押金、还款日期等数据，即可进行试算。</p>
</div>
<div v-if="title === '产品展示功能如何使用？'" class="article">
<p>进入首页“产品查询”功能，选择产品名称即可展示该类产品。</p>
......
src/pages/help/feedback.vue
View file @ cf216289
......@@ -11,7 +11,7 @@
<div class="write">
<div class="box">
<span>问题描述</span>
<textarea placeholder="请输入您的描述……" />
<textarea v-model="question_desc" placeholder="请输入您的描述……" />
</div>
</div>
<div class="upLoad">
......@@ -41,7 +41,7 @@
<p class="info">欢迎您为我们提出宝贵的意见与建议，您留下的任何信息都将改善我们的软件</p>
</h-content>
<bottom-tab>
<tab-button class="bottom-button">提&nbsp;&nbsp;交</tab-button>
<tab-button class="bottom-button" @click.native = "handSubmit">提&nbsp;&nbsp;交</tab-button>
</bottom-tab>
</h-view>
</template>
......@@ -51,14 +51,37 @@ import ps from '../../assets/constractSigning/bank.png'
export default {
data () {
return {
question_desc: '', // 问题描述
list: {
chck_id: '123456',
},
upload_list: [], // 上传图片列表
}
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'HelpList') {
vm.question_desc = ''
}
})
},
methods: {
// 图片上传入口
handSubmit () {
let vm = this
let url = process.env.basePath + 'app_question_save'
let param = {
'master': {
user_phone: window.localStorage.user_phone,
question_desc: vm.question_desc,
},
}
vm.hlsPopup.showLoading('提交数据中!')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log(',,,,,', res)
})
},
// 图片上传入口
imgUploadShow (check_id) {
let vm = this
// vm.upload_list = []
......
src/pages/help/help-list.vue
View file @ cf216289
......@@ -25,7 +25,7 @@
<li @click="changeDetail('如何通过扫描录入进件？')">如何通过扫描录入进件？</li>
</ul>
</div>
<div class="question">
<!-- <div class="question">
<div class="question-top" @click="show(1)">
<span>客户绑定相关问题</span>
<img class="img1" src="@/assets/help/down.png" >
......@@ -34,7 +34,7 @@
<li>如何进行客户绑定？</li>
<li>如何通过扫描录入进件？</li>
</ul>
</div>
</div> -->
<div class="question">
<div class="question-top" @click="show(2)">
<span>功能相关问题</span>
......
src/pages/productQuery/product-detailed.vue
View file @ cf216289
......@@ -2,7 +2,7 @@
* @Descrip: 产品明细
* @Author: your name
* @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-11-29 09:21:47
* @LastEditTime: 2019-12-03 15:36:03
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -294,6 +294,7 @@ export default {
let vm = this
let url = $config.basePath + 'prd_product_conf'
let param = {
bp_id: vm.bp_id,
product_id: vm.$route.params.product_id,
}
vm.hlsPopup.showLoading('数据加载中')
......
src/pages/videoSign/video-list.vue
View file @ cf216289
......@@ -39,7 +39,7 @@
<span class="number">{{ item.total_price }}</span>
</li>
<li>
<p v-if="item.leases_status ==='N'" class="to-unSign" @click="toSign1">
<p v-if="item.interview_status ==='待面签'" class="to-unSign" @click="toSign1">
<img src="@/assets/videoSign/unSign.png" >&nbsp;视频面签1
</p>
<p v-if="item.leases_status ==='N'" class="to-unSign" @click="toSign2">
......@@ -85,7 +85,7 @@ export default {
if (from.name === 'MyInfo') {
vm.searchInput = ''
vm.pagenum = 1
vm.tabNum = 1
vm.tabNum = 0
vm.submitPagenum = 1
vm.approvedPagenum = 1
vm.approvedFlag = false
......@@ -212,6 +212,7 @@ export default {
pagesize: 10,
searchInput: vm.searchInput,
pagenum: vm.submitPagenum,
// interview_status: '待面签',
user_phone: window.localStorage.getItem('user_phone'),
}
hlsPopup.showLoading('请稍候')
......
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