From 4bc0f0b9ab2a11307847ac7423b8dbb58adf1c30 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 25 May 2023 11:26:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9=E7=BB=93?=
=?UTF-8?q?=E7=AE=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/addStore/addStore.vue | 26 ++++++++++---------
.../updateSettlement/updateSettlement.vue | 21 +++++++--------
pages/welcome/welcome.vue | 6 ++---
unpackage/dist/build/h5/index.html | 2 +-
4 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/pages/index/addStore/addStore.vue b/pages/index/addStore/addStore.vue
index 3f1ce50..6bb1723 100644
--- a/pages/index/addStore/addStore.vue
+++ b/pages/index/addStore/addStore.vue
@@ -132,6 +132,19 @@
长期有效
+
+
+
+
+ {{start_date}}
+
+ 至
+
+ {{end_date}}
+
+ 长期有效
法人信息
@@ -191,18 +204,7 @@
-
-
- {{start_date}}
-
- 至
-
- {{end_date}}
-
- 长期有效
-
+
结算信息
diff --git a/pages/index/updateSettlement/updateSettlement.vue b/pages/index/updateSettlement/updateSettlement.vue
index 2f99293..58dc576 100644
--- a/pages/index/updateSettlement/updateSettlement.vue
+++ b/pages/index/updateSettlement/updateSettlement.vue
@@ -2,15 +2,15 @@
-
+ v-if="applyByMerList && (applyByMerList.status == 2 || applyByMerList.status == 4 || applyByMerList.status == 6)">
+
审核驳回
- {{applyByMerList.rejectReason}}
+ {{applyByMerList.rejectReason}}
-
+
审核中
-
+
@@ -187,7 +187,7 @@
- 提交审核
+ 提交审核
@@ -390,10 +390,10 @@
//上传图片
upload(item) {
let that = this;
- if (that.applyByMerList) {
- return;
- }
- if (that.applyByMerList.status == 2) {
+ // if (that.applyByMerList) {
+ // return;
+ // }
+ if (that.applyByMerList.status == 2 || that.applyByMerList.status == 5) {
return;
}
uni.chooseImage({
@@ -809,7 +809,6 @@
createApplyUpdateSettle(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
- that.merchart = 4;
uni.showToast({
title: '提交成功',
icon: 'none',
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 4d4e19d..9c93c9d 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -17,9 +17,9 @@
},
onLoad(options) {
let that = this;
- uni.reLaunch({
- url: '../tabBar/home/home'
- })
+ // uni.reLaunch({
+ // url: '../tabBar/home/home'
+ // })
// #ifdef H5
let arr1 = window.location.href;
let arr2 = arr1.split('=');
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 92f4050..f6c8610 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('')