From 495e2a20dc770523e808773f24e8b03c34b9201e Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 28 Sep 2023 14:12:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/moreProject/moreProject.vue | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 8c40e8b..2f8d435 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -54,6 +54,7 @@
订单管理
-->
+
@@ -83,7 +84,7 @@
订单核销
-
+
缴纳保证金
@@ -323,7 +324,7 @@
商户设置
-
+
缴纳保证金
@@ -394,7 +395,7 @@
商户设置
-
+
缴纳保证金
@@ -886,10 +887,7 @@
})
},
navigator(url, t) {
-
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
-
-
if (this.codenote.length == 0) {
this.isFshow = true
this.countDown()
@@ -904,7 +902,6 @@
}
}
} else {
-
uni.navigateTo({
url: url
})
From e532b9e288c137f81b500073b4513f76bd1cadbb Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 28 Sep 2023 14:33:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=A4=B1=E8=B4=A5?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/margin/margin.vue | 82 +++++++++++++--------------
pages/nongKe/cloud_entrepot/index.vue | 2 +-
2 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 9e9b518..3f728d6 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -40,7 +40,7 @@
{{loadTitle}}
-
+
@@ -98,7 +98,7 @@
that.$set(that, 'productList', productList);
}, 500)
-
+
that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => {
@@ -112,55 +112,55 @@
merchant({
id: this.mer_id
}).then((res) => {
-
+
this.merchant_Data = res.data
});
},
//缴纳保证金
paydecimal() {
-
- let that = this
- uni.showModal({
- title: '提示',
- content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
- success: (res) => {
- if (res.confirm) {
- // console.log('用户点击确定');
- paymerchant().then((res) => {
+ let that = this
+ uni.showModal({
+ title: '提示',
+ content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
+ success: (res) => {
+ if (res.confirm) {
- uni.requestPayment({
- provider: 'wxpay',
- orderInfo: res.data
- .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
- success: (res) => {
- that.$util.Tips({
- title: '支付成功'
- });
- that.decimal()
- that.list(true)
- },
- fail: (err) => {
- that.$util.Tips({
- title: '支付失败'
- });
+ // console.log('用户点击确定');
+ paymerchant().then((res) => {
- console.log('fail:' + JSON.stringify(err));
- }
- });
- }).catch((err) => {
- console.log(err)
- this.$util.Tips(()=>{
-
- })
- })
- } else if (res.cancel) {
- console.log('用户点击取消');
- }
+ uni.requestPayment({
+ provider: 'wxpay',
+ orderInfo: res.data
+ .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
+ success: (res) => {
+ that.$util.Tips({
+ title: '支付成功'
+ });
+ that.decimal()
+ that.list(true)
+ },
+ fail: (err) => {
+ that.$util.Tips({
+ title: '支付失败'
+ });
+
+ console.log('fail:' + JSON.stringify(err));
+ }
+ });
+ }).catch((err) => {
+ console.log(err)
+ that.$util.Tips({
+ title: err
+ })
+ })
+ } else if (res.cancel) {
+ console.log('用户点击取消');
}
- });
+ }
+ });
- }
+ }
}
}
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 73eace9..0be0883 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -491,7 +491,7 @@
.boundingClientRect(rect => {
// console.log(this.cartTagInfo, 6666)
that.cartTagInfo = rect
- console.log(rect)
+
})
.exec();
// console.log(that.headtop)