From c1dd3375450a7207ad9593389b86bc4d2e39ea87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 24 Dec 2021 09:09:33 +0800 Subject: [PATCH 1/9] 25889 --- src/apps/AppMarryAndDie/AppMarryAndDie.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue index b8077e40..e5ce7e07 100644 --- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue +++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue @@ -395,7 +395,7 @@ uni-page-body { .imgs { margin-top: 8px; img { - width: 201px; + width: 32%; height: 204px; margin-right: 8px; } From d687db47f3e977025a0f864fb0cd06bbe238aa19 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 09:21:17 +0800 Subject: [PATCH 2/9] bug --- src/apps/AppResourcesManage/img/play-icon.png | Bin 0 -> 4167 bytes src/apps/AppResourcesManage/img/stop-img.png | Bin 0 -> 3663 bytes src/apps/AppResourcesManage/recording.vue | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/apps/AppResourcesManage/img/play-icon.png create mode 100644 src/apps/AppResourcesManage/img/stop-img.png diff --git a/src/apps/AppResourcesManage/img/play-icon.png b/src/apps/AppResourcesManage/img/play-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..93d3c996361b7c81fd374884bf0928204178aba2 GIT binary patch literal 4167 zcmV-N5V-G&P)Px_0ZBwbRCr$PU2BX~)WZ z&;rI}5GI0AuPmRC03!*)88G@8=qI8R1U>}d8_4*YB-*#p>plb!*AmOf?u)rQaN?pg zq?ruN1k()wt^v?!(z*r!>;dr(0(xAKdp3BdA2n&NiVSNz04(g_i3xY?CYIB4CD0uV zTvZWH6`6#9FJ$mLB)K-%N1L{<@1SHg>Crm3EdVgPgX^X>MdnDLdzi5RV7JzVR;E2g ziLg-yzkV|2>3*++Qk9uk|16dUz=CI^Ka(fO4}-A?z(x9(S(TngL0BgZN-u9*>ON2v z3RFyLNdPPeL}ts3B>?6DEU8$Bg`1EJV3S1X-01bZXEj1C1%P&cxRpW60lwa9j53BE z>Lu`sE?;xVnDNRV#S#E$dpev<~3&${}?8 z^`##{yeQ~xe%s8on+JdnmfD*l&&Z6WR3&B8OvY7WY!+uF;n}X3=P7h34kg1sQve_W zHu0v&E5x|haEiy_fJ}I;A?A6|j6jp&0BBotVj3pYZ2za8p(P+V^MEBotVGni3^YG>0PLgVE~x-Tx3R_gl@;aH%c_c z#-YBHj5(Vg_lRtzvOhxrkp1Pq?+Cwad8izK`r_%tEF*S;vH_4i^S3$MzDn5{){J^F zn7XB0ouDiLDCt>^QE}!w3ZG$u)iMxmtsijDFULC24}cDqTAL!TI;Nf$ff?Ucn24d6 z=K;Nb0^I;;>kO{}VX5&;az@n30V1sF@-{!IwV!CO3jo5s%Z!lY;nTx%4srM`Ncx>ik&p(+5h`lG7|vMw`2E9p*qV>rOT>X5Iw z-Jx=znF@mYwD3o-u>zYz2=OqEq=8uHNZ{B|8#AVJ*^j6U4X&r0qF##ZM z>_C>cm_wX1YDG98Nw<%618GbEwE80-jhE|M6%j@iCK1=rLO##0icMV<0GW%L2v&h+ zXG()PKtNlu3#ml`(B_ZqaAN!hOQLGSQE$-a5#@76eFXuKxxU5kR*ha~V#7Hg5#3zK zIaCk;j^=MT|1B_JVT)iC0F<&Ub-dqk`C33`hLS+Cl%gv~ma7>BfVM#R88AwEkPM~G z8LToKAgl^{o1e;`Y#0Et;ofg;SdghQ47C3&M+XKxKg|yp4+B7JAU2mcy~+OTbXHJ| z15B=YA#c;>+`kV4KzktaH)a+k*_^LNIY30~y1br;Mgbt3;{Ahli!hEYk)}z6TduCh zFD|Zwdy0h93C6+WDg1YT5(iJDYgC+imPOI}0rv&DRPu8>fSvvRS6tx2L%*4fNfR^6 z5&xy^%ETXgkE9UX701!2DL1V3NTIrY^5O&M0MP31_Y=rlUCOl2?wKOtiMdnIFo6`I z=N5Dh0J*kcn>mO)#m^pO0K8abwrN5E0Fd*z4G9_arqGp(<-F!jv; z+S2*^AC3+@WaU$U}0M9(tb-W|t>UkySYM;ihWFYNNRyrHnFEzlnT(_%dW zsCJ*u`x=LS`6UIPp>_xqSs)PMSS*dMopJ2`*76nJjbSSNbQ=A13{n1O$!2%%Vg%SO_h>~gKIeg z@|8dVnfx6f9|Spbk{S5$KvFpxYSDC*h%Tr0&hR`Ym|Bd`MEPSR0E+nmhRng-xj&>2 zWDbFhZcwQIV4AUQUlN-?ODG=3TKR}EpV|ZA-!bDac3o7l9iW&WAYZ_W;3;Db%|T z5}98QCl_ZJu`BF6l)@VypT+kP+e97rP+K7UJs20;Qu+YQ@&gPDA{7fX6|fqFJ6Y%k z!iNyHdeo6{MCewHvKB$2gvs{7TOu||1RTE%$k+}din%Md)@4l!OH)-zKR^x$ zBa=;v9v9g-!=JlPuHX;$C-Kiu;s~FztmqX$D&gQ-O$e!mA3%hK*V`x< zlt~D&drFuE`~V^xECj#*n7uNIm6WjYloV>TAK;jh5E94ELzdL=OX?j;QmEb2!mHs2 z5Gi3@I}>={-YH?3v~U3vJ6{Z`q#rKd`mqX3W2gqFv5s4j^&+aLC;ty{y>~g4`uZNqJ4mJb(zWh$M~f zy$NjFR}&_khTngYGI5F?V8cR@cmJ{hv#y+28UWcap(qmdA5kRg^V+)Us}=!83q>k= zKp;Gq7`7@EJF-mNsEFOUSZ=mV-0s@E>#r67Oqdt)HWw}xYu94Y`Gq12fK84V( zny&VtR{mobi&osiHZ2$5IEiqpC>8sYI;Cu!CXK&HwkW0YOMc{EA`W9`vY)1y(@UBG!Z&K|N=K_&MF zeJ$#rjmyRcoQES-u+|PubUhrIi4QnW$J#-_W6`Ml=~(3$a2}7gyZnK29*=e`0=vt< z%;)39^6%;#xH3)YJpgB3WpF;5aDb97c3t!4lE(dG5j<2Od5l)A{_rXSp0vrz9Ws?7 zHCP?;HJ5w-mqTO9x- zON3hsy%b)Ea@7D(%);lRt4Nleqrk!#U`bjXTI?>l_2-tL2>{t}@q2cCUBtq2Gm5mH zfdS9#{I`Ki4Xg9cDp$hmiHXMO+W_BY%yOJjv~hs8 z)(^Pn=UxKW);H6-EC49_z?u`&FrjW6z}M>`!0Drx1JsMb)Gfhf(@*Lh!4Lq5L2h4r z?ED5-{rirmupCin=}Ud_bYj+)CoVj$rB|W0W$ysFLFYXenNcU9+W|qjA}Q6M`cg9H zYts8mZe|85un@^%8D6FA3#8t!XuL%s2IV!jc-{M^)r0w7N(*x)FJnx$K!18v1% z>h5yS{E?Fw4gfKMunyu)kyjiO(HIa2Q?DWBd9WO9zZfN^06>|ngQfPS*fTQAOC67) zJ|GAWpG4BLU9qO8^xFBQW;PE1*_nmg7)W7eY*-Nh2--v_d0JCsB{4nWB$X6Bk!2=cdot#ET1!Y* zr|gw(6$3zy$jr4fyy*A~Ms4|h65&y`nLOnPJ-=_o0iak3{=<{vn6{k2J}29lk_`4Y z;PeVLIebP5-ZVde76P*==bZrGsij}-w57LP>{?PPb=%DKR%Hhmxgc=^iDh0%;2X_c ztX0Mq*R@EZr-O^#-PNYa5&+0Cq1_*DWzh24btO|Tfmd|-nnTqVyd{o+Vob;?ic0{@ zv%kflBx-Du2%VKy@YI0JQaiv%f|YVL6Xb`%SOnlAH4Cy(o1-AClLn=iH!gJ_un=9t zNU<~ka+GF#2m^B@$oDW~0l*f0?w+DV*eFAK{ba1MyHd7%IpDGd0P+{8q@lTEH?hof zCGZ^#TvZMO%Izx(FU#O}NOEnik2Y;LBVbc5jbrt<9RNlyMwGfwLz>CJOfZQuDAxdJ zG>K^g0QP`*2LU}U$UPgp(~p`oS4D=kJpe{?iD^L~I)i1t8WJuCa2bPUF!OW*T0m$4 zV=@R6!KhdI6U6I|Nf6F}(a%6X5uG5g$h!FkGQK8>_HFdK4*_KD#{f0L=KpiB7Y%=6 RU(x^o002ovPDHLkV1jh*sMr7i literal 0 HcmV?d00001 diff --git a/src/apps/AppResourcesManage/img/stop-img.png b/src/apps/AppResourcesManage/img/stop-img.png new file mode 100644 index 0000000000000000000000000000000000000000..57180c34dd1322fb6155fff79feaa73342df824f GIT binary patch literal 3663 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 literal 0 HcmV?d00001 diff --git a/src/apps/AppResourcesManage/recording.vue b/src/apps/AppResourcesManage/recording.vue index de2b34c6..9162ba12 100644 --- a/src/apps/AppResourcesManage/recording.vue +++ b/src/apps/AppResourcesManage/recording.vue @@ -109,7 +109,7 @@
重新开始 - + 保存
From fbd61baa678c472e706a839d3d2f7dc092dad4ac Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 09:29:17 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=B9=A1=E6=9D=91=E7=9B=B8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppCountryAlbum/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppCountryAlbum/list.vue b/src/apps/AppCountryAlbum/list.vue index 65117c73..0111e06a 100644 --- a/src/apps/AppCountryAlbum/list.vue +++ b/src/apps/AppCountryAlbum/list.vue @@ -50,7 +50,7 @@ export default { getList() { this.$http.post(`/app/appvillagepicturealbum/queryAlbumMenu`, null, { params: { - areaId: this.user.areaId, + areaId: this.areaId, } }).then(res => { if (res.code == 0) { From aaf1d114072b54cb0c8f8a079352bc807149769e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 24 Dec 2021 09:33:49 +0800 Subject: [PATCH 4/9] 25832 --- src/apps/AppResidentDocument/DetailCard.vue | 6 +-- src/apps/AppResidentDocument/DetailPeople.vue | 39 +++++++++---------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue index 7a8afb9f..42a506b7 100644 --- a/src/apps/AppResidentDocument/DetailCard.vue +++ b/src/apps/AppResidentDocument/DetailCard.vue @@ -12,7 +12,7 @@
-
家庭成员 {{ data.family.length }}人
+
家庭成员 {{ data.family && data.family.length }}人
@@ -26,8 +26,8 @@
{{ item.name }} {{ $dict.getLabel('fileStatus', item.fileStatus) }} - 户主 - + + {{ $dict.getLabel('householdRelation', item.householdRelation) }}
diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue index fcbf24d7..ad49a3a3 100644 --- a/src/apps/AppResidentDocument/DetailPeople.vue +++ b/src/apps/AppResidentDocument/DetailPeople.vue @@ -2,21 +2,20 @@
- +
- {{ data.resident.name }} + {{ data.resident && data.resident.name }} - 户主 - - {{ $dict.getLabel('householdRelation', data.resident.householdRelation) }} + + {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
-
{{ data.resident.phone }}
+
{{ data.resident.phone }}
@@ -28,47 +27,47 @@
籍贯 - {{ data.resident.birthplaceAreaName }} + {{ data.resident && data.resident.birthplaceAreaName }}
身份证号 - {{ data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }} + {{ data.resident && data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}
民族 - {{ $dict.getLabel('nation', data.resident.householdName) }} + {{ $dict.getLabel('nation', data.resident.householdName) }}
文化程度 - {{ $dict.getLabel('education', data.resident.education) }} + {{ $dict.getLabel('education', data.resident.education) }}
婚姻状况 - {{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }} + {{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}
政治面貌 - {{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }} + {{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}
兵役状况 - {{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }} + {{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}
宗教信仰 - {{ $dict.getLabel('faithType', data.resident.faithType) }} + {{ $dict.getLabel('faithType', data.resident.faithType) }}
职业 - {{ $dict.getLabel('job', data.resident.job) }} + {{ $dict.getLabel('job', data.resident.job) }}
@@ -81,27 +80,27 @@
联系方式 - {{ data.resident.phone }} + {{ data.resident.phone }}
现住址 - {{ data.resident.currentAreaName }} + {{ data.resident.currentAreaName }}
现住详细地址 - {{ data.resident.currentAddress }} + {{ data.resident.currentAddress }}
户籍地址 - {{ data.resident.householdAreaName }} + {{ data.resident.householdAreaName }}
户籍详细地址 - {{ data.resident.householdAddress }} + {{ data.resident.householdAddress }}
From 2fd3c2bca86c853750e0a1af16700fbd94b975e9 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 09:34:19 +0800 Subject: [PATCH 5/9] bug --- src/apps/AppBuilding/detail.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/apps/AppBuilding/detail.vue b/src/apps/AppBuilding/detail.vue index f06a6ab6..38bfe65f 100644 --- a/src/apps/AppBuilding/detail.vue +++ b/src/apps/AppBuilding/detail.vue @@ -41,7 +41,7 @@
- +
{{ houseInfo.createAddress }}
@@ -127,6 +127,7 @@
+
编辑修改
@@ -520,6 +521,12 @@ export default { font-weight: 500; color: #FFF; background: #1365DD; + position: fixed; + bottom: 0; + left: 0; + } + .pad-b112{ + padding-bottom: 112px; } } From 2fed2844f7723f0c957df698ec8284584adeef1e Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 09:40:19 +0800 Subject: [PATCH 6/9] bug --- src/apps/AppUniMsg/Add.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppUniMsg/Add.vue b/src/apps/AppUniMsg/Add.vue index 597a4abf..ad25af86 100644 --- a/src/apps/AppUniMsg/Add.vue +++ b/src/apps/AppUniMsg/Add.vue @@ -17,7 +17,7 @@
- +
From 3d9d0bf6dd02813421bf7c7f70221cc1df1fabd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 24 Dec 2021 09:40:37 +0800 Subject: [PATCH 7/9] 25828 --- .../AppResidentDocument.vue | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue index fdf8f409..e71bee3e 100644 --- a/src/apps/AppResidentDocument/AppResidentDocument.vue +++ b/src/apps/AppResidentDocument/AppResidentDocument.vue @@ -1,6 +1,9 @@