yangjie
/
xuan-pay-cweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.优化分账接收方显示

Browse Source 
2.优化分页面功能
huipay-master
杨杰 2 years ago
parent 537e6d5d72
commit 3256f035cf
8 changed files with 132 additions and 57 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 50
      pages.json
  2. 11
      pages/index/bindScan/bindScan.vue
  3. 82
      pages/index/ledgerReceiverList/ledgerReceiverList.vue
  4. 4
      pages/index/merchant-management/merchant-management.vue
  5. 6
      pages/index/open-Divide_accounts/open-Divide_accounts.vue
  6. 28
      pages/index/scanList/scanList.vue
  7. 6
      pages/index/serviceBuild/serviceBuild.vue
  8. 2
      unpackage/dist/build/h5/index.html

50
pages.json
Unescape View File

@ -28,7 +28,8 @@
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "设备申请列表",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -40,7 +41,8 @@
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -52,7 +54,8 @@
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "我的设备",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -283,7 +286,8 @@
"style": {
"navigationBarTitleText": "设备订单",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -295,7 +299,8 @@
"style": {
"navigationBarTitleText": "选择支行",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -307,7 +312,8 @@
"style": {
"navigationBarTitleText": "开通分账",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -319,7 +325,8 @@
"style": {
"navigationBarTitleText": "绑定接收方",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -331,7 +338,8 @@
"style": {
"navigationBarTitleText": "绑定分账接收方",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -343,7 +351,8 @@
"style": {
"navigationBarTitleText": "接收方列表",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -355,7 +364,8 @@
"style": {
"navigationBarTitleText": "选择地址",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -367,7 +377,8 @@
"style": {
"navigationBarTitleText": "修改结算信息",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -379,7 +390,8 @@
"style": {
"navigationBarTitleText": "结算信息",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -391,7 +403,8 @@
"style": {
"navigationBarTitleText": "结算详情",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -403,7 +416,8 @@
"style": {
"navigationBarTitleText": "分配桌码",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -415,7 +429,8 @@
"style": {
"navigationBarTitleText": "权益活动",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -427,7 +442,8 @@
"style": {
"navigationBarTitleText": "活动详情",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -442,6 +458,7 @@
"navigationBarTitleText": "活动审核",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -456,6 +473,7 @@
"navigationBarTitleText": "订单详情",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"

11
pages/index/bindScan/bindScan.vue
Unescape View File

@ -69,7 +69,7 @@
toSearch() {
this.pageNum = 1;
this.pageSize = 10;
this.isNoMoreData = false;
this.isLoadMore = false;
this.serviceList = [];
if (this.typeId == 2) {
this.getStoreQrCodeList();
@ -82,13 +82,8 @@
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let params = {
pageNum: pagenum,
pageNum: this.pageNum,
pageSize: this.pagesize,
serialNumber: this.scanNo,
storeId: this.storeId
@ -113,7 +108,7 @@
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
if (this.isLoadMore) {
uni.hideLoading()
return false;
}

82
pages/index/ledgerReceiverList/ledgerReceiverList.vue
Unescape View File

@ -1,9 +1,14 @@
<template>
<view>
<view class="input-box">
<view class="icon search"></view>
<input placeholder="输入商户名称" v-model="merName" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
</view>
<view v-if="receiverList == ''" class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view>
<view class="width100">
<view class="width100 mart5">
<view class=" mcclist font15 fcor666" v-for="(item,index) in receiverList" :key="index"
@click="changebank(item)">
{{item.merName}}
@ -20,28 +25,60 @@
export default {
data() {
return {
receiverList: '' //商户列表
receiverList: [], //商户列表
pageNum: 1,
pagesize: 15,
isLoadMore: false, //是否加载中
merName: '' //商户名称
}
},
onLoad(options) {
this.getLedgerReceiverList();
},
onReachBottom() { //上拉触底函数
if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
this.isLoadMore = true
this.pageNum += 1
this.getLedgerReceiverList();
}
},
methods: {
toSearch() {
console.log('====='+this.merName);
this.pageNum = 1;
this.pageSize = 10;
this.isLoadMore = false;
this.receiverList = [];
this.getLedgerReceiverList();
},
//查询所有商户列表
getLedgerReceiverList() {
uni.showLoading({
title: '加载中...'
})
let datas = {
platformType: 1,
pageNum: 1,
pageSize: 10
pageNum: this.pageNum,
merNme: this.merName,
pageSize: this.pagesize
}
getLedgerReceiverList(datas).then(res => {
if (res.return_code == '000000' && res.return_data.list != null) {
this.receiverList = res.return_data.list;
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list) {
this.receiverList = this.receiverList.concat(res.return_data.list);
if (res.return_data.pages == this.pageNum) {
this.isLoadMore = true;
} else {
this.isLoadMore = false
}
} else {
this.receiverList = [];
this.isLoadMore = true
}
})
},
// 选择商户
changebank(item) {
changebank(item) {
app.globalData.receiverNo = item.receiverNo;
app.globalData.receiverName = item.merName;
uni.navigateBack();
@ -59,4 +96,35 @@
border-bottom: 1px solid #f6f6f6;
padding: 12upx 25upx;
}
.input-box {
width: 90%;
margin-left: 5%;
margin-top: 15px;
height: 70rpx;
background-color: #f5f5f5;
border-radius: 10rpx;
position: relative;
display: flex;
align-items: center;
.icon {
display: flex;
align-items: center;
position: absolute;
top: 2px;
left: 5px;
width: 60upx;
height: 60upx;
font-size: 34upx;
color: #c0c0c0;
}
input {
padding-left: 50upx;
height: 28upx;
font-size: 28upx;
width: 100%;
}
}
</style>

4
pages/index/merchant-management/merchant-management.vue
Unescape View File

@ -157,14 +157,14 @@
platformType: 1
}
getMerLedgerApply(datas).then(res => {
if (res.return_code == '000000' && res.return_data != null && res.return_data.status == 1) {
if (res.return_code == '000000') {
uni.navigateTo({
url: '/pages/index/bindMerchants/bindMerchants?id=' + res.return_data.id +
'&merId=' + item
})
} else {
uni.showToast({
title: '请开通商户分账',
title: res.return_msg,
duration: 2000,
icon: 'none'
})

6
pages/index/open-Divide_accounts/open-Divide_accounts.vue
Unescape View File

@ -2,7 +2,7 @@
<view>
<!-- <view class="width100 line10" v-if="merLedgerApply !=null && merLedgerApply !=''"></view> -->
<view class="width100 height100p" style="background-color: #eb6a53;"
v-if="merLedgerApply !=null && merLedgerApply !='' && merLedgerApply.status != 1">
v-if="merLedgerApply !=null && merLedgerApply !='' && merLedgerApply.status != 1 && merLedgerApply.status != 4">
<view class="font18 fcorfff paddtop35 fotct" v-if="merLedgerApply !=null && merLedgerApply.status == 2">
审核中
@ -40,7 +40,7 @@
@click="upload()"></image>
</view>
<view class="btn" @click="submitbtn()" v-if="merLedgerApply == null || merLedgerApply.status == 3">提交审核</view>
<view class="btn" @click="submitbtn()" v-if="merLedgerApply == null || merLedgerApply.status == 3 || merLedgerApply.status == 4">提交审核</view>
<view class="height60"></view>
</view>
</template>
@ -241,7 +241,7 @@
.namecont {
color: #666666;
width: 28%;
width: 45%;
}
}

28
pages/index/scanList/scanList.vue
Unescape View File

@ -57,7 +57,7 @@
toSearch() {
this.pageNum = 1;
this.pageSize = 10;
this.isNoMoreData = false;
this.isLoadMore = false;
this.serviceList = [];
this.getStoreQrCodeList();
},
@ -66,29 +66,23 @@
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let params = {
pageNum: pagenum,
pageNum: this.pageNum,
pageSize: this.pagesize,
serialNumber: this.scanNo,
storeId: this.userInfo.store.id
}
getStoreQrCodeList(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list) {
this.isLoadMore = res.return_data.list.length == this.pageSize ? false : true;
this.serviceList = this.serviceList.concat(res.return_data.list);
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isLoadMore = true;
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.serviceList = [];
this.isLoadMore = true
if (res.return_code == '000000' && res.return_data.list) {
this.receiverList = this.receiverList.concat(res.return_data.list);
if (res.return_data.pages == this.pageNum) {
this.isLoadMore = true;
} else {
this.isLoadMore = false
}
} else {
this.isLoadMore = true
}
});
},

6
pages/index/serviceBuild/serviceBuild.vue
Unescape View File

@ -73,7 +73,7 @@
toSearch() {
this.pageNum = 1;
this.pageSize = 10;
this.isNoMoreData = false;
this.isLoadMore = false;
this.serviceList = [];
if (this.typeId == 2) {
this.getStoreDeviceList();
@ -86,7 +86,7 @@
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
if (this.isLoadMore) {
uni.hideLoading()
return false;
}
@ -117,7 +117,7 @@
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
if (this.isLoadMore) {
uni.hideLoading()
return false;
}

2
unpackage/dist/build/h5/index.html vendored
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>惠支付</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.aaeb720f.js></script><script src=/cweb/static/js/index.0f655b0f.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.aaeb720f.js></script><script src=/cweb/static/js/index.b08b58bb.js></script></body></html>
Write Preview
Loading…
Cancel
Save