Merge branch 'master' of git.zdool.com:xs/yyx/h5

This commit is contained in:
lnn19986213 2022-08-18 10:26:28 +08:00
commit 3f2cc5adad
2 changed files with 60 additions and 38 deletions

View File

@ -76,7 +76,8 @@
<view v-for="(val,index) in StandradList" :key="index">
<view class="opus_inputBox">
<input type="text" v-model.trim="StandradList[index]" placeholder="请输入作品名称" class="opus_inputBox_inpt" />
<input type="text" v-model.trim="StandradList[index]" placeholder="请输入作品名称"
class="opus_inputBox_inpt" />
<view class="opus_inputBox_img">
<view style="width: 80rpx; height: 80rpx;" class="addImg" @click="AddItem"
v-if="StandradList.length==index+1">
@ -208,8 +209,8 @@
peopleSkillColums: [
["书法家", "画家", "雕塑家"]
],
xiehuiObj: {} ,//name id key value
artHonrList:[""]
xiehuiObj: {}, //name id key value
artHonrList: [""]
};
},
onLoad(opt) {
@ -221,10 +222,14 @@
uni.setNavigationBarTitle({
title: JSON.parse(opt.key)
})
/* if(this.Edkey == '' || this.Edkey == ''){
console.log("this.EdvaluePPPPPPP",JSON.parse(JSON.stringify(opt.value)));
if(this.Edkey == '艺术成就' || this.Edkey == '荣誉奖项'){
if (opt.value == '[""]' || opt.value == "null"){
this.Edvalue=[""]
console.log("onload 艺术成就",this.Edvalue );
}
} */
}
//
if (this.Edkey == '出生日期' || this.Edkey == '入会时间') {
this.timeMode = 'date'
@ -279,10 +284,15 @@
// stanlist fileList2
this.fileList2 = []
if (opt.value =='[""]') {
if (opt.value == '[""]' || opt.value == "null") {
console.log("ddd");
this.StandradList = [""]
this.fileList2 = [[]]
this.postFileList2=[[]]
this.fileList2 = [
[]
]
this.postFileList2 = [
[]
]
} else {
// console.log("this.Edvalue++++", this.Edvalue);
this.Edvalue.map((v, i) => {
@ -465,63 +475,64 @@
})
}
} else if (this.Edkey == '艺术成就' || this.Edkey == '荣誉奖项') {
console.log("艺术成就", this.Edvalue);
var str = JSON.stringify(this.Edvalue)
if(this.Edvalue[0]){
// console.log("submit", this.Edvalue);
var str = JSON.stringify(this.Edvalue)
if (this.Edvalue[0]) {
if (this.Edkey == '艺术成就') {
this.PostChangerRequest({
'artAtt': str
'artAtt': str
})
} else {
this.PostChangerRequest({
'greats': str
})
}
}else{
} else {
console.log("11");
if (this.Edkey == '艺术成就') {
this.PostChangerRequest({
'artAtt': ''
})
} else {
this.PostChangerRequest({
'greats':''
'greats': ''
})
}
}
} else if (this.Edkey == '代表作') {
var opsArr = []
for (let i = 0; i < this.StandradList.length; i++) {
// console.log("=====", this.fileList2);
opsArr.push({
name: this.StandradList[i] ?this.StandradList[i]: '' ,
value: this.postFileList2[i]? this.postFileList2[i] : []
name: this.StandradList[i] ? this.StandradList[i] : '',
value: this.postFileList2[i] ? this.postFileList2[i] : []
})
}
var isNull= opsArr.every((v,i)=>{
return v.name==''
})
console.log("isNul",isNull);
var isNull = opsArr.every((v, i) => {
return v.name == ''
})
console.log("isNul", isNull);
console.log("opsArr", opsArr);
// isNull
if(isNull){
// isNull
if (isNull) {
this.PostChangerRequest({
'opus': []
})
}else{
} else {
this.PostChangerRequest({
'opus': opsArr
})
}
/* if(this.fileList2 ){
var opsArr = []
for (let i = 0; i < this.StandradList.length; i++) {

View File

@ -786,14 +786,25 @@
})
})
}
}
}else{
opsArr=[]
}
console.log("opsArr====",opsArr);
console.log("honorList",this.honorList);
this.honorList.forEach()
return
var yishucj = JSON.stringify(this.artlist)
var rongyujx = JSON.stringify(this.honorList)
var yishucj=null
if(this.artlist[0]==""){
yishucj=''
}else{
yishucj = JSON.stringify(this.artlist)
}
var rongyujx=null
if(this.honorList[0]==""){
rongyujx=''
}else{
rongyujx = JSON.stringify(this.honorList)
}
let that = this.model1.userInfo
let data = {
// "phone": that.phoneNum,