From 2f98f6bc09541c76816c76f2ea69b3408a898727 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 22 Mar 2023 16:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=A4=BE=E7=BE=A4=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppHome/AppHome.vue        |  6 +-
 .../AppWxworkQrcode/AppWxworkQrcode.vue       | 96 ++++++++-----------
 .../components/GeneralLawExam.vue             | 16 +++-
 3 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue
index 96f18a7..6b727c4 100644
--- a/src/project/fengdu/AppHome/AppHome.vue
+++ b/src/project/fengdu/AppHome/AppHome.vue
@@ -22,7 +22,7 @@
 
       <div class="card">
         <div class="card-left">
-          <div class="left-word">
+          <div class="left-word" @click="$linkTo('/mods/AppNewFarmerBank/AppNewFarmerBank')">
             <p>丰收银行</p>
             <div>行好事</div>
             <div>得积分</div>
@@ -30,13 +30,13 @@
           </div>
         </div>
         <div class="card-right">
-          <div class="xnr">
+          <div class="xnr"  @click="$linkTo('/mods/AppFarmerBank/AppFarmerBank')">
             <div class="bottom-word">
               <p>丰都新农人</p>
               <div>新农人新经济</div>
             </div>
           </div>
-          <div class="jyhz">
+          <div class="jyhz" @click="$linkTo('/mods/AppHelpEachOther/AppHelpEachOther')">
             <div class="bottom-word">
               <p>家庭教育互助惠</p>
               <div>关注每一个留守儿童</div>
diff --git a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
index f08b9e2..0c99909 100644
--- a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
+++ b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
@@ -7,18 +7,18 @@
         <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px"></u-icon>
       </AiSelect>
       <div class="qrcode-content">
-        <AiImage :src="picUrl" class="qrcode-img" v-if="picUrl" preview/>
-        <!-- <web-view :webview-styles="webviewStyles" class="qrcode-img" v-if="picUrl" :src="picUrl"></web-view> -->
-        <div v-else class="tips">
-          <AiEmpty :description="`暂未选择群聊`" class="emptyWrap"/>
+        <div class="tips">
+          <div class="name-tip" v-if="groupInfo.name">
+            <div class="name">{{ groupInfo.name }}</div>
+            <div class="count">({{ groupInfo.personCount }})</div>
+          </div>
         </div>
       </div>
       
       <div class="jionGroup"> 
         <!-- 长按保存图片或扫码加入群聊 -->
         <!-- 通过扫一扫加入、与通过插件加入只能选一种 -->
-        <cell class="group" @startmessage="startmessage" @completemessage="completemessage" 
-        url='https://work.weixin.qq.com/gm/1c48ab4ed49168fa9433e2410d10797f' v-if="picUrl"></cell>
+        <cell class="group" :url='picUrl' v-if="picUrl"></cell>
       </div>
 
       <div class="pic">
@@ -43,10 +43,7 @@ export default {
       list: [],
       picUrl: '',
       idName: '',
-      // webviewStyles: {
-      //   width: '400px',
-      //   height: '400px',
-      // }
+      groupInfo: {},
     }
   },
   onShow() {
@@ -57,17 +54,12 @@ export default {
       handler(v) {
         if(v) {
           this.picUrl = this.list.filter(i=> i.id == v)[0].qrCode
+          this.groupInfo = this.list.filter(i => i.id == v)[0]
         }
       }
     }
   },
   methods: {
-    startmessage(e) {
-      console.log(e, '1111');
-    },
-    completemessage(e) {
-      console.log(e,'222');
-    },
     getSelect() {
       const {areaId} = this.user
       areaId && this.$instance.post(`/app/wxcp/wxgroup/listByAreaId`, null, {
@@ -118,26 +110,7 @@ export default {
     color: #666;
     text-align: center;
     font-size: 28px;
-    // ::v-deep functional-page-navigator {
-    //   width: 100%;
-    //   height: 100%;
-    //   text-align: center;
-    //   background: #2D7DFF;
-    //   border-radius: 40px;
-    //   view {
-    //     text {
-    //       color: #FFFFFF !important;
-    //       margin: 0;
-    //     }
-    //     image {
-    //       display: none;
-    //     }
-    //   }
-    // }
   }
-  // ::v-deep .group_chat_icon {
-  //   display: none;
-  // }
 
   .header {
     width: 100%;
@@ -149,29 +122,42 @@ export default {
       width: 542px;
       height: 542px;
       margin: 10% auto 10%;
-      background: #F6F9FF;
-      border-radius: 12px;
-      border: 8px solid #f6f5f8;
-      padding: 36px;
+      border-top: 4px solid #7d87a4;
+      padding: 70px 68px;
       box-sizing: border-box;
 
-      ::v-deep AiImage {
-        width: 100%;
-        height: 100%;
-      }
-
-      ::v-deep .qrcode-img {
-        width: 470px;
-        height: 470px;
-
-        image {
-          width: 470px;
-          height: 470px;
-        }
-      }
       .tips {
-        width: 100%;
-        height: 100%;
+        width: 406px;
+        height: 402px;
+        background: url('https://cdn.cunwuyun.cn/fengdu/img-qunliao.png') no-repeat;
+        background-size: 100% 100%;
+        position: relative;
+
+        .name-tip {
+          position: absolute;
+          top: 42px;
+          left: 86px;
+          width: 230px;
+          height: 50px;
+          line-height: 50px;
+          display: flex;
+          font-size: 22px;
+          font-weight: 600;
+          color: #333333;
+          .name {
+            width: 165px;
+            height: 100%;
+            line-height: 50px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+          .count {
+            width: calc(100% - 165px);
+            height: 100%;
+            line-height: 50px;
+          }
+        }
       }
       
 
diff --git a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
index 6ef7fe4..dac353a 100644
--- a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
+++ b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
@@ -24,6 +24,7 @@
               <img class="result-img" v-show="item.myRecord.assessmentType == 3" src="https://cdn.cunwuyun.cn/qujing/buhege.png" alt="">
             </div>
             <div class="grade" :class="{'error':item.myRecord.assessmentType == 3}">{{ item.myRecord.score }}</div>
+            <div class="tips" v-if="item.examinationType">{{ item.examinationType==0? '学习测试':'考试认证' }}</div>
           </div>
           <div class="card_bottom col_blue" @click="handleToTest(item.id)">{{ item.myRecord? '重新考试':'参加考试'}}</div>
         </div>
@@ -222,7 +223,7 @@ export default {
         .result {
           position: absolute;
           right: 0;
-          top: 0;
+          top: 10px;
           .result-img {
             width: 200px;
             height: 200px;
@@ -232,7 +233,7 @@ export default {
         .grade {
           position: absolute;
           right: 75px;
-          top: 60px;
+          top: 80px;
           font-weight: 500;
           font-size: 40px;
           color: #0FC484;
@@ -242,6 +243,17 @@ export default {
           color: #E23C3C;
         }
 
+        .tips {
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 116px;
+          height: 38px;
+          background: #FF772D;
+          border-radius: 0 16px 0 16px;
+          color: #FFF;
+        }
+
       }
 
       .card_bottom {