Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wechat_app into dev

src/project/fengdu/AppHome/AppHome.vue

@@ -21,10 +21,27 @@
       </div>
 
       <div class="card">
-        <img class="card-left" src="https://cdn.cunwuyun.cn/fengdu/img-fengshouyinhang.png" @click="$linkTo('/mods/AppNewFarmerBank/AppNewFarmerBank')" alt="">
+        <div class="card-left">
+          <div class="left-word">
+            <p>丰收银行</p>
+            <div>行好事</div>
+            <div>得积分</div>
+            <div>去兑换</div>
+          </div>
+        </div>
         <div class="card-right">
-          <img src="https://cdn.cunwuyun.cn/fengdu/img-fengduxinnongren.png" alt="" @click="$linkTo('/mods/AppNewFarmer/AppNewFarmer')">
+          <div class="xnr">
-          <img src="https://cdn.cunwuyun.cn/fengdu/ic-jiaoyuhuzhu.png" alt="" @click="$linkTo('/mods/AppHelpEachOther/AppHelpEachOther')">
+            <div class="bottom-word">
+              <p>丰都新农人</p>
+              <div>新农人新经济</div>
+            </div>
+          </div>
+          <div class="jyhz">
+            <div class="bottom-word">
+              <p>家庭教育互助惠</p>
+              <div>关注每一个留守儿童</div>
+            </div>
+          </div>
         </div>
       </div>
       <AiLogin ref="login"/>
@@ -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;
-
+        display: flex;
-        img {
+        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 {
+        .xnr {
-          margin-top: 24px;
+          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;
+          }
         }
       }
     }

src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue

@@ -8,13 +8,14 @@
       </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>
       </div>
       
       <div class="jionGroup"> 
-        长按识别二维码或扫码加入群聊
+        长按保存图片或扫码加入群聊
         <!-- 通过扫一扫加入、与通过插件加入只能选一种 -->
         <!-- <cell class="group" @startmessage="startmessage" @completemessage="completemessage" 
         url='picUrl' v-if="picUrl"></cell> -->
@@ -42,6 +43,10 @@ export default {
       list: [],
       picUrl: '',
       idName: '',
+      // webviewStyles: {
+      //   width: '400px',
+      //   height: '400px',
+      // }
     }
   },
   onShow() {
@@ -124,9 +129,9 @@ export default {
     //   }
     // }
   }
-  ::v-deep .group_chat_icon {
+  // ::v-deep .group_chat_icon {
-    display: none;
+  //   display: none;
-  }
+  // }
 
   .header {
     width: 100%;

src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue

@@ -7,7 +7,6 @@
 
     <p class="all_test">全部考试</p>
     <div class="card_list" v-if="testList.length">
-      <!-- @scrolltolower="scrolltLower" -->
       <scroll-view :style="{height: height + 'px'}" scroll-y>
         <div class="card" v-for="item in testList" :key="item.id">
           <div class="card_top">
@@ -19,10 +18,10 @@
               <span>{{ item.passNumber }}</span>人通过/<span>{{ item.examinationNumber }}</span>人参与
             </div>
             <div class="result" v-if="item.myRecord">
-              <img class="result-img" v-show="item.myRecord.assessmentType == 0" src="https://cdn.cunwuyun.cn/qujing/youxiu.png" alt="">
+              <img class="result-img" v-show="item.myRecord.assessmentType == 0" src="https://cdn.cunwuyun.cn/qujing/xuefuwuche.png" alt="">
-              <img class="result-img" v-show="item.myRecord.assessmentType == 1" src="https://cdn.cunwuyun.cn/qujing/lianghao.png" alt="">
+              <img class="result-img" v-show="item.myRecord.assessmentType == 1" src="https://cdn.cunwuyun.cn/qujing/caigaobadou.png" alt="">
-              <img class="result-img" v-show="item.myRecord.assessmentType == 2" src="https://cdn.cunwuyun.cn/qujing/jige.png" alt="">
+              <img class="result-img" v-show="item.myRecord.assessmentType == 2" src="https://cdn.cunwuyun.cn/qujing/hege.png" alt="">
-              <img class="result-img" v-show="item.myRecord.assessmentType == 3" src="https://cdn.cunwuyun.cn/qujing/bujige.png" alt="">
+              <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>
@@ -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()
-    // }
   },
 }
 </script>