Compare commits

..

No commits in common. '1ccb951d99acd0542d382a18bd818aa5fca9ee1e' and 'f9ffe473aec35aab18d3bfab164611baedf66424' have entirely different histories.

  1. 8
      App.vue
  2. 6
      Utils/Api.js
  3. 79
      pages/index/merchant-details/merchant-details.vue
  4. 125
      pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
  5. 17
      pages/index/merchant-management/merchant-management.vue
  6. 2
      pages/index/modifyRate/modifyRate.vue
  7. 6
      pages/index/normal-Merchant/normal-Merchant.vue
  8. 28
      pages/tabBar/home/home.vue
  9. BIN
      static/img/home6.png
  10. 2
      unpackage/dist/build/h5/index.html

@ -4,11 +4,11 @@
// url: 'http://192.168.3.4:9301/crest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//
url: 'https://pay.dctpay.com/crest',
imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
// url: 'https://pay.dctpay.com/crest',
// imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
//
// url: 'https://gratia-pay.dctpay.com/crest',
// imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
url: 'https://gratia-pay.dctpay.com/crest',
imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
userInfo: "",
openId: '',
h5code: '',

@ -320,12 +320,6 @@ export const unbindStore = params => {
return POST('POST', `${base}/device/unbindStore`, params).then(res => res.data);
}
//切换渠道
export const switchPlatform = params => {
return POST('POST', `${base}/merPlatform/switchPlatform`, params).then(res => res.data);
}

@ -101,34 +101,14 @@
<!-- 渠道列表 -->
<view class="mart15 width100" v-if="current == 2">
<!-- v-for="(item,indexplt) in merPlatformList" :key="indexplt" -->
<view class="width94 backcorfff border-r mart15 paddbotm10" v-for="(item,indexplt) in merPlatformList"
:key="indexplt" @click="jumpDetailsparts(item.merId,item.platformType)">
<view class="width94 backcorfff border-r mart15" v-for="(item,indexplt) in merPlatformList" :key="indexplt">
<view class="notes" style="border-bottom: 0px;">
<view class="width70 margle">
<view class="width100 margle">
<view class="font16 fcor333" v-if="item.platformType == 1">渠道名称: 拉卡拉</view>
<view class="font16 fcor333" v-if="item.platformType == 5">渠道名称: 随行付</view>
<view class="font14 fcor999 mart5" v-if="item.cupNo">商户号: {{item.cupNo}}</view>
<view class="font14 fcoreb5 mart5" v-if="item.suggestionReject">审核驳回原因:
{{item.suggestionReject}}
<view class="font14 fcor999 mart5">商户号: {{item.cupNo}}</view>
<view class="font14 fcor999 mart5">终端号: {{item.merPlatformTerm.termNo}}</view>
</view>
</view>
<view class="otstatucs" v-if="item.status == 0">
不可用
</view>
<view class="storestus" v-if="item.status == 1">
可用
</view>
<view class="otstatucs" v-if="item.status == 2">
审核中
</view>
<view class="otstatucs" v-if="item.status == 3">
审核驳回
</view>
</view>
<view class="btnschange width90 border-r" v-if="item.platformType == 1 && !item.currentPlatform"
@click.stop="switchPlatform(item.merId,item.platformType)">切换拉卡拉</view>
<view class="btnschange width90 border-r" v-if="item.platformType == 5 && !item.currentPlatform"
@click.stop="switchPlatform(item.merId,item.platformType)">切换随行付</view>
</view>
</view>
<view class="width94 alijus" v-if="current == 0">
@ -143,8 +123,7 @@
import {
getMerDetail,
getStoreListByMer,
getMerPlatformList,
switchPlatform
getMerPlatformList
} from '../../../Utils/Api.js';
export default {
components: {
@ -165,9 +144,6 @@
this.merid = options.id;
this.getMerDetail(this.merid);
},
onShow() {
this.getMerPlatformList();
},
methods: {
//
change(index) {
@ -274,39 +250,6 @@
uni.navigateTo({
url: '../bindScan/bindScan?storeid=' + item + '&type=' + items
})
},
//
jumpDetailsparts(item, item1) {
uni.navigateTo({
url: '../merchant-incoming-parts/merchant-incoming-parts?id=' + item + '&merPlatformType=' +
item1
})
},
//
switchPlatform(item, item1) {
uni.showModal({
title: '切换渠道',
content: '是否确认切换当前渠道',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '处理中...'
})
let data = {
"merId": item,
"platformType": item1
}
switchPlatform(data).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.getMerPlatformList();
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
}
}
@ -320,7 +263,7 @@
.notes {
width: calc(100% - 40rpx);
display: flex;
align-items: flex-start;
align-items: center;
padding: 30rpx 0 30rpx 20rpx;
border-bottom: 1px solid #f6f6f6;
}
@ -376,14 +319,4 @@
.lin10 {
height: 10px;
}
.btnschange {
background-color: #0083f5;
font-size: 14px;
width: 90px;
text-align: center;
padding-top: 5px;
padding-bottom: 5px;
color: #FFFFFF;
}
</style>

@ -11,12 +11,11 @@
</view>
<!-- 审核状态回馈 -->
<view class="width100 line10 "></view>
<view class="width100" style="background-color: #eb6a53;"
v-if="merDetailInfo.merContractFailMsg && merDetailInfo.merContractFailMsg.response_msg">
<view class="width100" style="background-color: #eb6a53;" v-if="merDetailInfo.merStatus == 4">
<view class="font18 fcorfff paading10 aliitem">
<image src="../../../static/img/error.png" mode="widthFix" class="iconw25 marglerig"></image>审核失败
<text class="fotct margle20 backcorfff fcoreb5 font14 border-r marRight20 flright paddtop5 paddbotm5"
style="width: 80px;" @click="reconsider" v-if="merPlatformType && merPlatformType == 1">复议提交</text>
style="width: 80px;" @click="reconsider">复议提交</text>
</view>
<view class="font14 fcorfff paading10">{{merDetailInfo.merContractFailMsg.response_msg}}</view>
@ -180,39 +179,11 @@
</pickRegions>
<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
</view>
<view class="username">
<view class="namecont font16">经营类型</view>
<picker mode="selector" style="width: 70%;" :range="merOperateList" range-key="codeName"
@change="bindUserCard">
<view class=" text1 marRight10 font14" v-if="merOperateType">
{{merOperateName}}
</view>
<view class=" text1 marRight10 fcor999 font14" v-else>
请选择设备类型
</view>
</picker>
<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
</view>
<view class="username" v-if="merOperateType == 2">
<view class="namecont font16">线上类型</view>
<picker mode="selector" style="width: 70%;" :range="merOnlineList" range-key="codeName"
@change="bindUserCard1">
<view class=" text1 marRight10 font14" v-if="merOnlineType">
{{merOnlinetypsName}}
</view>
<view class=" text1 marRight10 fcor999 font14" v-else>
请选择设备类型
</view>
</picker>
<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
</view>
<view class="username" v-if="merOperateType == 2">
<view class="namecont">线上产品名称</view>
<input placeholder="请输入线上产品名称" v-model="merOnlineName" style="width: 70%;"
<!-- <view class="username">
<view class="namecont">mcc编号</view>
<input placeholder="请输入四位数字的mcc编号" v-model="mccno" maxlength="4" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view>
</view> -->
<view class="username">
<view class="namecont">mcc编号</view>
<input placeholder="请选择mcc编号" v-model="mccname" style="width: 70%;" disabled="true"
@ -866,13 +837,6 @@
larIdCardAddress: '', //
idcardtime: '1', // times: longterm:
uncorporsettelimg: '', //
merOperateList: '', //
merOnlineList: '', //线
merOperateType: '', //" 1线 2线",
merOperateName: '', // 1线 2线",
merOnlineType: '', //"线 1APP 2 3//
merOnlinetypsName: '', //1APP 2 3//
merOnlineName: '', //"线"
uploaduncorporsettelimg: '', //
settleimg: '', //
uploadsettleimg: '', //
@ -921,7 +885,6 @@
merDetailInfo: '', //
rateCodeList: [], //
merRateList: [], //
merPlatformType: '' //ID
}
},
computed: {
@ -942,7 +905,6 @@
},
onLoad(options) {
this.merId = options.id;
this.merPlatformType = options.merPlatformType;
this.getMerDetail(1);
},
onShow() {
@ -971,8 +933,6 @@
this.storelongitude = app.globalData.storeMessage.location.lng;
this.storelatitude = app.globalData.storeMessage.location.lat;
}
this.merOperateList = app.globalData.Dictionaries.MER_OPERATE_TYPE;
this.merOnlineList = app.globalData.Dictionaries.MER_ONLINE_TYPE;
},
onUnload() {
app.globalData.businessid = '';
@ -985,16 +945,6 @@
app.globalData.depositaryBank = '';
},
methods: {
//
bindUserCard(e) {
this.merOperateType = this.merOperateList[e.target.value].codeValue;
this.merOperateName = this.merOperateList[e.target.value].codeName;
},
//线
bindUserCard1(e) {
this.merOnlineType = this.merOnlineList[e.target.value].codeValue;
this.merOnlinetypsName = this.merOnlineList[e.target.value].codeName;
},
//
showPopup() {
this.$refs.popup.show();
@ -1050,10 +1000,6 @@
//
reconsider() {
let that = this;
let platformType = "";
if (that.merPlatformType && that.merPlatformType != undefined) {
platformType = that.merPlatformType;
}
uni.showModal({
title: '复议提交',
content: '确认信息是否正确',
@ -1063,8 +1009,7 @@
title: '提交审核中...'
})
let datas = {
"merId": that.merId,
"merPlatformType": platformType
"merId": that.merId
}
reconsider(datas).then(res => {
uni.hideLoading();
@ -1572,13 +1517,8 @@
},
//
getMerDetail(item) {
let platformType = "";
if (this.merPlatformType && this.merPlatformType != undefined) {
platformType = this.merPlatformType;
}
let datas = {
merId: this.merId,
merPlatformType: platformType
merId: this.merId
}
getMerDetail(datas).then(res => {
if (res.return_code == '000000' && res.return_data) {
@ -1641,20 +1581,6 @@
this.idcardname = res.return_data.larName;
this.idcard = res.return_data.larIdCard;
this.merOperateType = res.return_data.merOperateType;
this.merOnlineType = res.return_data.merOnlineType;
for (var i = 0; i < this.merOperateList.length; i++) {
if (res.return_data.merOperateType == this.merOperateList[i].codeValue) {
this.merOperateName = this.merOperateList[i].codeName;
}
}
for (var j = 0; j < this.merOnlineList.length; j++) {
if (res.return_data.merOnlineType == this.merOnlineList[j].codeValue) {
this.merOnlinetypsName = this.merOnlineList[j].codeName;
}
}
//线
this.merOnlineName = res.return_data.merOnlineName;
this.larIdCardAddress = res.return_data.larIdCardAddress
this.getImgSignedUrl(1, res.return_data.blisUrl, 2);
this.getImgSignedUrl(2, res.return_data.larIdCardPortraitImg, 2);
@ -2000,33 +1926,6 @@
});
return;
}
if (!that.merOperateType) {
uni.showToast({
title: '请选择经营类型',
icon: "none",
duration: 2000
});
return;
}
if (that.merOperateType && that.merOperateType == 2) {
if (!that.merOnlineType) {
uni.showToast({
title: '请选择线上产品类型',
icon: "none",
duration: 2000
});
return;
}
if (!that.merOnlineName) {
uni.showToast({
title: '请输入线上产品名称',
icon: "none",
duration: 2000
});
return;
}
}
if (that.merchantId == 3) {
this.start_date = '';
@ -2058,9 +1957,6 @@
"blisPeriodEnd": that.end_date,
"larName": that.idcardname,
"larIdCard": that.idcard,
"merOperateType": that.merOperateType,
"merOnlineType": that.merOnlineType,
"merOnlineName": that.merOnlineName,
"larIdCardAddress": that.larIdCardAddress,
"larIdCardPortraitImg": that.uploadidcardposimg,
"larIdCardNationalEmblemImg": that.uploadidcardsideimg,
@ -2412,10 +2308,6 @@
});
return;
}
let platformType = "";
if (that.merPlatformType && that.merPlatformType != undefined) {
platformType = that.merPlatformType;
}
uni.showModal({
title: '提交审核',
content: '确认信息是否正确。',
@ -2434,7 +2326,6 @@
"doorHeadImg": that.uploadstoreimg1,
"cashRegisterImg": that.uploadstoreimg2,
"internalImg": that.uploadstoreimg3,
"merPlatformType": platformType,
"storeRegion": {
"address": that.storeAddress,
"areaCode": that.storeareaCode,

@ -27,11 +27,7 @@
<view class="otstatucs font14" v-if="item.merStatus == 4">审核失败</view>
<view class="otstatucs font14" v-if="item.merStatus == 5">违规</view>
</view>
<view class="notes" style="padding-top: 5px;padding-bottom: 5px;">
<view class="width30 fcor333 font15">商户号</view>
<view class="width30 fcor999 font15">{{item.merNo}}</view>
</view>
<view class="notes" style="padding-top: 5px;padding-bottom: 5px;">
<view class="notes">
<view class="width30 fcor333 font15">联系人</view>
<view class="width30 fcor999 font15" v-if="item.regName">{{item.regName}}</view>
<view class="width30 fcor999 font15" v-else>-</view>
@ -67,17 +63,6 @@
merstu: 2 // 2 3 4 5 1
}
},
onLoad(options) {
if (options.id == 1) {
this.merstu = 2;
this.current = 0;
}
if (options.id == 2) {
this.merstu = 3;
this.current = 1;
}
},
onShow() {
this.merchantlist = [];
this.pageNum = 1;

@ -26,7 +26,7 @@
</view>
</view>
<view class="btn" @click="updatemodifyRate()" v-if="!modifyDetails || modifyDetails.status == 4 || modifyDetails.status == 6 || modifyDetails.status == 3">提交审核</view>
<view class="btn" @click="updatemodifyRate()" v-if="!modifyDetails || modifyDetails.status == 4 || modifyDetails.status == 6">提交审核</view>
</view>
</template>

@ -17,11 +17,7 @@
</view>
<!-- <view class="statucs font14">正常</view> -->
</view>
<view class="notes" style="padding-top: 5px;padding-bottom: 5px;">
<view class="width30 fcor333 font15">商户号</view>
<view class="width30 fcor999 font15">{{item.merNo}}</view>
</view>
<view class="notes" style="padding-top: 5px;padding-bottom: 5px;">
<view class="notes">
<view class="width30 fcor333 font15">联系人</view>
<view class="width30 fcor999 font15" v-if="item.regName">{{item.regName}}</view>
<view class="width30 fcor999 font15" v-else>-</view>

@ -25,12 +25,12 @@
<view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType != 3">¥<text
class="margle font40">{{auditnum.tradePrice}}</text></view>
<!-- 业务员 -->
<view class="width94 mart80" v-if="userInfo.secUser.objectType == 3">
<view class="width50 fcorfff font14 flleft" @click.stop="jumpsuccmerchant">
<view class="width94 mart80" v-if="userInfo.secUser.objectType == 3" @click.stop="jumpaudt">
<view class="width50 fcorfff font14 flleft">
<view class="width100">进件成功数量</view>
<view class="width100 mart15 font22">{{auditnum.contractSuccess}}</view>
</view>
<view class="width48 fcorfff font14 flright" @click.stop="jumpwaitmerchant">
<view class="width48 fcorfff font14 flright">
<view class="width100">待审核数量</view>
<view class="width100 mart15 font22">{{auditnum.contractAudit}}</view>
</view>
@ -94,7 +94,7 @@
},
{
title: '进件管理',
url: '../../index/merchant-management/merchant-management?id=1',
url: '../../index/merchant-management/merchant-management',
img: '../../../static/img/home4.png'
}, {
title: '商户管理',
@ -108,10 +108,6 @@
title: '申请订单',
url: '../../index/salesOrderList/salesOrderList',
img: '../../../static/img/apply.png'
}, {
title: '收款记录',
url: '../../index/collectNotes/collectNotes',
img: '../../../static/img/home6.png'
}
]
return;
@ -121,7 +117,7 @@
this.funcList = [{
title: '收款记录',
url: '../../index/collectNotes/collectNotes',
img: '../../../static/img/home6.png'
img: '../../../static/img/home1.png'
},
{
title: '门店管理',
@ -136,7 +132,7 @@
this.funcList = [{
title: '收款记录',
url: '../../index/collectNotes/collectNotes',
img: '../../../static/img/home6.png'
img: '../../../static/img/home1.png'
}, {
title: '二维码列表',
url: '../../index/scanList/scanList',
@ -247,18 +243,6 @@
url: item
})
},
//
jumpsuccmerchant() {
uni.navigateTo({
url: '../../index/normal-Merchant/normal-Merchant'
})
},
//
jumpwaitmerchant() {
uni.navigateTo({
url: '../../index/merchant-management/merchant-management?id=2'
})
},
//
jumpaudt() {
uni.navigateTo({

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

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