Merge branch 'huipay-h5' into huipay-app-dev

huipay-app-dev
杨杰 1 year ago
commit 96c32f7a9a
  1. 18
      Utils/Api.js
  2. 30
      pages.json
  3. 13
      pages/index/merchant-details/merchant-details.vue
  4. 205
      pages/index/modifyRate/modifyRate.vue
  5. 175
      pages/index/rateReview/rateReview.vue
  6. 20
      pages/index/review-Settlement/review-Settlement.vue

@ -301,4 +301,22 @@ export const querySalesmanList = params => {
export const getOrderByOutTradeOrder = params => {
return POST('GET', `${base}/tradeOrder/getOrderByOutTradeOrder`, params).then(res => res.data);
}
// #根据商户查询费率
export const getRateByMer = params => {
return POST('GET', `${base}/merRate/getRateByMer`, params).then(res => res.data);
}
// #编辑费率申请
export const editRateApply = params => {
return POST('POST', `${base}/merRate/editRateApply`, params).then(res => res.data);
}
// #查询最新申请信息
export const getNewRateApplyDetail = params => {
return POST('GET', `${base}/merRate/getNewRateApplyDetail`, params).then(res => res.data);
}
//#查询费率申请详情
export const getRateApplyDetail = params => {
return POST('GET', `${base}/merRate/getRateApplyDetail`, params).then(res => res.data);
}

@ -444,6 +444,36 @@
}
}
,{
"path" : "pages/index/modifyRate/modifyRate",
"style" :
{
"navigationBarTitleText": "修改费率",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //
"softinputNavBar": "none"
}
}
}
,{
"path" : "pages/index/rateReview/rateReview",
"style" :
{
"navigationBarTitleText": "审核费率",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //
"softinputNavBar": "none"
}
}
}
],
"subpackages": [{
"root": "subPages",

@ -111,7 +111,10 @@
</view>
</view>
</view>
<view class="subbtn" @tap="updateFigMerBasis()" v-if="current == 0">修改结算</view>
<view class="width94 alijus" v-if="current == 0">
<view class="subbtn" @tap="updateFigMerBasis()" >修改结算</view>
<view class="subbtn" @tap="updatemodifyRate()" >修改费率</view>
</view>
</view>
</template>
@ -236,6 +239,12 @@
url: '/pages/index/updateSettlement/updateSettlement?id=' + this.merid
})
},
//
updatemodifyRate(){
uni.navigateTo({
url:'/pages/index/modifyRate/modifyRate?id=' + this.merid
})
},
//
jumpBindScan(item, items) {
if (items == 1) {
@ -311,7 +320,7 @@
.subbtn {
color: #FFFFFF;
background-color: #0083f5;
width: 90%;
width: 40%;
margin-left: 5%;
margin-top: 80rpx;
margin-bottom: 50rpx;

@ -0,0 +1,205 @@
<template>
<view>
<view class="width100 backcorfff">
<!-- 审核状态回馈 -->
<view class="width100 height100p" style="background-color: #eb6a53;"
v-if="modifyDetails && (modifyDetails.status == 2 || modifyDetails.status == 4 || modifyDetails.status == 6)">
<view class="font18 fcorfff paading10 aliitem"
v-if="modifyDetails.status == 4 || modifyDetails.status == 6">
<image src='../../../static/img/error.png' mode="widthFix" class="iconw25 marglerig"></image>审核驳回
</view>
<view class="font14 fcorfff paading10" v-if="modifyDetails.status == 4 || modifyDetails.status == 6">
{{modifyDetails.rejectReason}}
</view>
<view class="font18 fcorfff paddtop35 fotct"
v-if="modifyDetails.status == 2 || modifyDetails.status == 5">
审核中
</view>
</view>
<view class="titlename font18 fontwig6 fcor333" v-if="rateCodeList">修改商户费率</view>
<view class="username" v-for="(item,index) in rateCodeList" :key="index">
<view class="namecont">{{item.rateTypeName}}</view>
<input placeholder="请输入" type="digit" v-model="item.ratePct" style="padding-left: 2%;width: 28%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
<view style="width: 40%;">(单位: 百分之一)</view>
</view>
</view>
<view class="btn" @click="updatemodifyRate()" v-if="!modifyDetails || modifyDetails.status == 4 || modifyDetails.status == 6">提交审核</view>
</view>
</template>
<script>
import {
getRateByMer,
editRateApply,
getNewRateApplyDetail
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
merId: '', //id
rateCodeList: [], //
merRateList: [], //
modifystatus: '' ,//
modifyDetails:''//
}
},
onLoad(options) {
this.merId = options.id;
this.getNewRateApplyDetail();
},
methods: {
//
getNewRateApplyDetail() {
let datas = {
merId: this.merId
}
getNewRateApplyDetail(datas).then(res => {
if (res.return_code == '000000' && res.return_data != null) {
this.modifyDetails = res.return_data;
this.modifystatus = res.return_data.status;
if (res.return_data.status == 1 || res.return_data.status == 3 || res.return_data.status ==
4 || res.return_data.status == 6) {
this.getRateByMer();
} else {
this.rateCodeList = res.return_data.merRateApplyDetailList;
}
} else {
this.getRateByMer();
}
})
},
//
getRateByMer() {
let datas = {
merId: this.merId
}
getRateByMer(datas).then(res => {
if (res.return_code == '000000') {
this.rateCodeList = res.return_data;
}
})
},
//
updatemodifyRate() {
uni.showModal({
title: '提交审核',
content: '确认信息是否正确。',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '提交审核中...'
})
let rateDatas = [];
for (var i = 0; i < this.rateCodeList.length; i++) {
if (this.rateCodeList[i].ratePct) {
let datas = {
rateTypeCode: this.rateCodeList[i].rateTypeCode,
ratePct: this.rateCodeList[i].ratePct
}
rateDatas.push(datas);
}
}
this.merRateList = rateDatas;
let datas = {
"merId": this.merId,
"rate": this.merRateList
}
editRateApply(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '提交成功',
icon: 'none',
duration: 2000
})
uni.navigateBack();
}
})
}
}
})
}
},
}
</script>
<style lang="scss">
page {
background-color: #f7f5f6;
}
.titlename {
width: calc(100% - 90upx);
height: 100upx;
display: flex;
align-items: center;
background-color: rgba($color: #ffffff, $alpha: 0.1);
padding: 0 45upx;
}
.username {
width: calc(100% - 90upx);
height: 100upx;
display: flex;
align-items: center;
background-color: rgba($color: #ffffff, $alpha: 0.1);
border-bottom: 1px solid #f6f6f6;
padding: 8upx 45upx;
input {
width: 50%;
height: 50upx;
font-size: 16px;
color: #333333;
font-weight: blod;
}
.get-code {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
right: 7px;
z-index: 3;
border: 1px solid #bfbfbf;
width: 25%;
padding: 3px 5px;
border-radius: 22px;
&:after {
content: " ";
width: 1upx;
height: 50upx;
position: absolute;
z-index: 3;
margin-right: 100%;
left: 0;
top: 20upx;
}
}
.namecont {
color: #666666;
width: 28%;
}
}
.btn {
color: #FFFFFF;
background-color: #0083f5;
width: 90%;
margin-left: 5%;
margin-top: 80rpx;
margin-bottom: 50rpx;
height: 90rpx;
display: flex;
justify-content: center;
align-items: center;
border-radius: 10rpx;
font-size: 40rpx;
}
</style>

@ -0,0 +1,175 @@
<template>
<view>
<view class="width100 height100p" style="background-color: #eb6a53;" v-if="RateApplyDetail.status == 5">
<view class="font18 fcorfff paddtop35 fotct">
渠道审核中
</view>
</view>
<view class="titlename width100 font18 fontwig6 fcor333">费率信息审核</view>
<view class="width100 backcorfff">
<view class="notes" v-for="(item,index) in RateApplyDetail.merRateApplyDetailList">
<view class="fcor666 width25">{{item.rateTypeName}}</view>
<view class="font14 fcor333 text2 width75 fotrt">{{item.ratePct}} (单位: 百分之一)</view>
</view>
</view>
<view class="titlename width100 font18 fontwig6 fcor333"
v-if="RateApplyDetail.status == 2 || RateApplyDetail.status == 4 || RateApplyDetail.status == 6">驳回信息</view>
<textarea class="width100 backcorfff" v-model="rejectReason" v-if="RateApplyDetail.status == 2"
style="padding: 15px;" placeholder="请填写审核驳回内容"></textarea>
<textarea class="width100 backcorfff" :value="RateApplyDetail.rejectReason" disabled="true"
v-if="RateApplyDetail.status == 4 || RateApplyDetail.status == 6" style="padding: 15px;"></textarea>
<view class="alijusstart" v-if="RateApplyDetail.status == 2">
<button class="btns mart40 backcor008" @click="approve()">通过</button>
<button class="btns mart40 backcorlr" @click="reject()">驳回</button>
</view>
</view>
</template>
<script>
import {
reject,
approve,
getRateApplyDetail
} from '../../../Utils/Api.js';
export default {
data() {
return {
auditNo: '', //
rateApplyId: '', //id
rejectReason: '', //
RateApplyDetail: '' //
}
},
onLoad(options) {
this.rateApplyId = options.id;
this.auditNo = options.auditid;
this.getRateApplyDetail();
},
methods: {
//
getRateApplyDetail() {
let datas = {
rateApplyId: this.rateApplyId
}
getRateApplyDetail(datas).then(res => {
if (res.return_code == '000000') {
this.RateApplyDetail = res.return_data.rateApply;
}
})
},
//
approve() {
uni.showModal({
title: '通过审核',
content: '是否通过当前审核',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '提交中'
})
let datas = {
auditNo: this.auditNo
}
approve(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '提交成功',
icon: "none",
duration: 2000
});
uni.navigateBack();
} else {
uni.showToast({
title: res.return_msg,
icon: "none",
duration: 2000
});
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
//
reject() {
if (!this.rejectReason) {
uni.showToast({
title: '请填写驳回理由',
icon: "none",
duration: 2000
});
return;
}
uni.showModal({
title: '驳回审核',
content: '是否驳回当前审核',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '提交中'
})
let datas = {
auditNo: this.auditNo,
"rejectReason": this.rejectReason
}
reject(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '提交成功',
icon: "none",
duration: 2000
});
uni.navigateBack();
} else {
uni.showToast({
title: res.return_msg,
icon: "none",
duration: 2000
});
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
}
}
</script>
<style lang="scss">
page {
background-color: #f6f6f6;
}
.titlename {
align-items: center;
padding: 30rpx 0 30rpx 20rpx;
background-color: #ffffff;
border-bottom: 1px solid #f6f6f6;
}
.notes {
width: calc(100% - 40rpx);
display: flex;
align-items: center;
padding: 30rpx 0 30rpx 20rpx;
border-bottom: 1px solid #f6f6f6;
}
.btns {
width: 40%;
height: 50px;
line-height: 50px;
color: #FFFFFF;
font-weight: bold;
}
</style>

@ -12,12 +12,13 @@
<view class="mart20 width100">
<view class="width94 backcorfff border-r mart15" v-for="(item,index) in rviewList" :key="index"
@click="jumpRviewSettdetails(item.auditNo)">
@click="jumpRviewSettdetails(item)">
<view class="notes" style="padding-bottom: 0px;">
<!-- <image src="../../../static/img/merchantstu.png" mode="widthFix" class="iconw40"></image> -->
<view class="width80p">
<view class="font15 fcor333">{{item.auditObjectName}}</view>
<view class="font14 fcor999 paddtop5">
<view class="font14 fcor999 mart5">审核类型: {{item.vocationalWorkTypeName}}</view>
<view class="font14 fcor999 ">
提交时间: {{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
</view>
@ -105,9 +106,17 @@
},
//
jumpRviewSettdetails(item) {
uni.navigateTo({
url: '/pages/index/settlement_details/settlement_details?id=' + item
})
if (item.vocationalWorkType == 1) {
uni.navigateTo({
url: '/pages/index/settlement_details/settlement_details?id=' + item.auditNo
})
}
if (item.vocationalWorkType == 2) {
uni.navigateTo({
url: '/pages/index/rateReview/rateReview?id=' + item.auditObjectId + '&auditid=' + item
.auditNo
})
}
}
}
}
@ -128,5 +137,4 @@
align-items: center;
padding: 20upx 0 20upx 20upx;
}
</style>
Loading…
Cancel
Save