庞东旭 2 роки тому
джерело
коміт
04d149b587
4 змінених файлів з 123 додано та 51 видалено
  1. +7
    -1
      static/js/api/user.js
  2. +104
    -39
      static/js/project/user/index.js
  3. +1
    -1
      view/login/registerFrom.html
  4. +11
    -10
      view/user/user.html

+ 7
- 1
static/js/api/user.js Переглянути файл

@@ -60,7 +60,7 @@ var deleteSupply = '/transaction/demand/remove' //删除供求类接口
@purl /transaction/demand/{ids} @purl /transaction/demand/{ids}
@param @param
*/ */
var selectSupply = '/transaction/demand' //查询供求类接口
var selectSupply = '/transaction/demand/get' //查询供求类接口


/* /*
@purl /transaction/communicate @purl /transaction/communicate
@@ -86,6 +86,12 @@ var dictionaries = '/transaction/website/transfer' //数据字典
*/ */
var base64Attach = '/common/base64Attach' //数据字典 var base64Attach = '/common/base64Attach' //数据字典


/*
@purl /common/base64Attach
@param
*/
var base64Upload = '/common/base64Upload' //数据字典

/* /*
@purl /common/base64Attach @purl /common/base64Attach
@param @param


+ 104
- 39
static/js/project/user/index.js Переглянути файл

@@ -28,7 +28,15 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
modifyUrl:'', modifyUrl:'',
detailUrl:'', detailUrl:'',
sheng:[], sheng:[],
shi:[]
shi:[],
sfzList:[],
yhkList:[],
sfz:'',
yhk:'',
khzm:'',
upType1:false,
upType2:false,
upType5:false,
}, },
}; };
var tools = new Tools(); var tools = new Tools();
@@ -69,7 +77,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
setTimeout(function(){ setTimeout(function(){
//主题图片切换 //主题图片切换
module.switchTheme(); module.switchTheme();
},500)
},2000)


module.data.sheng = options; module.data.sheng = options;
module.data.shi = options[0].children; module.data.shi = options[0].children;
@@ -266,7 +274,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
//console.log(module.data.userId) //console.log(module.data.userId)


//用户图片 //用户图片
tools.doGet(showUserImg+'/'+module.data.memberId, {}, module.showUserImage);
module.showUserImage(content);
//我的供求 //我的供求
tools.doGet(userSupply, {memberId:content.id,pageNum:module.data.pageNum,pageSize:10}, module.userSupply); tools.doGet(userSupply, {memberId:content.id,pageNum:module.data.pageNum,pageSize:10}, module.userSupply);
//我的咨询 //我的咨询
@@ -285,34 +293,30 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
} }


module.showUserImage = function(data){ module.showUserImage = function(data){
//console.log(data)
if (data.code == 200) {
var content = data.data;
var fileUrlList = [];
var fileNum = [];
for (var i = 0 ; i < content.length ; i++){
fileUrlList[i] = serverApi + content[i].fileUrl ;
fileNum[i] = content[i].id;
}
if (fileUrlList.length == 0){
fileUrlList = '';
}
//console.log(fileUrlList)
module.data.fileNum = fileNum;
console.log(data)
var accountOpenCert = data.accountOpenCert==null||data.accountOpenCert == ''?null:['/api'+data.accountOpenCert];
var idCardPic = data.idCardPic==null||data.idCardPic == ''?null:['/api'+data.idCardPic];

console.log(accountOpenCert)
console.log(idCardPic)
if(module.data.memberType == '1'){ if(module.data.memberType == '1'){
var cupload2 = new Cupload ({ var cupload2 = new Cupload ({
ele: '#cupload-3', ele: '#cupload-3',
num: 5,
data:fileUrlList
num: 1,
data:idCardPic
});
var cupload4 = new Cupload ({
ele: '#cupload-4',
num: 1,
data:accountOpenCert
}); });
}else{ }else{
var cupload2 = new Cupload ({
ele: '#cupload-2',
num: 5,
data:fileUrlList
var cupload5 = new Cupload ({
ele: '#cupload-5',
num: 1,
data:accountOpenCert
}); });
} }
}
} }


module.showSupplyImage = function(data){ module.showSupplyImage = function(data){
@@ -341,7 +345,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",


deleteList = function(){ deleteList = function(){
//console.log(module.data.fileNum[deleteNum]) //console.log(module.data.fileNum[deleteNum])
tools.doGet(deleteUserImg+'/'+module.data.fileNum[deleteNum], {}, module.Tips);
// tools.doGet(deleteUserImg+'/'+module.data.fileNum[deleteNum], {}, module.Tips);
} }


module.getData = function(data){ module.getData = function(data){
@@ -353,7 +357,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
//console.log(type) //console.log(type)
var upLoadList = []; var upLoadList = [];
var data = {}; var data = {};
if(type == 'user'){
if(type == 'user'||type == 'company'){
if(module.data.memberType == '1'){ if(module.data.memberType == '1'){
$('#cupload-3').find('input').each(function() { $('#cupload-3').find('input').each(function() {
if($(this).val()!=''&&$(this).val().indexOf('http') == -1){ if($(this).val()!=''&&$(this).val().indexOf('http') == -1){
@@ -361,14 +365,15 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
} }
}) })
}else{ }else{
$('#cupload-2').find('input').each(function() {
$('#cupload-5').find('input').each(function() {
if($(this).val()!=''&&$(this).val().indexOf('http') == -1){ if($(this).val()!=''&&$(this).val().indexOf('http') == -1){
upLoadList.push($(this).val()) upLoadList.push($(this).val())
} }
}) })
data["files"] = upLoadList;
} }
data["tableName"] = 't_transaction_member';
data["tableId"] = module.data.memberId;
// tools.doPostImg(base64Upload, data, module.submitInfo());//memberType 1个人 2单位
}else{ }else{
$('#cupload-1').find('input').each(function() { $('#cupload-1').find('input').each(function() {
if($(this).val()!=''&&$(this).val().indexOf('http') == -1){ if($(this).val()!=''&&$(this).val().indexOf('http') == -1){
@@ -376,7 +381,11 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
} }
}) })
data["tableName"] = 't_transaction_supply_demand'; data["tableName"] = 't_transaction_supply_demand';
data["tableId"] = type;
data["tableId"] = type?type:module.data.supplyId;
data["files"] = upLoadList;
data["fileType"] = '';
data["bizPath"] = 'transaction';
tools.doPostImg(base64Attach, data, module.upLoadOver);//memberType 1个人 2单位
setTimeout(function(){ setTimeout(function(){
tools.doGet(userSupply, {memberId:module.data.memberId,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.userSupply) tools.doGet(userSupply, {memberId:module.data.memberId,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.userSupply)
document.getElementById('supplyInformation').style.display = "block"; document.getElementById('supplyInformation').style.display = "block";
@@ -389,17 +398,63 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
$('#projectContent').val(''); $('#projectContent').val('');
},2000) },2000)
} }
// tools.initError('发布成功');
}


data["files"] = upLoadList;
data["fileType"] = '';
data["bizPath"] = 'transaction';
tools.doPostImg(base64Attach, data, module.upLoadOver);//memberType 1个人 2单位
tools.initError('发布成功');
module.upLoadOver = function(type){


} }


module.upLoadOver = function(){
module.upLoadOverInfo1 = function(data){
if (data.code == 200)
module.data.sfz = data.fileName;
}

module.upLoadOverInfo2 = function(data){
if (data.code == 200)
module.data.yhk = data.fileName;
}


module.upLoadOverInfo5 = function(data){
if (data.code == 200)
module.data.khzm = data.fileName;
}

submitInfo = function(type){
var upLoadList = [];
var data = {};
if(type == 'user'||type == 'company'){
if(module.data.memberType == '1'){
$('#cupload-3').find('input').each(function() {
if($(this).val()!=''&&$(this).val().indexOf('http') == -1){
module.data.upType1 = true;
tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo1);
}
})
$('#cupload-4').find('input').each(function() {
if($(this).val()!=''&&$(this).val().indexOf('http') == -1){
module.data.upType2 = true;
tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo2);
}
})
console.log(type);
setTimeout(function(){
formAction(type)
},1000);

}else{
$('#cupload-5').find('input').each(function() {
if($(this).val()!=''&&$(this).val().indexOf('http') == -1){
module.data.upType5 = true;
tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo5);
}
})
setTimeout(function(){
formAction(type)
},1000);
}
//memberType 1个人 2单位
}
} }


//删除供求 //删除供求
@@ -562,6 +617,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
document.getElementById('supplyInformation').style.display = "none"; document.getElementById('supplyInformation').style.display = "none";
document.getElementById('releaseSupply').style.display = "block"; document.getElementById('releaseSupply').style.display = "block";
document.getElementById('cupload-1').innerHTML = ''; document.getElementById('cupload-1').innerHTML = '';
module.data.supplyType = 'add'
var cupload1 = new Cupload ({ var cupload1 = new Cupload ({
ele: '#cupload-1', ele: '#cupload-1',
num: 5, num: 5,
@@ -625,6 +681,8 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
var companyCapital = $('#companyCapital').val(); var companyCapital = $('#companyCapital').val();
var companyLicense = $('#companyLicense').val(); var companyLicense = $('#companyLicense').val();
var address = $('#address').val(); var address = $('#address').val();
var accountOpenCert = module.data.khzm;
data['accountOpenCert'] = accountOpenCert;
data['companyName'] = companyName; data['companyName'] = companyName;
data['idCardNum'] = idCardNum; data['idCardNum'] = idCardNum;
data['realname'] = realname; data['realname'] = realname;
@@ -641,7 +699,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
tools.setCookie('userName',realname,24 * 60 * 60) tools.setCookie('userName',realname,24 * 60 * 60)
tools.setCookie('idCardNum',idCardNum,24 * 60 * 60) tools.setCookie('idCardNum',idCardNum,24 * 60 * 60)
tools.setCookie('address',address,24 * 60 * 60) tools.setCookie('address',address,24 * 60 * 60)
upLoadAction('user');
// upLoadAction('user');
} }
if(type == 'user'){ if(type == 'user'){
//个人用户信息 //个人用户信息
@@ -650,6 +708,10 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
var userFormAddress = $('#userFormAddress').val(); var userFormAddress = $('#userFormAddress').val();
var bankAddress = $('#bankAddress').val(); var bankAddress = $('#bankAddress').val();
var bankType = $('#bankType').val(); var bankType = $('#bankType').val();
var idCardPic = module.data.sfz;
var accountOpenCert = module.data.yhk;
data['idCardPic'] = idCardPic;
data['accountOpenCert'] = accountOpenCert;
data['idCardNum'] = userFormIdCard; data['idCardNum'] = userFormIdCard;
data['realname'] = userFormRealName; data['realname'] = userFormRealName;
data['address'] = userFormAddress; data['address'] = userFormAddress;
@@ -657,7 +719,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
tools.setCookie('userName',userFormRealName,24 * 60 * 60) tools.setCookie('userName',userFormRealName,24 * 60 * 60)
tools.setCookie('idCardNum',userFormIdCard,24 * 60 * 60) tools.setCookie('idCardNum',userFormIdCard,24 * 60 * 60)
tools.setCookie('address',userFormAddress,24 * 60 * 60) tools.setCookie('address',userFormAddress,24 * 60 * 60)
upLoadAction('user');
// upLoadAction('user');
} }
if(type == 'bank'){ if(type == 'bank'){


@@ -780,6 +842,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
data['memberId'] = module.data.memberId; data['memberId'] = module.data.memberId;


if(module.data.supplyType == 'edit'){ if(module.data.supplyType == 'edit'){
data['id'] = module.data.supplyId;
tools.doPost(userEdit, data, module.getData) tools.doPost(userEdit, data, module.getData)
}else{ }else{
tools.doPost(userDemand, data, module.getData) tools.doPost(userDemand, data, module.getData)
@@ -978,7 +1041,9 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
} }


selectUserSupply = function(ids) { selectUserSupply = function(ids) {
module.data.supplyType = 'edit'
module.data.supplyType = 'edit';
module.data.supplyId = ids;

//console.log('点击修改') //console.log('点击修改')
tools.doGet(selectSupply + '/' + ids, {}, module.selectSupplyDetail);//memberType 1个人 2单位 tools.doGet(selectSupply + '/' + ids, {}, module.selectSupplyDetail);//memberType 1个人 2单位
} }


+ 1
- 1
view/login/registerFrom.html Переглянути файл

@@ -123,7 +123,7 @@
<td> <td>
<input type="text" id="phone"/> <input type="text" id="phone"/>
</td> </td>
<td></td>
<td><span>默认为登陆账户</span></td>
</tr> </tr>
<tr> <tr>
<td> <td>


+ 11
- 10
view/user/user.html Переглянути файл

@@ -196,16 +196,20 @@
<td><input type="text" value="{{userInformationDetail.address}}" id="userFormAddress" class="p-l-10" style="width: 30%"/></td> <td><input type="text" value="{{userInformationDetail.address}}" id="userFormAddress" class="p-l-10" style="width: 30%"/></td>
</tr> </tr>
<tr> <tr>
<td><span>*</span>上传附件:</td>
<td><span>*</span>身份证(正):</td>
<td colspan="3"> <td colspan="3">
<div id="cupload-3" class="m-l-10 m-b-5"></div> <div id="cupload-3" class="m-l-10 m-b-5"></div>
<span>* 身份证照片、本人和身份证的合影</span>
<!-- <input type="button" value="提交" id="upLoadBtn" >-->
</td>
</tr>
<tr>
<td><span>*</span>银行卡:</td>
<td colspan="3">
<div id="cupload-4" class="m-l-10 m-b-5"></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td><p onclick="formAction('user')">保存</p></td>
<td><p onclick="submitInfo('user')">保存</p></td>
</tr> </tr>
</script> </script>
<table width="100%" id="userInformationContent"></table> <table width="100%" id="userInformationContent"></table>
@@ -252,17 +256,14 @@
<td><input type="text" id="address" value="{{userInformationDetail.address}}"/></td> <td><input type="text" id="address" value="{{userInformationDetail.address}}"/></td>
</tr> </tr>
<tr> <tr>
<td><span>*</span>上传附件:</td>
<td><span>*</span>开户证明:</td>
<td colspan="3"> <td colspan="3">
<div id="cupload-2" class="m-l-10 m-b-5"></div>
<span>* 营业执照副本、单位负责人身份证</span>
<!-- <input type="button" value="提交" id="upLoadBtn" >-->
<!-- <img src="../../static/images/upload.png" alt="" class="m-l-10"/>-->
<div id="cupload-5" class="m-l-10 m-b-5"></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td><p onclick="formAction('company')">保存</p></td>
<td><p onclick="submitInfo('company')">保存</p></td>
</tr> </tr>
</script> </script>
<table width="100%" id="companyInformationContent"></table> <table width="100%" id="companyInformationContent"></table>


Завантаження…
Відмінити
Зберегти