diff --git a/src/views/pay/payAgentUser/operate.vue b/src/views/pay/payAgentUser/operate.vue
index 81391b5..6360ef3 100644
--- a/src/views/pay/payAgentUser/operate.vue
+++ b/src/views/pay/payAgentUser/operate.vue
@@ -20,6 +20,22 @@
inactive-value="close" @change="switchStatusChange('statusOut', detailInfoList)">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -243,6 +259,10 @@ export default {
this.$message.error("请填写谷歌动态验证码");
return;
}
+ if (this.infoList.roundDownStatus == 'open' && this.infoList.roundUpStatus == 'open') {
+ this.$message.error("向上取整和向下取整开关不能同时开启");
+ return;
+ }
this.loading = true
this.infoList.storeId = this.val;
this.infoList.id = this.infoList.id < 1 ? null : this.infoList.id;
diff --git a/src/views/pay/payOrder/payOrderWater.vue b/src/views/pay/payOrder/payOrderWater.vue
index 247730f..9d01055 100644
--- a/src/views/pay/payOrder/payOrderWater.vue
+++ b/src/views/pay/payOrder/payOrderWater.vue
@@ -131,11 +131,15 @@
-
+
- {{ scope.row.tranAmt }}
- {{ scope.row.payAmt }}
- {{ scope.row.realAmt }}
+ {{ scope.row.requestAmt }}
+
+ {{ scope.row.tranAmt }}
+
+ {{ scope.row.payAmt }}
+
+ {{ scope.row.realAmt }}
diff --git a/正式7uppay.zip b/正式7uppay.zip
index 88138f2..81411ed 100644
Binary files a/正式7uppay.zip and b/正式7uppay.zip differ
diff --git a/测试7uppay.zip b/测试7uppay.zip
index 491cc34..a37e9de 100644
Binary files a/测试7uppay.zip and b/测试7uppay.zip differ