From 73d84875c350fde3f5fad2848212db2a696992be Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 22 Mar 2023 17:53:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=A4=BE=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppHome/AppHome.vue        |  2 +-
 .../AppWxworkQrcode/AppWxworkQrcode.vue       | 36 +++++++++++++------
 .../components/GeneralLawExam.vue             | 13 ++++---
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue
index 6b727c4..b195bbd 100644
--- a/src/project/fengdu/AppHome/AppHome.vue
+++ b/src/project/fengdu/AppHome/AppHome.vue
@@ -30,7 +30,7 @@
           </div>
         </div>
         <div class="card-right">
-          <div class="xnr"  @click="$linkTo('/mods/AppFarmerBank/AppFarmerBank')">
+          <div class="xnr"  @click="$linkTo('/mods/AppNewFarmer/AppNewFarmer')">
             <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 0c99909..9c56c74 100644
--- a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
+++ b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
@@ -10,7 +10,7 @@
         <div class="tips">
           <div class="name-tip" v-if="groupInfo.name">
             <div class="name">{{ groupInfo.name }}</div>
-            <div class="count">({{ groupInfo.personCount }})</div>
+            <!-- <div class="count">({{ groupInfo.personCount }})</div> -->
           </div>
         </div>
       </div>
@@ -18,9 +18,11 @@
       <div class="jionGroup"> 
         <!-- 长按保存图片或扫码加入群聊 -->
         <!-- 通过扫一扫加入、与通过插件加入只能选一种 -->
-        <cell class="group" :url='picUrl' v-if="picUrl"></cell>
+        <cell class="group" contactText="点击加入群聊" :url='picUrl' v-if="picUrl"></cell>
       </div>
 
+      
+
       <div class="pic">
         <img src="https://cdn.cunwuyun.cn/fengdu/mdpi_img-chongqing.png" alt="">
       </div>
@@ -53,8 +55,11 @@ export default {
     id: {
       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]
+          this.picUrl = null
+          this.$nextTick(()=> {
+            this.picUrl = this.list.filter(i=> i.id == v)[0].qrCode
+            this.groupInfo = this.list.filter(i => i.id == v)[0]
+          }) 
         }
       }
     }
@@ -74,7 +79,7 @@ export default {
           this.dictList = res.data.records.map(e=> {
             return {
               value: e.id,
-              label: e.name
+              label: e.name? e.name: '未命名群聊'
             }
           })
         }
@@ -112,6 +117,13 @@ export default {
     font-size: 28px;
   }
 
+  .tishi {
+    color: #3D3D3D;
+    font-size: 28px;
+    font-weight: 400;
+    text-align: center;
+  }
+
   .header {
     width: 100%;
     height: 100%;
@@ -145,20 +157,22 @@ export default {
           font-weight: 600;
           color: #333333;
           .name {
-            width: 165px;
+            width: 100%;
             height: 100%;
             line-height: 50px;
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
           }
-          .count {
-            width: calc(100% - 165px);
-            height: 100%;
-            line-height: 50px;
-          }
+          // .count {
+          //   width: calc(100% - 165px);
+          //   height: 100%;
+          //   line-height: 50px;
+          // }
         }
       }
+
+      
       
 
       div {
diff --git a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
index dac353a..da0bfd1 100644
--- a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
+++ b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
@@ -24,9 +24,9 @@
               <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 class="tips" v-if="item.examinationType" :class="item.examinationType == 0? 'auth': ''">{{ item.examinationType==0? '学习测试':'考试认证' }}</div>
           </div>
-          <div class="card_bottom col_blue" @click="handleToTest(item.id)">{{ item.myRecord? '重新考试':'参加考试'}}</div>
+          <div class="card_bottom col_blue" @click="handleToTest(item)">{{ item.myRecord? '重新考试':'参加考试'}}</div>
         </div>
       </scroll-view>
     </div>
@@ -110,7 +110,8 @@ export default {
         }
       })
     },
-    handleToTest(id) {
+    handleToTest({id, examination_duration: time }) {
+      console.log(time);
       if(!this.user.areaId) {
         this.showAuth = true;
         this.testId = id;
@@ -223,7 +224,7 @@ export default {
         .result {
           position: absolute;
           right: 0;
-          top: 10px;
+          top: 15px;
           .result-img {
             width: 200px;
             height: 200px;
@@ -254,6 +255,10 @@ export default {
           color: #FFF;
         }
 
+        .auth {
+          background: #8F5AFF;
+        }
+
       }
 
       .card_bottom {