Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

Lou

2024-03-27 2cfc8e1160554230eba6d23ea75da9d762d6d98d

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

 subPackage/article/detail.vue

@@ -42,10 +42,10 @@
                            </view>
                            <text class="f-28 c-99">共{{applyList.length}}人</text>
                        </view>
                        <button v-if="computeEndTime > 0 && !applyInfo.userId" class="apply-btn bgc-main c-ff "
                        <button v-if="computeEndTime > 0 && !applyInfo.householdId" class="apply-btn bgc-main c-ff "
                            @click="handleApply()">报名</button>

                        <button v-if="applyInfo.userId && computeEndTime > 0"
                        <button v-if="applyInfo.householdId && computeEndTime > 0"
                            class="apply-btn bgc-lightblue c-main  border-current">已报名</button>

                        <button v-if="computeEndTime <= 0"
@@ -295,6 +295,7 @@
            },

            getDetailInfo() {
                this.params.houseCode = uni.getStorageSync("curHouseCode")
                getDetail(this.params).then(res => {
                    this.detailInfo = res.data;
                    this.type = res.data.type
@@ -327,7 +328,8 @@
            //报名列表
            getApplyList() {
                communityModel.getApplyList({
                    articleId: this.params.id
                    articleId: this.params.id,
                    houseCode: uni.getStorageSync("curHouseCode")
                }).then(res => {
                    // console.log(res)
                    if (res.code == 200) {
@@ -339,7 +341,8 @@
            //报名、投票详情
            getApplyDetail() {
                communityModel.getApplyDetail({
                    articleId: this.params.id
                    articleId: this.params.id,
                    houseCode: uni.getStorageSync("curHouseCode")
                }).then(res => {
                    // console.log(res)
                    if (res.code == 200) {
@@ -351,7 +354,8 @@
            //获取投票议题
            getVoteList() {
                communityModel.getVoteTopics({
                    articleId: this.params.id
                    articleId: this.params.id,
                    houseCode: uni.getStorageSync("curHouseCode")
                }).then(res => {
                    if (res.code == 200) {
                        let data = res.data;