From b84814c461c5484f3c03ae0921af90fdcc07e2a9 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Mar 2023 14:54:29 +0800
Subject: [PATCH] =?UTF-8?q?bug110,124,108=20+=20=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppHelpEachOther/AppHelpEachOther.vue     | 11 ++++--
 src/project/fengdu/AppMine/AppMine.vue        |  2 +-
 src/project/fengdu/AppMine/myHarvestQR.vue    | 11 ++----
 src/project/fengdu/AppMine/userInfo.vue       |  7 ++--
 .../fengdu/AppNewFarmer/AppNewFarmer.vue      | 11 ++++--
 .../AppNewFarmerBank/AppNewFarmerBank.vue     | 12 +++++-
 .../AppWxworkQrcode/AppWxworkQrcode.vue       | 39 ++++++++++++-------
 7 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/src/project/fengdu/AppHelpEachOther/AppHelpEachOther.vue b/src/project/fengdu/AppHelpEachOther/AppHelpEachOther.vue
index de7ab3d..630d802 100644
--- a/src/project/fengdu/AppHelpEachOther/AppHelpEachOther.vue
+++ b/src/project/fengdu/AppHelpEachOther/AppHelpEachOther.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="AppHelpEachOther">
-    <AiEmpty :description="`丰收号 内容建设中…`" class="emptyWrap"></AiEmpty>
+    <AiEmpty img='https://cdn.cunwuyun.cn/fengdu/mdpi_img-jianshezhong.png' :description="`丰收号 内容建设中…`" class="emptyWrap"></AiEmpty>
   </div>
 </template>
 
@@ -17,6 +17,11 @@ export default {
 }
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.AppHelpEachOther {
+  ::v-deep .emptyWrap .emptyImg {
+    width: 442px;
+    height: 312px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/project/fengdu/AppMine/AppMine.vue b/src/project/fengdu/AppMine/AppMine.vue
index 21108eb..6e50458 100644
--- a/src/project/fengdu/AppMine/AppMine.vue
+++ b/src/project/fengdu/AppMine/AppMine.vue
@@ -46,7 +46,7 @@
         </div>
       </div>
     </div>
-    <div class="logout">
+    <div class="logout" v-if="token">
       <b class="login-out" @click="onLogout">退出登录</b>
     </div>
     <AiLogin ref="login" @success="getAuth()"/>
diff --git a/src/project/fengdu/AppMine/myHarvestQR.vue b/src/project/fengdu/AppMine/myHarvestQR.vue
index a29b0ce..e4e83ac 100644
--- a/src/project/fengdu/AppMine/myHarvestQR.vue
+++ b/src/project/fengdu/AppMine/myHarvestQR.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="AppHarvestQR">
-    <u-navbar :is-back="false" title="我的丰收码" title-color="#000" title-width="300" title-size="32" 
-    :background="backgroundNavbar" :title-bold="true"></u-navbar>
     <div class="card">
       <div class="myself">
         <img class="avatar" :src="user.avatarUrl" alt="" v-if="user.avatarUrl">
@@ -28,13 +26,8 @@
 import { mapState } from 'vuex'
 export default {
   name: "AppHarvestQR",
-  appName: '丰收码',
-  customNavigation: true,
   data() {
     return {
-      backgroundNavbar: {
-        background: '#FFF'
-      },
       qrCode: '',
     }
   },
@@ -52,6 +45,9 @@ export default {
   },
   onLoad() {
     this.getQrCode()
+    uni.setNavigationBarTitle({
+      title: '我的丰收码'
+    })
   }
 }
 </script>
@@ -65,6 +61,7 @@ export default {
     height: 100%;
     box-sizing: border-box;
     border-radius: 16px;
+    background: #FFF;
 
     .myself {
       padding: 72px;
diff --git a/src/project/fengdu/AppMine/userInfo.vue b/src/project/fengdu/AppMine/userInfo.vue
index 7449b50..274de0a 100644
--- a/src/project/fengdu/AppMine/userInfo.vue
+++ b/src/project/fengdu/AppMine/userInfo.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="page">
-    <u-navbar :is-back="false" title="个人认证" title-color="#000" title-width="300" title-size="32" 
-      :background="{background: '#FFF'}" :title-bold="true"></u-navbar>
     <div class="info-list">
       <div class="item-content mar-b8">
         <div class="item solid">
@@ -74,13 +72,14 @@ import {mapActions, mapState} from 'vuex'
 
 export default {
   name: "userInfo",
-  appName: "个人中心",
-  customNavigation: true,
   computed: {
     ...mapState(['user', 'token']),
   },
   onLoad() {
     this.getUserInfo('qujing') 
+    uni.setNavigationBarTitle({
+      title: '个人中心'
+    })
   },
   data() {
     return {
diff --git a/src/project/fengdu/AppNewFarmer/AppNewFarmer.vue b/src/project/fengdu/AppNewFarmer/AppNewFarmer.vue
index d74bb83..7ed2b8f 100644
--- a/src/project/fengdu/AppNewFarmer/AppNewFarmer.vue
+++ b/src/project/fengdu/AppNewFarmer/AppNewFarmer.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="AppNewFarmer">
-    <AiEmpty :description="`丰收号 内容建设中…`" class="emptyWrap"></AiEmpty>
+    <AiEmpty img='https://cdn.cunwuyun.cn/fengdu/mdpi_img-jianshezhong.png' :description="`丰收号 内容建设中…`" class="emptyWrap"></AiEmpty>
   </div>
 </template>
 
@@ -19,6 +19,11 @@ export default {
 }
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.AppNewFarmer {
+  ::v-deep .emptyWrap .emptyImg {
+    width: 442px;
+    height: 312px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index 665aed9..9e5e693 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="AppNewFarmerBank">
-    <AiEmpty :description="`丰收号 内容建设中…`" class="emptyWrap"></AiEmpty>
+    <AiEmpty img='https://cdn.cunwuyun.cn/fengdu/mdpi_img-jianshezhong.png' :description="`丰收号 内容建设中…`" class="emptyWrap"></AiEmpty>
   </div>
 </template>
 
@@ -24,6 +24,14 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
+.AppNewFarmerBank {
+  
+  ::v-deep .emptyWrap .emptyImg {
+    width: 442px;
+    height: 312px;
+  }
+
+}
 
 </style>
\ No newline at end of file
diff --git a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
index b7ab5d1..5fff56b 100644
--- a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
+++ b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
@@ -1,14 +1,13 @@
 <template>
   <div class="AppWxworkQrcode">
     <div class="header">
-      <AiSelect v-model="id" :list="dictList" @selected="selectBtn">
+      <AiSelect v-model="id" :list="dictList">
         <span class="label" v-if="id">{{ dictList[id].label }}</span>
         <span v-else class="col-666">请选择</span>
         <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px"></u-icon>
       </AiSelect>
       <div v-if="user.areaId" class="qrcode-content">
-        <cell :url='picUrl' v-if="picUrl" class="qrcode-img"/>
-        <!-- <img :src="picUrl" class="qrcode-img" v-if="picUrl"/> -->
+        <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>
@@ -20,8 +19,8 @@
       </div>
 
       <div class="jionGroup">
-        
-        <div>加入群聊</div>
+        <!--  bind:startmessage='startmessage' @completemessage="completemessage" -->
+        <cell url='https://wework.qpic.cn/wwpic/71159_FwGG4OEPQM6LxsZ_1679023053/0' class="join-btn">加入群聊</cell>
       </div>
 
       <div class="pic">
@@ -60,7 +59,10 @@ export default {
     }
   },
   methods: {
-    selectBtn(e) {
+    startmessage(i) {
+      console.log(i);
+    },
+    completemessage(e) {
       console.log(e);
     },
     getSelect() {
@@ -70,7 +72,6 @@ export default {
           areaId: areaId,
           current: this.current,
           size: 3000,
-
         }
       }).then(res => {
         if (res?.data) {
@@ -88,12 +89,12 @@ export default {
       uni.navigateTo({url: "/mods/AppAuth/AppAuth"})
     }
   },
-  onShareAppMessage() {
-    return {
-      title: '入群二维码',
-      path: `/mods/AppWxworkQrcode/AppWxworkQrcode`
-    }
-  }
+  // onShareAppMessage() {
+  //   return {
+  //     title: '入群二维码',
+  //     path: `/mods/AppWxworkQrcode/AppWxworkQrcode`
+  //   }
+  // }
 }
 </script>
 <style scoped lang="scss">
@@ -120,12 +121,20 @@ export default {
     line-height: 80px;
     padding: 0 72px;
     box-sizing: border-box;
-    div {
+    ::v-deep .join-btn {
+      display: block;
+      width: 100%;
+      height: 100%;
       text-align: center;
       background: #2D7DFF;
       color: #FFFFFF;
       border-radius: 40px;
     }
+
+    .join-bg {
+      background: #999999;
+      color: #333333;
+    }
   }
 
   .header {
@@ -140,7 +149,7 @@ export default {
       margin: 10% auto 10%;
       background: #F6F9FF;
       border-radius: 12px;
-      border: 4px solid #E6EEFF;
+      border: 8px solid #f6f5f8;
       padding: 36px;
       box-sizing: border-box;