From 07a6c4ff161e4b8bfdf0b1306ef183698d82b89c Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 7 Apr 2023 11:53:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E8=BF=9B?=
=?UTF-8?q?=E4=BB=B6=E9=97=AE=E9=A2=98=202.=E4=BC=98=E5=8C=96=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 4 +-
pages/index/bindScan/bindScan.vue | 9 ++-
.../merchant-details/merchant-details.vue | 31 ++++++----
.../merchant-incoming-parts.vue | 34 ++++++----
pages/index/salesOrderList/salesOrderList.vue | 62 ++++++++++---------
pages/tabBar/user/user.vue | 10 +--
pages/welcome/welcome.vue | 2 +-
unpackage/dist/build/h5/index.html | 2 +-
8 files changed, 88 insertions(+), 66 deletions(-)
diff --git a/App.vue b/App.vue
index fa54101..2725333 100644
--- a/App.vue
+++ b/App.vue
@@ -4,8 +4,8 @@
// url: 'http://192.168.3.4:9301/crest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- // url: 'https://pay.bxb.cn/crest',
- // imgUrl: 'https://xuan-pay-private.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://xuan-pay-private.obs.cn-southwest-2.myhuaweicloud.com',
diff --git a/pages/index/bindScan/bindScan.vue b/pages/index/bindScan/bindScan.vue
index e66ed96..11475d0 100644
--- a/pages/index/bindScan/bindScan.vue
+++ b/pages/index/bindScan/bindScan.vue
@@ -11,7 +11,7 @@
{{item.serialNumber}}
- 绑定时间: {{item.storeBindTime | timeFormat('yyyy-mm-dd')}}
+ 绑定时间: {{item.storeBindTime | timeFormat('yyyy-mm-dd')}}
{{item.storeBindTime | timeFormat('hh:mm')}}
创建: {{item.createTime | timeFormat('yyyy-mm-dd')}}
@@ -56,9 +56,12 @@
onLoad(options) {
this.typeId = options.type;
this.storeId = options.storeid;
- if (options.type == 2) {
+ if (options.type == 2) {
+ uni.setNavigationBarTitle({
+ title: '二维码列表'
+ });
this.getStoreQrCodeList();
- } else {
+ } else {
this.getSalesmanQrCodeList();
}
},
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index 54c08e0..160f777 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -55,12 +55,21 @@
{{item.updateTime | timeFormat('hh:mm')}}
-
+
正常
-
- 停用
-
+
+ 编辑中
+
+
+ 审核中
+
+
+ 审核失败
+
+
+ 停用
+
@@ -74,12 +83,12 @@
{{item.storeRegion.address}}
-
+
+
+
+
+
+
@@ -221,7 +230,7 @@
.btns {
width: 21%;
- float: right;
+ float: left;
height: 35px;
line-height: 35px;
background-color: #0083f5;
diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
index 3f9838b..e8f9168 100644
--- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
+++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
@@ -173,13 +173,13 @@
-->
-
+
详情地址
有效期
- 选择时间
+ 选择时间
- 长期有效
+ 长期有效
@@ -839,6 +839,7 @@
onLoad(options) {
this.merId = options.id;
this.getMerDetail(1);
+ console.log('======' + this.cardstart_date);
},
onShow() {
if (app.globalData.businessid) {
@@ -1180,7 +1181,7 @@
url: items
}
recognizeIdCard(params).then(res => {
- uni.hideLoading();
+ uni.hideLoading();
if (res.return_code == '000000' && res.return_data) {
if (item == 1) {
if (JSON.parse(res.return_data.data).data.face != undefined) {
@@ -1204,6 +1205,7 @@
this.cardstart_date = times[0];
this.idcardsideimg = items;
this.cardend_date = times[1];
+ console.log('======' + this.idcardtime);
} else {
uni.showToast({
title: '请上传身份证国徽信息',
@@ -1268,11 +1270,11 @@
gonextstep() {
uni.pageScrollTo({
scrollTop: 0
- })
- // this.getMerDetail(0);
+ })
+ // this.getMerDetail(0);
// 第一步
if (this.merchart == 1) {
- if (this.currentstatus == 1) {
+ if (this.currentstatus == 1) {
this.getMerDetail(0);
this.merchart = 2;
} else {
@@ -1373,9 +1375,15 @@
// this.idcardsideimg = res.return_data.larIdCardNationalEmblemImg;
// this.uploadidcardsideimg = res.return_data.larIdCardNationalEmblemImg;
this.getImgSignedUrl(3, res.return_data.larIdCardNationalEmblemImg);
- this.cardstart_date = res.return_data.larIdCardPeriodStart;
- this.idcardtime = res.return_data.larIdCardPeriodType;
- this.cardend_date = res.return_data.larIdCardPeriodEnd;
+ if (res.return_data.larIdCardPeriodStart) {
+ this.cardstart_date = res.return_data.larIdCardPeriodStart;
+ }
+ 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) {
@@ -1946,7 +1954,7 @@
"settleIdCardNationalEmblemImg": that.uploadidcardsideimg, //"【对私非法人结算】结算人身份证国徽面图片",
"settleIdCardPeriodStart": that.cardstart_date, //"【对私非法人结算】结算人身份证有效期开始时间",
"settleIdCardPeriodEnd": that.cardend_date, //"【对私非法人结算】结算人身份证有效期结束时间"
- // "merRateList": that.merRateList //费率传值
+ "merRateList": that.merRateList //费率传值
}
configMerSettlement(datas).then(res => {
uni.hideLoading();
@@ -2226,4 +2234,4 @@
border-radius: 8px;
color: #bfbfbf;
}
-
+
\ No newline at end of file
diff --git a/pages/index/salesOrderList/salesOrderList.vue b/pages/index/salesOrderList/salesOrderList.vue
index bf32807..bfa2795 100644
--- a/pages/index/salesOrderList/salesOrderList.vue
+++ b/pages/index/salesOrderList/salesOrderList.vue
@@ -13,29 +13,31 @@
-
+
{{item.orderNo}}
支付金额: ¥{{item.payPrice}}
支付时间: {{item.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-
+
+
+
+ 设备编号: {{item.orderAssignList[0].deviceNo}}
+
+
+ 设备类型: {{item.deviceType | toFilter()}}
+ 申请数量: 1台
+
+
+
订单退款
-
更换设备
-
-
-
- 设备编号: {{item.orderAssignList[0].deviceNo}}
-
- 设备类型: {{item.deviceType | toFilter()}}
- 申请数量: 1台
-
-
+
@@ -79,23 +81,23 @@
}
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.getOrderList();
},
methods: {
//切换id
switchid(item) {
- this.goodtyid = item.id;
+ this.goodtyid = item.id;
this.serviceList = [];
this.getOrderList();
},
@@ -113,11 +115,11 @@
getOrderList(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list != '') {
- this.serviceList = this.serviceList.concat(res.return_data.list);
- if (res.return_data.pages == this.pageNum) {
- this.isLoadMore = true;
- } else {
- this.isLoadMore = false
+ this.serviceList = this.serviceList.concat(res.return_data.list);
+ if (res.return_data.pages == this.pageNum) {
+ this.isLoadMore = true;
+ } else {
+ this.isLoadMore = false
}
} else {
this.serviceList = [];
@@ -208,9 +210,9 @@
.otstatucs {
background-color: #fbeee4;
color: #db8c73;
- margin-top: -20px;
font-size: 14px;
- padding: 4px 8px;
+ width: 60px;
+ padding: 6px 8px;
}
.conts {
@@ -226,4 +228,4 @@
position: fixed;
right: 40rpx;
}
-
+
\ No newline at end of file
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index bbf2134..b8706ef 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -1,16 +1,16 @@
- {{userInfo.secUser.userName}}
- xxx
- 名称｜{{userInfo.secRole.roleName}}
+ {{userInfo.secUser.loginName}}
+
+ {{userInfo.secUser.userName}}｜{{userInfo.secRole.roleName}}
-
+
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index de162ae..040080b 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -68,7 +68,7 @@
},
jumpcdx() {
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';
},
}
}
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 7f73e98..5593c78 100644
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
惠支付
\ No newline at end of file
+ document.write('')