From 57fd465068d99fffd31c03806de3d5691e8048ee Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 15 三月 2024 22:13:45 +0800
Subject: [PATCH] 部分bug修改
---
cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js | 328 ++++++++++++++++++++++++++++--------------------------
1 files changed, 168 insertions(+), 160 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 93c1ba8..bc6a466 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:"待法人确认",4:"审核通过",5:"审核失败",6:"已冻结",7:"已撤回",8:"联系人处理中"}[data]
+ return {0:"未认证",1:"待审核",2:"审核通过",3:"审核失败"}[data]
}
},
{title: '操作', field: 'audit', visible: true, align: 'center', valign: 'middle',
@@ -50,7 +50,7 @@
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 {
- var str = '<button class="btn btn-outline btn-primary" onclick="TSite.auth(' + row.operatorId + ')" >详情</button>'
+ var str = '<button class="btn btn-outline btn-primary" onclick="TSite.auth1(' + row.operatorId + ')" >详情</button>'
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="" onfocus="TUser.tooltip()">' + str + '</p>']
}
return btn;
@@ -71,13 +71,28 @@
this.layerIndex = index;
}
};
+/**
+ * 商户号认证页面回显
+ */
+TSite.auth1 = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: "商户认证详情",
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/operator/proportionAuth1/' + TSite.seItem.operatorId
+ });
+ this.layerIndex = index;
+ }
+};
TSite.proportion = function () {
var selected = $('#' + this.id).bootstrapTable('getSelections');
if(selected.length >1 ){
Feng.info("只能选择一个运营商商户设置分账比例！");
}else {
if (this.check()) {
-
var index = layer.open({
type: 2,
title: "认证",
@@ -93,23 +108,12 @@
TSite.commit = function(){
var alipayProportion = $("#alipayProportion").val();
var wechatProportion = $("#wechatProportion").val();
- if($("#alipayNum").val()=='' ){
+ if($("#alipayProportion").val()=='' ){
Feng.info("请输入支付宝分账比例")
return;
}
- if($("#wechatNum").val()=='' ){
+ if($("#wechatProportion").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;
}
//提交信息
@@ -127,14 +131,78 @@
ajax.set("wechatNum", $("#wechatNum").val() );
ajax.start();
};
-
+// 银行卡使用
+TSite.oneChange2 = function (e) {
+ var oneId=$(e).val();
+ console.log(oneId)
+ console.log("!!!!!!!!!!!!!")
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange3", function(data){
+ if(data!=null){
+ var content='<option value="">选择市</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
+ });
+ $("#cCode").empty().append(content);
+ }
+ });
+ ajax.set("oneId",oneId);
+ ajax.start();
+};
+// 经营地址使用
+TSite.oneChange6 = function (e) {
+ var oneId=$(e).val();
+ console.log(oneId)
+ console.log("!!!!!!!!!!!!!")
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange3", function(data){
+ if(data!=null){
+ var content='<option value="">选择市</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
+ });
+ $("#bcCode").empty().append(content);
+ }
+ });
+ ajax.set("oneId",oneId);
+ ajax.start();
+};
+// 经营地址使用
+TSite.twoChange = function (e) {
+ var oneId=$(e).val();
+ console.log(oneId)
+ console.log("!!!!!!!!!!!!!")
+ var ajax = new $ax(Feng.ctxPath + "/operator/getDistrict", function(data){
+ if(data!=null){
+ var content='<option value="">选择区(县)</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
+ });
+ $("#bdCode").empty().append(content);
+ }
+ });
+ ajax.set("cityCode",oneId);
+ ajax.start();
+};
TSite.addSubmit = function(){
-
var bodyType = $("input[name='bodyType']:checked").val();
- var accountType = $("input[name='accountType']:checked").val();
var type = $("input[name='type']:checked").val();
if (bodyType=="" || null == bodyType){
Feng.error("请选择主体类型");
+ return;
+ }
+ if ("" == $("#businessName").val() ){
+ Feng.error("请输入商户名称");
+ return;
+ }
+ if ("" == $("#aliasName").val() ){
+ Feng.error("请输入商户别名");
+ return;
+ }
+ if ("" == $("#businessNumber").val() ){
+ Feng.error("请输入营业执照编号");
+ return;
+ }
+ if ("" == $("#businessNumber").val() ){
+ Feng.error("请上传营业执照");
return;
}
if ("" == $("#name").val() ){
@@ -145,187 +213,119 @@
Feng.error("请输入联系人电话");
return;
}
- if ("" == $("#number").val() ){
- Feng.error("请输入联系人身份证号");
- return;
- }
- var platform = $("input[name='platform']:checked").val();
-
- if ("" == $("#merchantName").val() ){
- Feng.error("请输入营业执照商户名称");
- return;
- }
- if ("" == $("#lrName").val() ){
- Feng.error("请输入法定代表人姓名");
- return;
- }
- var tradeT = document.getElementById("tradeE");
- if (!tradeT.checked){
- if ("" == $("#endTime").val() || null == $("#endTime").val()){
- Feng.error("请输入营业证照过期时间");
- return;
- }
- }
- if ("" == $("#tradeTime").val() || null == $("#tradeTime").val()){
- Feng.error("请输入营业执照生效期间");
- return;
- }
- if ("" == $("#licenseRegistration").val() ){
- Feng.error("请输入营业执照注册号");
- return;
- }
- if ("" == $("#registerAddress").val() ){
- Feng.error("请输入注册地址");
- return;
- }
if ("" == $("#legalPerson").val()){
Feng.error("请输入法人姓名");
return;
- }if ("" == $("#legalPhone").val()){
- Feng.error("请输入法人手机号");
- return;
}
- var IDCardT = document.getElementById("IDCardE");
- if (!IDCardT.checked){
- if ("" == $("#IDCardTime").val() || null == $("#IDCardTime").val()){
- Feng.error("请输入法人身份证结束时间");
- return;
- }
- }
- if ("" == $("#IDCardTime").val()){
- Feng.error("请输入法人身份证开始时间");
- return;
- }
- if ("" == $("#lIDNumber").val()){
+
+ if ("" == $("#leagleNumber").val()){
Feng.error("请输入法人身份证号");
return;
- }if ("" == $("#lEmail").val()){
- Feng.error("请输入法人邮箱");
- return;
- }if ("" == $("#lIDAddress").val()){
- Feng.error("请输入法人身份证地址");
+ }
+ if ("" == $("#zfbAccount").val()){
+ Feng.error("请输入签约支付宝账号");
return;
}
- if(bodyType=="ENTERPRISE"){
- if ("" == $("#bName").val()){
- Feng.error("请输入受益人姓名");
+ // 结算账户类型
+ var accountType = $("input[name='accountType']:checked").val();
+ // 结算到银行卡
+ if (accountType == "bankCard"){
+ if ("" == $("#bankCard").val()){
+ Feng.error("请输入银行卡号");
return;
}
-
- if ("" == $("#bAddress").val()){
- Feng.error("请输入受益人身份证地址");
+ if ("" == $("#bankName").val()){
+ Feng.error("请选择开户银行");
return;
}
- var bIDCardT = document.getElementById("bIDCardT");
- if (!bIDCardT.checked){
- if ("" == $("#bEnd").val()){
- Feng.error("请输入受益人身份证结束时间");
- return;
- }
- }
- if ("" == $("#bTime").val()){
- Feng.error("请输入受益人身份证开始时间");
+ if ("" == $("#bankName1").val()){
+ Feng.error("请输入开户支行名称");
return;
}
-
- if ("" == $("#bIDNumber").val()){
- Feng.error("请输入受益人身份证号");
+ if ("" == $("#bankUserName").val()){
+ Feng.error("请输入开户名称");
return;
}
-
+ if ("" == $("#pCode").val()){
+ Feng.error("请选择开户银行所在省");
+ return;
+ }
+ if ("" == $("#cCode").val()){
+ Feng.error("请选择开户银行所在市");
+ return;
+ }
+ }else{
+ // 结算到支付宝
+ if ("" == $("#alipayAccount").val()){
+ Feng.error("请输入支付宝账号");
+ return;
+ }
}
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/operator/auth", function(data){
if (data==5001){
Feng.error("未上传营业执照!");
+ return;
}else if(data==5002){
Feng.error("未上传法人身份证正面照!");
+ return;
}else if(data==5003){
Feng.error("未上传法人身份证背面照!");
- }else if(data==5004){
- Feng.error("未上传受益人身份证正面照!");
- }else if(data==5005){
- Feng.error("未上传受益人身份证背面照!");
+ return;
+ }else if(data==5007){
+ Feng.error("输入的开户银行名称有误!");
+ return;
+ } else if (data.code==500){
+ console.log(data);
+ Feng.error("认证失败:"+data.msg);
+ return;
}else{
- Feng.success("操作成功!");
+ Feng.success("认证成功!请等待支付宝审核");
window.parent.TSite.table.refresh();
TSite.close();
}
},function(data){
Feng.error("操作失败!");
});
- ajax.set("operatorId", $("#id").val() );
- ajax.set("bodyType", bodyType );
- ajax.set("type", platform );
- ajax.set("businessName", $("#merchantName").val() );
- ajax.set("businessNumber", $("#licenseRegistration").val() );
- ajax.set("legalRepresentative", $("#lrName").val() );
- ajax.set("registerAddress", $("#registerAddress").val() );
- if ($("#endTime").val()==""){
- ajax.set("businessEnd","forever");
- }else{
- ajax.set("businessEnd",$("#endTime").val());
- }
- if ($("#IDCardEnd").val()==""){
- ajax.set("legalEnd","forever");
- ajax.set("lpIcForeverFlag", 0);
- }else{
- ajax.set("legalEnd",$("#IDCardEnd").val());
- ajax.set("lpIcForeverFlag", 1);
- }
-
- if(bodyType=="ENTERPRISE"){
- if ($("#bEnd").val()==""){
- console.log("永远")
- ajax.set("beneficiaryEnd","forever");
-
- }else{
- console.log("嗯嗯嗯")
- ajax.set("beneficiaryEnd",$("#bEnd").val());
- }
- }
-
- var tradeT = document.getElementById('tradeE');
- if (tradeT.checked) {
- endTime.disabled = true;
- endTime.value="";
- ajax.set("blBusinessFoeverFlag", 1);
- } else {
- ajax.set("blBusinessFoeverFlag", 0);
- endTime.disabled = false;
- }
- ajax.set("businessTerm", $("#tradeTime").val() );
+ ajax.set("operatorId", $("#id").val());
+ ajax.set("bodyType", bodyType );
+ ajax.set("businessName", $("#businessName").val());
+ ajax.set("aliasName", $("#aliasName").val());
+ ajax.set("businessNumber", $("#businessNumber").val() );
+ ajax.set("license", $("#license").val() );
ajax.set("name", $("#name").val() );
ajax.set("phone", $("#phone").val() );
- ajax.set("number", $("#number").val() );
- ajax.set("businessPicture", $("#license").val() );
+ ajax.set("shopProvinceCode", $("#bpCode").val() );
+ ajax.set("shopProvince", $('#bpCode option:selected').text());
+ ajax.set("shopCityCode", $("#bcCode").val() );
+ ajax.set("shopCity", $('#bcCode option:selected').text());
+ ajax.set("shopDistrictCode", $("#bdCode").val() );
+ ajax.set("shopDistrict", $('#bdCode option:selected').text());
+ ajax.set("registerAddress", $("#registerAddress").val() );
ajax.set("legalPerson", $("#legalPerson").val() );
- ajax.set("legalNumber", $("#lIDNumber").val() );
- ajax.set("legalPhone", $("#legalPhone").val() );
- ajax.set("legalEmail", $("#lEmail").val() );
- ajax.set("legalTerm", $("#IDCardTime").val() );
- ajax.set("legalAddress", $("#lIDAddress").val() );
+ ajax.set("leagleNumber", $("#leagleNumber").val() );
ajax.set("legalFront", $("#IDCardImg").val() );
ajax.set("legalBack", $("#IDCardImg1").val() );
ajax.set("accountType", accountType );
- ajax.set("bank", $("#bank").val() );
- ajax.set("accountName", $("#backUserName").val() );
- ajax.set("province", $('#pCode option:selected').text() );
+ ajax.set("alipayAccount", $("#alipayAccount").val() );
+ ajax.set("bankCard", $("#bankCard").val() );
+ // 结算账户类型
+ var useType = $("input[name='useType']:checked").val();
+ ajax.set("useType", useType );
+ // 银行卡类型
+ var cardType = $("input[name='cardType']:checked").val();
+ ajax.set("cardType", cardType );
+ ajax.set("bankName", $("#bankName").val() );
+ ajax.set("bankNameTwo", $("#bankName1").val() );
+ ajax.set("accountName", $("#bankUserName").val() );
ajax.set("provinceCode", $("#pCode").val() );
- ajax.set("city", $('#cCode option:selected').text() );
+ ajax.set("province", $('#pCode option:selected').text());
ajax.set("cityCode", $("#cCode").val() );
- ajax.set("bankName", $("#backName").val() );
- ajax.set("bankNumber", $("#backNumber").val() );
- ajax.set("isBeneficiary", type );
- ajax.set("beneficiary", $("#bName").val() );
- ajax.set("beneficiaryPhone", $("#bPhone").val() );
- ajax.set("beneficiaryNumber", $("#bIDNumber").val() );
- ajax.set("beneficiaryAddress", $("#bAddress").val() );
- ajax.set("beneficiaryTerm", $("#bTime").val() );
- ajax.set("beneficiaryFront", $("#bImg1").val() );
- ajax.set("beneficiaryBack", $("#bImg2").val() );
- ajax.set("remark", $("#remark").val() );
+ ajax.set("city", $('#cCode option:selected').text());
+ ajax.set("iqImage", $("#iqImage").val() );
+ ajax.set("zfbAccount", $("#zfbAccount").val() );
ajax.start();
};
/**
@@ -436,7 +436,6 @@
$(function () {
-
var defaultColunms = TSite.initColumn();
var table = new BSTable(TSite.id, "/operatorUser/listAll", defaultColunms);
table.setPaginationType("client");
@@ -447,6 +446,9 @@
var c4 = new $WebUpload("bImg1");
var c5 = new $WebUpload("bImg2");
var c6 = new $WebUpload("Img");
+ var inDoorImages = new $WebUpload("inDoorImages");
+ var outDoorImages = new $WebUpload("outDoorImages");
+ var iqImage = new $WebUpload("iqImage");
c1.setUploadBarId("progressBar");
c1.init();
c2.setUploadBarId("progressBar");
@@ -459,4 +461,10 @@
c5.init();
c6.setUploadBarId("progressBar");
c6.init();
+ inDoorImages.setUploadBarId("progressBar");
+ inDoorImages.init();
+ outDoorImages.setUploadBarId("progressBar");
+ outDoorImages.init();
+ iqImage.setUploadBarId("progressBar");
+ iqImage.init();
});
--
Gitblit v1.7.1