qniao
/
paper-shopkeeper-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改基础信息测试问题

devlop
buffeyu 4 years ago
parent
97a435bd5e
commit
3c819cfaa6
6 changed files with 267 additions and 257 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      pages/add-record/index.vue
  2. 479
      pages/client-detail/base-paper-deals.vue
  3. 6
      pages/client-detail/basic-information.vue
  4. 2
      pages/follow-up-records/index.vue
  5. 6
      pages/mall/index.vue
  6. 28
      pages/trade/index.vue

3
pages/add-record/index.vue
View File

@ -41,7 +41,7 @@
</view> </view>
<view class=""> <view class="">
<view class="paper-price-image-title"> <view class="paper-price-image-title">
<text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text>
<!-- <text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text> -->
<text class="add-paper-title">备注信息</text> <text class="add-paper-title">备注信息</text>
</view> </view>
<view class="paper-price-image"> <view class="paper-price-image">
@ -72,7 +72,6 @@ import qnHeader from '@/components/qn-header/qn-header.vue'
import { createVisitRecord } from '@/apis/followUpRecords.js' import { createVisitRecord } from '@/apis/followUpRecords.js'
const validateFields = [ const validateFields = [
'content', 'content',
'remark',
'respondent' 'respondent'
] ]
export default { export default {

479
pages/client-detail/base-paper-deals.vue
View File

@ -1,52 +1,50 @@
<template> <template>
<view class="warpper">
<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
<view class="sum-box">
<view class="">
<view class="title">交易金额</view>
<view class="value">{{ topInfo.tradingVolume }}</view>
</view>
<view class="">
<view class="title">总交易量(吨)</view>
<view class="value">{{ topInfo.volumeOfBusiness }}</view>
</view>
</view>
<uGap></uGap>
<view class="card-box" v-for="(item, index) in list" :key="index">
<view class="header">
<view class="left-title">{{ item.customerEnterpriseName }}</view>
<view class="right-title">¥ {{ item.totalOfferPrice }}</view>
</view>
<view class="content" v-for="(subItem, subIndex) in item.supplierOrderList[0].orderItems" :key="subIndex">
<!-- <image class="image" :src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image> -->
<image class="image" :src="subItem.productImg" mode=""></image>
<view class="">
<view class="title">{{ subItem.productName }}</view>
<view class="desc">
{{ subItem.brandName }}/{{ subItem.categoryName }}/{{ subItem.gramWeight }}g/{{ subItem.length }}*{{ subItem.width }}/{{
subItem.pieceQuantity
}}张
</view>
</view>
</view>
<!-- <view class="content">
<view class="warpper">
<view class="sum-box">
<view class="">
<view class="title">交易金额</view>
<view class="value">{{ topInfo.tradingVolume }}</view>
</view>
<view class="">
<view class="title">总交易量(吨)</view>
<view class="value">{{ topInfo.volumeOfBusiness }}</view>
</view>
</view>
<uGap></uGap>
<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
<view class="card-box" v-for="(item, index) in list" :key="index">
<view class="header">
<view class="left-title">{{ item.customerEnterpriseName }}</view>
<view class="right-title">¥ {{ item.totalOfferPrice }}</view>
</view>
<view class="content" v-for="(subItem, subIndex) in item.supplierOrderList[0].orderItems" :key="subIndex">
<!-- <image class="image" :src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image> -->
<image class="image" :src="subItem.productImg" mode=""></image>
<view class="">
<view class="title">{{ subItem.productName }}</view>
<view class="desc">
{{ subItem.brandName }}/{{ subItem.categoryName }}/{{ subItem.gramWeight }}g/{{ subItem.length }}*{{ subItem.width }}/{{ subItem.pieceQuantity }}张
</view>
</view>
</view>
<!-- <view class="content">
<image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image> <image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image>
<view class=""> <view class="">
<view class="title">丽盈白卡</view> <view class="title">丽盈白卡</view>
<view class="desc">白卡纸/丽盈/350g/787*1092/2200张</view> <view class="desc">白卡纸/丽盈/350g/787*1092/2200张</view>
</view> </view>
</view> --> </view> -->
<view class="other">
<view class="time">{{ item.createTime }}</view>
<view class="btn">
更多详情
<image class="icon" src="/static/imgs/client-detail/arrow-right-icon.png"></image>
</view>
</view>
<uGap></uGap>
</view>
</scroll-list>
</view>
<view class="other">
<view class="time">{{ item.createTime }}</view>
<view class="btn">
更多详情
<image class="icon" src="/static/imgs/client-detail/arrow-right-icon.png"></image>
</view>
</view>
<uGap></uGap>
</view>
</scroll-list>
</view>
</template> </template>
<script> <script>
@ -54,208 +52,209 @@ import uGap from '@/components/u-gap/u-gap.vue'
import { getBasePaperDeals, getOrderVolumeStatistics } from '@/apis/clientDetailApi.js' import { getBasePaperDeals, getOrderVolumeStatistics } from '@/apis/clientDetailApi.js'
export default { export default {
components: { uGap },
data() {
return {
option: {
size: 10,
auto: true,
emptyText: '暂无数据~',
background: '#F7F8FA',
disabled: false
},
params: {
asc: '',
desc: '',
customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
// customerEnterpriseId: '651107734133018624', // 客户企业ID
// mallSupplierId: '670334117090562048', // 供应商id
status: '0', // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104
enterpriseIds: [] //企业ID集合网关获取
},
pagination: {
pageNum: 0, // 初始会执行一次下拉加载
pageSize: 10
},
orderParams: {
beginDate: '',
// currentSupplier: '670334117090562048',
currentSupplier: this.$store.state.supplierInfo.supplierId || null,
endDate: ''
},
list: [],
topInfo: {}
}
},
onLoad() {},
methods: {
// 顶部统计数据
getOrderVolumeStatistics() {
getOrderVolumeStatistics(this.orderParams).then((res) => {
// console.log('原纸交易顶部统计数据', res)
this.topInfo = res
})
},
getList() {
this.getOrderVolumeStatistics()
return new Promise((resolve, reject) => {
getBasePaperDeals({ ...this.params, ...this.pagination })
.then((res) => {
// console.log('原纸交易', res)
if (res) {
if (this.pagination.pageNum == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
}
// this.list = []
// this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
resolve({ list: this.list, total: res.total })
} else {
reject()
}
})
.catch((err) => {
reject(err)
})
})
},
downCallback() {
this.pagination.pageNum = 1
this.getList()
.then(({ list, total }) => {
this.$refs.list.refreshSuccess({ list, total })
})
.catch(() => {
this.$refs.list.refreshFail()
})
},
upCallback() {
this.pagination.pageNum++
this.getList()
.then(({ list, total }) => {
this.$refs.list.loadSuccess({ list, total })
})
.catch(() => {
this.$refs.list.loadFail()
})
}
}
components: { uGap },
data() {
return {
option: {
size: 10,
auto: true,
emptyText: '暂无数据~',
background: '#F7F8FA',
disabled: false
},
params: {
asc: '',
desc: '',
customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
// customerEnterpriseId: '651107734133018624', // 客户企业ID
// mallSupplierId: '670334117090562048', // 供应商id
status: '0', // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104
enterpriseIds: [] //企业ID集合网关获取
},
pagination: {
pageNum: 0, // 初始会执行一次下拉加载
pageSize: 10
},
orderParams: {
beginDate: '',
// currentSupplier: '670334117090562048',
currentSupplier: this.$store.state.supplierInfo.supplierId || null,
endDate: ''
},
list: [],
topInfo: {}
}
},
created() {
this.getOrderVolumeStatistics()
},
methods: {
// 顶部统计数据
getOrderVolumeStatistics() {
getOrderVolumeStatistics(this.orderParams).then(res => {
console.log('原纸交易顶部统计数据', res)
this.topInfo = res
})
},
getList() {
return new Promise((resolve, reject) => {
getBasePaperDeals({ ...this.params, ...this.pagination })
.then(res => {
console.log('原纸交易', res)
if (res) {
if (this.pagination.pageNum == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
}
// this.list = []
// this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
resolve({ list: this.list, total: res.total })
} else {
reject()
}
})
.catch(err => {
reject(err)
})
})
},
downCallback() {
this.pagination.pageNum = 1
this.getList()
.then(({ list, total }) => {
this.$refs.list.refreshSuccess({ list, total })
})
.catch(() => {
this.$refs.list.refreshFail()
})
},
upCallback() {
this.pagination.pageNum++
this.getList()
.then(({ list, total }) => {
this.$refs.list.loadSuccess({ list, total })
})
.catch(() => {
this.$refs.list.loadFail()
})
}
}
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.warpper { .warpper {
width: 750rpx;
.sum-box {
display: flex;
flex-direction: row;
justify-content: space-around;
align-items: center;
// text-align: center;
height: 184rpx;
background: url('/static/imgs/client-detail/yzjy-icon.png') no-repeat;
background-size: 100%;
.title {
font-size: 26rpx;
color: #ffffff;
letter-spacing: 0;
font-weight: 500;
}
.value {
font-size: 56rpx;
color: #ffffff;
letter-spacing: 0;
text-align: left;
font-weight: 500;
margin-top: 16rpx;
}
}
.card-box {
.header {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
height: 88rpx;
background: #ffffff;
border-bottom: 2rpx solid #dddddd;
padding: 0rpx 32rpx;
.left-title {
font-size: 30rpx;
color: #000000;
letter-spacing: 0;
font-weight: 600;
}
.right-title {
font-size: 30rpx;
color: #ff5368;
letter-spacing: 0;
text-align: right;
font-weight: 500;
}
}
.content {
display: flex;
flex-direction: row;
align-items: center;
height: 148rpx;
background: #ffffff;
border-bottom: 2rpx solid #dddddd;
padding: 0rpx 32rpx;
.image {
width: 100rpx;
height: 100rpx;
flex: 0 0 100rpx;
margin-right: 20rpx;
}
.title {
font-size: 30rpx;
color: #333333;
letter-spacing: 0;
text-align: left;
font-weight: 400;
}
.desc {
padding-top: 26rpx;
font-size: 26rpx;
color: #888888;
letter-spacing: 0;
text-align: left;
font-weight: 400;
}
}
.other {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
height: 80rpx;
background: #ffffff;
padding: 0rpx 32rpx;
.time {
font-size: 26rpx;
color: #888888;
letter-spacing: 0;
text-align: left;
font-weight: 400;
}
.btn {
font-size: 28rpx;
color: #007aff;
letter-spacing: 0;
text-align: center;
font-weight: 500;
display: flex;
align-items: center;
}
.icon {
width: 24rpx;
height: 24rpx;
margin-left: 6rpx;
}
}
}
width: 750rpx;
.sum-box {
display: flex;
flex-direction: row;
justify-content: space-around;
align-items: center;
// text-align: center;
height: 184rpx;
background: url('/static/imgs/client-detail/yzjy-icon.png') no-repeat;
background-size: 100%;
.title {
font-size: 26rpx;
color: #ffffff;
letter-spacing: 0;
font-weight: 500;
}
.value {
font-size: 56rpx;
color: #ffffff;
letter-spacing: 0;
text-align: left;
font-weight: 500;
margin-top: 16rpx;
}
}
.card-box {
.header {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
height: 88rpx;
background: #ffffff;
border-bottom: 2rpx solid #dddddd;
padding: 0rpx 32rpx;
.left-title {
font-size: 30rpx;
color: #000000;
letter-spacing: 0;
font-weight: 600;
}
.right-title {
font-size: 30rpx;
color: #ff5368;
letter-spacing: 0;
text-align: right;
font-weight: 500;
}
}
.content {
display: flex;
flex-direction: row;
align-items: center;
height: 148rpx;
background: #ffffff;
border-bottom: 2rpx solid #dddddd;
padding: 0rpx 32rpx;
.image {
width: 100rpx;
height: 100rpx;
flex: 0 0 100rpx;
margin-right: 20rpx;
}
.title {
font-size: 30rpx;
color: #333333;
letter-spacing: 0;
text-align: left;
font-weight: 400;
}
.desc {
padding-top: 26rpx;
font-size: 26rpx;
color: #888888;
letter-spacing: 0;
text-align: left;
font-weight: 400;
}
}
.other {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
height: 80rpx;
background: #ffffff;
padding: 0rpx 32rpx;
.time {
font-size: 26rpx;
color: #888888;
letter-spacing: 0;
text-align: left;
font-weight: 400;
}
.btn {
font-size: 28rpx;
color: #007aff;
letter-spacing: 0;
text-align: center;
font-weight: 500;
display: flex;
align-items: center;
}
.icon {
width: 24rpx;
height: 24rpx;
margin-left: 6rpx;
}
}
}
} }
</style> </style>

6
pages/client-detail/basic-information.vue
View File

@ -59,7 +59,7 @@
</view> </view>
<view class="row"> <view class="row">
<view class="info-title"><text>营业执照：</text></view> <view class="info-title"><text>营业执照：</text></view>
<view class="look-over" @tap="previewImg(info.businessLicenseImg, [info.businessLicenseImg])"><text>点击查看</text></view>
<view class="look-over" v-if="info.businessLicenseImg !== null" @tap="previewImg(info.businessLicenseImg, [info.businessLicenseImg])"><text>点击查看</text></view>
</view> </view>
<view class="row"> <view class="row">
<view class="info-title"><text>所属行业：</text></view> <view class="info-title"><text>所属行业：</text></view>
@ -90,11 +90,11 @@
<view class="row"> <view class="row">
<view class="left"> <view class="left">
<view class="title"><text>产房照片：</text></view> <view class="title"><text>产房照片：</text></view>
<view class="look-over" @tap="previewImg(info.factoryImgList[0], info.factoryImgList)"><text>点击查看</text></view>
<view class="look-over" v-if="info.factoryImgList !== null" @tap="previewImg(info.factoryImgList[0], info.factoryImgList)"><text>点击查看</text></view>
</view> </view>
<view class="right"> <view class="right">
<view class="title"><text>租赁合同：</text></view> <view class="title"><text>租赁合同：</text></view>
<view class="look-over" @tap="previewImg(info.leaseContract, [info.leaseContract])"><text>点击查看</text></view>
<view class="look-over" v-if="info.leaseContract !== null" @tap="previewImg(info.leaseContract, [info.leaseContract])"><text>点击查看</text></view>
</view> </view>
</view> </view>
</view> </view>

2
pages/follow-up-records/index.vue
View File

@ -77,7 +77,7 @@ export default {
params: { params: {
asc: '', asc: '',
desc: '', desc: '',
enterpriseIds : [this.$store.state.supplierInfo.id],
customerEnterpriseId : [this.$store.state.supplierInfo.id],
mallSupplierId : this.$store.state.supplierInfo.supplierId || null, mallSupplierId : this.$store.state.supplierInfo.supplierId || null,
// enterpriseIds : ['651107734133018624'], // enterpriseIds : ['651107734133018624'],
// mallSupplierId : '670334117090562048', // mallSupplierId : '670334117090562048',

6
pages/mall/index.vue
View File

@ -55,7 +55,7 @@
<script> <script>
import uGap from '@/components/u-gap/u-gap.vue' import uGap from '@/components/u-gap/u-gap.vue'
import { back, go2 } from '@/utils/hook.js'
import { back, go2, loginG2 } from '@/utils/hook.js'
import { SupplierList,productStatus } from '@/apis/add-paper.js' import { SupplierList,productStatus } from '@/apis/add-paper.js'
export default { export default {
components: { uGap }, components: { uGap },
@ -112,7 +112,6 @@ export default {
}) })
}, },
downCallback() { downCallback() {
return
this.orderPagination.pageNum = 1 this.orderPagination.pageNum = 1
this.quertData() this.quertData()
.then(({ list, total }) => { .then(({ list, total }) => {
@ -123,7 +122,6 @@ export default {
}) })
}, },
upCallback() { upCallback() {
return
this.orderPagination.pageNum++ this.orderPagination.pageNum++
this.quertData() this.quertData()
.then(({ list, total }) => { .then(({ list, total }) => {
@ -157,7 +155,7 @@ export default {
}, },
// 详情点击事件 // 详情点击事件
detailInfo(){ detailInfo(){
go2('paper-detail')
loginGo2('paper-detail')
}, },
// 上下架事件 // 上下架事件
productStatusChange(item){ productStatusChange(item){

28
pages/trade/index.vue
View File

@ -1,6 +1,18 @@
<template> <template>
<view class="trade-index"> <view class="trade-index">
<view class="top-bar">
<uni-nav-bar>
<view class="left-title">
<view v-if="mainKey === '0'" class="text-view"><text class="title">交易大厅</text></view>
<view v-if="mainKey === '1'">
<view class="bar-contant">
<view class="check-control title-left36" :class="current === '0' ? 'check-title' : 'oncheck-title'" @click="controlChange('0')"><text>报价</text></view>
<view class="check-control title-left" :class="current === '1' ? 'check-title' : 'oncheck-title'" @click="controlChange('1')"><text>订单</text></view>
</view>
</view>
</view>
</uni-nav-bar>
<!-- <view class="top-bar">
<view v-if="mainKey === '0'" class="text-view"><text class="title">交易大厅</text></view> <view v-if="mainKey === '0'" class="text-view"><text class="title">交易大厅</text></view>
<view v-if="mainKey === '1'"> <view v-if="mainKey === '1'">
<view class="bar-contant"> <view class="bar-contant">
@ -8,7 +20,7 @@
<view class="check-control title-left" :class="current === '1' ? 'check-title' : 'oncheck-title'" @click="controlChange('1')"><text>订单</text></view> <view class="check-control title-left" :class="current === '1' ? 'check-title' : 'oncheck-title'" @click="controlChange('1')"><text>订单</text></view>
</view> </view>
</view> </view>
</view>
</view> -->
<view class="" v-if="mainKey === '0'"><not-logged @loginChange="loginChange()"></not-logged></view> <view class="" v-if="mainKey === '0'"><not-logged @loginChange="loginChange()"></not-logged></view>
<view class="" v-if="mainKey === '1'"> <view class="" v-if="mainKey === '1'">
<view class="content"> <view class="content">
@ -66,6 +78,10 @@ export default {
<style lang="scss"> <style lang="scss">
.trade-index { .trade-index {
.left-title {
position: relative;
left: -100rpx;
}
.top-bar { .top-bar {
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
border-bottom-width: 2rpx; border-bottom-width: 2rpx;
@ -87,29 +103,27 @@ export default {
display: flex; display: flex;
} }
.check-title { .check-title {
font-family: PingFangSC-Medium;
font-size: 40rpx; font-size: 40rpx;
color: #000000; color: #000000;
letter-spacing: 0;
// letter-spacing: 0;
font-weight: 550; font-weight: 550;
border-bottom: 4rpx solid #007aff; border-bottom: 4rpx solid #007aff;
} }
.oncheck-title { .oncheck-title {
font-family: PingFangSC-Regular;
font-size: 32rpx; font-size: 32rpx;
color: #555555; color: #555555;
font-weight: 550; font-weight: 550;
} }
.check-control { .check-control {
line-height: 70rpx; line-height: 70rpx;
// width: 40px;
width: 80rpx;
text-align: center; text-align: center;
} }
.title-left { .title-left {
margin-left: 24rpx; margin-left: 24rpx;
} }
.title-left36 { .title-left36 {
margin-left: 36rpx;
// margin-left: 36rpx;
} }
} }
</style> </style>
Write Preview
Loading…
Cancel
Save