From bd03d5b95e7728e7d15228d7086c6e88e26f099f Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 15 Mar 2023 15:38:43 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=8D=A2=E6=88=90class=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GeneralLawExam.vue                | 16 ++++++++--------
 .../AppLegalLearning/components/OnlineClass.vue  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
index 2e745a0..542133c 100644
--- a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
+++ b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
@@ -19,10 +19,10 @@
               <span>{{ item.passNumber }}</span>人通过/<span>{{ item.examinationNumber }}</span>人参与
             </div>
             <div class="result" v-if="item.myRecord">
-              <img v-show="item.myRecord.assessmentType == 0" src="https://cdn.cunwuyun.cn/qujing/youxiu.png" alt="">
-              <img v-show="item.myRecord.assessmentType == 1" src="https://cdn.cunwuyun.cn/qujing/lianghao.png" alt="">
-              <img v-show="item.myRecord.assessmentType == 2" src="https://cdn.cunwuyun.cn/qujing/jige.png" alt="">
-              <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 == 0" src="https://cdn.cunwuyun.cn/qujing/youxiu.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 == 2" src="https://cdn.cunwuyun.cn/qujing/jige.png" alt="">
+              <img class="result-img" v-show="item.myRecord.assessmentType == 3" src="https://cdn.cunwuyun.cn/qujing/bujige.png" alt="">
             </div>
             <div class="grade" :class="{'error':item.myRecord.assessmentType == 3}">{{ item.myRecord.score }}</div>
           </div>
@@ -38,9 +38,9 @@
         
         <div class="auth_form">
           <div class="form_name"><span class="red">*</span>姓名</div>
-          <input class="form_value" type="text" placeholder="请输入姓名" v-model="form.name"/>
+          <input class="input" type="text" placeholder="请输入姓名" v-model="form.name"/>
           <div class="form_name"><span class="red">*</span>身份证号</div>
-          <input class="form_value" type="idcard" placeholder="请输入18位身份证号" v-model="form.idNumber"/>
+          <input class="input" type="idcard" placeholder="请输入18位身份证号" v-model="form.idNumber"/>
           <div class="form_name"><span class="red">*</span>地区</div>
           <AiAreaPicker class="ai-area" v-model="form.areaId" :areaId="$areaId" :fullName.sync="form.areaName">
             <div class="ai-area__wrapper">
@@ -220,7 +220,7 @@ export default {
           position: absolute;
           right: 0;
           top: 0;
-          img {
+          .result-img {
             width: 200px;
             height: 200px;
           }
@@ -276,7 +276,7 @@ export default {
         }
       }
 
-      input {
+      .input {
         height: 96px;
         background: #F4F5FA;
         border-radius: 16px;
diff --git a/src/project/qujing/AppLegalLearning/components/OnlineClass.vue b/src/project/qujing/AppLegalLearning/components/OnlineClass.vue
index 5cd25df..22b0a73 100644
--- a/src/project/qujing/AppLegalLearning/components/OnlineClass.vue
+++ b/src/project/qujing/AppLegalLearning/components/OnlineClass.vue
@@ -11,7 +11,7 @@
       <scroll-view :style="{height: height + 'px'}" scroll-y>
         <div class="card" v-for="item in classList" :key="item.id" @click="handleToDetail(item.id)">
           <div class="card_left">
-            <img :src="item.pictureUrl" alt="">
+            <img :src="item.pictureUrl" alt="" class="card-img">
           </div>
           <div class="card_right">
             <div class="title">{{ item.title }}</div>
@@ -98,7 +98,7 @@ export default {
       box-sizing: border-box;
       .card_left {
         margin-right: 24px;
-        img {
+        .card-img {
           width: 160px;
           height: 160px;
           border-radius: 8px;

From 4abfb9f7bf07d9163477512521f482689b9041fc Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 15 Mar 2023 15:53:38 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/qujing/AppHome/AppHome.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/project/qujing/AppHome/AppHome.vue b/src/project/qujing/AppHome/AppHome.vue
index d11821d..dcaeadb 100644
--- a/src/project/qujing/AppHome/AppHome.vue
+++ b/src/project/qujing/AppHome/AppHome.vue
@@ -167,8 +167,9 @@ export default {
       }
     },
     clickLaw(index) {
-
-      this.$linkTo("/pages/AppLegalLearning/AppLegalLearning?inx=" + index)
+      un.switchTab({
+        url: "/pages/AppLegalLearning/AppLegalLearning?inx=" + index
+      })
     },
     handleActive({type, appId, url}) {
       if (type == 0) {

From 78d6862d9f7014e6f5770ac88a34408359e249b8 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 15 Mar 2023 16:07:15 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/qujing/AppHome/AppHome.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/project/qujing/AppHome/AppHome.vue b/src/project/qujing/AppHome/AppHome.vue
index dcaeadb..3a619fd 100644
--- a/src/project/qujing/AppHome/AppHome.vue
+++ b/src/project/qujing/AppHome/AppHome.vue
@@ -167,8 +167,8 @@ export default {
       }
     },
     clickLaw(index) {
-      un.switchTab({
-        url: "/pages/AppLegalLearning/AppLegalLearning?inx=" + index
+      uni.switchTab({
+        url: `/pages/AppLegalLearning/AppLegalLearning?inx=${index}`
       })
     },
     handleActive({type, appId, url}) {

From 2168403b2f40fa59f767b8246bbaed89c740380a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 15 Mar 2023 16:21:11 +0800
Subject: [PATCH 4/9] console

---
 src/project/qujing/AppHome/AppHome.vue                   | 2 +-
 src/project/qujing/AppLegalLearning/AppLegalLearning.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/project/qujing/AppHome/AppHome.vue b/src/project/qujing/AppHome/AppHome.vue
index 3a619fd..e3509e0 100644
--- a/src/project/qujing/AppHome/AppHome.vue
+++ b/src/project/qujing/AppHome/AppHome.vue
@@ -168,7 +168,7 @@ export default {
     },
     clickLaw(index) {
       uni.switchTab({
-        url: `/pages/AppLegalLearning/AppLegalLearning?inx=${index}`
+        url: '/pages/AppLegalLearning/AppLegalLearning?inx=' + index
       })
     },
     handleActive({type, appId, url}) {
diff --git a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
index 208f32d..1590e01 100644
--- a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
+++ b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
@@ -49,6 +49,7 @@ export default {
   },
   onLoad(o) {
     if(o) {
+      console.log(o);
       this.currIndex = o.inx
     }
   },

From 17543b1fca53e3dab57b74fc4bac94d7267f9716 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 15 Mar 2023 16:31:44 +0800
Subject: [PATCH 5/9] uni.relaunch

---
 src/project/qujing/AppHome/AppHome.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/qujing/AppHome/AppHome.vue b/src/project/qujing/AppHome/AppHome.vue
index e3509e0..d3910f4 100644
--- a/src/project/qujing/AppHome/AppHome.vue
+++ b/src/project/qujing/AppHome/AppHome.vue
@@ -167,7 +167,7 @@ export default {
       }
     },
     clickLaw(index) {
-      uni.switchTab({
+      uni.relaunch({
         url: '/pages/AppLegalLearning/AppLegalLearning?inx=' + index
       })
     },

From 43b7aa757b2efddda01ef5437f265bf7da035e13 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 15 Mar 2023 16:51:26 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AD=98=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/qujing/AppHome/AppHome.vue                 |  7 +++++--
 .../qujing/AppLegalLearning/AppLegalLearning.vue       | 10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/project/qujing/AppHome/AppHome.vue b/src/project/qujing/AppHome/AppHome.vue
index d3910f4..c55eb9a 100644
--- a/src/project/qujing/AppHome/AppHome.vue
+++ b/src/project/qujing/AppHome/AppHome.vue
@@ -167,8 +167,11 @@ export default {
       }
     },
     clickLaw(index) {
-      uni.relaunch({
-        url: '/pages/AppLegalLearning/AppLegalLearning?inx=' + index
+      uni.switchTab({
+        url: '/pages/AppLegalLearning/AppLegalLearning',
+        success: ()=> {
+          uni.setStorageSync('inx', index)
+        }
       })
     },
     handleActive({type, appId, url}) {
diff --git a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
index 1590e01..206451f 100644
--- a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
+++ b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
@@ -35,6 +35,9 @@ export default {
     }
   },
   onShow() {
+    if(uni.getStorageSync('inx')) {
+      this.currIndex = uni.getStorageSync('inx')
+    }
     if(this.currIndex == 0) {
       this.$refs.OnlineClass.getList();
     } else {
@@ -47,11 +50,8 @@ export default {
       }
     });
   },
-  onLoad(o) {
-    if(o) {
-      console.log(o);
-      this.currIndex = o.inx
-    }
+  onUnload() {
+    uni.removeStorageSync('inx')
   },
   components: {
     OnlineClass,

From 43cee8bd0fa527a6345fa3b7bc2470d8c760c61b Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 15 Mar 2023 17:14:27 +0800
Subject: [PATCH 7/9] console

---
 src/project/qujing/AppLegalLearning/AppLegalLearning.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
index 206451f..4e0459b 100644
--- a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
+++ b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
@@ -35,7 +35,9 @@ export default {
     }
   },
   onShow() {
+    console.log(uni.getStorageSync('inx'),'index');
     if(uni.getStorageSync('inx')) {
+      console.log(uni.getStorageSync('inx'), 'inx');
       this.currIndex = uni.getStorageSync('inx')
     }
     if(this.currIndex == 0) {
@@ -50,7 +52,7 @@ export default {
       }
     });
   },
-  onUnload() {
+  onHide() {
     uni.removeStorageSync('inx')
   },
   components: {

From c1ca841f287e8315e6afc05ced00927a03faeed7 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 15 Mar 2023 17:28:36 +0800
Subject: [PATCH 8/9] $emit

---
 src/project/qujing/AppHome/AppHome.vue                |  2 +-
 .../qujing/AppLegalLearning/AppLegalLearning.vue      | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/project/qujing/AppHome/AppHome.vue b/src/project/qujing/AppHome/AppHome.vue
index c55eb9a..aa27c7b 100644
--- a/src/project/qujing/AppHome/AppHome.vue
+++ b/src/project/qujing/AppHome/AppHome.vue
@@ -170,7 +170,7 @@ export default {
       uni.switchTab({
         url: '/pages/AppLegalLearning/AppLegalLearning',
         success: ()=> {
-          uni.setStorageSync('inx', index)
+          uni.$emit('update',{inx: index})
         }
       })
     },
diff --git a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
index 4e0459b..d8ddb94 100644
--- a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
+++ b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
@@ -35,11 +35,9 @@ export default {
     }
   },
   onShow() {
-    console.log(uni.getStorageSync('inx'),'index');
-    if(uni.getStorageSync('inx')) {
-      console.log(uni.getStorageSync('inx'), 'inx');
-      this.currIndex = uni.getStorageSync('inx')
-    }
+    uni.$once('update',(data)=> {
+      this.currIndex = data.inx
+    })
     if(this.currIndex == 0) {
       this.$refs.OnlineClass.getList();
     } else {
@@ -52,9 +50,6 @@ export default {
       }
     });
   },
-  onHide() {
-    uni.removeStorageSync('inx')
-  },
   components: {
     OnlineClass,
     GeneralLawExam

From 9918f1eec924ff6d056ecea27a05b6e452e02489 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 16 Mar 2023 09:10:17 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=88=91=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppMine/AppMine.vue     | 353 +++++++++++++++++++++
 src/project/fengdu/AppMine/me.png          | Bin 0 -> 993 bytes
 src/project/fengdu/AppMine/me_selected.png | Bin 0 -> 1035 bytes
 src/project/fengdu/AppMine/myFamily.vue    | 180 +++++++++++
 src/project/fengdu/AppMine/userInfo.vue    | 282 ++++++++++++++++
 5 files changed, 815 insertions(+)
 create mode 100644 src/project/fengdu/AppMine/AppMine.vue
 create mode 100644 src/project/fengdu/AppMine/me.png
 create mode 100644 src/project/fengdu/AppMine/me_selected.png
 create mode 100644 src/project/fengdu/AppMine/myFamily.vue
 create mode 100644 src/project/fengdu/AppMine/userInfo.vue

diff --git a/src/project/fengdu/AppMine/AppMine.vue b/src/project/fengdu/AppMine/AppMine.vue
new file mode 100644
index 0000000..e36f663
--- /dev/null
+++ b/src/project/fengdu/AppMine/AppMine.vue
@@ -0,0 +1,353 @@
+<template>
+  <div class="page">
+    <div class="header-bg">
+      <div class="header-info">
+        <div class="wrap" @click="handleLogin()">
+          <div class="user-img-div">
+            <img :src="user.avatarUrl" alt="" class="user-img" v-if="user.id && user.avatarUrl"/>
+            <img class="user-img" src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" v-else alt="">
+          </div>
+          <div class="user-info">
+            <div class="option">
+              <template v-if="!user.id">
+                <p>登录</p>
+                <p>点击进行登录</p>
+              </template>
+              <template v-else>
+                <p v-if="isApprove">{{ user.realName }}</p>
+                <p v-else>{{ user.nickName }}</p>
+                <p>{{ user.areaName || "" }}</p>
+              </template>
+            </div>
+            <p class="info" v-if="user.id" @click.stop="$linkTo('./userInfo')">个人信息</p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="approve">
+      <img class="icon" src="https://cdn.cunwuyun.cn/wxmp/mine/approve.png" alt="">
+      <div class="flex">
+        <span class="cert" v-if="isApprove" v-text="approveLabel" @click="$linkTo('/mods/AppAuth/AppAuth')"/>
+        <u-icon v-else name="arrow-right" color="#E7F2FF" size="28"
+                :label="approveLabel" label-color="#E7F2FF" label-pos="left" @click="approve"/>
+      </div>
+    </div>
+    <div class="list-wrap">
+      <div class="card" v-for="(group,index) in listGroup" :key="index">
+        <div class="item" v-for="(item) in group" hover-class="bg-hover" :key="item.label"
+             @click="linkTo(item.path, item.type)">
+          <div class="block">
+            <img class="icon" :src="item.icon" alt="">
+          </div>
+          <span class="desc" v-if="!item.share">{{ item.label }}</span>
+          <button open-type="share" v-else>
+            <span>{{ item.label }}</span>
+          </button>
+        </div>
+      </div>
+    </div>
+    <AiLogin ref="login" @success="getAuth()"/>
+  </div>
+</template>
+<script>
+import {mapActions, mapState} from "vuex";
+
+export default {
+  name: "AppMine",
+  appName: "我的",
+  customNavigation: true,
+  computed: {
+    ...mapState(['user', 'token']),
+    isApprove() {
+      return this.user?.status == 2;
+    },
+    approveLabel() {
+      return this.user?.status == 2 ? "已认证" :
+          this.user?.status == 1 ? "审核中" :
+              this.user?.status == -1 ? "审核驳回" : "前往认证"
+    },
+    listGroup() {
+      return [
+        [
+          {
+            icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png",
+            label: "我的家庭",
+            path: "./myFamily",
+            type: 'idNumber'
+          },
+          {
+            icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png",
+            label: "我的家乡",
+            path: "/mods/AppHometown/AppHometown",
+            type: 'token'
+          }
+        ],
+        [
+          {
+            icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejifen.png",
+            label: "我的积分",
+            path: "/mods/AppCreditPoints/AppCreditPoints?type=detail",
+            type: 'idNumber'
+          },
+          {
+            icon: "https://cdn.cunwuyun.cn/wxmp/mine/chaoshidingdan.png",
+            label: "超市订单",
+            path: "/mods/AppOrderList/AppOrderList",
+            type: 'idNumber'
+          },
+          {
+            icon: "https://cdn.cunwuyun.cn/wxmp/mine/banshijindu.png",
+            label: "办事进度",
+            path: "/mods/AppProgress/AppProgress",
+            type: 'idNumber'
+          }
+        ],
+      ]
+    }
+  },
+  methods: {
+    ...mapActions(['getUserInfo']),
+    approve() {
+      if (!this.token) {
+        this.$refs.login.show();
+      } else if (!this.isApprove) {
+        if (this.user.status == 0) {
+          this.$linkTo('/mods/AppAuth/AppAuth');
+        } else {
+          this.$linkTo('/mods/AppAuth/authSuccess')
+        }
+      }
+    },
+    linkTo(url, type) {
+      if (type) {
+        if (this.token) {
+          if (type == 'token') {
+            this.$linkTo(url)
+          }
+          if (type == 'idNumber') {
+            if (this.user.status == 0) {
+              if (!this.user.phone) {
+                this.$linkTo('/pages/phone/bingPhoneNumber?from=auth')
+              } else {
+                this.$linkTo('/mods/AppAuth/AppAuth')
+              }
+            } else {
+              this.$linkTo(url)
+            }
+          }
+        } else {
+          this.$refs.login.show()
+        }
+      } else {
+        this.$linkTo(url)
+      }
+    },
+    handleLogin() {
+      if (!this.token) {
+        this.$refs.login.show();
+      }
+    },
+    getAuth() {
+      this.$nextTick(() => {
+        this.token && this.getUserInfo()
+      })
+    }
+  },
+  onShow() {
+    this.getAuth();
+  },
+  onShareAppMessage() {
+    return {
+      title: '欢迎使用数字乡村治理服务一体化平台~',
+      path: `/pages/AppModules/AppModules`
+    }
+  },
+}
+</script>
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+
+.page {
+  width: 100%;
+  min-height: 100%;
+  background-color: #F3F6F9;
+  position: relative;
+
+  .header-bg {
+    width: 100%;
+    height: 512px;
+    position: relative;
+
+    .header-info {
+      width: 100%;
+      height: 100%;
+      background: url("https://cdn.cunwuyun.cn/wxmp/sanjianxi/mineBg.png") no-repeat no-repeat;
+      background-size: 100% 100%;
+      box-sizing: border-box;
+      padding: 240px 0 0 48px;
+
+      .wrap {
+        width: 100%;
+        height: 96px;
+        display: flex;
+        align-items: center;
+
+        .user-img-div {
+          display: inline-block;
+          width: 96px;
+          height: 96px;
+          border-radius: 50%;
+          overflow: hidden;
+          border: 4px solid #FFFFFF;
+          flex-shrink: 0;
+
+          .user-img {
+            display: inline-block;
+            width: 96px;
+            height: 96px;
+            border-radius: 58px;
+          }
+        }
+
+        .user-info {
+          flex: 1;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-left: 26px;
+          box-sizing: border-box;
+          padding-right: 32px;
+
+          .option {
+            & > p:first-child {
+              font-size: 34px;
+              font-weight: 600;
+              color: #333333;
+              line-height: 54px;
+            }
+
+            & > p:last-child {
+              font-size: 26px;
+              font-weight: 400;
+              color: #7088A0;
+              line-height: 36px;
+            }
+          }
+
+          .info {
+            width: 136px;
+            height: 48px;
+            border-radius: 8px;
+            border: 2px solid #7088A0;
+            font-size: 26px;
+            font-weight: 400;
+            color: #7088A0;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+    }
+  }
+
+  .approve {
+    position: absolute;
+    left: 50%;
+    top: 400px;
+    transform: translateX(-50%);
+    width: 686px;
+    height: 112px;
+    background: linear-gradient(90deg, #8FB4FF 0%, #4181FF 100%);
+    border-radius: 16px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding: 0 20px;
+
+    .icon {
+      width: 296px;
+      height: 52px;
+    }
+
+    .cert {
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-size: 28px;
+      color: #E7F2FF;
+      margin-right: 4px;
+    }
+  }
+
+  .list-wrap {
+    box-sizing: border-box;
+    padding: 32px;
+
+    .card {
+      width: 100%;
+      min-height: 100px;
+      border-radius: 16px;
+      background-color: #fff;
+      margin-bottom: 32px;
+
+      .item {
+        height: 100px;
+        display: flex;
+        align-items: center;
+
+        &:last-child {
+          .desc {
+            border-bottom: none !important;
+          }
+        }
+
+        .block {
+          width: 80px;
+          height: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          flex-shrink: 0;
+
+          .icon {
+            width: 44px;
+            height: 44px;
+          }
+        }
+
+        .desc, & > button {
+          height: 100%;
+          flex: 1;
+          font-size: 30px;
+          font-weight: 400;
+          color: #666666;
+          display: flex;
+          align-items: center;
+          border-bottom: 1px solid #EEEEEE;
+
+          & > span {
+            width: 100%;
+            height: 100%;
+            text-align: left;
+            display: flex;
+            align-items: center;
+          }
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .no-border {
+          border-bottom: none;
+        }
+      }
+
+      &:first-of-type {
+        margin-bottom: 32px;
+      }
+    }
+  }
+
+}
+</style>
diff --git a/src/project/fengdu/AppMine/me.png b/src/project/fengdu/AppMine/me.png
new file mode 100644
index 0000000000000000000000000000000000000000..03b531e43c595fe513714a8a21f4a46145487440
GIT binary patch
literal 993
zcmV<710MW|P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFOG!jQRA>e5S-)#jQ50^{1QIX~
zLI!IGp^K0qkYsZzxE1^{baQbLr6RbvivNIuSac|45jtcLg>FJ!+>$_sKo`M5>rm)m
zg#_};?~6CkXWz+t=ib|BF&8fH-5=*W-*?V?H}}3QEX>P10{?de5<ca(TCL@NzkdUm
zYopO<C6P!h5g+&axc`jXom49Iu2?L7WxtQ&ML@IJTpA9CPeJGo>S6@30miGzWb#R=
zRN9Z28#(MO0OYTO{2O@6MS2TPID&}V5b-|Pt!pK9(}T0?_4-3R9&gdBB~PFnZHW;?
z)wQfMz{ryTs#6f~ZVXXx*=E8@fO+Qk7)4#Y#MykDuGqX2R?#yrtS|CZl{1*4LTNyq
z0WOujUhfM4qgETqr_?`4r_-0UORPErW}Wv<o}v~Fwj?mLUo8MAYoSPfI@Q=}0a$fb
z{BS*qVuP&~FxeiQbno6{gRK_ePSY=fS^(1Qynm4-*kG##AkExWo=UO7Rto_0ol{}|
z8&r+07Qp>Hd~r+cy9^Ar3Rf+_{8Cm`UgAxzYJY_Zs}?Xe!eIp0Bi?%|+{_VEU91Ff
z*T};NUb>;$;~xgZFb5l})y+x(IdK1uW$%%T2-*_E_AEdi>fI=fj+Zliq@)l=kB1T5
zZlT6moj7NUHZG9|#<)0VU;@PJnfa`O$0m;x)Fz(c6zT&+(&`1|(G>5%OVmCxvH_ff
z;{l0tug(CzBCLb-CY<JtgCDrQ0D)I=g_tw-ec17f#ChTX^8lC|l}e??cH9zMz$EGb
zUKhZ7An^fXyAbmUWWFIw<A|c2$JiybuVQ=^W7lv^3ph1RHev|~iMrt1Pq!u;Qw6l!
z?F*ew=QU_aQTM}GMyX}9*?WaT;ZT|)3IO?Y-EMam>8?n|v*<@Q>X}St6(W9y`Ada$
zvJa7ej*B(<a=9FUZZsN!cH9O7h(JEW{JUW`;#LC6`I-D*DK{k|q5vqLER&M$%=)Ks
z5e3YQoui|<0LK72o6j@g970C`@pk~Y-%&5x;@htKf<JNzEz=&MkD(TSr&Hu23c#NY
zkHJ;kgUnFJq2UthQWU^%G%zf}Y8zEdVJNDfPWs#?2b=FjekjaQq9gDNY0or+k>Osu
P00000NkvXXu0mjfs`RPk

literal 0
HcmV?d00001

diff --git a/src/project/fengdu/AppMine/me_selected.png b/src/project/fengdu/AppMine/me_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..dff9fcad51a427fe6d821489f29d35b1be45360f
GIT binary patch
literal 1035
zcmV+m1oZofP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFbxA})RA>e5Sifr&Q4pS&Un^)V
zBv%+Mgfw<G>8vg)5(Iw~*V)*JauU$OfS@4}gftPvpoMUaU~z>gNDw8lvGWhG5iB$o
zcW2>gak(VVZ`R$z%k8_{ncZ9r-ooAP&c6BP`{uo!on4~d*2}>EodJ`k{K<KHcx{c&
zSxaZg(wHS0Wqbr##os4m=+)2=y;zzyU($-3ihxt|c66ggvmkW|<onx^gNO}WFZ6pf
z^Jdztwi_GgT4Dj&yY?)y{S?39H~|}D3{^2J7guhZmkpcZpikk`a5*t&r_3fj7n5fM
z2xec#XaFh>)HA@DX98H~iIM;Uo3@WGXlFttfY<zbjXtU}AC+Y+rvZ<SYVHYD_WT=G
zy5^&Zhc;jZMIf}q-iv2|OJ%J_pF35X*bIV!T%A0Rjz~+acm{$x-?mgr$@6$l2xCiq
z#RB|?lr&1r@fvKg0Nl7^G5N@cDX_%?!uCMUuCs>*TP&b6jqZ*R3qaXQ+`qUaYOuuu
zxT|y#NNiVNiv@5?oS3KsK!Yt7!2NvC5<6(<%#6v{Qg5+<;7M7K28uDhAbkomrdR+w
z@yiJAg(@GXvH{D-RDh`j_+2AjMo=|26)~G!d<<Y|I#C8v31CO=-?475ClSHEjG=uO
zU>?9ow(aUyN|w&q<ChU+@(EXxPU+w=JeGZuWIl|Ocm_fs-tU^vDwFqYrdFp#EWiO&
zk89c+F!&tv5FPHiH%R%VTc-4PLgE~YXJBI1=BxpEOBoITfFJmK03na!3JHi`1;!LQ
z(EUD9LnUJ=zdU1#afpXwVhaefj)1w)xoK~x4zRZnw}LhP9@oC^&5)nbUnO7cA-u30
z2gxijPJ;YklYejmjG|;VVhPxq^{Bw9+61%FR>0{6d!SyW$Ih&$%DNSdXJc@fuDrfs
zzPDceV{r<|E!utMGOb|PxXZaq_75W?lr84X&!~6<QAV~^Ds&$^HTmT`&BzmT&F6x%
z@k*H%F#d9skF%A)vJrpchzgK~4Ta&n3&$xSER!zBuG)i=9Tn3pAZqkKXzK~s=}GC$
zz)sJA^ErS9?Hel5K`p@qb-y(vb8&3WC4{Eyox`W==5}110=zwR6McrW2kDjy=D=KB
z@tgwq8x0(f0pOXxoLmUoWyiAN*vvumy=c2=^>DXl;5V3H4*E~|h{pf`002ovPDHLk
FV1ghz#N+?~

literal 0
HcmV?d00001

diff --git a/src/project/fengdu/AppMine/myFamily.vue b/src/project/fengdu/AppMine/myFamily.vue
new file mode 100644
index 0000000..a544cf9
--- /dev/null
+++ b/src/project/fengdu/AppMine/myFamily.vue
@@ -0,0 +1,180 @@
+<template>
+  <div class="page">
+    <div class="credit-points">
+      <div class="bg-blue"></div>
+      <div class="header-content">
+        <div class="title">家庭地址</div>
+        <div class="address">
+          <img src="https://cdn.cunwuyun.cn/img/location-blue.svg" alt="">
+          <p>{{ info.resident.currentAreaName || '' }}{{ info.resident.currentAddress || '' }}</p>
+        </div>
+      </div>
+      <div class="list-content">
+        <div class="title">家庭成员</div>
+        <div class="item" v-for="(item, index) in info.family" :key="index">
+          <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/1.png" alt="" class="banner-top" v-if="item.sex == 1">
+          <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/2.png" alt="" class="banner-top" v-else>
+          <div class="user-img">
+            <img v-if="item.photo" :src="item.photo" alt=""/>
+            <img v-else src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt=""/>
+          </div>
+          <div class="user-info">
+            <p>{{ item.name }}</p>
+            <div v-if="item.householdName == 1" class="color-5AAD6A">户主</div>
+            <div v-else>{{ $dict.getLabel('householdRelation', item.householdRelation) }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  appName: "我的家庭",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  data() {
+    return {
+      info: {}
+    }
+  },
+  onLoad() {
+    this.$dict.load('householdRelation').then(() => {
+      this.$nextTick(() => {
+        this.getUser()
+      })
+    })
+  },
+  methods: {
+    getUser() {
+      this.$instance.post(`/app/appresident/detailForWx?id=${this.user.residentId}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+
+.page {
+  width: 100%;
+  background-color: #f3f6f9;
+
+  .credit-points {
+    .bg-blue {
+      width: 100%;
+      height: 112px;
+      background-color: #197DF0;
+    }
+
+    .header-content {
+      width: 690px;
+      background: #FFF;
+      border-radius: 16px;
+      margin: -80px 0 32px 30px;
+      padding: 0 30px 80px;
+      box-sizing: border-box;
+      box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
+
+      .address {
+        font-size: 32px;
+        color: #666;
+        overflow: hidden;
+
+        img {
+          width: 34px;
+          height: 38px;
+          margin-right: 14px;
+          vertical-align: middle;
+        }
+
+        p {
+          line-height: 44px;
+          width: 580px;
+          word-break: break-all;
+          float: right;
+        }
+      }
+    }
+
+    .title {
+      font-size: 32px;
+      font-weight: 500;
+      color: #333;
+      line-height: 120px;
+    }
+
+    .list-content {
+      width: 690px;
+      background: #FFF;
+      border-radius: 16px;
+      padding: 0 30px 110px;
+      box-sizing: border-box;
+      margin-left: 30px;
+      box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
+
+      .item {
+        width: 630px;
+        height: 192px;
+        background: #FFF;
+        box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.08);
+        border-radius: 16px;
+        padding-left: 30px;
+        box-sizing: border-box;
+        margin-bottom: 32px;
+        overflow: hidden;
+
+        .banner-top {
+          width: 100%;
+          height: 72px;
+        }
+
+        .user-img {
+          width: 104px;
+          height: 104px;
+          margin: -16px 34px 0 0;
+          border-radius: 50%;
+          float: left;
+
+          img {
+            width: 100%;
+            height: 100%;
+            border-radius: 50%;
+          }
+        }
+
+        .user-info {
+          margin-top: -16px;
+          width: calc(100% - 138px);
+          float: right;
+
+          p {
+            font-size: 32px;
+            font-weight: 600;
+            color: #333;
+            line-height: 44px;
+            margin-bottom: 8px;
+          }
+
+          div {
+            font-size: 26px;
+            font-weight: 400;
+            color: #666;
+            line-height: 36px;
+          }
+
+          .color-5AAD6A {
+            color: #5AAD6A;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/fengdu/AppMine/userInfo.vue b/src/project/fengdu/AppMine/userInfo.vue
new file mode 100644
index 0000000..79ebe2a
--- /dev/null
+++ b/src/project/fengdu/AppMine/userInfo.vue
@@ -0,0 +1,282 @@
+<template>
+  <div class="page">
+    <div class="info-list">
+      <div class="item-content mar-b8">
+        <div class="item solid">
+          <p class="mar-t22">头像</p>
+          <button class="user-img-div" open-type="chooseAvatar" @chooseavatar="handleWeixinSync">
+            <img v-if="user.avatarUrl" :src="user.avatarUrl" class="user-img">
+            <img v-else src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="" class="user-img">
+          </button>
+        </div>
+        <div class="item">
+          <p>用户昵称</p>
+          <div class="item-right" v-if="!editNickName" @click="editNickName=true, userName= user.nickName">
+            <p class="name">{{ user.nickName }}</p>
+          </div>
+          <input class="item-right" v-else type="text" v-model="userName" @blur="handleWeixinSync">
+        </div>
+      </div>
+      <div class="item-content mar-b8">
+        <div class="item">
+          <p>手机号</p>
+          <div class="item-right" v-if="!!!editPhone" @click="editPhone=true, userPhone= user.phone">
+            <p class="name">{{ user.phone || ''}}</p>
+          </div>
+          <input class="item-right" v-else type="number" v-model="userPhone" @blur="handleWeixin" maxlength="11">
+        </div>
+      </div>
+      <div class="item-content" @click="onLogout">
+        <div class="item">
+          <b class="login-out">退出登录</b>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapActions, mapState} from 'vuex'
+
+export default {
+  name: "userInfo",
+  appName: "个人中心",
+  computed: {
+    ...mapState(['user', 'token']),
+    nickName: {
+      set(v) {
+        this.userName = v
+      },
+      get() {
+        const {nickName} = this.user
+        return nickName
+      }
+    },
+    phone: {
+      set(v) {
+        this.userPhone = v
+      },
+      get() {
+        const { phone } = this.user
+        return phone
+      }
+    }
+  },
+  onLoad() {
+    this.getUserInfo()
+    
+  },
+  data() {
+    return {
+      editNickName: false,
+      editPhone: false,
+      avatar: '',
+      userName: '',
+      userPhone: ''
+    }
+  },
+  methods: {
+    ...mapActions(['getUserInfo', 'autoLogin']),
+    updateInfo() {
+      this.$instance.post(`/app/appwechatuser/update-nickName`,null,{
+        params: {
+          id: this.user.id,
+          nickName: this.userName? this.userName : this.user.nickName,
+          avatarUrl: this.avatar? this.avatar : this.user.avatarUrl,
+          phone: this.userPhone ? this.userPhone : this.user.phone,
+        }
+      }).then(res=> {
+        if(res?.code==0) {
+          this.$u.toast('修改成功')
+        }
+      })
+    },
+    upLoad(img) {
+      return new Promise((resolve, reject) => {
+        uni.uploadFile({
+          url: `${this.$instance.defaults.baseURL}/admin/file/add`,
+          filePath: img,
+          name: 'file',
+          header: {
+            'Content-Type': 'multipart/form-data',
+            Authorization: uni.getStorageSync('token')
+          },
+          success: uploadFileRes => {
+            this.avatar = JSON.parse(uploadFileRes.data).data[0].split(';')[0]
+            resolve(uploadFileRes)
+          },
+          fail: err => {
+            reject(err)
+          }
+        })
+      })
+    },
+    onLogout() {
+      uni.showModal({
+        title: '提示',
+        content: "是否要退出登录",
+        success: res => {
+          if (res.confirm) {
+            this.$store.commit('logout')
+            this.$toast('退出成功');
+            setTimeout(() => {
+              uni.switchTab({
+                url: '/pages/AppMine/AppMine'
+              })
+            }, 500)
+          }
+        }
+      })
+    },
+    handleWeixin({ detail }) {
+      if(detail.value) {
+        this.phone = detail.value
+        this.updateInfo()
+      }
+    },
+    handleWeixinSync({detail}) {
+      const { value: nickName, avatarUrl } = detail
+      this.autoLogin({ nickName, avatarUrl })
+      if(avatarUrl?.length) {
+        this.upLoad(avatarUrl).then(() => {
+          this.updateInfo()
+        })
+      }
+      if(nickName) {
+        this.updateInfo()
+      }
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+
+.page {
+  width: 100%;
+  background-color: #F5F5F5;
+
+  .info-list {
+    padding: 50px 32px 0 32px;
+    box-sizing: border-box;
+
+    .item-content {
+      padding: 0 32px;
+      box-sizing: border-box;
+      background-color: #fff;
+      border-radius: 32px;
+    }
+
+    .item {
+      padding: 36px 0;
+      line-height: 40px;
+      width: 100%;
+      box-sizing: content-box;
+      display: flex;
+
+      p {
+        color: #333;
+        font-weight: 400;
+        width: 200px;
+      }
+
+      div {
+        color: #666;
+        font-size: 28px;
+      }
+
+      .item-right {
+        width: calc(100% - 200px);
+        text-align: right;
+        font-size: 28px;
+        p {
+          width: 100%;
+        }
+      }
+
+      .user-img-div {
+        width: calc(100% - 200px);
+        text-align: right;
+        display: inline-block;
+      }
+
+      .user-img {
+        width: 104px;
+        height: 104px;
+        vertical-align: middle;
+        border-radius: 50%;
+      }
+
+      .right-icon {
+        width: 40px;
+        height: 40px;
+        vertical-align: middle;
+      }
+
+      .mar-t22 {
+        margin-top: 44px;
+      }
+    }
+
+    .login-out {
+      width: 100%;
+      font-size: 30px;
+      text-align: center;
+      color: #4181FF;
+    }
+  }
+
+  .self-knowledge-show {
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 100;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.3);
+  }
+
+  .toast-bg {
+    position: fixed;
+    z-index: 101;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .toast {
+    background-color: #fff;
+    width: 686px;
+    height: 316px;
+    font-size: 36px;
+  }
+
+  .toast-msg {
+    text-align: center;
+    line-height: 50px;
+    color: #333;
+    font-weight: 500;
+    padding: 84px 0 80px 0;
+  }
+
+  .toast-btn {
+    display: inline-block;
+    width: 120px;
+    text-align: center;
+    line-height: 50px;
+  }
+
+  .cancel {
+    margin-left: 394px;
+    margin-right: 40px;
+  }
+
+  .confirm {
+    color: #197DF0;
+  }
+
+  // .editNickName {
+  //   text-align: right;
+  //   font-size: 28px;
+  // }
+}
+</style>