Skip to content

H
hls-xcmg-vue-app
Commit ffbb28a5 authored by 李晓兵's avatar 李晓兵
Browse files
Options

'bug修复'

parents 6baf19c8 d73d99f3
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 82 deletions
src/pages/myInfo/my-info.vue
View file @ ffbb28a5
......@@ -91,7 +91,7 @@ export default {
user_bp_class: '',
bp_id: '',
user_phone: '',
// show: false,
user_bp_name: '',
}
},
watch: {
......@@ -219,6 +219,7 @@ export default {
name: 'NaturePerson',
params: {
bp_id: this.bp_id,
user_bp_name: this.user_bp_name,
},
})
} else {
......@@ -226,6 +227,7 @@ export default {
name: 'Enterprise',
params: {
bp_id: this.bp_id,
user_bp_name: this.user_bp_name,
},
})
}
......@@ -236,6 +238,7 @@ export default {
name: 'NaturePerson',
params: {
bp_id: this.bp_id,
user_bp_name: this.user_bp_name,
status: 'APPROVED',
},
})
......@@ -244,6 +247,7 @@ export default {
name: 'Enterprise',
params: {
bp_id: this.bp_id,
user_bp_name: this.user_bp_name,
status: 'APPROVED',
},
})
......@@ -274,6 +278,7 @@ export default {
vm.user_bp_status = res.info.user_bp_status
vm.user_bp_class = res.info.user_bp_class
vm.bp_id = res.info.user_bp_id
vm.user_bp_name = res.info.user_bp_name
vm.user_phone = res.info.user_phone
} else {
this.hlsPopup.showLongCenter(res.message)
......
src/pages/productQuery/product-list.vue
View file @ ffbb28a5
......@@ -18,7 +18,7 @@
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</div>
<list-item v-for="item in lists" :item-height="102" :key="item.product_id">
<list-item v-for="item in lists" :key="item.product_id">
<item>
<div slot="name" class="item-pic">
<img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
......@@ -135,7 +135,7 @@ export default {
.arrow {
width: 16px;
height: 16px;
margin-left: 30px;
// margin-left: 30px;
margin-top: 16px;
}
.item-pic {
......@@ -147,19 +147,21 @@ export default {
}
}
.item-content {
height: 102px;
// width: 100%;
// height: 102px;
width: 100%;
margin-left: 20px;
.center:nth-of-type(1) {
margin-top: 16px;
}
.center:nth-of-type(2) {
margin-top: 10px;
margin-top: 6px;
}
.center:nth-of-type(3) {
margin-top: 10px;
margin-top: 6px;
}
.center {
// margin-top: 6px;
// white-space: nowrap;
font-family: PingFangSC-Semibold;
font-size: 13px;
color: rgba(56,63,69,0.60);
......@@ -172,10 +174,13 @@ export default {
color: rgba(56,63,69,0.60);
}
.seconds {
margin-left: 20px;
margin-left: 16px;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #383F45;
// white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
}
}
}
......
src/pages/productQuery/query-home.vue
View file @ ffbb28a5
......@@ -2,7 +2,7 @@
* @Descrip: 查询首页
* @Author: your name
* @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-10-16 15:55:05
* @LastEditTime: 2019-10-17 13:33:48
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -20,9 +20,9 @@
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</div>
<div v-for="item in prolists" :key="item.factory_bp_id" class="wrap">
<div v-for="(item,index) in prolists" :key="index" class="wrap">
<div class="box" @click="goLists(item.division)">
<div class="box">
<div class="first">
<img src="@/assets/productQuery/product-query.png" alt="">
<p class="product-class">产品类别</p>
......@@ -30,10 +30,17 @@
</div>
<div class="second">
<p class="product-class">产品线</p>
<p class="product">{{ item.division_n }}</p>
<img src="@/assets/productQuery/pull.png" alt="">
<div class="product">
<p>{{ item.division_n }}</p>
<div v-for="items in divisionList" v-if="list_flag&&item.factory_bp_id === factory_bp_id " :key="items.division" class="division-lists">
<div>
<p @click="checkDivision(items.product_line,items.division,index)">{{ items.product_line }}</p>
</div>
</div>
</div>
<img src="@/assets/productQuery/pull.png" alt="" @click="queryDivision(item.factory_bp_id)">
</div>
<img class="arrow" src="@/assets/productQuery/getIn.png" alt="">
<img class="arrow" src="@/assets/productQuery/getIn.png" alt="" @click="goLists(item.division)">
</div>
</div>
</h-content>
......@@ -46,6 +53,9 @@ export default {
data () {
return {
prolists: [],
divisionList: [],
list_flag: false,
factory_bp_id: '',
}
},
computed: {},
......@@ -84,6 +94,28 @@ export default {
},
})
},
queryDivision (val) {
let vm = this
let url = $config.basePath + 'prd_product_division_list'
let param = {
factory_bp_id: val,
}
vm.$post(url, param).then(function (res) {
console.log(res)
if (res.result === 'S') {
vm.divisionList = res.lists
vm.list_flag = !vm.list_flag
vm.factory_bp_id = val
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
checkDivision (val, division, index) {
this.prolists[index].division_n = val
this.prolists[index].division = division
this.list_flag = !this.list_flag
},
},
}
</script>
......@@ -184,7 +216,28 @@ export default {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #383F45;
margin-left: 16px
margin-left: 16px;
.division-lists {
width: 100%;
height: auto;
position: relative;
z-index: 1000;
border: 1px solid #ccc;
border-bottom: none;
// margin-top: 4px;
div {
background: #fff;
//border: 1px solid #ccc;
p {
width: 100%;
height: 24px;
line-height: 24px;
border-bottom: 1px solid #ccc;
// text-align: center
}
}
}
}
img {
width: 16px;
......
src/pages/productQuery/tab.vue
View file @ ffbb28a5
......@@ -2,33 +2,36 @@
* @Description: 详情tab
* @Author: your name
* @Date: 2019-09-25 19:47:59
* @LastEditTime: 2019-10-16 09:29:53
* @LastEditTime: 2019-10-17 10:55:24
* @LastEditors: Please set LastEditors
-->
<template>
<div class="tab-style">
<span @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?check1:uncheck1"></span>
<span @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?check2:uncheck2" ></span>
<span @click="tabNum = 2;sendTabNum()"><img :src="tabNum == 2?check3:uncheck3"></span>
<div :class="{'tab-content-bg':tabNum == 0}" class="tab-content" @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?baseInfo:unBaseInfo"><span
:class="{'colored':tabNum == 0}">基本信息</span></div>
<div :class="{'tab-content-bg':tabNum == 1}" class="tab-content" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?detail:unDetail"><span
:class="{'colored':tabNum == 1}">商品详情</span></div>
<div :class="{'tab-content-bg':tabNum == 2}" class="tab-content" @click="tabNum = 2;sendTabNum()"><img :src="tabNum == 2?config:unConfig"><span
:class="{'colored':tabNum == 2}">产品配置</span></div>
</div>
</template>
<script>
import check1 from '@/assets/distributorSign/check1.png'
import check2 from '@/assets/distributorSign/check2.png'
import check3 from '@/assets/distributorSign/guaranteed.png'
import uncheck1 from '@/assets/distributorSign/uncheck1.png'
import uncheck2 from '@/assets/distributorSign/uncheck2.png'
import uncheck3 from '@/assets/distributorSign/guarantee.png'
import baseInfo from '@/assets/productQuery/baseInfo.png'
import unBaseInfo from '@/assets/productQuery/unBaseInfo.png'
import detail from '@/assets/productQuery/detail.png'
import unDetail from '@/assets/productQuery/unDetail.png'
import config from '@/assets/productQuery/config.png'
import unConfig from '@/assets/productQuery/unConfig.png'
export default {
data () {
return {
tabNum: 0,
check1: check1,
check2: check2,
check3: check3,
uncheck1: uncheck1,
uncheck2: uncheck2,
uncheck3: uncheck3,
baseInfo: baseInfo,
unBaseInfo: unBaseInfo,
detail: detail,
unDetail: unDetail,
config: config,
unConfig: unConfig,
}
},
methods: {
......@@ -49,19 +52,47 @@ export default {
padding-bottom: 8px;
align-items: center;
box-shadow:0 2px 3px 0 rgba(220,220,221,0.50);
span{
display: block;
width:112px;
height: 32px;
border-radius:16px;
.tab-content {
display: block;
width: 33%;
height: 32px;
background: rgba(220, 220, 221, 0.26);
border-radius: 16px;
display: flex;
justify-content: center;
align-items: center;
span {
margin-left: 2%;
font-size: 14px;
color: #383F45;
font-weight: 600;
font-family: PingFangSC-Semibold;
}
.colored {
color: #00469C
}
}
img{
width:112px;
height: 32px;
margin-right:5.7px;
.tab-content-bg{
background: rgba(0,70,156,0.10);
}
span:nth-of-type(2){
margin:0 10px;
.tab-content:nth-of-type(1) {
margin-left: 12px
}
img {
height: 16px;
// margin-right:5.7px;
}
.tab-content:nth-of-type(2) {
margin-left: 8px;
}
.tab-content:nth-of-type(3) {
margin-left: 8px;
margin-right: 4px;
}
}
</style>
src/pages/userBind/np/bankInfo.vue
View file @ ffbb28a5
......@@ -21,11 +21,12 @@
<div class="clear" />
<div class="card-content">
<ul>
<li v-for="(item,index) in getBankList" :key="index">
<li v-for="(item,index) in getBankList" :key="index" >
<item-option class="slider">
<div
:style="'background-image: url('+ changeBgImg (item) +')'"
class="my-bank-card"
@click="sendList(item)"
>
<div class="card-info">
<span class="name">{{ item.bank_full_name }}</span>
......@@ -65,6 +66,10 @@ export default {
this.showModalValue = true
this.$emit('getInfo', this.showModalValue)
},
sendList (a) {
this.$emit('getList', a)
this.sendFlag()
},
changeBgImg (item) {
if (item.bank_full_name === '中国农业银行') {
return backImg1
......
src/pages/userBind/np/naturePerson.vue
View file @ ffbb28a5
......@@ -198,19 +198,13 @@
<span>{{ list.description }}</span>
<div class="img-content">
<!--待上传图片列表-->
<div v-for="(item, index) in upload_list" v-if="item.check_id==list.check_id" :key="index" class="card-upload">
<img :src="item.picture" >
<div class="close" @click="delete_pic(item.attachment_id)">
<img src="@/assets/userBind/deleteIcon.png">
</div>
<div v-for="(list, index) in upload_list" :key="index">
<img :src="list.picture" >
</div>
<!--从服务器上下载的图片-->
<div v-for="item in dowload_list" >
<div v-for="(pic, index) in item" v-if="pic.check_id==list.check_id" :key="index" class="card-upload">
<img :src="pic.url" >
<div class="close" @click="delete_pic(pic.attachment_id)">
<img src="@/assets/userBind/deleteIcon.png">
</div>
<div v-for="item in dowload_list" class="card-upload">
<div v-for="(pic, index) in item" :key="index">
<img :src="item.url" >
</div>
</div>
<div class="card-upload" @click="imgUploadShow(list.check_id)">
......@@ -219,7 +213,7 @@
</div>
</div>
</div>
<BankInfo v-show="tabNum==1" :getBankList="getBankList" @getInfo="getInfo" />
<BankInfo v-show="tabNum==1" :getBankList="getBankList" @getInfo="getInfo" @getList="getList"/>
<InvoiceInfo
v-show="tabNum==2"
:baseInfo="baseInfo"
......@@ -444,20 +438,18 @@ export default {
}
})
},
load_picture (check_id, index) {
load_picture (check_id) {
let vm = this
let url = process.env.basePath + 'attachment_list_query' + '&index' + index // 附件查询
let url = process.env.basePath + 'attachment_list_query'
let param = {
check_id: check_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('%%%%%%%%%%%%' + res)
if (res.result === 'S') {
res.lists.forEach(item => {
item['url'] = process.env.filePath + 'attachment_id=' + item.attachment_id + '&access_token=' + window.localStorage.access_token
})
vm.dowload_list.push(res.lists)
console.log('**********' + res.lists)
} else {
hlsPopup.showLongCenter(res.message)
}
......@@ -605,7 +597,6 @@ export default {
'pkvalue': check_id,
'source_type': 'PRJ_CDD_ITEM_CHECK',
'picture': '',
'check_id': check_id,
'filePath': '',
'attachment_id': '',
'user_id': 1,
......@@ -632,21 +623,21 @@ export default {
quality: 100,
}
let success = function (imgUrl) {
var list = []
for (let i = 0; i < imgUrl.length; i++) {
let obj = {
'pkvalue': check_id,
'source_type': 'PRJ_CDD_ITEM_CHECK',
'picture': '',
'check_id': check_id,
'filePath': '',
'attachment_id': '',
'user_id': 1,
}
obj.picture = imgUrl[i]
obj.filePath = imgUrl[i]
var list = []
list.push(obj)
}
// 拍完一张立马执行保存图片逻辑
vm.save_picture(list)
}
let error = function () {
......@@ -671,6 +662,7 @@ export default {
for (var i = 0; i < list.length; i++) {
let uploadSuccess = function (res) {
if (res.result === 'S') {
alert('返回结果 ' + JSON.stringify(res.response))
alreadyUploadNum++
for (var j = 0; j < list.length; j++) {
if (list[j].filePath === res.response.filePath) {
......@@ -826,8 +818,7 @@ export default {
}
},
addRowsLive (e) {
// let addNum = parseInt(e.length / 16)
let addNum = e.size()
let addNum = parseInt(e.length / 16)
console.log(addNum)
if (addNum === 0) {
this.$refs.myTestareaLive.rows = 1
......@@ -850,7 +841,7 @@ export default {
onConfirm: data => {
console.log(data)
if (data) {
let bpName = window.localStorage.getItem('bp_name')
let bpName = this.from ? this.$route.params.user_bp_name : window.localStorage.getItem('bp_name')
if (
this.bank.bank_account_num === '' ||
this.bank.bank_account_name === '' ||
......@@ -914,6 +905,8 @@ export default {
vm.$router.push({
name: 'Home',
})
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
}
......@@ -929,6 +922,9 @@ export default {
getInfo (i) {
this.showModalValue = i
},
getList (a) {
Object.assign(this.bank, a)
},
showModal () {
this.showModalValue = true
},
......@@ -1290,17 +1286,7 @@ export default {
align-items: center;
margin-top: 12px;
margin-left: 12px;
float: left;
.close {
position: relative;
color: #F96F68;
margin-top: -100%;
margin-left: -10%;
img{
width: 14px;
height: 14px;
}
}
// float: left;
img {
width: 88px;
height: 88px;
......@@ -1401,4 +1387,3 @@ export default {
line-height: 34px !important;
}
</style>
</h-view></textarea></item></list-item></div></h-content></template>
src/pages/userBind/org/bankInfo.vue
View file @ ffbb28a5
......@@ -33,8 +33,9 @@
<div
:style="'background-image: url('+ changeBgImg (item) +')'"
class="my-bank-card"
@click="sendList(item)"
>
<div class="card-info">
<div class="card-info" >
<span class="name">{{ item.bank_full_name }}</span>
<span class="card-type">{{ item.bank_card_type }}</span>
<span class="number">卡号</span>
......@@ -72,6 +73,10 @@ export default {
this.showModalValue = true
this.$emit('getInfo', this.showModalValue)
},
sendList (a) {
this.$emit('getList', a)
this.sendFlag()
},
changeBgImg (item) {
if (item.bank_full_name === '中国农业银行') {
return backImg1
......
src/pages/userBind/org/enterprise.vue
View file @ ffbb28a5
......@@ -318,7 +318,7 @@
</div>
</div>
<!-- <BankInfo v-show="tabNum==1" :bp_id="bp_id" @getInfo="getInfo" /> -->
<BankInfo v-show="tabNum==1" :getBankList="getBankList" @getInfo="getInfo" />
<BankInfo v-show="tabNum==1" :getBankList="getBankList" @getInfo="getInfo" @getList="getList" />
<InvoiceInfo
v-show="tabNum==2"
:tabNum="tabNum"
......@@ -914,6 +914,9 @@ export default {
getInfo (i) {
this.showModalValue = i
},
getList (i) {
Object.assign(this.bank_lists, i)
},
getinvoiceList (val) {
console.log(val)
this.invoiceInfo = val
......
src/router/index.js
View file @ ffbb28a5
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-10-16 19:08:10
* @LastEditTime: 2019-10-17 11:02:08
* @LastEditors: Please set LastEditors
*/
import Vue from 'vue'
......
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