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

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

Browse Source
huipay-app-dev
杨杰 1 year ago
parent 26f4dda7a6 1ccb951d99
commit cdb172b43f
5 changed files with 44 additions and 9 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. 17
      pages/index/merchant-management/merchant-management.vue
  2. 6
      pages/index/normal-Merchant/normal-Merchant.vue
  3. 28
      pages/tabBar/home/home.vue
  4. BIN
      static/img/home6.png
  5. 2
      unpackage/dist/build/h5/index.html

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

@ -26,8 +26,12 @@
<view class="otstatucs font14" v-if="item.merStatus == 3">审核中</view>
<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">
<view class="notes" style="padding-top: 5px;padding-bottom: 5px;">
<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>
@ -63,6 +67,17 @@
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;

6
pages/index/normal-Merchant/normal-Merchant.vue
Unescape View File

@ -16,8 +16,12 @@
</view>
</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">
<view class="notes" style="padding-top: 5px;padding-bottom: 5px;">
<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>

28
pages/tabBar/home/home.vue
Unescape View File

@ -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" @click.stop="jumpaudt">
<view class="width50 fcorfff font14 flleft">
<view class="width94 mart80" v-if="userInfo.secUser.objectType == 3">
<view class="width50 fcorfff font14 flleft" @click.stop="jumpsuccmerchant">
<view class="width100">进件成功数量</view>
<view class="width100 mart15 font22">{{auditnum.contractSuccess}}</view>
</view>
<view class="width48 fcorfff font14 flright">
<view class="width48 fcorfff font14 flright" @click.stop="jumpwaitmerchant">
<view class="width100">待审核数量</view>
<view class="width100 mart15 font22">{{auditnum.contractAudit}}</view>
</view>
@ -188,7 +188,7 @@
},
{
title: '进件管理',
url: '../../index/merchant-management/merchant-management',
url: '../../index/merchant-management/merchant-management?id=1',
img: '../../../static/img/home4.png'
}, {
title: '商户管理',
@ -202,6 +202,10 @@
title: '申请订单',
url: '../../index/salesOrderList/salesOrderList',
img: '../../../static/img/apply.png'
}, {
title: '收款记录',
url: '../../index/collectNotes/collectNotes',
img: '../../../static/img/home6.png'
}
]
return;
@ -211,7 +215,7 @@
this.funcList = [{
title: '收款记录',
url: '../../index/collectNotes/collectNotes',
img: '../../../static/img/home1.png'
img: '../../../static/img/home6.png'
},
{
title: '门店管理',
@ -226,7 +230,7 @@
this.funcList = [{
title: '收款记录',
url: '../../index/collectNotes/collectNotes',
img: '../../../static/img/home1.png'
img: '../../../static/img/home6.png'
}, {
title: '二维码列表',
url: '../../index/scanList/scanList',
@ -466,6 +470,18 @@
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({

BIN
static/img/home6.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

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.bc8fb141.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.fb76baf3.js></script></body></html>
Write Preview
Loading…
Cancel
Save