From 6bcd9c870aed298763e337e1cf9be882101b109f Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Mar 2023 11:11:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppHome/AppHome.vue        | 189 +++++++++---------
 src/project/fengdu/AppMine/myHarvestQR.vue    |  28 ++-
 .../AppWxworkQrcode/AppWxworkQrcode.vue       |   1 +
 3 files changed, 120 insertions(+), 98 deletions(-)

diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue
index ca68bd8..06485cc 100644
--- a/src/project/fengdu/AppHome/AppHome.vue
+++ b/src/project/fengdu/AppHome/AppHome.vue
@@ -1,32 +1,35 @@
 <template>
   <div class="page">
     <u-navbar :is-back="false" title="首页" title-color="#000" title-width="300" title-size="32" :background="backgroundNavbar" :title-bold="true"></u-navbar>
-    <div class="swiper-content">
-      <u-swiper :list="swiperList" mode="none" height="240" bg-color="none" @click="handleBannerClick"/>
-    </div>
-    <div class="grid-content">
-      <u-grid :col="4" hover-class="text-hover" :border="false">
-        <u-grid-item v-for="(item, index) in grids" :key="index" :custom-style="{padding:'8px 0'}" bg-color="none"
-                     class="grid-item" @click="handleClick(item)">
-          <img :src="item.pictureUrl" alt=""/>
-          <div class="grid-text">{{ item.name }}</div>
-        </u-grid-item>
-      </u-grid>
-    </div>
-    <div class="notice">
-      <img :src="`${cdn}/notice-new.png`" alt="">
-      <u-notice-bar mode="vertical" color="#4181FF" style="flex: 1;" :volume-icon="false" :is-circular="false"
-                    duration="5000" speed="5000" :list="noticeList" @click="clickNotice"/>
-    </div>
+    <div class="container">
+      <div class="swiper-content">
+        <u-swiper :list="swiperList" mode="none" height="240" bg-color="none" @click="handleBannerClick"/>
+      </div>
+      <div class="grid-content">
+        <u-grid :col="4" hover-class="text-hover" :border="false">
+          <u-grid-item v-for="(item, index) in grids" :key="index" :custom-style="{padding:'8px 0'}" bg-color="none"
+                      class="grid-item" @click="handleClick(item)">
+            <img :src="item.pictureUrl" alt=""/>
+            <div class="grid-text">{{ item.name }}</div>
+          </u-grid-item>
+        </u-grid>
+      </div>
+      <div class="notice">
+        <img :src="`${cdn}/notice-new.png`" alt="">
+        <u-notice-bar mode="vertical" color="#4181FF" style="flex: 1;" :volume-icon="false" :is-circular="false"
+                      duration="5000" speed="5000" :list="noticeList" @click="clickNotice"/>
+      </div>
 
-    <div class="card">
-      <img class="card-left" src="https://cdn.cunwuyun.cn/fengdu/img-fengshouyinhang.png" @click="$linkTo('/mods/newFarmerBank/newFarmerBank')" alt="">
-      <div class="card-right">
-        <img src="https://cdn.cunwuyun.cn/fengdu/img-fengduxinnongren.png" alt="" @click="$linkTo('./mods/newFarmer/newFarmer')">
-        <img src="https://cdn.cunwuyun.cn/fengdu/ic-jiaoyuhuzhu.png" alt="" @click="$linkTo('./mods/helpEachOther/helpEachOther')">
+      <div class="card">
+        <img class="card-left" src="https://cdn.cunwuyun.cn/fengdu/img-fengshouyinhang.png" @click="$linkTo('/mods/newFarmerBank/newFarmerBank')" alt="">
+        <div class="card-right">
+          <img src="https://cdn.cunwuyun.cn/fengdu/img-fengduxinnongren.png" alt="" @click="$linkTo('./mods/newFarmer/newFarmer')">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-jiaoyuhuzhu.png" alt="" @click="$linkTo('./mods/helpEachOther/helpEachOther')">
+      </div>
+      </div>
+      
+      <AiLogin ref="login"/>
     </div>
-    </div>
-    <AiLogin ref="login"/>
   </div>
 </template>
 <script>
@@ -45,7 +48,8 @@ export default {
       notices: [],
       search: {areaId: ''},
       backgroundNavbar: {
-        background: '#FFF'
+        background: 'url(https://cdn.cunwuyun.cn/fengdu/mdpi_img-bg1.png) no-repeat',
+        backgroundSize: '100% auto',
       }
     }
   },
@@ -168,80 +172,85 @@ export default {
   width: 100%;
   min-height: 100%;
   // background-color: #F3F6F9;
-  // background: url('./img/img-bg2.png') no-repeat;
+  // background: url('https://cdn.cunwuyun.cn/fengdu/mdpi_img-bg2.png') no-repeat;
   position: relative;
-  .swiper-content {
-    width: 100%;
-    height: 292px;
-    padding: 20px 32px 32px;
-    box-sizing: border-box;
-    background: #FFF;
-  }
 
-  .grid-content {
-    box-sizing: border-box;
-    background: #FFF;
-    .grid-item {
-      img {
-        width: 108px;
-        height: 108px;
-        object-fit: fill;
-      }
+  .container{
+    background: url('https://cdn.cunwuyun.cn/fengdu/mdpi_img-bg2.png') no-repeat;
+    background: 100% auto;
+    .swiper-content {
+      width: 100%;
+      height: 292px;
+      padding: 20px 32px 32px;
+      box-sizing: border-box;
+      // background: 'url(https://cdn.cunwuyun.cn/fengdu/img-bg2) no-repeat',;
+    }
 
-      .grid-text {
-        font-size: 26px;
-        font-weight: 400;
-        color: #333333;
-        line-height: 36px;
+    .grid-content {
+      box-sizing: border-box;
+      background: #FFF;
+      .grid-item {
+        img {
+          width: 108px;
+          height: 108px;
+          object-fit: fill;
+        }
+
+        .grid-text {
+          font-size: 26px;
+          font-weight: 400;
+          color: #333333;
+          line-height: 36px;
+        }
       }
     }
-  }
 
-  ::v-deep .notice {
-    width: 684px;
-    height: 88px;
-    box-sizing: border-box;
-    padding: 0 24px;
-    margin: 30px auto 30px;
-    background: #FFFFFF;
-    box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
-    border-radius: 16px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+    ::v-deep .notice {
+      width: 684px;
+      height: 88px;
+      box-sizing: border-box;
+      padding: 0 24px;
+      margin: 30px auto 30px;
+      background: #FFFFFF;
+      box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
+      border-radius: 16px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
 
-    & > img {
-      width: 128px;
-      height: 52px;
+      & > img {
+        width: 128px;
+        height: 52px;
+      }
+
+      .u-news-item {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
     }
-
-    .u-news-item {
-      text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
-    }
-  }
-  .card {
-    background: #FFF;
-    padding: 32px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    width: 100%;
-    .card-left {
-      width: 322px;
-      height: 462px;
-    }
-    .card-right {
-      width: 334px;
-      height: 462px;
-
-      img {
+    .card {
+      background: #FFF;
+      padding: 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
+      .card-left {
+        width: 322px;
+        height: 462px;
+      }
+      .card-right {
         width: 334px;
-        height: 216px;
-      }
-      img:last-child {
-        margin-top: 24px;
+        height: 462px;
+
+        img {
+          width: 334px;
+          height: 216px;
+        }
+        img:last-child {
+          margin-top: 24px;
+        }
       }
     }
   }
diff --git a/src/project/fengdu/AppMine/myHarvestQR.vue b/src/project/fengdu/AppMine/myHarvestQR.vue
index 45e83bc..a29b0ce 100644
--- a/src/project/fengdu/AppMine/myHarvestQR.vue
+++ b/src/project/fengdu/AppMine/myHarvestQR.vue
@@ -4,14 +4,15 @@
     :background="backgroundNavbar" :title-bold="true"></u-navbar>
     <div class="card">
       <div class="myself">
-        <img class="avatar" src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="">
+        <img class="avatar" :src="user.avatarUrl" alt="" v-if="user.avatarUrl">
+        <img class="avatar" src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="" v-else>
         <div class="info">
-          <div class="name">百里守约</div>
-          <div class="area">百地社区</div>
+          <div class="name">{{ user.nickName }}</div>
+          <div class="area">{{ user.areaName }}</div>
         </div>
       </div>
       <div class="qr">
-        <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="">
+        <img :src="qrCode" alt="">
       </div>
 
       <div class="my-qr">我的丰收码</div>
@@ -24,6 +25,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: "AppHarvestQR",
   appName: '丰收码',
@@ -32,14 +34,25 @@ export default {
     return {
       backgroundNavbar: {
         background: '#FFF'
-      }
+      },
+      qrCode: '',
     }
   },
   methods: {
-
+    getQrCode() {
+      this.$instance.post('/app/appwechatuserqujing/queryMyQrCode').then(res=> {
+        if(res?.data) {
+          this.qrCode = res.data
+        }
+      })
+    }
   },
-  onShow() {
+  computed: {
+    ...mapState(['user'])
   },
+  onLoad() {
+    this.getQrCode()
+  }
 }
 </script>
 
@@ -51,7 +64,6 @@ export default {
     width: 100%;
     height: 100%;
     box-sizing: border-box;
-    background: #FFF;
     border-radius: 16px;
 
     .myself {
diff --git a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
index 47ff761..4f28f2a 100644
--- a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
+++ b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
@@ -19,6 +19,7 @@
       </div>
 
       <div class="jionGroup">
+        <!-- <cell bind:startmessage='startmessage' bind:completemessage="completemessage" url='url'  /> -->
         <div>加入群聊</div>
       </div>
 

From ae7fe3f5b50a0ba962c5deb6d8766c4883068cf6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Mar 2023 11:49:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E5=B1=8F=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppHome/openPage.vue       | 27 ++++++++++++++-----
 .../AppWxworkQrcode/AppWxworkQrcode.vue       |  5 ++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/project/fengdu/AppHome/openPage.vue b/src/project/fengdu/AppHome/openPage.vue
index c96c8ba..3418673 100644
--- a/src/project/fengdu/AppHome/openPage.vue
+++ b/src/project/fengdu/AppHome/openPage.vue
@@ -1,24 +1,39 @@
 <template>
   <div class="openPage">
-    <img class="images" src="./img/kaiping3.png" alt="">
+    <img class="images" :src="picUrl" alt="">
   </div>
 </template>
 
 <script>
 export default {
   name: "openPage",
-  appName: "openPage",
   customNavigation: true,
   data() {
     return {
-
+      picUrl: '',
     }
   },
   methods: {
-
+    getList() {
+      this.$instance.post('/app/appwechatguidepage/listForXCX',null, {
+        params: {
+          current: 1,
+          size: 100,
+        }
+      }).then(res=> {
+        if(res?.data) {
+          this.picUrl = res.data.records[0].picUrl
+        }
+      })
+    }
   },
-  onShow() {
-
+  onLoad() {
+    this.getList()
+    setTimeout(()=> {
+      uni.switchTab({
+        url: '/pages/AppHome/AppHome'
+      })
+    }, 2000)
   },
 }
 </script>
diff --git a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
index 4f28f2a..b7ab5d1 100644
--- a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
+++ b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
@@ -7,7 +7,8 @@
         <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px"></u-icon>
       </AiSelect>
       <div v-if="user.areaId" class="qrcode-content">
-        <img :src="picUrl" class="qrcode-img" v-if="picUrl"/>
+        <cell :url='picUrl' v-if="picUrl" class="qrcode-img"/>
+        <!-- <img :src="picUrl" class="qrcode-img" v-if="picUrl"/> -->
         <div v-else class="tips">
           <u-icon name="error-circle" color="#909399" size="34" style="display: inline"></u-icon>
           <div class="col-666">请选择居民群</div>
@@ -19,7 +20,7 @@
       </div>
 
       <div class="jionGroup">
-        <!-- <cell bind:startmessage='startmessage' bind:completemessage="completemessage" url='url'  /> -->
+        
         <div>加入群聊</div>
       </div>