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 d7ec5835ba
commit 07a6c4ff16
8 changed files with 88 additions and 66 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. 4
      App.vue
  2. 9
      pages/index/bindScan/bindScan.vue
  3. 31
      pages/index/merchant-details/merchant-details.vue
  4. 34
      pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
  5. 62
      pages/index/salesOrderList/salesOrderList.vue
  6. 10
      pages/tabBar/user/user.vue
  7. 2
      pages/welcome/welcome.vue
  8. 2
      unpackage/dist/build/h5/index.html

4
App.vue
Unescape View File

@ -4,8 +4,8 @@
// url: 'http://192.168.3.4:9301/crest', // url: 'http://192.168.3.4:9301/crest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/', // imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式 //正式
// url: 'https://pay.bxb.cn/crest', // url: 'https://pay.dctpay.com/crest',
// imgUrl: 'https://xuan-pay-private.obs.cn-southwest-2.myhuaweicloud.com', // imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
//测试 //测试
url: 'https://gratia-pay.dctpay.com/crest', url: 'https://gratia-pay.dctpay.com/crest',
imgUrl: 'https://xuan-pay-private.obs.cn-southwest-2.myhuaweicloud.com', imgUrl: 'https://xuan-pay-private.obs.cn-southwest-2.myhuaweicloud.com',

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

@ -11,7 +11,7 @@
</view> </view>
<view class="height110 width94 backcorfff mart20" v-for="(item,index) in serviceList" :key="index"> <view class="height110 width94 backcorfff mart20" v-for="(item,index) in serviceList" :key="index">
<view class="font20 font306adb paddtop10 fontwig6 padleft15">{{item.serialNumber}}</view> <view class="font20 font306adb paddtop10 fontwig6 padleft15">{{item.serialNumber}}</view>
<view class="mart10 fcor666 padleft15 font14" v-if="typeId == 1">绑定时间: {{item.storeBindTime | timeFormat('yyyy-mm-dd')}} <view class="mart10 fcor666 padleft15 font14" v-if="typeId == 2">绑定时间: {{item.storeBindTime | timeFormat('yyyy-mm-dd')}}
{{item.storeBindTime | timeFormat('hh:mm')}} {{item.storeBindTime | timeFormat('hh:mm')}}
</view> </view>
<view class="mart10 fcor666 padleft15 font14" v-else>创建: {{item.createTime | timeFormat('yyyy-mm-dd')}} <view class="mart10 fcor666 padleft15 font14" v-else>创建: {{item.createTime | timeFormat('yyyy-mm-dd')}}
@ -56,9 +56,12 @@
onLoad(options) { onLoad(options) {
this.typeId = options.type; this.typeId = options.type;
this.storeId = options.storeid; this.storeId = options.storeid;
if (options.type == 2) { if (options.type == 2) {
uni.setNavigationBarTitle({
title: '二维码列表'
});
this.getStoreQrCodeList(); this.getStoreQrCodeList();
} else { } else {
this.getSalesmanQrCodeList(); this.getSalesmanQrCodeList();
} }
}, },

31
pages/index/merchant-details/merchant-details.vue
Unescape View File

@ -55,12 +55,21 @@
{{item.updateTime | timeFormat('hh:mm')}} {{item.updateTime | timeFormat('hh:mm')}}
</view> </view>
</view> </view>
<view class="storestus" v-if="item.status == 1"> <view class="storestus" v-if="item.status == 2">
正常 正常
</view> </view>
<view class="otstatucs" v-if="item.status == 2"> <view class="otstatucs" v-if="item.status == 1">
停用 编辑中
</view> </view>
<view class="otstatucs" v-if="item.status == 3">
审核中
</view>
<view class="otstatucs" v-if="item.status == 4">
审核失败
</view>
<view class="otstatucs" v-if="item.status == 5">
停用
</view>
</view> </view>
<view class="conts" style="border-bottom: 0px;"> <view class="conts" style="border-bottom: 0px;">
<image src="../../../static/img/store/store8.png" mode="widthFix" class="iconw"></image> <image src="../../../static/img/store/store8.png" mode="widthFix" class="iconw"></image>
@ -74,12 +83,12 @@
<image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image> <image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image>
<view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view> <view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view>
</view> </view>
<!-- <view class="height45 width100"> <view class="height45 width100">
<button class="btns mart10 marRight10" @click.stop="jumpBindScan(item.id,1)">二维码列表</button> <button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,1)">绑定二维码</button>
<button class="btns mart10 marRight10" @click.stop="jumpBindScan(item.id,2)">绑定二维码</button> <button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,2)">二维码列表</button>
<button class="btns mart10 marRight10" @click.stop="jumpService(item.id,1)">绑定设备</button> <!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,1)">绑定设备</button> -->
<button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> <!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> -->
</view> --> </view>
<view class="lin10"></view> <view class="lin10"></view>
</view> </view>
</view> </view>
@ -221,7 +230,7 @@
.btns { .btns {
width: 21%; width: 21%;
float: right; float: left;
height: 35px; height: 35px;
line-height: 35px; line-height: 35px;
background-color: #0083f5; background-color: #0083f5;

34
pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
Unescape View File

@ -173,13 +173,13 @@
<input placeholder="请输入四位数字的mcc编号" v-model="mccno" maxlength="4" style="width: 70%;" <input placeholder="请输入四位数字的mcc编号" v-model="mccno" maxlength="4" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" /> placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view> --> </view> -->
<!-- <view class="username"> <view class="username">
<view class="namecont">mcc编号</view> <view class="namecont">mcc编号</view>
<input placeholder="请选择mcc编号" v-model="mccno" style="width: 70%;" disabled="true" <input placeholder="请选择mcc编号" v-model="mccno" style="width: 70%;" disabled="true"
@click="jumpchangemcc()" placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" /> @click="jumpchangemcc()" placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image> <image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
</view> </view>
-->
<view class="username" style="border-bottom: 0px;"> <view class="username" style="border-bottom: 0px;">
<view class="namecont">详情地址</view> <view class="namecont">详情地址</view>
<input placeholder="请精确到XX路XX号" v-model="detailsaddress" style="width: 70%;" <input placeholder="请精确到XX路XX号" v-model="detailsaddress" style="width: 70%;"
@ -238,10 +238,10 @@
<view class="username" style="border-bottom: 0px;"> <view class="username" style="border-bottom: 0px;">
<view class="namecont">有效期</view> <view class="namecont">有效期</view>
<view class="width30 aliitem" @tap="idcardtime='1'"> <view class="width30 aliitem" @tap="idcardtime='1'">
<radio class="checbox" :checked="idcardtime=='1'" color="#0083f5" /> 选择时间 <radio class="checbox" :checked="idcardtime =='1'" color="#0083f5" /> 选择时间
</view> </view>
<view class="width30 aliitem" @tap="idcardtime='2'"> <view class="width30 aliitem" @tap="idcardtime='2'">
<radio class="checbox" :checked="idcardtime=='2'" color="#0083f5" /> 长期有效 <radio class="checbox" :checked="idcardtime =='2'" color="#0083f5" /> 长期有效
</view> </view>
</view> </view>
<view class="username width80"> <view class="username width80">
@ -839,6 +839,7 @@
onLoad(options) { onLoad(options) {
this.merId = options.id; this.merId = options.id;
this.getMerDetail(1); this.getMerDetail(1);
console.log('======' + this.cardstart_date);
}, },
onShow() { onShow() {
if (app.globalData.businessid) { if (app.globalData.businessid) {
@ -1180,7 +1181,7 @@
url: items url: items
} }
recognizeIdCard(params).then(res => { recognizeIdCard(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000' && res.return_data) { if (res.return_code == '000000' && res.return_data) {
if (item == 1) { if (item == 1) {
if (JSON.parse(res.return_data.data).data.face != undefined) { if (JSON.parse(res.return_data.data).data.face != undefined) {
@ -1204,6 +1205,7 @@
this.cardstart_date = times[0]; this.cardstart_date = times[0];
this.idcardsideimg = items; this.idcardsideimg = items;
this.cardend_date = times[1]; this.cardend_date = times[1];
console.log('======' + this.idcardtime);
} else { } else {
uni.showToast({ uni.showToast({
title: '请上传身份证国徽信息', title: '请上传身份证国徽信息',
@ -1268,11 +1270,11 @@
gonextstep() { gonextstep() {
uni.pageScrollTo({ uni.pageScrollTo({
scrollTop: 0 scrollTop: 0
}) })
// this.getMerDetail(0); // this.getMerDetail(0);
// 第一步 // 第一步
if (this.merchart == 1) { if (this.merchart == 1) {
if (this.currentstatus == 1) { if (this.currentstatus == 1) {
this.getMerDetail(0); this.getMerDetail(0);
this.merchart = 2; this.merchart = 2;
} else { } else {
@ -1373,9 +1375,15 @@
// this.idcardsideimg = res.return_data.larIdCardNationalEmblemImg; // this.idcardsideimg = res.return_data.larIdCardNationalEmblemImg;
// this.uploadidcardsideimg = res.return_data.larIdCardNationalEmblemImg; // this.uploadidcardsideimg = res.return_data.larIdCardNationalEmblemImg;
this.getImgSignedUrl(3, res.return_data.larIdCardNationalEmblemImg); this.getImgSignedUrl(3, res.return_data.larIdCardNationalEmblemImg);
this.cardstart_date = res.return_data.larIdCardPeriodStart; if (res.return_data.larIdCardPeriodStart) {
this.idcardtime = res.return_data.larIdCardPeriodType; this.cardstart_date = res.return_data.larIdCardPeriodStart;
this.cardend_date = res.return_data.larIdCardPeriodEnd; }
if (res.return_data.larIdCardPeriodType) {
this.idcardtime = res.return_data.larIdCardPeriodType;
}
if (res.return_data.larIdCardPeriodEnd) {
this.cardend_date = res.return_data.larIdCardPeriodEnd;
}
} }
//第三步 //第三步
if (res.return_data.merSettleAcct && this.rateCodeList) { if (res.return_data.merSettleAcct && this.rateCodeList) {
@ -1946,7 +1954,7 @@
"settleIdCardNationalEmblemImg": that.uploadidcardsideimg, //"【对私非法人结算】结算人身份证国徽面图片", "settleIdCardNationalEmblemImg": that.uploadidcardsideimg, //"【对私非法人结算】结算人身份证国徽面图片",
"settleIdCardPeriodStart": that.cardstart_date, //"【对私非法人结算】结算人身份证有效期开始时间", "settleIdCardPeriodStart": that.cardstart_date, //"【对私非法人结算】结算人身份证有效期开始时间",
"settleIdCardPeriodEnd": that.cardend_date, //"【对私非法人结算】结算人身份证有效期结束时间" "settleIdCardPeriodEnd": that.cardend_date, //"【对私非法人结算】结算人身份证有效期结束时间"
// "merRateList": that.merRateList //费率传值 "merRateList": that.merRateList //费率传值
} }
configMerSettlement(datas).then(res => { configMerSettlement(datas).then(res => {
uni.hideLoading(); uni.hideLoading();
@ -2226,4 +2234,4 @@
border-radius: 8px; border-radius: 8px;
color: #bfbfbf; color: #bfbfbf;
} }
</style> </style>

62
pages/index/salesOrderList/salesOrderList.vue
Unescape View File

@ -13,29 +13,31 @@
<view class="width94 backcorfff border-r mart15" v-for="(item,index) in serviceList" :key="index" <view class="width94 backcorfff border-r mart15" v-for="(item,index) in serviceList" :key="index"
@click="jumpService(item.orderNo)"> @click="jumpService(item.orderNo)">
<view class="notes"> <view class="notes">
<view class="width75 margle"> <view class="width100 margle">
<view class="font18 fcor333 fontwig6">{{item.orderNo}}</view> <view class="font18 fcor333 fontwig6">{{item.orderNo}}</view>
<view class="font13 fcor999 mart5">支付金额: ¥{{item.payPrice}}</view> <view class="font13 fcor999 mart5">支付金额: ¥{{item.payPrice}}</view>
<view class="font13 fcor999 mart5">支付时间: {{item.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} <view class="font13 fcor999 mart5">支付时间: {{item.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
</view> </view>
<view class="otstatucs border-r" @click.stop="orderRefund(item.orderNo)" v-if="item.status == 2"> </view>
<view class="conts" v-if="item.orderAssignList !=''">
<view class="margle10 font13 fcor999">设备编号: {{item.orderAssignList[0].deviceNo}}</view>
</view>
<view class="conts">
<view class="margle10 font13 fcor999">设备类型: {{item.deviceType | toFilter()}}</view>
<view class="margle10 font13 fcor999">申请数量: 1台</view>
</view>
<view class="width90 paddbotm10 alijusstart">
<view class="otstatucs border-r marRight10" @click.stop="orderRefund(item.orderNo)" v-if="item.status == 2">
订单退款 订单退款
</view> </view>
<view class="otstatucs border-r" @click.stop="replace(item.orderAssignList[0].id)" <view class="otstatucs border-r marRight10" @click.stop="replace(item.orderAssignList[0].id)"
v-if="item.status == 3"> v-if="item.status == 3">
更换设备 更换设备
</view> </view>
</view>
<view class="conts" v-if="item.orderAssignList !=''">
<view class="margle10 font13 fcor999" >设备编号: {{item.orderAssignList[0].deviceNo}}</view>
</view> </view>
<view class="conts">
<view class="margle10 font13 fcor999">设备类型: {{item.deviceType | toFilter()}}</view>
<view class="margle10 font13 fcor999">申请数量: 1台</view>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -79,23 +81,23 @@
} }
return codeName; return codeName;
} }
},
onReachBottom() { //上拉触底函数
if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
this.isLoadMore = true
this.pageNum += 1
this.serviceList = [];
this.getDeviceList();
}
}, },
onShow() { onReachBottom() { //上拉触底函数
if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
this.isLoadMore = true
this.pageNum += 1
this.serviceList = [];
this.getDeviceList();
}
},
onShow() {
this.serviceList = []; this.serviceList = [];
this.getOrderList(); this.getOrderList();
}, },
methods: { methods: {
//切换id //切换id
switchid(item) { switchid(item) {
this.goodtyid = item.id; this.goodtyid = item.id;
this.serviceList = []; this.serviceList = [];
this.getOrderList(); this.getOrderList();
}, },
@ -113,11 +115,11 @@
getOrderList(datas).then(res => { getOrderList(datas).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list != '') { if (res.return_code == '000000' && res.return_data.list != '') {
this.serviceList = this.serviceList.concat(res.return_data.list); this.serviceList = this.serviceList.concat(res.return_data.list);
if (res.return_data.pages == this.pageNum) { if (res.return_data.pages == this.pageNum) {
this.isLoadMore = true; this.isLoadMore = true;
} else { } else {
this.isLoadMore = false this.isLoadMore = false
} }
} else { } else {
this.serviceList = []; this.serviceList = [];
@ -208,9 +210,9 @@
.otstatucs { .otstatucs {
background-color: #fbeee4; background-color: #fbeee4;
color: #db8c73; color: #db8c73;
margin-top: -20px;
font-size: 14px; font-size: 14px;
padding: 4px 8px; width: 60px;
padding: 6px 8px;
} }
.conts { .conts {
@ -226,4 +228,4 @@
position: fixed; position: fixed;
right: 40rpx; right: 40rpx;
} }
</style> </style>

10
pages/tabBar/user/user.vue
Unescape View File

@ -1,16 +1,16 @@
<template> <template>
<view> <view>
<view class="width100 backcorfff height100p mart10"> <view class="width100 backcorfff height100p mart10">
<view class="width94 fcor333 font16 paddtop10">{{userInfo.secUser.userName}}</view> <view class="width94 fcor333 font16 paddtop10">{{userInfo.secUser.loginName}}</view>
<view class="width94 fcor999 font14 paddtop10">xxx</view> <!-- <view class="width94 fcor999 font14 paddtop10">xxx</view> -->
<view class="width94 fcor999 font14 paddtop10">名称｜{{userInfo.secRole.roleName}}</view> <view class="width94 fcor999 font14 paddtop10">{{userInfo.secUser.userName}}｜{{userInfo.secRole.roleName}}</view>
</view> </view>
<view class="width100 backcorfff mart15" @click="jumpbankjs"> <!-- <view class="width100 backcorfff mart15" @click="jumpbankjs">
<view class="notes"> <view class="notes">
<view class="fcor666 width90p">结算银行账户</view> <view class="fcor666 width90p">结算银行账户</view>
<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image> <image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
</view> </view>
</view> </view> -->
<wButton class="mart60" text="退 出 登 录" bgColor="#089bf5" :rotate="isRotate" @click="exitLogin"></wButton> <wButton class="mart60" text="退 出 登 录" bgColor="#089bf5" :rotate="isRotate" @click="exitLogin"></wButton>
</view> </view>
</template> </template>

2
pages/welcome/welcome.vue
Unescape View File

@ -68,7 +68,7 @@
}, },
jumpcdx() { jumpcdx() {
location.href = location.href =
'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsgcs.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';
}, },
} }
} }

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)')) <!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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.e911c294.js></script><script src=/cweb/static/js/index.8334b05a.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.65d11cca.js></script><script src=/cweb/static/js/index.65ccf64d.js></script></body></html>
Write Preview
Loading…
Cancel
Save