Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp
This commit is contained in:
commit
52d36d8eff
@ -71,9 +71,13 @@
|
||||
} from '@/api/business/member.js'
|
||||
import noticeItem from '@/pages/components/notice-item.vue'
|
||||
import navigationBarVue from '@/components/navigation/navigationBar.vue';
|
||||
import config from '@/config'
|
||||
import {postForkUser} from '@/api/business/base.js'
|
||||
import {getNoticeDetail} from '@/api/business/notice';
|
||||
import config from '@/config'
|
||||
import {
|
||||
postForkUser
|
||||
} from '@/api/business/base.js'
|
||||
import {
|
||||
getNoticeDetail
|
||||
} from '@/api/business/notice';
|
||||
export default {
|
||||
components: {
|
||||
navigationBarVue,
|
||||
@ -83,32 +87,32 @@
|
||||
return {
|
||||
imageUrl: '',
|
||||
member: {},
|
||||
dataList: ['', ''],
|
||||
dataList: [],
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
userId: null,
|
||||
status: '进行中',
|
||||
status: '审核通过',
|
||||
},
|
||||
userId: null,
|
||||
total: 0,
|
||||
//下来刷新状态
|
||||
isTriggered: false,
|
||||
//当前用户是否关注该博主
|
||||
isLove: false,
|
||||
noticeId:null,
|
||||
//当前用户是否关注该博主
|
||||
isLove: false,
|
||||
noticeId: null,
|
||||
}
|
||||
},
|
||||
|
||||
onLoad(option){
|
||||
console.log(option,'option')
|
||||
this.userId = option.userId
|
||||
this.queryParams.userId = option.userId
|
||||
this.noticeId = option.noticeId
|
||||
this.initMember()
|
||||
this.initNotice()
|
||||
this.getDetail()
|
||||
},
|
||||
onLoad(option) {
|
||||
console.log(option, 'option')
|
||||
this.userId = option.userId
|
||||
this.queryParams.userId = option.userId
|
||||
this.noticeId = option.noticeId
|
||||
this.initMember()
|
||||
this.initNotice()
|
||||
this.getDetail()
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
@ -138,25 +142,25 @@
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 查通告详情
|
||||
*/
|
||||
getDetail() {
|
||||
getNoticeDetail({
|
||||
noticeId: this.noticeId
|
||||
}).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.isLove = res.data.isLove
|
||||
}
|
||||
}).catch((e) => {
|
||||
this.isTriggered = false
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
duration: 2000,
|
||||
title: e
|
||||
});
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 查通告详情
|
||||
*/
|
||||
getDetail() {
|
||||
getNoticeDetail({
|
||||
noticeId: this.noticeId
|
||||
}).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.isLove = res.data.isLove
|
||||
}
|
||||
}).catch((e) => {
|
||||
this.isTriggered = false
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
duration: 2000,
|
||||
title: e
|
||||
});
|
||||
})
|
||||
},
|
||||
|
||||
/**出初始化通告主详情*/
|
||||
initMember() {
|
||||
|
@ -64,7 +64,7 @@
|
||||
<view class="dl-label">
|
||||
招募名额:
|
||||
</view>
|
||||
<view class="dl-value">{{noticeDetail.needNum||'0'}}人 </view>
|
||||
<view class="dl-value">{{noticeDetail.needNum||'无上限'}}人 </view>
|
||||
</view>
|
||||
<view class="dl-item" v-if="noticeDetail.isShowBrand&¬iceDetail.isShowBrand==1">
|
||||
<view class="dl-label">
|
||||
@ -124,7 +124,7 @@
|
||||
三方链接:
|
||||
</view>
|
||||
<view class="dl-value">
|
||||
报名后可查看
|
||||
报名通过后可查看
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -140,8 +140,8 @@
|
||||
<rich-text style="width: 100%" :nodes="noticeDetail.detail" />
|
||||
</view>
|
||||
<view class="detail-images">
|
||||
<image v-for="(item,index) in noticeDetail.imageArray" @click="preview(noticeDetail.imageArray)"
|
||||
:src="imageUrl+item" mode="widthFix"></image>
|
||||
<image v-for="(item,index) in noticeDetail.imageArray" @click="preview([item])" :src="imageUrl+item"
|
||||
mode="widthFix"></image>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 联系方式 -->
|
||||
@ -168,7 +168,7 @@
|
||||
<view class="dl-label">
|
||||
微信群码图片:
|
||||
</view>
|
||||
<view class="dl-value">报名后可查看 </view>
|
||||
<view class="dl-value">报名通过后可查看 </view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -193,7 +193,7 @@
|
||||
<!-- 去报名,始终浮动下方 -->
|
||||
<view class="dl-bottom-box" v-show="showBottom&&type=='common'">
|
||||
<!-- 报名 -->
|
||||
<view class="report-box" v-if="'2'!=noticeDetail.approvalStatus">
|
||||
<view class="report-box" v-if="'1'==noticeDetail.approvalStatus">
|
||||
<view @click="goHome()">
|
||||
<image src="@/static/detail/home.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
@ -457,8 +457,9 @@
|
||||
.noticeId)
|
||||
},
|
||||
goMemberIndex() {
|
||||
this.$tab.navigateTo('/pages/mine/member/member-index?userId=' + this.userDetail.userId + '¬iceId=' + this
|
||||
.noticeId)
|
||||
this.$tab.navigateTo('/pages/mine/member/member-index?userId=' + this.userDetail.userId + '¬iceId=' +
|
||||
this
|
||||
.noticeId)
|
||||
},
|
||||
/**
|
||||
* 去报名列表
|
||||
@ -844,10 +845,19 @@
|
||||
align-items: flex-start;
|
||||
margin-bottom: 10rpx;
|
||||
|
||||
.dl-label {}
|
||||
.dl-label {
|
||||
min-width: 220rpx;
|
||||
display: flex;
|
||||
justify-content: start;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.dl-value {
|
||||
flex: 1;
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: start;
|
||||
word-break: break-all;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -922,6 +932,7 @@
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
white-space: normal;
|
||||
|
||||
image {
|
||||
width: 200rpx;
|
||||
|
@ -241,7 +241,7 @@
|
||||
queryData = this.checkedParams
|
||||
}
|
||||
this.isTriggered = true
|
||||
quertData.pageNum = 1
|
||||
queryData.pageNum = 1
|
||||
if (0 == this.menuIndex) {
|
||||
this.waitingTotal = 0
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user