Merge pull request '修改小程序bug' (#112) from dj into dev
Reviewed-on: http://git.feashow.cn/feashow/pupil/pulls/112
This commit is contained in:
@@ -121,6 +121,7 @@
|
|||||||
showUpdating: false,
|
showUpdating: false,
|
||||||
showCall: false,
|
showCall: false,
|
||||||
mobile: '',
|
mobile: '',
|
||||||
|
kf_email: '',
|
||||||
updateContent: '您暂无权限访问,请升级VIP访问',
|
updateContent: '您暂无权限访问,请升级VIP访问',
|
||||||
updatingContent: '升级VIP,正在审核中',
|
updatingContent: '升级VIP,正在审核中',
|
||||||
timoutText: 1
|
timoutText: 1
|
||||||
@@ -313,10 +314,10 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
font-size: 44rpx;
|
font-size: 48rpx;
|
||||||
font-weight: blod;
|
font-weight: bold;
|
||||||
color: #134b40;
|
color: #134b40;
|
||||||
line-height: 50rpx;
|
line-height: 60rpx;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
@@ -326,7 +327,7 @@
|
|||||||
height: 30rpx;
|
height: 30rpx;
|
||||||
background: #0EBB5B;
|
background: #0EBB5B;
|
||||||
border-radius: 7rpx;
|
border-radius: 7rpx;
|
||||||
font-size: 20rpx;
|
font-size: 26rpx;
|
||||||
font-family: PingFangSC-Regular, PingFang SC;
|
font-family: PingFangSC-Regular, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: #FFFFFF;
|
color: #FFFFFF;
|
||||||
@@ -336,24 +337,24 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.desc {
|
.desc {
|
||||||
font-size: 38rpx;
|
font-size: 42rpx;
|
||||||
font-family: PingFangSC-Regular, PingFang SC;
|
font-family: PingFangSC-Regular, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: #3E3E3E;
|
color: #3E3E3E;
|
||||||
line-height: 34rpx;
|
// line-height: 38rpx;
|
||||||
padding: 15rpx 0;
|
padding: 24rpx 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.classify {
|
.classify {
|
||||||
width: 100rpx;
|
width: 117rpx;
|
||||||
height: 30rpx;
|
height: 40rpx;
|
||||||
border-radius: 6rpx;
|
border-radius: 6rpx;
|
||||||
border: 1rpx solid #EEEEEE;
|
border: 1rpx solid #EEEEEE;
|
||||||
font-size: 24rpx;
|
font-size: 30rpx;
|
||||||
font-family: PingFangSC-Regular, PingFang SC;
|
font-family: PingFangSC-Regular, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: #666666;
|
color: #666666;
|
||||||
line-height: 28rpx;
|
line-height: 40rpx;
|
||||||
padding: 1rpx 15rpx;
|
padding: 1rpx 15rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -361,12 +362,12 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding-top: 14rpx;
|
padding-top: 24rpx;
|
||||||
font-size: 24rpx;
|
font-size: 30rpx;
|
||||||
font-family: PingFangSC-Regular, PingFang SC;
|
font-family: PingFangSC-Regular, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: #CCCCCC;
|
color: #CCCCCC;
|
||||||
line-height: 28rpx;
|
// line-height: 28rpx;
|
||||||
|
|
||||||
.tagOne {
|
.tagOne {
|
||||||
padding-right: 20rpx;
|
padding-right: 20rpx;
|
||||||
@@ -389,7 +390,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.releaseDate {
|
.releaseDate {
|
||||||
font-size: 24rpx;
|
font-size: 30rpx;
|
||||||
font-family: PingFangSC-Regular, PingFang SC;
|
font-family: PingFangSC-Regular, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: #666666;
|
color: #666666;
|
||||||
|
|||||||
@@ -205,7 +205,6 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.needsPublishForm = publishFormList
|
this.needsPublishForm = publishFormList
|
||||||
console.log('this.needsPublishForm', this.needsPublishForm);
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.$toast.warn(error)
|
this.$toast.warn(error)
|
||||||
}
|
}
|
||||||
@@ -384,7 +383,8 @@
|
|||||||
if (this.needsPublishForm.mobile && !/^1[3456789]\d{9}$/.test(this.needsPublishForm.mobile)) {
|
if (this.needsPublishForm.mobile && !/^1[3456789]\d{9}$/.test(this.needsPublishForm.mobile)) {
|
||||||
this.$toast.warn('请输入正确的手机号')
|
this.$toast.warn('请输入正确的手机号')
|
||||||
return false
|
return false
|
||||||
} else if (this.needsPublishForm.email && !/^([0-9a-zA-Z_\.\-\])+\@([0-9a-zA-Z_\.\-\])+\.([a-zA-Z]+)$/.test(this.needsPublishForm.email)) {
|
} else if (this.needsPublishForm.email && !/^([0-9a-zA-Z_\.\-\])+\@([0-9a-zA-Z_\.\-\])+\.([a-zA-Z]+)$/
|
||||||
|
.test(this.needsPublishForm.email)) {
|
||||||
this.$toast.warn('请输入正确的邮箱地址')
|
this.$toast.warn('请输入正确的邮箱地址')
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
@@ -417,7 +417,7 @@
|
|||||||
}
|
}
|
||||||
apiService.submitIdeasAndNeeds(data).then(res => {
|
apiService.submitIdeasAndNeeds(data).then(res => {
|
||||||
if (res.data.code === 1) {
|
if (res.data.code === 1) {
|
||||||
this.$toast.success('提交成功')
|
this.$toast.success('提交成功')
|
||||||
// if (this.needsPublishForm.id) {
|
// if (this.needsPublishForm.id) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '../../packageMy/myRelease/myRelease?index=' + (this.tabCurrent + 1)
|
url: '../../packageMy/myRelease/myRelease?index=' + (this.tabCurrent + 1)
|
||||||
@@ -426,7 +426,7 @@
|
|||||||
this.tabCurrent = 0
|
this.tabCurrent = 0
|
||||||
this.fileList1 = []
|
this.fileList1 = []
|
||||||
this.needsPublishForm = {}
|
this.needsPublishForm = {}
|
||||||
} else{
|
} else {
|
||||||
this.$toast.warn(res.data.msg)
|
this.$toast.warn(res.data.msg)
|
||||||
}
|
}
|
||||||
// this.$toast.success(res.data.msg)
|
// this.$toast.success(res.data.msg)
|
||||||
@@ -449,6 +449,10 @@
|
|||||||
background-color: #ffffff !important;
|
background-color: #ffffff !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/deep/.u-input {
|
||||||
|
background-color: #ffffff !important;
|
||||||
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
background-color: #F8F8F8;
|
background-color: #F8F8F8;
|
||||||
|
|
||||||
|
|||||||
@@ -140,7 +140,9 @@
|
|||||||
//获取首页轮播图
|
//获取首页轮播图
|
||||||
getBanner() {
|
getBanner() {
|
||||||
this.$apiServe.getBanner().then(res => {
|
this.$apiServe.getBanner().then(res => {
|
||||||
|
|
||||||
let banner = res.data.data
|
let banner = res.data.data
|
||||||
|
console.log('轮播图', banner);
|
||||||
if (banner) {
|
if (banner) {
|
||||||
for (const item of banner) {
|
for (const item of banner) {
|
||||||
item.img = this.imgUrl + item.img
|
item.img = this.imgUrl + item.img
|
||||||
|
|||||||
Reference in New Issue
Block a user