Skip to content

W
wly-APP
Commit 74b9f7fa authored by chuan.liu's avatar chuan.liu
Browse files
Options

个人中心数据联调 滚动处理

parent 5d97187d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3597 additions and 2224 deletions
pages.json
View file @ 74b9f7fa
...@@ -621,7 +621,7 @@ ...@@ -621,7 +621,7 @@
"titleSize": "17px", "titleSize": "17px",
"backgroundColor": "#fff", "backgroundColor": "#fff",
"titleText": "账票查询", "titleText": "账票查询",
"autoBackButton": false, "autoBackButton": true,
"splitLine": { "splitLine": {
"color": "#ccc", "color": "#ccc",
"height": "0.5px" "height": "0.5px"
......
pages/account-inquiry/account-inquiry.nvue
View file @ 74b9f7fa
<template> <template>
<view class="lists" :style="mainHeight"> <view class="lists">
<list class="list-wrapper"> <view class="status_bar" :style="navHeight"></view>
<view class="status_bar" :style="navHeight"></view> <view class="header-bg"></view>
<view class="header-bg"></view> <view class="main">
<cell class="order view" v-for="(item,index) in lists" :key="index"> <view class="list-wrapper" :style="scrollHeight">
<view class="listview"> <list class="list" scrollable loadmoreoffset='1' show-scrollbar='false'>
<view class="cell-list"> <cell class="list-cell" v-for="(item,index) in lists" :key="index">
<view class="middle view planout-block-item"> <view class="listview">
<view class="item-block item-block-code"> <view class="cell-list">
<text class="item-block-label">开票方编号：{{item.BILLTO_BP}}</text> <view class="middle view planout-block-item">
</view> <view class="item-block item-block-code">
<view class="item-block item-block-name"> <text class="item-block-label">开票方编号：{{item.BILLTO_BP}}</text>
<text class="item-block-label item-block__label">{{item.BILLTO_NAME}}</text> </view>
</view> <view class="item-block item-block-name">
<view class="item-block item-block-date"> <text class="item-block-label item-block__label">{{item.BILLTO_NAME}}</text>
<text class="detal-item-label">开票方名称</text> </view>
</view> <view class="item-block item-block-date">
<text class="detal-item-label">开票方名称</text>
</view>
<view class="block-detal block-detal-last">
<view class="block-detal-item">
<text class="detal-item-label">贷款</text>
<text class="detal-item-value">{{item.GOODS_AMOUNT}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">随量保证金</text>
<text class="detal-item-value">{{item.FORWARD_AMOUNT}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">经销商保证金</text>
<text class="detal-item-value">{{item.DEALING_AMOUNT}}</text>
</view>
</view>
<view class="block-detal block-detal-last">
<view class="block-detal-item">
<text class="detal-item-label">贷款</text>
<text class="detal-item-value">{{item.GOODS_AMOUNT}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">随量保证金</text>
<text class="detal-item-value">{{item.FORWARD_AMOUNT}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">经销商保证金</text>
<text class="detal-item-value">{{item.DEALING_AMOUNT}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> <view class="empty-block">
</view> </view>
<view class="empty-block"> </cell>
</list>
</view> </view>
</cell> </view>
</list>
</view> </view>
</template> </template>
...@@ -70,6 +73,11 @@ ...@@ -70,6 +73,11 @@
'height': `${this.sysinfo.safeArea.height }px`, 'height': `${this.sysinfo.safeArea.height }px`,
} }
}, },
scrollHeight() {
return {
'height': `${this.sysinfo.safeArea.height -58}px`,
}
},
...mapState(['sysinfo', 'userInfo']) ...mapState(['sysinfo', 'userInfo'])
}, },
created() { created() {
...@@ -107,19 +115,31 @@ ...@@ -107,19 +115,31 @@
.header-bg { .header-bg {
height: 284rpx; height: 284rpx;
margin-top: -88rpx; margin-top: -88rpx;
margin-bottom: -85px;
background: linear-gradient(232deg, #f4e2e2 25%, #faf3f3 98%); background: linear-gradient(232deg, #f4e2e2 25%, #faf3f3 98%);
} }
.lists { .lists {
width: 750rpx;
position: relative; position: relative;
overflow-y: scroll; flex-direction: column;
background: #f0f4f5; background: #f0f4f5;
overflow: hidden;
}
.main {
flex-direction: column;
margin-top: -164rpx;
padding: 0 16rpx;
overflow-y: scroll;
} }
.list-wrapper { .list-wrapper {
flex: 1; display: flex;
flex-direction: column;
}
.list {
display: flex;
flex-direction: column;
} }
.order { .order {
...@@ -128,6 +148,10 @@ ...@@ -128,6 +148,10 @@
background: #f0f4f5; background: #f0f4f5;
} }
.list-cell {
padding-bottom: 26rpx;
}
.listview { .listview {
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
......
pages/marketsupportfee-select/marketsupportfee-select.nvue
View file @ 74b9f7fa
...@@ -40,26 +40,33 @@ ...@@ -40,26 +40,33 @@
</button> </button>
</view> </view>
<view class="planout-block-lists"> <view class="planout-block-lists" :style="scrollHeight">
<view class="middle view planout-block-item" v-for="(item,index) in lists" :key='item.index'> <list class="lists-wrapper" scrollable loadmoreoffset='1' show-scrollbar='false'>
<view class="text-block"> <cell class="list-cell" v-for="(item,index) in lists" :key='index'>
<text class="middle-date middle-date-select">客户编码</text> <view class="middle view planout-block-item">
<text class="middle-date-des middle-date-des-select">{{item.CUSTOMER}}</text> <view class="text-block">
</view> <text class="middle-date middle-date-select">客户编码</text>
<view class="text-block"> <text class="middle-date-des middle-date-des-select">{{item.CUSTOMER}}</text>
<text class="middle-date middle-date-select">客户名称</text> </view>
<text class="middle-date-des middle-date-des-select">{{item.CUSTOMER_NAME}}</text> <view class="text-block">
</view> <text class="middle-date middle-date-select">客户名称</text>
<view class="text-block"> <text class="middle-date-des middle-date-des-select">{{item.CUSTOMER_NAME}}</text>
<text class="middle-date middle-date-select">上账日期</text> </view>
<text class="middle-date-des middle-date-des-select">{{item.POSTING_DATE}}</text> <view class="text-block">
</view> <text class="middle-date middle-date-select">上账日期</text>
<view class="text-block text-block-last"> <text class="middle-date-des middle-date-des-select">{{item.POSTING_DATE}}</text>
<text class="middle-date middle-date-select">金额</text> </view>
<text class="middle-date-des middle-date-des-select">{{item.GOODS_AMOUNT}}</text> <view class="text-block text-block-last">
</view> <text class="middle-date middle-date-select">金额</text>
</view> <text class="middle-date-des middle-date-des-select">{{item.GOODS_AMOUNT}}</text>
</view>
</view>
<view class="empty-block"></view>
</cell>
</list>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
...@@ -92,6 +99,16 @@ ...@@ -92,6 +99,16 @@
return { return {
'height': `${this.sysinfo.safeArea.top + 44}px` 'height': `${this.sysinfo.safeArea.top + 44}px`
} }
},
mainHeight() {
return {
'height': `${this.sysinfo.safeArea.height}px`,
}
},
scrollHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 237}px`,
}
} }
}, },
created() { created() {
...@@ -158,10 +175,7 @@ ...@@ -158,10 +175,7 @@
.lists { .lists {
position: relative; position: relative;
flex-direction: column; flex-direction: column;
overflow-y: scroll;
background: #f0f4f5; background: #f0f4f5;
overflow-x: hidden;
height: 100%;
} }
.main { .main {
...@@ -202,7 +216,6 @@ ...@@ -202,7 +216,6 @@
font-size: 28rpx; font-size: 28rpx;
line-height: 96rpx; line-height: 96rpx;
height: 96rpx; height: 96rpx;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #888; color: #888;
...@@ -222,6 +235,11 @@ ...@@ -222,6 +235,11 @@
align-items: center; align-items: center;
} }
.uni-input {
font-size: 12px;
color: #888;
}
.uni-list-cell { .uni-list-cell {
flex: 1; flex: 1;
} }
...@@ -246,7 +264,17 @@ ...@@ -246,7 +264,17 @@
.planout-block-lists { .planout-block-lists {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: scroll;
background: #f0f4f5;
}
.list-cell {
padding-bottom: 26rpx;
}
.lists-wrapper {
display: flex;
flex-direction: column;
} }
.planout-block { .planout-block {
...@@ -260,8 +288,6 @@ ...@@ -260,8 +288,6 @@
.planout-block-item { .planout-block-item {
flex: 1; flex: 1;
width: 750rpx;
margin-bottom: 26rpx;
} }
.btn { .btn {
...@@ -275,4 +301,9 @@ ...@@ -275,4 +301,9 @@
color: #fff; color: #fff;
font-size: 34rpx; font-size: 34rpx;
} }
.empty-block {
height: 26rpx;
background: #f0f4f5;
}
</style> </style>
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 74b9f7fa
...@@ -3,98 +3,103 @@ ...@@ -3,98 +3,103 @@
<view class="status_bar" :style="navHeight"></view> <view class="status_bar" :style="navHeight"></view>
<view class="header-bg"></view> <view class="header-bg"></view>
<view class="main"> <view class="main">
<view class="order-main view"> <view class="list-wrapper" :style="scrollHeight">
<view class="top"> <list class="list-block" scrollable loadmoreoffset='1' show-scrollbar='false'>
<text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text> <cell class="view scroll-area">
<view class="title-info"> <view class="order-main view">
<button class="title-info__status title-info__status-done" type="default"><text <view class="top">
class="title-info__status-text">{{INFO.STATUS}}</text> <text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
</button> <view class="title-info">
</view> <button class="title-info__status title-info__status-done" type="default"><text
</view> class="title-info__status-text">{{INFO.STATUS}}</text>
<view class="order-main-middle view"> </button>
<view class="middle-title"> </view>
<text class="middle-title__text">{{INFO.PROCESS_TYPE_TEXT}}</text> </view>
</view> <view class="order-main-middle view">
<view class="text-block-box"> <view class="middle-title">
<view class="text-block text-block-last"> <text class="middle-title__text">{{INFO.PROCESS_TYPE_TEXT}}</text>
<text class="middle-date">{{INFO.POSTING_DATE}}</text> </view>
<text class="middle-date-des">下单日期</text> <view class="text-block-box">
</view> <view class="text-block text-block-last">
<view class="text-block text-block-last"> <text class="middle-date">{{INFO.POSTING_DATE}}</text>
<view class="middle-date-right"> <text class="middle-date-des">下单日期</text>
<text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text> </view>
<view class="text-block text-block-last">
<view class="middle-date-right">
<text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
</view>
<text class="middle-date-des middle-date-right">金额</text>
</view>
</view>
</view> </view>
<text class="middle-date-des middle-date-right">金额</text>
</view> </view>
</view>
</view>
</view>
<view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}" ref='receiveInfo' <view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}"
:style="receiveInfoHeightComputed"> ref='receiveInfo' :style="receiveInfoHeightComputed">
<view class="middle view" v-for="(item,index) in ITEM" :key="index"> <view class="middle view" v-for="(item,index) in ITEM" :key="index">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">{{item.ZZFLD000005_Z1}}</text> <text class="item-block-label">{{item.ZZFLD000005_Z1}}</text>
</view> </view>
<view class="block-detal"> <view class="block-detal">
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">产品</text> <text class="detal-item-label">产品</text>
<text class="detal-item-value">{{item.DESCRIPTION}}</text> <text class="detal-item-value">{{item.DESCRIPTION}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">数量（件)）</text> <text class="detal-item-label">数量（件)）</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text> <text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">盒数</text> <text class="detal-item-label">盒数</text>
<text class="detal-item-value">{{item.ZZFLD00002W}}</text> <text class="detal-item-value">{{item.ZZFLD00002W}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">单价</text> <text class="detal-item-label">单价</text>
<text class="detal-item-value">{{item.NET_PRICE}}</text> <text class="detal-item-value">{{item.NET_PRICE}}</text>
</view> </view>
<view class="block-detal-item block-detal-item-last"> <view class="block-detal-item block-detal-item-last">
<text class="detal-item-label"></text> <text class="detal-item-label"></text>
<view class="detal-item-value"> <view class="detal-item-value">
<text class="item-value-intotal">小计：</text> <text class="item-value-intotal">小计：</text>
<text class="item-value-intotal-num">{{item.NET_VALUE}}</text> <text class="item-value-intotal-num">{{item.NET_VALUE}}</text>
</view>
</view>
</view>
</view> </view>
</view>
</view>
</view>
<view class="float-btn-block"> <view class="float-btn-block">
<view class="float-btn" @click="handleShowReceiveDetail"> <view class="float-btn" @click="handleShowReceiveDetail">
<text class="float-btn__text">{{ishowReceiveDetail?'收起':'展示完整信息'}}</text> <text class="float-btn__text">{{ishowReceiveDetail?'收起':'展示完整信息'}}</text>
<image class="icon-arrow" :class="{'icon-arrow-rotate':!ishowReceiveDetail}" <image class="icon-arrow" :class="{'icon-arrow-rotate':!ishowReceiveDetail}"
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image> src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
</view> </view>
</view> </view>
</view> </view>
<view class="order-bottom view"> <view class="order-bottom view">
<view class="middle view"> <view class="middle view">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">附件</text> <text class="item-block-label">附件</text>
</view> </view>
<view class="block-detal"> <view class="block-detal">
<view class="block-detal-item"> <view class="block-detal-item">
<view class="detal-item-file"> <view class="detal-item-file">
<image class="icon-file" src="@/static/image/logo@3x.png" mode="widthFix"> <image class="icon-file" src="@/static/image/logo@3x.png" mode="widthFix">
</image> </image>
<text class="detal-item-label">开票要求.docx</text> <text class="detal-item-label">开票要求.docx</text>
</view>
<button class="btn" type="default">
<text class="btn-text">下载</text>
</button>
</view>
</view>
</view> </view>
<button class="btn" type="default">
<text class="btn-text">下载</text>
</button>
</view> </view>
</view> </cell>
</view> </list>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
...@@ -141,7 +146,12 @@ ...@@ -141,7 +146,12 @@
return { return {
"height": `${this.receiveInfoHeight}px` "height": `${this.receiveInfoHeight}px`
} }
} },
scrollHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 58 }px`,
}
},
}, },
onLoad(option) { onLoad(option) {
this.orderItem = JSON.parse(option.order) this.orderItem = JSON.parse(option.order)
...@@ -182,7 +192,6 @@ ...@@ -182,7 +192,6 @@
.lists { .lists {
position: relative; position: relative;
flex-direction: column; flex-direction: column;
overflow-y: scroll;
background: #f0f4f5; background: #f0f4f5;
} }
...@@ -190,6 +199,21 @@ ...@@ -190,6 +199,21 @@
flex-direction: column; flex-direction: column;
margin-top: -164rpx; margin-top: -164rpx;
padding: 0 16rpx; padding: 0 16rpx;
overflow-y: scroll;
}
.list-wrapper {
display: flex;
flex-direction: column;
}
.scroll-area {
padding-bottom: 26rpx;
}
.list-block {
display: flex;
flex-direction: column;
} }
.order-main { .order-main {
......
pages/usercenter/usercenter.nvue
View file @ 74b9f7fa
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
<view class="userinfo"> <view class="userinfo">
<image class="avatar" src="@/static/image/avatar@3x.png" mode=""></image> <image class="avatar" src="@/static/image/avatar@3x.png" mode=""></image>
<view class="nick-block"> <view class="nick-block">
<text class="nick-block--name">苏州新川商贸有限公司</text> <text class="nick-block--name">{{userInfo.username}}</text>
<text class="nick-block--no">编号：00998873</text> <text class="nick-block--no">编号：{{userInfo.customerCode}}</text>
</view> </view>
</view> </view>
<view class="amount-card"> <view class="amount-card">
<view class="amount-card--order"> <view class="amount-card--order">
<text class="amount-card--order_num">5000</text> <text class="amount-card--order_num">{{bpPrice.ORDER_PRICE}}</text>
<text class="amount-card--order_text">订单金额</text> <text class="amount-card--order_text">订单金额</text>
</view> </view>
<i class="divider"></i> <i class="divider"></i>
<view class="amount-card--order amount-card--bill"> <view class="amount-card--order amount-card--bill">
<text class="amount-card--order_num">5000</text> <text class="amount-card--order_num">{{bpPrice.ZHIPIAO_PRICE}}</text>
<text class="amount-card--order_text">开票金额</text> <text class="amount-card--order_text">开票金额</text>
</view> </view>
</view> </view>
...@@ -95,19 +95,36 @@ ...@@ -95,19 +95,36 @@
mapState mapState
} from 'vuex' } from 'vuex'
import {
apiGetBpPrice
} from '@/servers/common.js'
export default { export default {
onLoad() { onLoad() {
this.winHeight = `height:${this.sysinfo.safeArea.height}px` this.winHeight = `height:${this.sysinfo.safeArea.height}px`
}, },
data() { data() {
return { return {
winHeight: 'height:auto' winHeight: '',
bpPrice: {
ORDER_PRICE: '--',
ZHIPIAO_PRICE: '--'
}
} }
}, },
computed: { computed: {
...mapState(['sysinfo']) ...mapState(['sysinfo', 'userInfo'])
},
created() {
this.getBpPrice()
}, },
methods: { methods: {
async getBpPrice() {
const res = await apiGetBpPrice({
PARTNER: this.userInfo.customerCode
})
this.bpPrice = res.DATA
},
goPage(page) { goPage(page) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/${page}/${page}` url: `/pages/${page}/${page}`
...@@ -174,7 +191,7 @@ ...@@ -174,7 +191,7 @@
} }
.nick-block--no { .nick-block--no {
width: 220rpx; width: 240rpx;
height: 40rpx; height: 40rpx;
line-height: 40rpx; line-height: 40rpx;
font-size: 24rpx; font-size: 24rpx;
......
servers/common.js
View file @ 74b9f7fa
...@@ -60,6 +60,16 @@ export async function apiAddressSelect(params) { ...@@ -60,6 +60,16 @@ export async function apiAddressSelect(params) {
return res return res
} }
/**
* 客户订单和制票金额查询。
* @param captcha 验证码
* @returns {Promise<AxiosResponse<T>>}
*/
export async function apiGetBpPrice(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/masterdata/get_price_by_bp', params)
return res
}
export default { export default {
apiProductSelect, apiProductSelect,
apiSalesPlanSelect, apiSalesPlanSelect,
......
store/index.js
View file @ 74b9f7fa
...@@ -39,7 +39,7 @@ const store = new Vuex.Store({ ...@@ -39,7 +39,7 @@ const store = new Vuex.Store({
vuex_version: '1.0.1', vuex_version: '1.0.1',
vuex_demo: '绛紫', vuex_demo: '绛紫',
userInfo: { userInfo: {
username: '', username: '苏州新川商贸有限公司',
password: '', password: '',
customerCode: '' || '0050000215' customerCode: '' || '0050000215'
}, },
......
unpackage/dist/dev/app-plus/app-service.js
View file @ 74b9f7fa
This diff is collapsed.
unpackage/dist/dev/app-plus/pages/login/login.js
View file @ 74b9f7fa
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/usercenter/usercenter.js
View file @ 74b9f7fa
This source diff could not be displayed because it is too large. You can view the blob instead.
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