From 0fe811958dfb5665bdb0bf600dd53c53c9e44be1 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 22 Mar 2023 10:54:20 +0800 Subject: [PATCH 1/2] bug --- src/project/fengdu/AppHome/AppHome.vue | 6 ++--- .../AppWxworkQrcode/AppWxworkQrcode.vue | 9 ++++++-- .../components/GeneralLawExam.vue | 23 +++++++++++-------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue index 2677a10..247a270 100644 --- a/src/project/fengdu/AppHome/AppHome.vue +++ b/src/project/fengdu/AppHome/AppHome.vue @@ -21,10 +21,10 @@
- +
- - + +
diff --git a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue index 49e17f7..6146529 100644 --- a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue +++ b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue @@ -7,14 +7,15 @@
- + +
- 长按识别二维码或扫码加入群聊 + 长按保存图片或扫码加入群聊 @@ -42,6 +43,10 @@ export default { list: [], picUrl: '', idName: '', + webviewStyles: { + width: '400px', + height: '400px', + } } }, onShow() { diff --git a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue index 542133c..6ef7fe4 100644 --- a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue +++ b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue @@ -7,7 +7,6 @@

全部考试

-
@@ -19,10 +18,10 @@ {{ item.passNumber }}人通过/{{ item.examinationNumber }}人参与
- - - - + + + +
{{ item.myRecord.score }}
@@ -83,6 +82,7 @@ export default { current: 1, testList: [], testId: '', + studyDuration: '', } }, computed: { @@ -98,7 +98,6 @@ export default { } }).then(res=> { if(res?.data) { - // this.testList = this.current==1? res.data.records: [...this.testList,...res.data.records] this.testList = res.data.records } }) @@ -118,6 +117,14 @@ export default { this.$emit('toTest',id) } }, + // 查看累计时长 + getStudyDuration() { + this.$instance.post(`/app/appwechatuserqujing/queryStudyDuration`).then(res => { + if (res?.data) { + this.studyDuration = res.data.studyDuration + } + }) + }, comfirm() { if(this.flag) return @@ -156,10 +163,6 @@ export default { this.$u.toast(err.msg) }) }, - // scrolltLower() { - // this.current++ - // this.getList() - // } }, } From 5206203caa1c34258914d224ad56e960c5021683 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 22 Mar 2023 13:47:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/fengdu/AppHome/AppHome.vue | 76 +++++++++++++++++-- .../AppWxworkQrcode/AppWxworkQrcode.vue | 18 ++--- 2 files changed, 78 insertions(+), 16 deletions(-) diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue index 247a270..96f18a7 100644 --- a/src/project/fengdu/AppHome/AppHome.vue +++ b/src/project/fengdu/AppHome/AppHome.vue @@ -21,10 +21,27 @@
- +
+
+

丰收银行

+
行好事
+
得积分
+
去兑换
+
+
- - +
+
+

丰都新农人

+
新农人新经济
+
+
+
+
+

家庭教育互助惠

+
关注每一个留守儿童
+
+
@@ -226,6 +243,7 @@ export default { white-space: nowrap; } } + .card { background: #FFF; padding: 32px; @@ -236,17 +254,61 @@ export default { .card-left { width: 322px; height: 462px; + background: url('https://cdn.cunwuyun.cn/fengdu/fengshouyinhang.png') no-repeat; + background-size: 100% 100%; + padding: 32px 32px; + box-sizing: border-box; + + .left-word { + color: #4C3FCD; + font-size: 22px; + p { + font-size: 36px; + font-weight: 600; + margin-bottom: 10px; + } + div { + margin-left: 40px; + height: 40px; + line-height: 40px; + } + } } .card-right { width: 334px; height: 462px; - - img { + display: flex; + flex-direction: column; + justify-content: space-between; + .xnr, + .jyhz { width: 334px; height: 216px; + padding: 32px 32px; + box-sizing: border-box; + font-size: 20px; } - img:last-child { - margin-top: 24px; + .xnr { + background: url('https://cdn.cunwuyun.cn/fengdu/fengduxinnongren.png'); + background-size: 100% 100%; + color: #DF863E; + p { + color: #DF863E; + font-size: 30px; + font-weight: 600; + margin-bottom: 8px; + } + } + .jyhz { + background: url('https://cdn.cunwuyun.cn/fengdu/jiaoyuhuzhu.png'); + background-size: 100% 100%; + color: #D9606E; + p { + color: #D9606E; + font-size: 30px; + font-weight: 600; + margin-bottom: 8px; + } } } } diff --git a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue index 6146529..cea70b4 100644 --- a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue +++ b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue @@ -7,8 +7,8 @@
- - + +
@@ -43,10 +43,10 @@ export default { list: [], picUrl: '', idName: '', - webviewStyles: { - width: '400px', - height: '400px', - } + // webviewStyles: { + // width: '400px', + // height: '400px', + // } } }, onShow() { @@ -129,9 +129,9 @@ export default { // } // } } - ::v-deep .group_chat_icon { - display: none; - } + // ::v-deep .group_chat_icon { + // display: none; + // } .header { width: 100%;