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

src/pages/PersonalCenter/ReEditSingleInfo.vue

@@ -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  对象
+				xiehuiObj: {}, //协会的name id 为key value  对象
-				artHonrList:[""]
+				artHonrList: [""]
 			};
 		},
 		onLoad(opt) {
@@ -221,10 +222,14 @@
 			uni.setNavigationBarTitle({
 				title: JSON.parse(opt.key)
 			})
-			/* if(this.Edkey == '艺术成就' || this.Edkey == '荣誉奖项'){
+			if(this.Edkey == '艺术成就' || this.Edkey == '荣誉奖项'){
-				console.log("this.EdvaluePPPPPPP",JSON.parse(JSON.stringify(opt.value)));
+				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.fileList2 = [
-					this.postFileList2=[[]]
+						[]
+					]
+					this.postFileList2 = [
+						[]
+					]
 				} else {
 					// console.log("this.Edvalue++++", this.Edvalue);
 					this.Edvalue.map((v, i) => {
@@ -465,21 +475,22 @@
 						})
 					}
 				} else if (this.Edkey == '艺术成就' || this.Edkey == '荣誉奖项') {
-					console.log("艺术成就", this.Edvalue);
+					// console.log("艺术成就submit", this.Edvalue);
 					 
-					 var str = JSON.stringify(this.Edvalue)
+					var str = JSON.stringify(this.Edvalue)
-					if(this.Edvalue[0]){
+					
+					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 == '艺术成就') {
 
@@ -488,7 +499,7 @@
 							})
 						} else {
 							this.PostChangerRequest({
-								'greats':''
+								'greats': ''
 							})
 						}
 					}
@@ -499,24 +510,24 @@
 					for (let i = 0; i < this.StandradList.length; i++) {
 						// console.log("=====", this.fileList2);
 						opsArr.push({
-							name: this.StandradList[i] ?this.StandradList[i]: '' ,
+							name: this.StandradList[i] ? this.StandradList[i] : '',
-							value: this.postFileList2[i]? this.postFileList2[i] : []
+							value: this.postFileList2[i] ? this.postFileList2[i] : []
 						})
 					}
-					var isNull= opsArr.every((v,i)=>{
+					var isNull = opsArr.every((v, i) => {
-						 return v.name==''
+						return v.name == ''
-					 })
+					})
 
 
-					 console.log("isNul",isNull);
+					console.log("isNul", isNull);
 					console.log("opsArr", opsArr);
 
-					 // isNull  是否所有作品名称 都没有
+					// isNull  是否所有作品名称 都没有
-					if(isNull){
+					if (isNull) {
 						this.PostChangerRequest({
 							'opus': []
 						})
-					}else{
+					} else {
 						this.PostChangerRequest({
 							'opus': opsArr
 						})

src/pages/improveData/improveData.vue

@@ -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 yishucj=null
-                var rongyujx = JSON.stringify(this.honorList)
+				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,