From 48323fce3b4b8013755421aa1d1feb9a73cddde9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 03 一月 2024 11:42:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js b/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js
index dba4d34..2c02a4b 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js
@@ -40,7 +40,7 @@
{title: '分账比例', field: 'proportion', visible: true, align: 'center', valign: 'middle'},
{title: '审核状态', field: 'audit', visible: true, align: 'center', valign: 'middle',
formatter:function (data) {
- return {0:"未认证",1:"审核中",2:"待联系人确认",3:"待法人确认",5:"审核失败",6:"已冻结",7:"已撤回",8:"联系人处理中"}[data]
+ return {0:"未认证",1:"审核中",2:"待联系人确认",3:"待法人确认",4:"审核通过",5:"审核失败",6:"已冻结",7:"已撤回",8:"联系人处理中"}[data]
}
},
{title: '操作', field: 'audit', visible: true, align: 'center', valign: 'middle',
@@ -49,12 +49,9 @@
if(data==0) {
var str = '<button class="btn btn-outline btn-primary" onclick="TSite.auth('+row.operatorId+')" >去认证</button>'
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="" onfocus="TUser.tooltip()">' + str + '</p>']
- }else if(data !=4){
- var str = '<button class="btn btn-outline btn-primary" onclick="TSite.auth('+row.operatorId+')" >详情</button>'
+ }else {
+ var str = '<button class="btn btn-outline btn-primary" onclick="TSite.auth(' + row.operatorId + ')" >详情</button>'
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="" onfocus="TUser.tooltip()">' + str + '</p>']
- } else if(data==4){
- var str = '<h3>已绑定</h3>'
- btn = [str]
}
return btn;
}
@@ -93,6 +90,44 @@
}
}
};
+TSite.commit = function(){
+ var alipayProportion = $("#alipayProportion").val();
+ var wechatProportion = $("#wechatProportion").val();
+ if($("#alipayNum").val()=='' ){
+ Feng.info("请输入支付宝分账比例")
+ return;
+ }
+ if($("#wechatNum").val()=='' ){
+ Feng.info("请输入微信分账比例")
+ return;
+ }
+ if (Number(alipayProportion)+Number(wechatProportion)!=100){
+ Feng.info("总比例应该是100%,当前比例："+Number(Number(alipayProportion)+Number(wechatProportion)));
+ return;
+ }
+
+ var ali = $("#alipayProportion").val()
+ var wechat = $("#wechatProportion").val()
+ if(Number(ali)+Number(wechat)!=100){
+ Feng.success("总比例需为100%!");
+ return;
+ }
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/operator/proportion", function(data){
+ Feng.success("设置成功!");
+ window.parent.TSite.table.refresh();
+ TSite.close();
+ },function(data){
+ Feng.error("操作失败!");
+ });
+ ajax.set("operatorIdOne", $("#id").val() );
+ ajax.set("alipayProportion", $("#alipayProportion").val() );
+ ajax.set("alipayNum", $("#alipayNum").val() );
+ ajax.set("wechatProportion", $("#wechatProportion").val() );
+ ajax.set("wechatNum", $("#wechatNum").val() );
+ ajax.start();
+};
+
TSite.addSubmit = function(){
var bodyType = $("input[name='bodyType']:checked").val();
@@ -176,7 +211,6 @@
Feng.error("请输入受益人姓名");
return;
}
-
if ("" == $("#bAddress").val()){
Feng.error("请输入受益人身份证地址");
return;
@@ -338,7 +372,7 @@
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/operatorUser/proportion/' + 5
+ content: Feng.ctxPath + '/operatorUser/proportion/' + TSite.seItem.operatorId
});
this.layerIndex = index;
@@ -401,7 +435,7 @@
$(function () {
- $("#benefit").hide()
+
var defaultColunms = TSite.initColumn();
var table = new BSTable(TSite.id, "/operatorUser/listAll", defaultColunms);
table.setPaginationType("client");
--
Gitblit v1.7.1