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

更新

This commit is contained in:
lnn19986213 2023-07-31 09:11:29 +08:00
parent 8a941f5e54
commit 3101b03df6
7 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/manifest.json
View File

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

6
src/pagesB/PersonalCenter/PersonalCenter.vue
View File

@ -16,10 +16,10 @@
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('出生日期',userInfoObj.birthDay )">
<text class="person_itm_sign_tit">出生日期</text>
<view class="person_itm_sign" @click="goChangeInfo('出生年月',userInfoObj.dateBirth )">
<text class="person_itm_sign_tit">出生年月</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.birthDay}}</text>
<text> {{userInfoObj.dateBirth}}</text>
<u-icon name="calendar"></u-icon>
</view>
</view>

16
src/pagesB/PersonalCenter/ReEditSingleInfo.vue
View File

@ -28,7 +28,7 @@
<!-- 性别选择ed -->
<view class="date m16" @click="DatePicker"
v-if="Edkey=='出生日期'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'">
v-if="Edkey=='出生年月'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'">
<u--input class='p32 gray' readonly v-model="Edvalue" border="none">
</u--input>
</view>
@ -124,7 +124,7 @@
:columns="Edkey=='政治面貌'? Zhengcolumns : Edkey=='会员级别'? peopleSkillColums:Edkey=='所属协会'? xiecolumns:Edkey=='学历'? educolumns:[]">
</u-picker>
<u-datetime-picker confirmColor="#99241B" :minDate="-2207520000000" :maxDate="1786778555000"
:show="showBirthday" v-if="Edkey=='出生日期'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'" :value="Edvalue"
:show="showBirthday" v-if="Edkey=='出生年月' || Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'" :value="Edvalue"
:mode="timeMode" closeOnClickOverlay @confirm="birthdayConfirm" @cancel="birthdayClose"
@close="birthdayClose">
</u-datetime-picker>
@ -159,7 +159,7 @@
'人才类型': 'rcType',
// '所属协会':,
'身份证号码': 'idCard',
'出生日期': 'birthDay',
'出生年月': 'dateBirth',
'入会时间': 'comeTime',
'服务开始时间': 'timeStart',
'服务结束时间': 'timeEnd',
@ -228,8 +228,10 @@
}
}
// 日期选择器模式的转换
if (this.Edkey == '出生日期' || this.Edkey == '入会时间') {
if (this.Edkey == '入会时间') {
this.timeMode = 'date'
}else if (this.Edkey == '出生年月') {
this.timeMode = 'year-month'
} else {
this.timeMode = 'time'
}
@ -398,9 +400,11 @@
},
birthdayConfirm(e) {
this.showBirthday = false
if (this.Edkey == '出生日期' || this.Edkey == '入会时间') {
if (this.Edkey == '入会时间') {
this.Edvalue = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
} else {
} else if(this.Edkey == '出生年月') {
this.Edvalue = uni.$u.timeFormat(e.value, 'yyyy.mm')
}else {
this.Edvalue = e.value
}
},

15
src/pagesB/improveData/improveData.vue
View File

@ -18,8 +18,8 @@
</u--input>
</u-form-item>
<u-form-item ref="item1" @click="showBirthday=true" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>出生日期</text>
<u--input class="p32" placeholder="请填选择出生日期" v-model="model1.userInfo.birthday" readonly
<text class="label_t"><text style="color: #99241B;">*</text>出生年月</text>
<u--input class="p32" placeholder="请填选择出生年月" v-model="model1.userInfo.dateBirth" readonly
inputAlign="right" border="none">
<u-icon slot="suffix" name="calendar"></u-icon>
</u--input>
@ -220,7 +220,7 @@
<!-- 弹框区 ed -->
<!-- 日期选择器 -->
<u-datetime-picker confirmColor="#99241B" :minDate="-2207520000000" :show="showBirthday"
:value="model1.userInfo.birthday" mode="date" closeOnClickOverlay @confirm="birthdayConfirm"
:value="model1.userInfo.dateBirth" mode="year-month" closeOnClickOverlay @confirm="birthdayConfirm"
@close="close('showBirthday')" @cancel="close('showBirthday')">
</u-datetime-picker>
<!-- 日期选择器ed -->
@ -338,6 +338,7 @@
name: '',
sex: '',
birthday: "2000-01-01",
dateBirth: "2000.01",
idCOde: '',
phoneNum: '',
meeting: '',
@ -487,7 +488,8 @@
this.model1.userInfo.officeTel = this.userData.officeTel
this.model1.userInfo.unitName = this.userData.unitName
this.model1.userInfo.mailAddress = this.userData.mailAddress
this.model1.userInfo.birthday = this.userData.birthDay
this.model1.userInfo.birthday = this.userData.birthDay
this.model1.userInfo.dateBirth = this.userData.dateBirth
}
},
onReady() {
@ -562,7 +564,7 @@
},
birthdayConfirm(e) {
this.showBirthday = false
this.model1.userInfo.birthday = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
this.model1.userInfo.dateBirth = uni.$u.timeFormat(e.value, 'yyyy.mm')
// this.$refs.form1.validateField('userInfo.birthday')
},
ServeTimeConfirm(e) {
@ -747,6 +749,7 @@
associationId: this.xiehuiId,
base: this.jiguan,
birthDay: that.birthday,
dateBirth: that.dateBirth,
cfPhoto: fl4,
comeTime: that.jionTime,
greats: rongyujx,
@ -779,7 +782,7 @@
member: that.member,
}
console.log(data)
if (!data.userName || !data.sex || !data.birthDay || !data.images || !data.password || !data.education || !
if (!data.userName || !data.sex || !data.dateBirth || !data.images || !data.password || !data.education || !
data.mailAddress || !data.politics) {
this.upLoadReady = false
console.log(zyz)

6
src/pagesD/xskz/index.vue
View File

@ -26,7 +26,7 @@
<view class="forms" v-if="tabC == '0'">
<view class="teamBox" v-for="(item, index) in videoList">
<view class="teamBox-top">
<video
<!-- <video
id="video"
style="width: 100%; height: 100%"
object-fit="cover"
@ -34,7 +34,7 @@
:src="item.video"
poster="../../static/orderE.png"
>
</video>
</video> -->
<view class="mask" @click="playMask(index)" v-if="item.play">
<text>{{ item.title }}</text>
<image src="../../static/play.png"></image>
@ -71,7 +71,7 @@ export default {
playback: "40.123",
like: "8.112.490",
collect: "8.112.490",
video: "../../static/a1.mp4",
// video: "../../static/a1.mp4",
play: true,
},

2
src/request/interface.js
View File

@ -5,7 +5,7 @@
export default {
config: {
baseUrl: "http://10.0.0.61:8080/h5/api", //俞燕红-小程序不能配跨域
baseUrl: "http://192.168.1.85:8080/h5/api", //俞燕红-小程序不能配跨域
// baseUrl: "/pre", //俞燕红-跨域
// baseUrl: "https://yxx.ydool.net/h5/api", //线上
// baseUrl: "/h5/api", //h5

BIN
src/static/a1.mp4
View File

Binary file not shown.