+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -37,7 +41,31 @@
data() {
return {
id:'',
- activeName: 'first'
+ activeName: 'first',
+ tabindex:0,
+ tabList:[
+ {
+ name:'first',
+ title:'基本设置',
+ component:jcindex
+ },
+ {
+ name:'second',
+ title:'支付配置',
+ component:payment
+ },
+ {
+ name:'staff',
+ title:'员工管理',
+ component:staff
+ },
+ {
+ name:'allOrder',
+ title:'订单查看',
+ component:allOrder
+ }
+ ]
+
};
},
@@ -53,6 +81,10 @@
},
methods: {
+ gettab(index){
+ this.tabindex = index
+ console.log(this.tabindex)
+ },
handleClick(tab, event) {
console.log(tab, event);
}
@@ -62,11 +94,40 @@
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue
index 3bec8fb59..6843b1639 100644
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ b/fuintAdmin_zt/src/views/components/Service/payment.vue
@@ -1,130 +1,396 @@
-
-
添加商户信息
-
-
-
-
-
-
-
-
-
-
-
-
切换为当前通道
-
当前使用中
+
+
+
+
+
商户信息
+
说明：为了保证加油站商户日常在线支付业务的稳定性，目前支持多通道支付，可以有效的避免单支付通道带来不稳定性，从而造成油站不能正常支付问题，加油站一旦出现不能正常支付的情况，可以随时手工切换支付通道，来保证加油站支付收款业务
-
商户编号: {{ item.mchntCd }}
-
-
- 备注: {{ item.remark ? item.remark : "--" }}
-
-
- 修改
- 删除
-
+
新增商户信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+
+
+
+
+
+
商户分账规则
+
使用说明：添加/编辑对应的规则->规则配置正常->发布规则->规则生效 注意:功能状态启用且通道规则发布生效后当前功能才有效,否则使用系统单商户号模式
-
-
-
-
-
+
+
+
+
+
+ 规则名称
+
-
-
规则周期
-
- 永久
- 单日
-
-
功能状态
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
{{index + 1}}.通道
-
{{ item.merchantName }}({{ item.remark }})
-
商户号
-
{{ item.mchntCd }}
-
-
交易占比
-
{{ item.proportion }}
-
%更换支付通道
-
+
+ .com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 启用成功后其他规则的规则状态变为停用！
- 编辑
- 删除
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
注:规则按照顺序进行处理并自动更换支付通道，新增或变更规则后需要发布当前规则才生效,发布生效后的规则将从序号1的配置生效
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -248,6 +514,13 @@ export default {
data(){
return{
+ ruleForm:[],
+ Enable:false,
+ SeparateAccounts:1,
+ addRule:false,
+ Ruletitle:'',
+ addMerchants:false,
+ addMerchantTitile:'',
// 是否禁用
isDis:false,
// 商户配置信息
@@ -265,10 +538,11 @@ export default {
delivery: false,
type: [],
resource: '',
- desc: ''
+ desc: '',
+ boxlist:[],
},
form1:{},
- formLabelWidth: '80px',
+ formLabelWidth: '100px',
dialogFormVisible:false,
dialogVisible:false,
show:false,
@@ -276,7 +550,76 @@ export default {
value1:true,
labelPosition: 'singleDay',
title:"",
+ boxlist:[],
merchantConfig:{},
+ tableData: [{
+ date: '2016-05-02',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1518 弄',
+ PaymentChannel:'富有',
+ PaymentNum:'00004879449874854',
+ price:'1587461740.00',
+ status: '正在使用',
+ remark:'',
+ founder:'xxxx',
+ }, {
+ date: '2016-05-02',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1518 弄',
+ PaymentChannel:'富有',
+ PaymentNum:'00004879449874854',
+ price:'1587461740.00',
+ status: '正在使用',
+ remark:'',
+ founder:'xxxx',
+ },{
+ date: '2016-05-02',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1518 弄',
+ PaymentChannel:'富有',
+ PaymentNum:'00004879449874854',
+ price:'1587461740.00',
+ status: '正在使用',
+ remark:'',
+ founder:'xxxx',
+ },{
+ date: '2016-05-02',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1518 弄',
+ PaymentChannel:'富有',
+ PaymentNum:'00004879449874854',
+ price:'1587461740.00',
+ status: '正在使用',
+ remark:'',
+ founder:'xxxx',
+ }, ],
+ tableData1: [{
+ date: '2016-05-02',
+ name: '按交易类型分账',
+ address: 'xxxxxxxxxxxxxxxxxxx',
+ RuleName:'规则名字',
+ PaymentNum:'00004879449874854',
+ price:'1587461740.00',
+ status: true,
+ remark:'',
+ founder:'xxxx',
+ }, {
+ id: 2,
+ date: '2016-05-04',
+ name: '王小虎',
+ address: 'xxxxxxxxxxxxxxxxxxx',
+ }, {
+ id: 3,
+ date: '2016-05-01',
+ name: '王小虎',
+ address: 'xxxxxxxxxxxxxxxxxxx',
+
+ }, {
+ id: 4,
+ date: '2016-05-03',
+ name: '王小虎',
+ address: 'xxxxxxxxxxxxxxxxxxx',
+ }],
rules:{
merchantName: [
{ required: true, message: '请选择支付通道', trigger: 'blur' },
@@ -291,6 +634,32 @@ export default {
this.getList();
},
methods:{
+ addboxlsit(){
+
+ let data = {
+ one: '',
+ two: '',
+ three: '',
+ }
+ this.form.boxlist.push(data)
+ },
+ deleteDoxlist(index){
+ this.form.boxlist.splice(index, 1)
+ },
+ addRules(){
+ this.Ruletitle = '新增规则'
+ this.addRule = true
+ },
+ addMerchantShow(){
+ this.addMerchantTitile = '新增商户信息'
+ this.addMerchants = true
+
+ },
+ editMerchant(data){
+ // data用于请求接口
+ this.addMerchantTitile = '修改商户信息'
+ this.addMerchants = true
+ },
handleUpdate(data){
merchantInfo(data.id).then(res => {
this.title = "商户信息"
@@ -547,9 +916,58 @@ export default {