From 82b50d7c2049cc7a3db2e3c86d9da126ea858869 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 23 Jan 2025 14:35:54 +0800 Subject: [PATCH] finish tid1807 --- src/pages.json | 30 ++++++ src/pages/index/index.vue | 2 +- src/pages/menu/forth.vue | 29 +++-- src/pages/menu/second.vue | 32 ++++++ src/pages/menu/third.vue | 117 +++++++++++++++++++++ src/static/images/third_pages/banner.png | Bin 0 -> 23995 bytes src/static/images/third_pages/bg.png | Bin 0 -> 2519 bytes src/static/images/third_pages/tab_a.png | Bin 0 -> 2399 bytes src/static/images/third_pages/tab_b.png | Bin 0 -> 1962 bytes src/store/index.js | 2 +- .../authorization/components/user_info/impower.vue | 3 +- src/subpackage/menu/components/bottom_logo.vue | 37 ++++--- .../message/components/edit/upload_img.vue | 6 +- src/subpackage/message/components/fixed_button.vue | 2 +- src/subpackage/message/pages/complaint/list.vue | 2 +- src/subpackage/message/pages/work_order/list.vue | 2 +- 16 files changed, 237 insertions(+), 27 deletions(-) create mode 100644 src/pages/menu/second.vue create mode 100644 src/pages/menu/third.vue create mode 100644 src/static/images/third_pages/banner.png create mode 100644 src/static/images/third_pages/bg.png create mode 100644 src/static/images/third_pages/tab_a.png create mode 100644 src/static/images/third_pages/tab_b.png diff --git a/src/pages.json b/src/pages.json index d007de2..73c4bde 100644 --- a/src/pages.json +++ b/src/pages.json @@ -10,6 +10,24 @@ } }, { + "path": "pages/menu/second", + "style": { + "navigationBarTitleText": "推广营销", + "componentPlaceholder": { + "bottom-logo": "view" + } + } + }, + { + "path": "pages/menu/third", + "style": { + "navigationBarTitleText": "商家服务", + "componentPlaceholder": { + "bottom-logo": "view" + } + } + }, + { "path": "pages/menu/forth", "style": { "navigationBarTitleText": "个人中心", @@ -1003,6 +1021,18 @@ "selectedIconPath": "static/images/tab/ta_1.png" }, { + "pagePath": "pages/menu/second", + "text": "推广营销", + "iconPath": "static/images/tab/tab_2.png", + "selectedIconPath": "static/images/tab/ta_2.png" + }, + { + "pagePath": "pages/menu/third", + "text": "商家服务", + "iconPath": "static/images/tab/tab_3.png", + "selectedIconPath": "static/images/tab/ta_3.png" + }, + { "pagePath": "pages/menu/forth", "text": "我的", "iconPath": "static/images/tab/tab_4.png", diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 21e9c93..38e7e21 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -121,7 +121,7 @@ }, { id: 6, - name: '设备管理', + name: '智能设备', path: '/subpackage/device/pages/index/index', serverKey: 1010 // 后端对应权限编号 }, diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue index 9af5aa4..2fcc2b9 100644 --- a/src/pages/menu/forth.vue +++ b/src/pages/menu/forth.vue @@ -6,10 +6,11 @@ @click:login="loginBtn" :nickname="userInfo.nickname" :name="userInfo.actual_name" - :account="userInfo.mobile" + :account="userInfo.mobile || userInfo.username || ''" :photo="userInfo.avatar_url" @click:update="updateUser" > + @@ -29,15 +30,14 @@ (复制网址) - - - + + + 总后台({{ deadData.backstageLink }})复制 + - + 投诉建议 解绑退出 @@ -218,4 +218,19 @@ export default { .fm-copy{ @include flcw(32upx, 44upx, $mColor); } + .fm-admin{ + @include ctf; + .fa-txt{ + @include flcw(32upx, 44upx, #9A9A9D); + @include tHide; + .ft-txt{ + font-size: 28upx; + } + } + .fa-copy{ + padding: 0upx 10upx; + flex-shrink: 0; + @include flcw(28upx, 44upx, $mColor); + } + } \ No newline at end of file diff --git a/src/pages/menu/second.vue b/src/pages/menu/second.vue new file mode 100644 index 0000000..0e40ef5 --- /dev/null +++ b/src/pages/menu/second.vue @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/src/pages/menu/third.vue b/src/pages/menu/third.vue new file mode 100644 index 0000000..92636e0 --- /dev/null +++ b/src/pages/menu/third.vue @@ -0,0 +1,117 @@ + + + + + \ No newline at end of file diff --git a/src/static/images/third_pages/banner.png b/src/static/images/third_pages/banner.png new file mode 100644 index 0000000000000000000000000000000000000000..17323159ac94b1713aef580684980aa28b87751c GIT binary patch literal 23995 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 literal 0 HcmV?d00001 diff --git a/src/static/images/third_pages/tab_a.png b/src/static/images/third_pages/tab_a.png new file mode 100644 index 0000000000000000000000000000000000000000..afc8d31dc3baae55c6875e6de4a5d615f37c8ebb GIT binary patch literal 2399 zcmV-l3840gP)Dt(^e(K`J=*+0_>)P$(%j(#<=f0EZ-@xeGyY=DC>b{iq>)q(Ql=R-l`PIGc=hN!o z$?D$0>e{^L)v@WfjOWv^>EFQT*tPTU=J4dv>cN`wFC6s>AH{d z)w}7qjQ8Tt_1?+q#-Q%$*YM7<^xeqkxsC15uk_i&_TkUyxs2}Bxb4QG=GD6GAaNc;l$_0qV)0T^z!QFyp;3v>GSdF^YiTG#+~=(*X6>P<-U{S zt9ka}&gROa@X)gF%&p|QjrHHm@zJ&P+{W|S!spJY_1?)!U` z(dgg7_~_Z|U!^xDMx^Xv2Q=kwRT@XoL7!=38Al=tJ) z=+(3G@8s_3*685D@zlBL&aCdprt80$>AH~c?A`3<&+FsJ<=4CE(68;rqUXn<`tauZ z?&Iv`⋙K^3}ZP%c$tdr02z*{r2(p;?U>b!{^+=?7^GryOR9$?eFT??da0x+P?DC zy6V-p=E9lz?BMO^(CXvH=-Ig8&$H&gmi_tl`tIcE;Ku3U#N*Ss>D05>xtr_2nd`om z`|;@c?cwO$#_HF);LEVy$*k$Qjq>i|@ax>^;>GLQzT(if=Dd>s{QB+Y*X`)k>*UPp z;mhjb$LHC^>)pcU*ud}0s@%e*+Q6aj>)Gt&)9d5T>E6uc)xPY(n&`HP=d*?D-^JeI8?y`JT-e)RF_-NdKl!=v86px(Qf=(dab>)`O`*YVlG z2J=Hubs*Vok4(#puj#l5<;v$BzDYH4*X00jU51-MB>K~zY`?UrX)QehOw zaogT|@4ffld+)uAk~ETtf>cOpNtq>KL&ZuoBq=Hrr4oru(?m0Krz1 zF4Xh%t)D(V_sjd^f6jS1SITdx-D1@61?|fEOdYUz*vPK6DSttY;jNfVvAa8;;l&N* zZFSv0toffRnhl~M=yawSEc=kf?ZMn}f1>EVOv2#^1RRb8G-7wY-m?AZkeXIIMo$v> zP%%CN4vo$P3)deCa@)RpinU>?aeSyA9v&0vjr#(Zzf(7|?!@>^v90+|poB5Jhm%p2*0su*gWT zC|Djo5;_ytLo_A8*Fr(nrR=I$oN9%0d!eksG$`QFDs|XaYlLaXBC%9rIw2KugrFE-o%xv4js# zQX+}GGD#;g$qX6?Cn<)bZ*VyQE&$y$3G_rbkWA8wj(U=ybV0-*NfCNtm^SttNE(t$ zh!IzyqiDoxA(s3wV&NOo3Dar#viZVEAzU`K@+dr27%m$~&}Ea7CmGDdQP^d0l&cPc z3rmBilSE5+`fDFAO&mx%Vlkb@K^9l(R;3bu0YinmVKJG00YO4Kow0mmp;A52CQ!gC zfG@E?f>uEptO8?863389dQEm`;w-R}0KAkW=1U2;q!)#Z&J1Lc7}ukZVLi%m5Pa37 zi6bba)arvQpy3DrjzmI3iyG}UA_#FydQ!+4<;8FpBaPveVO;jGO!RHFydal&G5GG_ z!HC6%mlrMuIs!qK+FF#<8nDlc0Uit=y}7t@ z&8B^`-d1RO)L7rN{rjy1uAsm%u*3JrlP7659b4FvonG5?^}N2%pFiKbckjFR==}cu zZlEwaqyd=)1$k*UL%aX#^tz_2=J(xez-J2Rh6a5$kWMW4qeRtb(+w|;Wm8q zq1y;=JxNJvc?Fq;DcZ-`Ii=Tu*Qvt9H$}z89}6=z`FUx6GFkg(CX%{=fo&YT4ICrL zg&<}U(0m3*#TFDLzmCoi=-9$2d4zCu(4S61}0SFb-8 zSA0Yg(WUbkV~6h(I6CC!=E`zq7(bm(l%Ju=QblWTfhIdACnr1m#p7Gr=#=AGu^H(h zBGDy4Bob94I($b@Jx2#W1G+kOMEP|!nT4v9Xsz}ZfmRzGtvVhRp{bjZo*oh+3PGf| z>Czh{UvC0+#{1wstEh&#qyf5x-83BAhbB(=+fMSi->rqKGH} zo_2+Ym&C;-UxuG#ySDWj*K1tmDL`3x!W<_%hzOs99I?o<3lo9=hL;@Pb+}67dR6OJ zb-GdsyeDQIF~`a7G9o!HIWDfG1q3I7BDQum8Zitpm%(n3xu RiQfPK002ovPDHLkV1j}*j5q)Q literal 0 HcmV?d00001 diff --git a/src/static/images/third_pages/tab_b.png b/src/static/images/third_pages/tab_b.png new file mode 100644 index 0000000000000000000000000000000000000000..545b00be3776f3292d4bfdb91ef89fed87145792 GIT binary patch literal 1962 zcmX|B2UJtp77c_dMWm@rhCzf6!^kKI3Q`25gpV*%q$@3`hy|2Eq$q-bFpgprlo~{8 zAe2yoAd>*0BoLB70x7hB!q6lTdKv!JS?k}m-hJnuch1@S>~q&kz2sykb3o+)1Okz< zhg-XVw>5Z-C7@t$3XelUAi@@xF1p!(gTWXW7zAr*XqZZ+Q>iopp3v3VH8eCt zr_;ZD`NHLLX*60_S66RuAFvq==E%s%^71l=!(p*l1t`?`_&CVzXzyrlZXO*S<#4zZ z3YFAD>h0|%_4KgW942#!N~MA<=Jz!2t_~Cj$L{WK zB9X{qeRBfb_V)JH*48E*4p61j2S7T7(qE9D57Gf5r~^D8cyN#b{NF3HSu74PK)~Q2 zlSUf=9ZgM5k;!C01|atL(+36yN{Wly2yHc0RWma)z?qw!O`%XeefreV(Sfb4U0Pbg zH8v9P_eAxk#)bw! zgUcPs%g(Muqg$GrLF0u51!H4lB+@sv!GQ31JkX)DvlH|SfWChH3g}g!(S<00oC_#{ zHvgSzPY=1Rtqn*DSOKYppaX4IgIU3vnpbQ3s zsl(PaHa2EWcpHE_ln~+K_LTwKVCk5d0hY;SX8eSK|BAXr&s zF^HIV=?}x~Y)o}j_I7u-w>CD`mzNd+{Pbt`&=9q|t)adg^)e;$rl-5p1#?q_6B@F6 z+uK`P-vR|IEA!LSys^=d;bBTo7p}gp4qH|E>g68~A4J~t^>DUT_fbO8AP|wa_STke z@b1OT4WB`aBi*iYLY5*UF-xr*W8XKQ)7eFi^{Hphypi?kbgwB^)1KTMj$OKUJ7K$i zd3NgVqx`GL>DisxjbBMu%3y9Xo@1}cum2P>G}redy^BZx+Uubo9*?dnT?sBehg0+G zHu~FX!}P~iWpOu5Xz8xT=rOo&1-X}g9|AYHO(x>e-e)Us9uC%*H&G19xE%Y?ex~w; zy1ldQ0~oWZL|Y!;X=-dGH)?{lx3x!N+x5`}1ldPM8Sjs1czt+2r5VC{+E*qo4u{z& z1`Mh>!wgc%T_wyq&ETz|4+5yAC2ZB+)J-(#HH)O9@Sf>)ln4=5JGjkO)@3#e^7mrgMvQ_v=9hAQ;e0d?sGR8KzeY1ki z_E(;_#xZ`X9e>#QDVWR6Ju5m2LuY1go>!N|Y{kBUYq*=2bV!(pWuASsNqbgy`k9`r zeQIK7iUu;#sTOOYaRT$iOgcCEMh1VEa8En#?J;G^9bx$?M&jD3`tux9RqDZm&s|*| z+7|;gbRp41EJj(9)?k{P>fcTg%9zQGjxqC{L|`!uy6m~VG>yVOz6;Dn%#BD+4Uzma zi>oF7AA_A(v=}nmx<>WN@sl(f#KY`eSTBt73o`jq{Lh!W0^thVk&95~k*FZI8&1kM zSJ(X=%!CwERh+NUKa+yOyxz_UpQybN))(dbIx72qTQGCYIwnRAa=~hNG+`m|Xwk9z zT7dztes1Hi(`pkwpq|)-wS=xp8{Uc1zXHj^$YFimolV={obntL4Mb`lRF;&0szMJD zsJI1U9kC!SG2^t3cw(HsAuNy=fjD294kbYL)zt_WAW|IZ@?5=$Yq)^|$xo`fh;yfY zm#rK@c#A?M3ora2+>kPp!T3ikdcMr|asMg4-kGG}PWANi;S}jS!)nB%eZ)Y{s{BOH zQ>%+Ah8gn~0iB2+^_qO}Qz^$pWLlp)>gc82nbb%g#Q64W@CB) literal 0 HcmV?d00001 diff --git a/src/store/index.js b/src/store/index.js index ebb04ce..f4a60d0 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -38,7 +38,7 @@ export default new Vuex.Store({ '1007': '员工管理', '1008': '核销查询', '1009': '场地看板', - '1010': '设备管理', + '1010': '智能设备', '1011': '商品零售', // '1013': '课程管理', '1014': '储值卡管理', diff --git a/src/subpackage/authorization/components/user_info/impower.vue b/src/subpackage/authorization/components/user_info/impower.vue index 5fb815a..e3f4571 100644 --- a/src/subpackage/authorization/components/user_info/impower.vue +++ b/src/subpackage/authorization/components/user_info/impower.vue @@ -27,7 +27,7 @@ export default { watch: { showAuthorizationModal(nVal, oVal){ let { initData } = this; - if(!nVal&&oVal)initData?.close(); + if(!nVal&&oVal)initData?.close?.(); } }, data() { @@ -51,6 +51,7 @@ export default { let _imgUrl = await this.uploadImg(info.avatar); let _editObj = { nickname: info.nickname, avatar_url: _imgUrl }; await userEdit(_editObj); + this.hide(); initData?.success?.(_editObj); }catch(err){ console.warn('authorize components user info impower updatedUserInfoEvent err --->', err) diff --git a/src/subpackage/menu/components/bottom_logo.vue b/src/subpackage/menu/components/bottom_logo.vue index 9806574..56a1a45 100644 --- a/src/subpackage/menu/components/bottom_logo.vue +++ b/src/subpackage/menu/components/bottom_logo.vue @@ -1,27 +1,40 @@