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

# Conflicts:
#	pages/welcome/welcome.vue
1.解决冲突
huipay-app-dev
杨杰 1 year ago
commit aaef8d1d84
  1. 14
      pages/index/bindDividedMerchant/bindDividedMerchant.vue
  2. 11
      pages/index/bindMerchants/bindMerchants.vue
  3. 7
      pages/index/ledgerReceiverList/ledgerReceiverList.vue
  4. 25
      pages/index/merchant-management/merchant-management.vue
  5. 69
      pages/index/normal-Merchant/normal-Merchant.vue
  6. 70
      pages/index/open-Divide_accounts/open-Divide_accounts.vue
  7. 2
      pages/welcome/welcome.vue
  8. 2
      unpackage/dist/build/h5/index.html

@ -16,7 +16,8 @@
</view>
<view class="font14 fcorfff paading10"
v-if="ledgerReceiverApply.auditStatus == 3 || ledgerReceiverApply.auditStatus == 5">
{{ledgerReceiverApply.rejectReason}}</view>
{{ledgerReceiverApply.rejectReason}}
</view>
</view>
<view class="username">
@ -32,7 +33,7 @@
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view>
<view class="notes font16" style="border-bottom: 0px;">
<view class="notes font16" style="border-bottom: 0px;" v-if="platformType == 1">
<view class="width70 aliitem fcor666"
v-if="typeId == 1 || (typeId == 2 && (ledgerReceiverApply.auditStatus == 1 || ledgerReceiverApply.auditStatus == 2|| ledgerReceiverApply.auditStatus == 3))">
合作协议
@ -46,7 +47,7 @@
<image mode="widthFix" style="width: 12px;" src="../../../static/img/jtg.png"></image>
</view> -->
</view>
<view class="width94 displ mart5">
<view class="width94 displ mart5" v-if="platformType == 1">
<image mode="widthFix" class="width100" :src="imgUrls+entrustFilePath" v-if="entrustFilePath"
@click="upload()">
</image>
@ -85,12 +86,13 @@
typeId: '', //id 1 2
ledgerReceiverId: '', //id
ledgerReceiverApply: '', //
platformType: '' //ID
}
},
onLoad(options) {
this.merLedgerId = options.id;
this.typeId = options.typeid;
this.platformType = options.platformType;
if (this.typeId == 2 || this.typeId == 3) {
this.ledgerReceiverId = options.ledgerReceiverId;
this.getLedgerReceiverById();
@ -115,7 +117,7 @@
jumpMerchantlist() {
if (this.typeId == 1) {
uni.navigateTo({
url: '/pages/index/ledgerReceiverList/ledgerReceiverList'
url: '/pages/index/ledgerReceiverList/ledgerReceiverList?platformType='+this.platformType
})
}
},
@ -252,7 +254,7 @@
});
return;
}
if (!this.entrustFilePath) {
if (!this.entrustFilePath && this.platformType == 1) {
uni.showToast({
title: '请上传合作协议',
icon: "none",

@ -17,7 +17,7 @@
{{item.createTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}}
</view>
<view class="height45 width100 paddbotm10" v-if="item.status == 1 && item.auditStatus == 2">
<view class="height45 width100 paddbotm10" v-if="item.status == 1 && item.auditStatus == 2 && platformType == 1">
<button class="btns mart10 margle10" @click.stop="jumpBindMerchants(3,item.id)">解除绑定</button>
</view>
</view>
@ -35,12 +35,14 @@
return {
merchantList: [], //
merLedgerId: '', //ID
merId: '' //id
merId: '', //id
platformType: '' //ID
}
},
onLoad(options) {
this.merId = options.merId;
this.merLedgerId = options.id;
this.platformType = options.platformType;
},
onShow() {
this.getLedgerReceiverListByMer();
@ -50,7 +52,7 @@
getLedgerReceiverListByMer() {
let datas = {
merId: this.merId,
platformType: 1
platformType: this.platformType
}
getLedgerReceiverListByMer(datas).then(res => {
if (res.return_code == '000000' && res.return_data != null) {
@ -62,7 +64,7 @@
jumpBindMerchants(item, item1) {
uni.navigateTo({
url: '/pages/index/bindDividedMerchant/bindDividedMerchant?id=' + this.merLedgerId +
'&typeid=' + item + '&ledgerReceiverId=' + item1
'&typeid=' + item + '&ledgerReceiverId=' + item1 + '&platformType=' + this.platformType
})
}
}
@ -104,6 +106,7 @@
text-align: center;
padding: 2px 5px;
}
.btns {
width: 21%;
float: left;

@ -29,10 +29,12 @@
pageNum: 1,
pagesize: 15,
isLoadMore: false, //
merName: '' //
merName: '' ,//
platformType: '' //ID
}
},
onLoad(options) {
this.platformType = options.platformType;
this.getLedgerReceiverList();
},
onReachBottom() { //
@ -44,7 +46,6 @@
},
methods: {
toSearch() {
console.log('====='+this.merName);
this.pageNum = 1;
this.pageSize = 10;
this.isLoadMore = false;
@ -57,7 +58,7 @@
title: '加载中...'
})
let datas = {
platformType: 1,
platformType: this.platformType,
pageNum: this.pageNum,
merNme: this.merName,
pageSize: this.pagesize

@ -38,7 +38,7 @@
</view>
<view class="height45 width100 paddbotm10" v-if="item.merStatus == 1">
<button class="btns mart10 margle10" @click.stop="openAccounts(item.id)">开通分账</button>
<button class="btns mart10 margle10" @click.stop="bindMerchants(item.id)">分账接收方</button>
<!-- <button class="btns mart10 margle10" @click.stop="bindMerchants(item.id)">分账接收方</button> -->
<button class="btns mart10 margle10" @click.stop="jumpEquityActivity(item.id)">权益活动</button>
</view>
</view>
@ -50,7 +50,6 @@
import QSTabs from '../../../components/QS-tabs/QS-tabs.vue';
import {
getMerListBySalesman,
getMerLedgerApply
} from '../../../Utils/Api.js';
export default {
components: {
@ -164,28 +163,6 @@
url: '/pages/index/open-Divide_accounts/open-Divide_accounts?id=' + item
})
},
//
bindMerchants(item) {
//
let datas = {
merId: item,
platformType: 1
}
getMerLedgerApply(datas).then(res => {
if (res.return_code == '000000') {
uni.navigateTo({
url: '/pages/index/bindMerchants/bindMerchants?id=' + res.return_data.id +
'&merId=' + item
})
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
},
//
jumpEquityActivity(item) {
uni.navigateTo({

@ -1,5 +1,10 @@
<template>
<view>
<view class="input-box">
<view class="icon search"></view>
<input placeholder="请输入商户名称" v-model="mersearchName" placeholder-style="color:#c0c0c0;"
@input="getMerListBySalesman()" />
</view>
<view class="mart20 width100">
<view v-if="merchantlist == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
@ -28,7 +33,7 @@
</view>
<view class="height45 width100 paddbotm10">
<button class="btns mart10 margle10" @click.stop="openAccounts(item.id)">开通分账</button>
<button class="btns mart10 margle10" @click.stop="bindMerchants(item.id)">分账接收方</button>
<!-- <button class="btns mart10 margle10" @click.stop="bindMerchants(item.id)">分账接收方</button> -->
<button class="btns mart10 margle10" @click.stop="jumpEquityActivity(item.id)">权益活动</button>
</view>
</view>
@ -39,7 +44,6 @@
<script>
import {
getMerListBySalesman,
getMerLedgerApply
} from '../../../Utils/Api.js';
export default {
data() {
@ -48,6 +52,7 @@
pageNum: 1,
pagesize: 10,
isLoadMore: false, //
mersearchName: '' //
}
},
onShow() {
@ -65,17 +70,19 @@
methods: {
//
getMerListBySalesman() {
this.merchantlist = [];
uni.showLoading({
title: '加载中'
})
let datas = {
merStatus: 1,
merName: this.mersearchName,
pageNum: this.pageNum,
pageSize: this.pagesize,
}
getMerListBySalesman(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list) {
if (res.return_code == '000000' && res.return_data.list != '') {
this.merchantlist = this.merchantlist.concat(res.return_data.list);
if (res.return_data.pages == this.pageNum) {
this.isLoadMore = true;
@ -83,6 +90,7 @@
this.isLoadMore = false
}
} else {
this.merchantlist = [];
this.isLoadMore = true
}
});
@ -98,28 +106,7 @@
url: '/pages/index/open-Divide_accounts/open-Divide_accounts?id=' + item
})
},
//
bindMerchants(item) {
//
let datas = {
merId: item,
platformType: 1
}
getMerLedgerApply(datas).then(res => {
if (res.return_code == '000000') {
uni.navigateTo({
url: '/pages/index/bindMerchants/bindMerchants?id=' + res.return_data.id +
'&merId=' + item
})
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
},
//
jumpEquityActivity(item) {
uni.navigateTo({
@ -135,6 +122,38 @@
background-color: #f6f6f6;
}
.input-box {
width: 90%;
margin-left: 5%;
margin-top: 15px;
margin-bottom: 15px;
height: 70rpx;
background-color: #fff;
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%;
}
}
.notes {
width: calc(100% - 40upx);
display: flex;

@ -1,5 +1,15 @@
<template>
<view>
<!-- tabs栏 -->
<view class=" mart10 marb20 alijus">
<view class="font16 fcor333 paddtop5 paddbotm5 margle20 marRight40" v-for="(item,index) in platformList"
@click="switchid(item)" :class="[platformType == item.codeValue ? 'fcor089 borbtom fontwig6' : '']"
:key="index">
{{item.codeName}}
</view>
</view>
<view class="width100 line1"></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 && merLedgerApply.status != 4">
@ -15,7 +25,7 @@
</view>
</view>
<view class="username">
<view class="username" v-if="platformType == 1">
<view class="namecont">最低分账比例</view>
<input placeholder="请输入最低分账比例" v-model="splitLowestRatio" type="digit"
style="width: 70%;padding-right:10px;text-align: right;"
@ -40,7 +50,10 @@
@click="upload()"></image>
</view>
<view class="btn" @click="submitbtn()" v-if="merLedgerApply == null || merLedgerApply.status == 3 || merLedgerApply.status == 4">提交审核</view>
<view class="btn" @click="submitbtn()"
v-if="merLedgerApply == '' || merLedgerApply.status == 3 || merLedgerApply.status == 4">提交审核</view>
<view class="btn" @click="bindMerchants()" v-if="merLedgerApply != '' && merLedgerApply.status == 1">分账接收方
</view>
<view class="height60"></view>
</view>
</template>
@ -49,9 +62,10 @@
import {
getMerLedgerApply,
merLedgerApply
} from '../../../Utils/Api.js'
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
splitLowestRatio: '', //
@ -59,7 +73,18 @@
imgUrls: app.globalData.imgUrl, //
reqUrl: app.globalData.url, //
merId: '', //id
merLedgerApply: '' //
merLedgerApply: '', //
platformList: [{
id: 1,
codeValue: 1,
codeName: '拉卡拉'
}, {
id: 2,
codeValue: 5,
codeName: '随行付'
}],
platformType: '1', // ID
platformName: '拉卡拉', //
}
},
onLoad(options) {
@ -71,18 +96,26 @@
getMerLedgerApply() {
let datas = {
merId: this.merId,
platformType: 1
platformType: this.platformType
}
getMerLedgerApply(datas).then(res => {
if (res.return_code == '000000' && res.return_data != null) {
this.merLedgerApply = res.return_data;
this.splitLowestRatio = res.return_data.splitLowestRatio;
this.powerofattorney = res.return_data.splitEntrustFilePath;
}else{
this.merLedgerApply = null;
} else {
this.merLedgerApply = '';
this.splitLowestRatio = '';
this.powerofattorney = '';
}
})
},
//id
switchid(item) {
this.platformType = item.codeValue;
this.platformName = item.platformName;
this.getMerLedgerApply();
},
//item
perImage(item) {
uni.previewImage({
@ -160,7 +193,7 @@
},
//
submitbtn() {
if (!this.splitLowestRatio) {
if (!this.splitLowestRatio && this.platformType == 1) {
uni.showToast({
title: '请输入最低分账比例',
icon: "none",
@ -176,6 +209,9 @@
});
return;
}
if (this.platformType == 1) {
this.splitLowestRatio = '';
}
uni.showModal({
title: '提交审核',
content: '确认信息是否正确。',
@ -186,7 +222,7 @@
})
let datas = {
"merId": this.merId,
"platformType": 1,
"platformType": this.platformType,
"splitLowestRatio": this.splitLowestRatio,
"splitEntrustFilePath": this.powerofattorney
}
@ -216,7 +252,15 @@
}
}
});
}
},
//
bindMerchants() {
uni.navigateTo({
url: '/pages/index/bindMerchants/bindMerchants?id=' + this.merLedgerApply.id +
'&merId=' + this.merId + '&platformType=' + this.platformType
})
},
}
}
</script>
@ -245,6 +289,10 @@
}
}
.borbtom {
border-bottom: 3px solid #089bf5;
}
.btn {
color: #FFFFFF;
background-color: #0083f5;
@ -256,7 +304,7 @@
justify-content: center;
align-items: center;
border-radius: 10rpx;
font-size: 40rpx;
font-size: 36rpx;
}
.notes {

@ -71,7 +71,7 @@
},
jumpcdx() {
location.href =
'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://gratia-pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect';
'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect';
},
}
}

@ -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.f7d5fa91.js></script><script src=/cweb/static/js/index.fb76baf3.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.f7d5fa91.js></script><script src=/cweb/static/js/index.1495033b.js></script></body></html>
Loading…
Cancel
Save