xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gx

This commit is contained in:
lnn19986213 2023-04-18 16:35:35 +08:00
parent cd31703fc7
commit a205625508
4 changed files with 33 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/manifest.json
View File

@ -85,7 +85,7 @@
// 与vue中的proxyTable配置大致上一致,此处我同时代理了两个
"/pre" : {
// 预发布
"target" : "http://10.0.0.59:8080/h5/api", // 目标接口域名
"target" : "http://10.0.0.28:8080/h5/api", // 目标接口域名
// "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名
"changeOrigin" : true, // 是否跨域

4
src/pages/PersonalCenter/PersonalCenter.vue
View File

@ -72,7 +72,7 @@
<view class="person_itm_sign" @click="goChangeInfo('头像',userInfoObj.images)">
<text class="person_itm_sign_tit">头像</text>
<view class="person_itm_sign_right">
<image class="avator" :src='imgUrl'>
<image class="avator" :src='userInfoObj.images'>
</image>
<u-icon name="arrow-right"></u-icon>
</view>
@ -219,7 +219,7 @@
<view class="person_itm_sign" @click="goChangeInfo('头像',userInfoObj.images)">
<text class="person_itm_sign_tit">头像</text>
<view class="person_itm_sign_right">
<image class="avator" :src='imgUrl'>
<image class="avator" :src='userInfoObj.images'>
</image>
<u-icon name="arrow-right"></u-icon>
</view>

102
src/pages/PersonalCenter/ReEditSingleInfo.vue
View File

@ -1,6 +1,6 @@
<template>
<view>
<view class="m16" v-if="Edkey=='姓名'||Edkey=='负责人姓名'||Edkey=='服务名称'||Edkey=='地址'">
<view class="m16" v-if="Edkey=='姓名'||Edkey=='负责人姓名'||Edkey=='服务名称'||Edkey=='地址' || Edkey =='民族' || Edkey=='籍贯'">
<u--input class="p32 nameClass" placeholder="请填写" clearable v-model.trim="Edvalue" border="none"
@change="CheckValue" @clear="clearFun">
</u--input>
@ -31,7 +31,7 @@
</view>
<!-- 政治面貌 民族 籍贯 选择 input-->
<view class="select m16" @click="zhengzhiShow=true"
v-if="Edkey=='政治面貌'||Edkey=='民族'||Edkey=='籍贯'||Edkey=='人才类型'||Edkey=='所属协会'">
v-if="Edkey=='政治面貌'||Edkey=='人才类型'||Edkey=='所属协会'">
<u--input class="p32 gray" readonly v-model="Edvalue" border="none">
</u--input>
</view>
@ -73,7 +73,6 @@
<!-- 成就类ed -->
<!-- 代表作 -->
<view class="opus" v-if="Edkey=='代表作'">
<view v-for="(val,index) in StandradList" :key="index">
<view class="opus_inputBox">
<input type="text" v-model.trim="StandradList[index]" placeholder="请输入作品名称"
@ -90,7 +89,6 @@
</view>
</view>
</view>
<view class="chen_itm ">
<u-upload class="WenYiUpload" accept="image" width="172rpx" height="172rpx"
:fileList="fileList2[index]" @afterRead="afterRead1" @delete="deletePic1" :name='String(index)'
@ -120,7 +118,7 @@
<!-- 实景 资质上传 ed-->
<u-picker :show="zhengzhiShow" confirmColor="#99241B" @confirm="confimZheng" immediateChange closeOnClickOverlay
@close="zhengzhiClose" @cancel="zhengzhiClose"
:columns="Edkey=='政治面貌'? Zhengcolumns : Edkey =='民族' ? Zucolumns : Edkey=='籍贯' ? Jicolumns : Edkey=='人才类型'? peopleSkillColums:Edkey=='所属协会'? xiecolumns:[]">
:columns="Edkey=='政治面貌'? Zhengcolumns : Edkey=='人才类型'? peopleSkillColums:Edkey=='所属协会'? xiecolumns:[]">
</u-picker>
<u-datetime-picker confirmColor="#99241B" :minDate="-2207520000000" :maxDate="1786778555000"
:show="showBirthday" v-if="Edkey=='出生日期'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'" :value="Edvalue"
@ -192,12 +190,11 @@
Zucolumns: [
["汉族", "朝鲜族"],
],
Jicolumns: [
["河南", "浙江", '上海', '宁波'],
],
peopleSkillColums: [
["书法家", "画家", "雕塑家"]
["无", "乡镇人才", "县级人才", "市级人才", "省级人才", "国家级人才"]
],
xiehuiObj: {}, //协会的name id 为key value 对象
artHonrList: [""]
@ -208,7 +205,6 @@
this.Edkey = JSON.parse(opt.key)
this.Edvalue = JSON.parse(opt.value)
this.tempValue = JSON.parse(opt.value)
console.log("optvalue", this.Edvalue);
uni.setNavigationBarTitle({
title: JSON.parse(opt.key)
})
@ -271,11 +267,9 @@
}
if (this.Edkey == '代表作') {
this.isSubmit = true
// 分化为 stanlist 和fileList2
this.fileList2 = []
if (opt.value == '[""]' || opt.value == "null") {
console.log("ddd");
this.StandradList = [""]
this.fileList2 = [
[]
@ -289,19 +283,13 @@
this.StandradList.push(v.name)
this.fileList2.push(v.value ? v.value : [])
})
// console.log("StandradList", this.StandradList);
// console.log("this.Edvalue==", this.Edvalue);
// 代表作 提交用的 数组
this.postFileList2 = this.Edvalue.map((v, i) => {
return v.value ? v.value : ['']
})
// console.log(" this.postFileList2===", this.postFileList2);
var urL = this.baseurl
// console.log("ddd", urL);
var sarr = this.fileList2.map((v, i) => {
// console.log("vv", v);
return v.map((vv, ii) => {
return urL + vv
return vv
})
})
// console.log("sarr", sarr);
@ -315,17 +303,11 @@
url: sarr[i][j]
})
}
}
// this.fileList2.splice(1,0)
console.log(" this.fileList2", this.fileList2);
}
}
},
onReady() {
// this.$refs.form1.setRules(this.rules);
},
methods: {
@ -402,7 +384,6 @@
},
birthdayClose() {
this.showBirthday = false
},
birthdayConfirm(e) {
this.showBirthday = false
@ -411,7 +392,6 @@
} else {
this.Edvalue = e.value
}
},
submit() {
var baseStr = http.config.baseUrl.replace('/h5/api', '')
@ -471,12 +451,15 @@
}
} else if (this.Edkey == '艺术成就' || this.Edkey == '荣誉奖项') {
// console.log("艺术成就submit", this.Edvalue);
var str = JSON.stringify(this.Edvalue)
if (this.Edvalue[0]) {
let arr = []
this.Edvalue.forEach(function(item) {
if(item){
arr.push(item)
}
})
var str = JSON.stringify(arr)
if (arr.length > 0) {
if (this.Edkey == '艺术成就') {
this.PostChangerRequest({
'artAtt': str
})
@ -486,7 +469,6 @@
})
}
} else {
console.log("11");
if (this.Edkey == '艺术成就') {
this.PostChangerRequest({
@ -500,53 +482,29 @@
}
} 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] : []
})
}
var isNull = opsArr.every((v, i) => {
return v.name == ''
console.log('代表作',this.StandradList,this.fileList2)
let arr = []
let _this = this
this.StandradList.forEach(function(item,index) {
if(item){
arr.push({
name: item,
value: _this.fileList2[index].map((v, num) => {
return v.url
// return v.thumb
})
})
}
})
console.log("isNul", isNull);
console.log("opsArr", opsArr);
// isNull 是否所有作品名称 都没有
if (isNull) {
if (arr.length > 0) {
this.PostChangerRequest({
'opus': []
'opus': arr
})
} else {
this.PostChangerRequest({
'opus': opsArr
'opus': []
})
}
/* if(this.fileList2 ){
var opsArr = []
for (let i = 0; i < this.StandradList.length; i++) {
// console.log("=====", this.fileList2);
opsArr.push({
name: this.StandradList[i],
value: this.postFileList2[i]
})
}
console.log("opsArr", opsArr);
this.PostChangerRequest({
'opus': opsArr
})
}else{
this.PostChangerRequest({
'opus': '[null]'
})
} */
} else {
// postListObj 通过对应列表 来发起修改请求
this.PostChangerRequest({
@ -722,9 +680,7 @@
uni.$u.toast('值不能为空')
this.isSubmit = false
}
}
}
},
}

2
src/pages/activity/activity.vue
View File

@ -21,7 +21,7 @@
</view>
</view>
<view class="right">
<image :src="v.imagePath" mode=""></image>
<image :src="v.imgCover" mode=""></image>
</view>
</view>