diff --git a/src/views/coin/coinAddress/index.vue b/src/views/coin/coinAddress/index.vue
index 2b723e7..fab5f61 100644
--- a/src/views/coin/coinAddress/index.vue
+++ b/src/views/coin/coinAddress/index.vue
@@ -68,7 +68,7 @@
- 清除
+ 清除
设置
diff --git a/src/views/pay/payAgentUser/operate.vue b/src/views/pay/payAgentUser/operate.vue
index bb10864..81391b5 100644
--- a/src/views/pay/payAgentUser/operate.vue
+++ b/src/views/pay/payAgentUser/operate.vue
@@ -45,8 +45,8 @@
-
+
@@ -112,7 +112,7 @@
diff --git a/src/views/pay/payAgentUser/payAgentUserList.vue b/src/views/pay/payAgentUser/payAgentUserList.vue
index ba43f1e..fdcf017 100644
--- a/src/views/pay/payAgentUser/payAgentUserList.vue
+++ b/src/views/pay/payAgentUser/payAgentUserList.vue
@@ -167,7 +167,8 @@
分配代理商
+ v-hasPermi="['system:user:assignAgents']" @click="handleAgent('分配代理商', 'divide', scope.row)"
+ style="color: #006EFF;">分配代理商
查看密钥
子钱包
通道
+ v-if="scope.row.userType == 'store'"
+ v-hasPermi="['store:store:query']"
+ >通道
费率
+ v-if="scope.row.userType == 'store'"
+ v-hasPermi="['store:store:query']"
+ >费率
配置
+ v-if="scope.row.userType == 'store'"
+ v-hasPermi="['store:store:query']"
+ >配置
diff --git a/src/views/pay/payAgentUser/rate.vue b/src/views/pay/payAgentUser/rate.vue
index 4632dfb..5e238ec 100644
--- a/src/views/pay/payAgentUser/rate.vue
+++ b/src/views/pay/payAgentUser/rate.vue
@@ -169,7 +169,7 @@
diff --git a/src/views/pay/payOrder/my-date-picker.vue b/src/views/pay/payOrder/my-date-picker.vue
index 882521f..0715a42 100644
--- a/src/views/pay/payOrder/my-date-picker.vue
+++ b/src/views/pay/payOrder/my-date-picker.vue
@@ -135,7 +135,7 @@ export default {
this.systemDate2 = date.year + '-' + 0 + date.month + '-' + date.date;
}
- this.dateRange=[ this.systemDate2 + ' ' + '00' + ':' + '00' + ':' + '00',this.systemDate+ ' ' + '23' + ':' + '59' + ':' + '59']
+ this.dateRange=[ this.systemDate + ' ' + '00' + ':' + '00' + ':' + '00',this.systemDate+ ' ' + '23' + ':' + '59' + ':' + '59']
this.$forceUpdate()
},
},
diff --git a/src/views/pay/payOrder/orderReport.vue b/src/views/pay/payOrder/orderReport.vue
index 422ddd5..733125d 100644
--- a/src/views/pay/payOrder/orderReport.vue
+++ b/src/views/pay/payOrder/orderReport.vue
@@ -201,7 +201,7 @@ export default {
} else {
this.systemDate2 = date.year + '-' + 0 + date.month + '-' + date.date;
}
- this.queryParams.beginTime = this.systemDate2 + ' ' + '00' + ':' + '00' + ':' + '00'
+ this.queryParams.beginTime = this.systemDate + ' ' + '00' + ':' + '00' + ':' + '00'
this.queryParams.endTime = this.systemDate+ ' ' + '23' + ':' + '59' + ':' + '59'
this.$forceUpdate()
},
diff --git a/src/views/pay/payOrder/payDaiFuWater.vue b/src/views/pay/payOrder/payDaiFuWater.vue
index 1ecd2c2..f217e4c 100644
--- a/src/views/pay/payOrder/payDaiFuWater.vue
+++ b/src/views/pay/payOrder/payDaiFuWater.vue
@@ -176,7 +176,7 @@
补发通知
+ v-hasPermi="['order:rechargeRecord:reissueNotice']">补发通知
diff --git a/src/views/pay/payOrder/payOrderWater.vue b/src/views/pay/payOrder/payOrderWater.vue
index 86e882c..247730f 100644
--- a/src/views/pay/payOrder/payOrderWater.vue
+++ b/src/views/pay/payOrder/payOrderWater.vue
@@ -36,6 +36,11 @@
+
+
+
+
-
@@ -300,10 +309,12 @@
{{ detailInfoList.payTypeName }}
+
+
-
+
{{ detailInfoList.orderMsg }}
+
+ {{ detailInfoList.userKey }}
+
{{ detailInfoList.notifyRemark }}
@@ -637,6 +651,7 @@ export default {
storeSettle: null,
payType: null,
channelType: null,
+ userKey: null,
},
// 表单参数
diff --git a/src/views/pay/payOrder/payuwater.vue b/src/views/pay/payOrder/payuwater.vue
index 596d0bb..33f0e04 100644
--- a/src/views/pay/payOrder/payuwater.vue
+++ b/src/views/pay/payOrder/payuwater.vue
@@ -83,7 +83,7 @@
导出
+ v-hasPermi="['order:rechargeRecord:export']">导出
@@ -67,10 +67,10 @@
-
+
-
-
+
+
-
+
+
{{ dict.label
diff --git a/正式7uppay.zip b/正式7uppay.zip
new file mode 100644
index 0000000..4bdfc7f
Binary files /dev/null and b/正式7uppay.zip differ
diff --git a/测试7uppay.zip b/测试7uppay.zip
index e10b894..bff959f 100644
Binary files a/测试7uppay.zip and b/测试7uppay.zip differ