Skip to content

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

Merge branch 'ren' into develop

parents 1a375898 bdce7ad3
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 96 deletions
src/pages/contractSigning/contract-detail.vue
View file @ 43e77420
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-23 18:37:15
* @LastEditTime: 2019-10-24 10:21:55
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -126,7 +126,7 @@
<img src="@/assets/constractSigning/read.png" alt="" class="read">
</div>
<div slot="content" class="in-all">
<div v-show="confirm_status === 'SUBMIT'" @click="entryInfo"><img src="@/assets/constractSigning/scan.png" alt=""></div>
<div @click="entryInfo"><img src="@/assets/constractSigning/scan.png" alt=""></div>
<div @click="goContractContent('农行代扣授权书')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
</div>
......@@ -197,11 +197,11 @@ export default {
},
activated () {
// console.log('...........', this.$route.params.confirm_status)
if (window.sessionStorage.getItem('add_status') === 'true') { // 根据add_status值改变entry_info_flag，传入银行卡录入页面，负责重置数据与否
this.entry_info_flag = true
} else {
this.entry_info_flag = false
}
// if (window.sessionStorage.getItem('add_status') === 'true') { // 根据add_status值改变entry_info_flag，传入银行卡录入页面，负责重置数据与否
// this.entry_info_flag = true
// } else {
// this.entry_info_flag = false
// }
},
methods: {
// 合同商务条件查询
......
src/pages/contractSigning/entry-info.vue
View file @ 43e77420
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-24 09:24:21
* @LastEditTime: 2019-10-24 10:32:12
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -100,7 +100,8 @@ export default {
activated () {
this.name = this.$route.params.name
this.bankCardQuery()
if (this.project_id !== this.$route.params.project_id || !this.$route.params.entry_info_flag) {
// || !this.$route.params.entry_info_flag
if (this.project_id !== this.$route.params.project_id) {
this.project_id = this.$route.params.project_id
this.bankImg = ''
this.bank_lists = [
......@@ -233,6 +234,9 @@ export default {
}
vm.hlsHttp.post(url, param).then(function (res) {
console.log('bankcardinfo。。。。。。。。。。。。', res)
if (!(JSON.stringify(res.info) === '{}')) {
vm.bank_lists[0] = res.info
}
})
},
},
......
src/pages/financingTrial/financing-trial.vue
View file @ 43e77420
......@@ -2,7 +2,7 @@
* @Descrip 融资试算
* @Author: your name
* @Date: 2019-09-29 17:09:49
* @LastEditTime: 2019-10-18 10:11:01
* @LastEditTime: 2019-10-24 10:52:13
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -70,6 +70,19 @@ export default {
}
next()
},
activated () {
// let vm = this
// let url = $config.basePath + 'con_bank_query'
// let param = {
// project_id: vm.$route.params.project_id,
// }
// vm.hlsHttp.post(url, param).then(function (res) {
// console.log('bankcardinfo。。。。。。。。。。。。', res)
// if (!(JSON.stringify(res.info) === '{}')) {
// vm.bank_lists[0] = res.info
// }
// })
},
created () {
},
......
src/pages/myProductCollection/my-product-list.Vue
View file @ 43e77420
<!--
* @Author: your name
* @Date: 2019-10-22 20:26:28
* @LastEditTime: 2019-10-24 12:28:54
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \hls-xcmg-vue-app\src\pages\myProductCollection\my-product-list.Vue
-->
/**
* @Author Sean
* @Date 2019/10/22
*/
<template>
<h-view class="public-style" style="height: 100%">
<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>
<h-view class="public-style" style="height: 100%">
<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>
<h-content>
<div class="hinput">
<div class="search-box">
<input type="text" placeholder="请输入经销商/产品名称/参数项">
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</h-header>
<h-content>
<div class="hinput">
<div class="search-box">
<input type="text" placeholder="请输入经销商/产品名称/参数项">
<img src="@/assets/distributorSign/search.png" alt="">
</div>
<list-item v-for="item in productList" :key="item.product_id">
<item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status)">
<div slot="name" class="item-pic">
<img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
</div>
<div slot="content" class="item-content">
<div class="centers">
<p class="firsts1">经销商</p>
<p class="seconds1">{{ item.bp_name }}</p>
</div>
<div class="centers">
<p class="firsts1">参数项</p>
<p class="seconds1">{{ item.product_code }}</p>
</div>
<div class="centers">
<p class="firsts1">产品名称</p>
<p class="seconds1">{{ item.product_name }}</p>
</div>
</div>
<list-item v-for="item in productList" :key="item.product_id">
<item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status)">
<div slot="name" class="item-pic">
<img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
</div>
<div slot="content" class="item-content">
<div class="centers">
<p class="firsts1">经销商</p>
<p class="seconds1">{{ item.bp_name }}</p>
</div>
<div class="centers">
<p class="firsts1">参数项</p>
<p class="seconds1">{{ item.product_code }}</p>
</div>
<div class="centers">
<p class="firsts1">产品名称</p>
<p class="seconds1">{{ item.product_name }}</p>
</div>
</div>
<div slot="right-icon">
<img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
</div>
</item>
</list-item>
</h-content>
</h-view>
<div slot="right-icon">
<img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
</div>
</item>
</list-item>
</h-content>
</h-view>
</template>
<script>
export default {
data() {
return {
productList: [],
}
},
created: function () {
},
mounted: function () {
},
updated: function () {
},
destroyed: function () {
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'MyInfo') {
vm.getList()
}
})
},
methods: {
getList(){
let vm = this
let url = $config.basePath + 'my_collection_query'
let param = {
user_phone: window.localStorage.getItem('user_phone'),
}
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
vm.productList = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// val：产品id, status: 收藏状态
goDetailed (val, status) { // 进入产品查询功能明细页面
window.sessionStorage.setItem('collect_status', status)
this.$router.push({
name: 'ProDetailed',
params: {
product_id: val,
// collect_status: status,
},
})
},
}
export default {
data () {
return {
productList: [],
}
},
created: function () {
},
mounted: function () {
},
updated: function () {
},
destroyed: function () {
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'MyInfo') {
vm.getList()
}
})
},
methods: {
getList () {
let vm = this
let url = $config.basePath + 'my_collection_query'
let param = {
user_phone: window.localStorage.getItem('user_phone'),
}
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
vm.productList = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// val：产品id, status: 收藏状态
goDetailed (val, status) { // 进入产品查询功能明细页面
window.sessionStorage.setItem('collect_status', status)
this.$router.push({
name: 'ProDetailed',
params: {
product_id: val,
// collect_status: status,
},
})
},
},
}
</script>
<style scoped lang="less" rel="stylesheet">
......
src/pages/userBind/org/enterprise.vue
View file @ 43e77420
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-19 09:31:19
* @LastEditTime: 2019-10-23 14:04:33
* @LastEditTime: 2019-10-24 10:00:33
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -781,6 +781,9 @@ export default {
case 'bp_type':
vm.hlsPopup.showLongCenter('客户类型未填写')
break
case 'agent_username':
vm.hlsPopup.showLongCenter('业务经办员工代码未填写')
break
case 'bp_name':
vm.hlsPopup.showLongCenter('公司名称未填写')
break
......
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