From 712a2e567bbde502da8bfdd1a08787abe3a56975 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Thu, 17 Nov 2022 14:17:56 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/plus/addArticle.vue | 7 +++---- pages/plus/addQuestion.vue | 6 +++--- pages/plus/feedback.vue | 10 ++++------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pages/plus/addArticle.vue b/pages/plus/addArticle.vue index 8b995e2..64f92e0 100644 --- a/pages/plus/addArticle.vue +++ b/pages/plus/addArticle.vue @@ -13,7 +13,7 @@ 保存草稿 - 提交 + 发布 @@ -324,7 +324,7 @@ color: #0D0D0D; } .title-right{ - color: #588AFC; + color: #387DF7; font-size: 28rpx; font-family: Source Han Sans CN; line-height: 36rpx; @@ -363,12 +363,11 @@ font-family: Source Han Sans CN; font-weight: bold; line-height: 36rpx; - } .title-right{ // position: absolute; right: 18rpx; - color: #588AFC; + color: #387DF7; font-size: 30rpx; font-family: Source Han Sans CN; line-height: 36rpx; diff --git a/pages/plus/addQuestion.vue b/pages/plus/addQuestion.vue index 2f22536..3a79a6d 100644 --- a/pages/plus/addQuestion.vue +++ b/pages/plus/addQuestion.vue @@ -7,7 +7,7 @@ 取消 - 提交 + 发布 @@ -319,10 +319,10 @@ color: #0D0D0D; } .bar-go{ - color: #588AFC; + color: #387DF7; font-size: 30rpx; font-family: Source Han Sans CN; - font-weight: bold; + font-weight: 400; line-height: 36rpx; } } diff --git a/pages/plus/feedback.vue b/pages/plus/feedback.vue index 63e310e..2a7d26f 100644 --- a/pages/plus/feedback.vue +++ b/pages/plus/feedback.vue @@ -9,7 +9,7 @@ 取消 - 提交 + 发布 @@ -154,7 +154,7 @@ } .active{ color: #333; - font-weight: 500; + font-weight: bold; font-size: 36upx; } .sub-box{ @@ -238,12 +238,10 @@ color: #0D0D0D; } .title-right{ - // position: absolute; - // right: 18rpx; - color: #588AFC; + color: #387DF7; font-size: 32upx; font-family: Source Han Sans CN; - font-weight: bold; + font-weight: 400; line-height: 36rpx; } } From 9659f53e46fa0cde1993b2bbacd8e67fdab8cb2b Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Thu, 17 Nov 2022 14:22:27 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=98=BB=E6=AD=A2=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/my/myShares.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/my/myShares.vue b/pages/my/myShares.vue index 57fc0f0..beecc12 100644 --- a/pages/my/myShares.vue +++ b/pages/my/myShares.vue @@ -15,7 +15,7 @@ 分享给{{ item.toAname }} - + 撤回 From 812a6625f4bb96bd3aa7dea33535ee1ce4838960 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Thu, 17 Nov 2022 14:23:24 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=98=BB=E6=AD=A2=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/my/myShares.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/my/myShares.vue b/pages/my/myShares.vue index beecc12..0d7efcd 100644 --- a/pages/my/myShares.vue +++ b/pages/my/myShares.vue @@ -42,7 +42,7 @@ 分享给{{item.toAname}} - + 撤回 @@ -67,7 +67,7 @@ 分享给{{item.toAname}} - + 撤回 From c82c51022064b961870dd752248ca701874db684 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Thu, 17 Nov 2022 14:29:12 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/study/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pages/study/index.vue b/pages/study/index.vue index 4cb76e9..90ce257 100644 --- a/pages/study/index.vue +++ b/pages/study/index.vue @@ -15,7 +15,7 @@ - + 学习任务 @@ -77,7 +77,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -520,8 +520,8 @@ }) }, autonomyStatus(num) { - console.log(num) this.Applistatus = num; + // console.log(this.Applistatus) this.getLearning(); }, taskStatus(num) { @@ -701,6 +701,7 @@ }) }, async getLearning() { + console.log(this.Applistatus) uni.showLoading({ title: '加载中...' }); From 27a0a55c052bb1b964b30f8848d6c3147c869ba3 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 17 Nov 2022 14:34:49 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 22 ++++++++++++++++++++++ pages/my/myQa.vue | 10 ++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/App.vue b/App.vue index 0b7ced7..5fb7601 100644 --- a/App.vue +++ b/App.vue @@ -71,6 +71,28 @@ border-right: 1px solid #bdbdbd; transform: rotate(45deg); } + uni-modal { + .uni-modal { + width: 288px !important; + max-width: 288px !important; + border-radius: 26upx; + .uni-modal__bd{ + font-size: 36upx; + font-weight: 600; + color: #333333; + padding: 33px 25px 33px 25px; + } + .uni-modal__ft{ + font-size: 32upx; + .uni-modal__btn_default{ + color: #333333; + } + .uni-modal__btn_primary{ + color: #387DF7; + } + } + } + } /**统一样式*/ .fixed-field{ diff --git a/pages/my/myQa.vue b/pages/my/myQa.vue index df4ecff..19f77ec 100644 --- a/pages/my/myQa.vue +++ b/pages/my/myQa.vue @@ -117,6 +117,7 @@ + @@ -132,6 +133,7 @@ }, data() { return { + modalShow:false, inputShow:false, loadStatus:'more', active:1, @@ -232,8 +234,9 @@ delItem(item) { const $this=this uni.showModal({ - title: '提示', + // title: '提示', content: '您确定要删除此回答吗？', + confirmText:"删除", success: function (res) { if (res.confirm) { apiQa @@ -278,8 +281,9 @@ del(item,index){ const $this=this uni.showModal({ - title: '提示', + // title: '提示', content: '确认删除这条提问吗？', + confirmText:"删除", success: function (res) { if (res.confirm) { apiQa.del(item.id).then(res=>{ @@ -441,9 +445,7 @@ } - From ed6f8c4797c9694e04fc13b6e7aac65c9ba14a99 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 17 Nov 2022 15:33:16 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 3 ++- pages/study/index.vue | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pages.json b/pages.json index 5fee363..20d108d 100644 --- a/pages.json +++ b/pages.json @@ -66,7 +66,8 @@ } }, {"path" : "pages/plus/addQuestion","style" : {"navigationBarTitleText": "提问题"}}, - {"path" : "pages/plus/editQuestion","style" : {"navigationBarTitleText": "编辑问题"}}, + {"path" : "pages/plus/editQuestion","style" : {"navigationBarTitleText": "编辑问题"}}, + {"path" : "pages/plus/editAnser","style" : {"navigationBarTitleText": "编辑回答"}}, {"path" : "pages/plus/feedback","style" : {"navigationBarTitleText": "提意见"}}, {"path" : "pages/login/next","style" : {"navigationBarTitleText": "修改密码"}}, {"path" : "pages/login/headPortrait","style" : {"navigationBarTitleText": "修改头像"}}, diff --git a/pages/study/index.vue b/pages/study/index.vue index 90ce257..2ccc696 100644 --- a/pages/study/index.vue +++ b/pages/study/index.vue @@ -415,7 +415,6 @@ }, methods: { removecour(item){ - console.log(item); item.delcour = !item.delcour }, rowbtn(row) { @@ -576,6 +575,7 @@ loadBoeData(flag) { if (flag) { this.taskPageIndex = 1; //回到首页 + this.couresList = []; } let params = { page: this.taskPageIndex, @@ -587,12 +587,12 @@ params.cmtask_name = this.keyWord; } apiBoeCourse.cmtaskList(params).then(res => { - this.taskCount = res.result.count; + this.taskCount = res.result.count; res.result.list.forEach(item => { let time = this.formatDate(item.created_at * 1000); item.created_at = time.split(' ')[0]; }); - this.couresList = res.result.list; + this.couresList.push(...res.result.list); if (this.taskCount > this.taskPageIndex * this.taskPageSize) { this.taskHasMore = true; } else { @@ -648,12 +648,12 @@ }, clicktab(idx) { this.tabIndex = idx; - if (this.tabIndex == 1) { + if (this.tabIndex == 1 && this.studyList.length == 0) { this.getLearning() // this.searchData(); } else if (this.tabIndex == 2) { this.history() - } else if (this.tabIndex == 0) { + } else if (this.tabIndex == 0 && this.couresList.length == 0) { this.loadBoeData() } },