From 9e26794b24c43420f5863efa3610413f6263d7b0 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 20 Apr 2022 15:37:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppGreatPowerIntegral.vue                  |  17 ++---------------
 .../AppNeighborLinkage/addLinkage.vue          |   2 +-
 .../AppNeighborLinkage/familyInfo.vue          |   5 +++--
 .../AppNeighborLinkage/memberInfo.vue          |   3 ++-
 .../AppNeighborLinkage/myNeighborInfo.vue      |   3 ++-
 .../AppNeighborLinkage/neighborDetail.vue      |   6 ++++++
 project/sanjianxi/static/avatar.png            | Bin 1134 -> 0 bytes
 7 files changed, 16 insertions(+), 20 deletions(-)
 delete mode 100644 project/sanjianxi/static/avatar.png

diff --git a/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue b/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue
index 345ca5d..9b58d85 100644
--- a/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue
+++ b/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue
@@ -1,18 +1,6 @@
 <template>
   <div class="AppGreatPowerIntegral">
-    <u-button type="primary" class="" @click="show = true" >按钮</u-button>
-
-    <!-- 弹框 -->
-    <u-popup v-model="show" mode="center" :closeable="false"> 
-			<div class="dialog">
-        <u-input v-model="value" :type="number" :border="true" />
-
-        <div style="display: flex;">
-          <u-button type="primary" >取消</u-button>
-          <u-button type="primary" >确认</u-button>
-        </div>
-      </div>
-		</u-popup>
+    
   </div>
 </template>
 
@@ -22,8 +10,7 @@ export default {
   appName: '强国积分',
   data() {
     return {
-      show: false,
-      value: '',
+      
     }
   },
   onShow() {},
diff --git a/project/sanjianxi/AppNeighborLinkage/addLinkage.vue b/project/sanjianxi/AppNeighborLinkage/addLinkage.vue
index 9029cc0..bc618eb 100644
--- a/project/sanjianxi/AppNeighborLinkage/addLinkage.vue
+++ b/project/sanjianxi/AppNeighborLinkage/addLinkage.vue
@@ -76,7 +76,7 @@ export default {
         }
       }).then(res => {
         if(res?.data) {
-          this.form = res.data
+          this.form = {...res.data}
         }
       })
     },
diff --git a/project/sanjianxi/AppNeighborLinkage/familyInfo.vue b/project/sanjianxi/AppNeighborLinkage/familyInfo.vue
index fe8b847..3871585 100644
--- a/project/sanjianxi/AppNeighborLinkage/familyInfo.vue
+++ b/project/sanjianxi/AppNeighborLinkage/familyInfo.vue
@@ -3,8 +3,8 @@
     <div class="card-list">
       <div class="item" v-for="(item, index) in familyList" :key="index" @click="$linkTo(`./memberInfo?id=${item.id}`)">
         <div class="userpic">
-          <img src="../static/avatar.png" alt="" v-if="item.photo">
-          <img src="../static/avatar.png" alt="" v-else>
+          <img :src="item.photo" alt="" v-if="item.photo">
+          <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="" v-else>
         </div>
         <div class="user-info">
           <p class="name">{{ item.name }}</p>
@@ -69,6 +69,7 @@ export default {
         height: 96px;
         margin-right: 10px;
         img {
+          border-radius: 50%;
           width: 100%;
           height: 100%;
         }
diff --git a/project/sanjianxi/AppNeighborLinkage/memberInfo.vue b/project/sanjianxi/AppNeighborLinkage/memberInfo.vue
index 0a14e8f..3ce0600 100644
--- a/project/sanjianxi/AppNeighborLinkage/memberInfo.vue
+++ b/project/sanjianxi/AppNeighborLinkage/memberInfo.vue
@@ -3,7 +3,7 @@
     <div class="user">
       <div class="pic">
         <img :src="data.photo" alt="" v-if="data.photo">
-        <img src="../static/avatar.png" alt="" v-else>
+        <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="" v-else>
       </div>
       <div class="info">
         <div class="name">{{ data.name }}</div>
@@ -120,6 +120,7 @@ export default {
       height: 96px;
       margin-right: 10px;
       img {
+        border-radius: 50%;
         width: 100%;
         height: 100%;
       }
diff --git a/project/sanjianxi/AppNeighborLinkage/myNeighborInfo.vue b/project/sanjianxi/AppNeighborLinkage/myNeighborInfo.vue
index f6a30d3..0ffd098 100644
--- a/project/sanjianxi/AppNeighborLinkage/myNeighborInfo.vue
+++ b/project/sanjianxi/AppNeighborLinkage/myNeighborInfo.vue
@@ -4,7 +4,7 @@
       <div class="item" v-for="(item,index) in userList" :key="index" @click="$linkTo(`./familyInfo?idNumber=${item.idNumber}`)">
         <div class="userpic">
           <img :src="item.avatarUrl" v-if="item.avatarUrl" alt="">
-          <img src="../static/avatar.png" v-else alt="">
+          <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" v-else alt="">
         </div>
         <div class="user-info">
           <p class="name">{{ item.name }}</p>
@@ -64,6 +64,7 @@ export default {
         height: 96px;
         margin-right: 10px;
         img {
+          border-radius: 50%;
           width: 100%;
           height: 100%;
         }
diff --git a/project/sanjianxi/AppNeighborLinkage/neighborDetail.vue b/project/sanjianxi/AppNeighborLinkage/neighborDetail.vue
index 0e56a43..3500243 100644
--- a/project/sanjianxi/AppNeighborLinkage/neighborDetail.vue
+++ b/project/sanjianxi/AppNeighborLinkage/neighborDetail.vue
@@ -115,6 +115,7 @@ export default {
     }
   }
   .btn {
+    display: flex;
     position: fixed;
     bottom: 0;
     left: 0;
@@ -125,6 +126,7 @@ export default {
     background: #F3F6F9;
     .delBtn,
     .editBtn {
+      flex: 1;
       height: 88px;
       line-height: 88px;
       text-align: center;
@@ -132,7 +134,11 @@ export default {
       border: 1px solid #FF4466;
       border-radius: 16px;
     }
+    .delBtn {
+      margin-right: 10px;
+    }
     .editBtn {
+
       background: #4181FF !important;
       color: #FFF;
       border: none;
diff --git a/project/sanjianxi/static/avatar.png b/project/sanjianxi/static/avatar.png
deleted file mode 100644
index 064c6426f3476620ebddf172321d546d3a210b7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1134
zcmV-!1d;oRP)<h;3K|Lk000e1NJLTq003YB003YJ0{{R3)kcR300004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#bx=%HMNDaNrOE!K$^E9t|GV1%rO5rJ%Kqx~|GL%x
zrO5rJ%KfFt{H4hJrpf%J$o;z1|L^$!@A&`l_y48I{qXny@Av=l_y48I{PFq!@Av=k
z_y6$t|M2+#rO5p6_y6wp|Kjid!rT4L;r-d^{;kdYyVm@*(){5lPp|+003CEvPE!C`
z(KQ3^O8*b}iQC9ys37l3U!2C#Ho%G7sGM>r8TXL@00VAGL_t(&-nClSmZCrqB_{!q
zG0*8h{Qpl}R-GMIsX({hXS=RlxvFs-782jh%6t>16T(eiX0D$&??Mt~o>+jFMQ<QU
zic=~;q^H7;BPtQ;4~{Z2l^(dBV8L?(6Y<4Hu(2stQ}~`(1<zk++ApyhUn|TVg~9+K
z*V;iQ43V)cvCV}s@-4%<p|C*ce@6X$L%6B1MCzjQ#T$SyMA-lDo3_)jinVSB{0@<c
zeH$%jhzAo(Z(;dOET7Pz42#|xfd1cW`HHwhZjmoV92mc2ESI52IHng24E}#ezLW}9
z)Qh1L&;VK@02#vP+zRIB7LzaI9?afP9%`VV8#+))|M_a*nO$H4cm;3nNrf=7z+bfB
z(PDN1u)g<{e5v71AYkOUh9rP>G|PH$2hq|5aI|@3jIjuitn?FYCH#|)CV;Ih%102V
zpCU*T!bfch9-eyo9Kngw5XZ<E!A(aIR+}0tFS`2?+9-}TaquWSc%QB;BKaO`3Et#r
z^IUX80#^dO9{-jcR7F!&aP2NYUBSg|%rJqJ_{e}IA|8Q41(Z(ySrz3DKCD_s@>JFw
zeBhu1P2pY?I>f}$+Fd}T6oD9Gizwg_;2FCU_5=e)Fwg|_RH-d4Fd3QNsf=oU>pOE(
z##|3o9W~Hrb0Sq>zN#9=(b8dUK3Y@xQ?ldD-h)~l0YB;5=Z)_#;TH4G`BcfYB}k~E
zZ%N=$ZHp~IMm1ix1QFFb!nISemPZNI{35ej&p37>+jlrysFrc8AO{en|6)YiV*sJk
z(Q;Lb8#)n@L*PySU`^{r+J}fScKY`n)_m!v7xWklC%myGn_ty|94@g+U`YSRL97y%
zJhjns1>&~HmLad}oOR;wanU2|oTsYLchUe)%Tym;sg1ETLkq9e=1alBRQ{adWhwX@
zZN0htStAg^i&-r#@Y9NA@M?LGR%qeX@?$x!?FeFcIeuU7_tFvr_K*{$ob3mtqcp;v
zSUOvRPT-F?+Ll1O_%qb5vXfu!sE4$p6+?AoJT>mk<?pww$I`Q@{4@92+RPBN`e(WI
zd%gVcb>Al(59`Dqj?PL1^@T6~QX74jP&03FFcN>a_LVeub=^5ONa{V(*{OZ~j?Y_m
z=feVtI-GZJ{6gngpRfB%RVh_fm;LozADP1c08<(_b0tvBBme*a07*qoM6N<$f?tb2
A1poj5